chiark / gitweb /
Much faster
[ypp-sc-tools.db-test.git] / pctb / pages.c
index 14d0be20aeada9cc0088502cf39a672ff372dba1..5978f74e365d5e62866422e0d3a59edb43b48d35 100644 (file)
@@ -6,6 +6,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
@@ -13,20 +14,26 @@ int npages;
 static Window id;
 static Display *disp;
 static struct timeval tv_startup;
+static unsigned wwidth, wheight;
 
 static KeyCode keycode(KeySym sym) {
   return XKeysymToKeycode(disp,sym);
 }
 
+#if 0
+static void check_exitstatus(int st) {
+  eassert(WIFEXITED(st));
+  eassert(!WEXITSTATUS(st));
+}
+
 static void check_pclose(FILE *f, char *cmd) {
   int r;
   eassert(!ferror(f));
   r= fgetc(f);  eassert(r==EOF);  eassert(feof(f));
-  r= pclose(f);  eassert(r>=0);  eassert(WIFEXITED(r) && !WEXITSTATUS(r));
+  r= pclose(f);  eassert(r>=0);  check_exitstatus(r);
   free(cmd);
 }
 
-#if 0
 static CanonImage *screenshot_now(void) {
   char *cmd;
   CanonImage *ci;
@@ -56,135 +63,82 @@ static CanonImage *single_page(void) {
 }
 #endif
 
-static void raise_and_set_focus(void) {
-  int r;
-  XWindowAttributes attr;
-  int xpos,ypos, evbase,errbase,majver,minver;
-  unsigned width,height,bd,depth;
-  Window dummy;
-  
-  fprintf(stderr,"PAGING raise_and_set_focus\n");
+/*---------- pager ----------*/
 
-  r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
-  eassert(r==True);
+typedef XImage Snapshot;
 
-  r= XRaiseWindow(disp, id);  eassert(r);
+//static size_t snapshot_alloc= 1024;
+static double last_input;
+static const double min_update_allowance= 0.25;
 
-  r= XGetWindowAttributes(disp, id, &attr);  eassert(r);
-  r= XGetGeometry(disp,id, &attr.root,&xpos,&ypos,&width,&height, &bd,&depth);
-  eassert(r);
-
-  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos,
-                          &dummy);
-  eassert(r);
-
-  int screen= XScreenNumberOfScreen(attr.screen);
-  XTestFakeMotionEvent(disp,screen, xpos, ypos, 0);
+static double timestamp(void) {
+  struct timeval tv;
+  int r;
+  
+  r= gettimeofday(&tv,0);  eassert(!r);
+  double t= (tv.tv_sec - tv_startup.tv_sec) +
+            (tv.tv_usec - tv_startup.tv_usec) * 1e-6;
+  fprintf(stderr,"%f\n",t);
+  return t;
+}
+static void delay(double need_sleep) {
+  int r;
+  fprintf(stderr,"PAGING     delay %f\n",need_sleep);
+  r= usleep(need_sleep * 1e6);  eassert(!r);
+}
 
-  XTestFakeButtonEvent(disp,1,1, 50);
-  XTestFakeButtonEvent(disp,1,0, 50);
+static void sync_after_input(void) {
+  int r;
   r= XSync(disp, False);  eassert(r);
-
-  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
+  last_input= timestamp();
 }
 
-/*---------- pager ----------*/
-
-typedef struct {
-  size_t len;
-  unsigned char d[];
-} Snapshot;
-
 static void send_key(KeySym sym) {
-  int r;
   XTestFakeKeyEvent(disp, keycode(sym),1, 10);
   XTestFakeKeyEvent(disp, keycode(sym),0, 10);
-  r= XSync(disp, False);  eassert(r);
 }
 
 static void send_pgup_many(void) {
   int i;
-  fprintf(stderr,"PAGING   PageUp\n");
   for (i=0; i<25; i++)
     send_key(XK_Prior);
+  fprintf(stderr,"PAGING   PageUp x %d\n",i);
+  sync_after_input();
 }
 static void send_pgdown(void) {
-  fprintf(stderr,"PAGING   PageDown\n");
   send_key(XK_Next);
+  fprintf(stderr,"PAGING   PageDown\n");
+  sync_after_input();
 }
 
-static double timestamp(void) {
-  struct timeval tv;
-  int r;
-  
-  r= gettimeofday(&tv,0);  eassert(!r);
-  double t= (tv.tv_sec - tv_startup.tv_sec) +
-            (tv.tv_usec - tv_startup.tv_usec) * 1e-6;
-  fprintf(stderr,"%f\n",t);
-  return t;
+static void free_snapshot(Snapshot **io) {
+  if (*io) XDestroyImage(*io);
+  *io= 0;
 }
 
-static double worst_snapshot= 0.050;
-static double worst_stabilise= 0.100;
-static size_t snapshot_alloc= 1024;
-
 static void snapshot(Snapshot **output) {
-  char *cmd;
-  int r;
+//  char *cmd;
+//  int r;
+//  XImage *xim;
   
-  free(*output);  *output=0;
-  double a= timestamp();
+  free_snapshot(output);
 
   fprintf(stderr,"PAGING   snapshot\n");
 
-  r= asprintf(&cmd, "xwd -silent -id 0x%lx", (unsigned long)id); eassert(r>=0);
-  FILE *f= popen(cmd,"r"); eassert(f);
-
-  int need_alloc=1;
-  size_t used=0;
-  for (;;) {
-    size_t allow= snapshot_alloc - used;
-    if (!allow) {
-      snapshot_alloc <<= 1;
-      need_alloc= 1;
-      fprintf(stderr,"PAGING   snapshot   grow %ld\n", (long)snapshot_alloc);
-      continue;
-    }
-    if (need_alloc) {
-      *output= realloc(*output, sizeof(**output) + snapshot_alloc);
-      eassert(*output);
-      need_alloc= 0;
-    }
-    size_t got= fread((*output)->d, 1, allow, f);
-    if (got==0) break;
-    used += got;
-  }
-  check_pclose(f,cmd);
-
-  (*output)->len= used;
-  snapshot_alloc= used+1;
-  *output= realloc(*output, sizeof(**output) + snapshot_alloc);
-  eassert(*output);
+  timestamp();
+  *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap);
+  timestamp();
   
-  double b= timestamp();
-  double it_took= b-a;
-  if (it_took > worst_snapshot)
-    worst_snapshot= it_took;
-
-  fprintf(stderr,"PAGING   snapshot took=%f len=%ld\n",
-         it_took, (long)used);
-}
-
-static void snapshot_idle(void) {
-  int r;
-  r= usleep(worst_snapshot * 1e6 * 0.5);
-  /* spend no more than 2/3 of our time constantly snapshotting */
-  eassert(!r);
+  fprintf(stderr,"PAGING   snapshot done.\n");
 }
 
 static int identical(const Snapshot *a, const Snapshot *b) {
-  return !(memcmp(a,    b,    sizeof(*a)) ||
-          memcmp(a->d, b->d, a->len));
+  if (!(a->width == b->width &&
+       a->height == b->height &&
+       a->bytes_per_line == b->bytes_per_line &&
+       a->format == b->format))
+    return 0;
+  return !memcmp(a->data, b->data, a->bytes_per_line * a->height);
 }
 
 static void wait_for_stability(Snapshot **output,
@@ -194,83 +148,151 @@ static void wait_for_stability(Snapshot **output,
   /* waits longer if we're going to return an image identical to previously
    * if previously==0, all images are considered identical to it */
 
-  double when_started= timestamp();
-  double last_change= when_started;
-  double it_took= -1;
-
   fprintf(stderr,"PAGING  wait_for_stability"
-         "  worst_snapshot=%f worst_stabilise=%f  previously=%p\n",
-         worst_snapshot, worst_stabilise, previously);
+         "  last_input=%f previously=%p\n",
+         last_input, previously);
 
   for (;;) {
     double at_snapshot= timestamp();
+    double need_sleep= min_update_allowance - (at_snapshot - last_input);
+    if (need_sleep > 0) { delay(need_sleep); continue; }
+
     snapshot(output);
-    double right_now= timestamp();
-
-    if (!last) {
-      fprintf(stderr,"PAGING  wait_for_stability first...\n");
-      last_change= when_started= right_now;
-      last=*output; *output=0;
-    } else if (!identical(*output,last)) {
-      fprintf(stderr,"PAGING  wait_for_stability changed...\n");
-      last_change= right_now;
-      free(last); last=*output; *output=0;
-      it_took= -1;
-    } else {
-      if (it_took<0)
-       it_took= at_snapshot - when_started;
-
-      double threshold= worst_stabilise + worst_snapshot;
-      if (!previously || identical(*output,previously))
-       threshold *= 2;  threshold += 1.5;
-
-      double stable_for= right_now - last_change;
-      fprintf(stderr,"PAGING  wait_for_stability"
-             "  worst_snapshot=%f worst_stabilise=%f"
-             "  it_took=%f stable_for=%f threshold=%f...\n",
-             worst_snapshot, worst_stabilise,
-             it_took, stable_for, threshold);
-      
-      if (stable_for > threshold)
-       break;
+
+    if (!with_keypress &&
+       !(previously && identical(*output,previously))) {
+      fprintf(stderr,"PAGING  wait_for_stability  simple\n");
+      break;
+    }
+
+    if (last && identical(*output,last)) {
+      fprintf(stderr,"PAGING  wait_for_stability  stabilised\n");
+      break;
     }
+    
+    fprintf(stderr,"PAGING  wait_for_stability  retry\n");
+
+    free_snapshot(&last); last=*output; *output=0;
+
     if (with_keypress)
       with_keypress();
-    snapshot_idle();
-  }
 
-  if (!with_keypress && it_took > worst_stabilise)
-    worst_stabilise= it_took;
+    delay(0.5);
+  }
 
-  free(last);
+  free_snapshot(&last);
   fprintf(stderr,"PAGING  wait_for_stability done.\n");
 }
 
+static void raise_and_set_focus(void) {
+  int r;
+  XWindowAttributes attr;
+  int xpos,ypos, evbase,errbase,majver,minver;
+  unsigned bd,depth;
+  Window dummy;
+  
+  fprintf(stderr,"PAGING raise_and_set_focus\n");
+
+  r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
+  eassert(r==True);
+
+  r= XRaiseWindow(disp, id);  eassert(r);
+
+  r= XGetWindowAttributes(disp, id, &attr);  eassert(r);
+  r= XGetGeometry(disp,id, &attr.root,
+                 &xpos,&ypos, &wwidth,&wheight,
+                 &bd,&depth);
+  eassert(r);
+
+  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos,
+                          &dummy);
+  eassert(r);
+
+  int screen= XScreenNumberOfScreen(attr.screen);
+  XTestFakeMotionEvent(disp,screen, xpos, ypos, 0);
+
+  XTestFakeButtonEvent(disp,1,1, 50);
+  XTestFakeButtonEvent(disp,1,0, 50);
+
+  sync_after_input();
+  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
+}
+
+typedef struct {
+  unsigned long mask;
+  int lshift, rshift;
+} ShMask;
+
+static void compute_shift_mask(ShMask *sm, int targshift,
+                              unsigned long ximage_mask) {
+  unsigned long below;
+  
+  sm->lshift= 0;
+  sm->rshift= 0;
+  sm->mask= 0xfful << targshift;
+  below= ~0ul << targshift;
+  
+  for (;;) {
+    if (ximage_mask < sm->mask) {
+      sm->lshift++;  ximage_mask <<= 1;
+    } else if ((ximage_mask & ~below) > sm->mask) {
+      sm->rshift++;  ximage_mask >>= 1;
+    } else {
+      break;
+    }
+    assert(!(sm->lshift && sm->rshift));
+  }
+  assert(sm->lshift < LONG_BIT);
+  assert(sm->rshift < LONG_BIT);
+}
+
+static void store_page(int pageno, Snapshot *sn) {
+  eassert(pageno < MAX_PAGES);
+  ShMask shiftmasks[3];
+  CanonImage *im;
+
+#define COMPUTE_SHIFT_MASK(ix, targshift, rgb) \
+  compute_shift_mask(&shiftmasks[ix], targshift, sn->rgb##_mask)
+  COMPUTE_SHIFT_MASK(0, 16, red);
+  COMPUTE_SHIFT_MASK(1, 8,  green);
+  COMPUTE_SHIFT_MASK(2, 0,  blue);
+
+  CANONICALISE_IMAGE(im, sn->width, sn->height, {
+    long xrgb= XGetPixel(sn, x, y);
+    int i;
+    rgb= 0;
+    for (i=0; i<3; i++)
+      rgb |= ((xrgb << shiftmasks[i].lshift)
+             >> shiftmasks[i].rshift) & shiftmasks[i].mask;
+  });
+  
+  page_images[pageno]= im;
+}
+
 static void read_pages(void) {
   Snapshot *current=0, *last=0;
 
   raise_and_set_focus();
 
   /* page to the top - keep pressing page up until the image stops changing */
-  wait_for_stability(&last,0, send_pgup_many);
+  wait_for_stability(&current,0, send_pgup_many);
 
   /* now to actually page down */
   for (;;) {
     fprintf(stderr,"PAGING page %d\n",npages);
-    //eassert(npages < MAX_PAGES);
-    //page_images[npages++]=
-    npages++;
+    store_page(npages, current);
+    free_snapshot(&last); last=current; current=0;
+    fprintf(stderr,"PAGING page %d converted\n",npages);
 
     wait_for_stability(&current,last, 0);
     if (npages &&  /* first pagedown doesn't do much */
        identical(current,last)) {
-      free(current);
+      free_snapshot(&current);
       break;
     }
 
-    free(last); last=current; current=0;
-
     send_pgdown();
+    npages++;
   }
   fprintf(stderr,"PAGING all done.\n");
 }