page with the mouse to avoid the silly page-back-to-top effect

[ypp-sc-tools.web-live.git] / pctb / pages.c

diff --git a/pctb/pages.c b/pctb/pages.c
index f9ca6e05409874b37a3b0b27e38f852d396a9e99..72f9bb478a982f5b0206af12c2cc0b6209c6df83 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -52,6 +52,7 @@ static Display *disp;
 static struct timeval tv_startup;
 static unsigned wwidth, wheight;
 static int max_relevant_y= -1;
+static Point commod_focus_point, commod_page_point, commod_focuslast_point;
 
 static XImage *shmim;
 static XShmSegmentInfo shminfo;
@@ -104,6 +105,9 @@ static void translate_coords_toroot(int wx, int wy, int *rx, int *ry) {
   Window dummy;
   xassert( XTranslateCoordinates(disp, id,attr.root, wx,wy, rx,ry, &dummy) );
 }
+static void translate_coords_toroot_p(Point w, int *rx, int *ry) {
+  translate_coords_toroot(w.x, w.y, rx, ry);
+}
 
 static void check_client_window_all_on_screen(void) {
   Rect onroot;
@@ -160,8 +164,8 @@ static void send_key(KeySym sym) {
 }
 static void mouse_1_updown_here(void) {
   check_not_disturbed();
-  XTestFakeButtonEvent(disp,1,1, 50);
-  XTestFakeButtonEvent(disp,1,0, 50);
+  XTestFakeButtonEvent(disp,1,1, 10);
+  XTestFakeButtonEvent(disp,1,0, 10);
 }
 static void mouse_1_updown(int x, int y) {
   check_not_disturbed();
@@ -171,6 +175,12 @@ static void mouse_1_updown(int x, int y) {
   XTestFakeMotionEvent(disp, screen, xpos,ypos, 0);
   mouse_1_updown_here();
 }
+static void pgdown_by_mouse(void) {
+  check_not_disturbed();
+  debugf("PAGING   Mouse\n");
+  mouse_1_updown_here();
+  sync_after_input();
+}
 
 static int pgupdown;
 
@@ -183,12 +193,6 @@ static void send_pgup_many(void) {
   debugf("PAGING   PageUp x %d\n",i);
   sync_after_input();
 }
-static void send_pgdown(void) {
-  send_key(XK_Next);
-  pgupdown++;
-  debugf("PAGING   PageDown\n");
-  sync_after_input();
-}
 static void send_pgdown_torestore(void) {
   debugf("PAGING   PageDown x %d\n", -pgupdown);
   while (pgupdown < 0) {
@@ -225,6 +229,8 @@ static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
   }
   assert(sm->lshift < LONG_BIT);
   assert(sm->rshift < LONG_BIT);
+  debugf("SHIFTMASK %p={.lshift=%d, .rshift=%d} image_mask=%lx\n",
+        sm, sm->lshift, sm->rshift, ximage_mask);
 }
 
 static void rtimestamp(double *t, const char *wh) {
@@ -273,13 +279,31 @@ static void snapshot(Snapshot **output) {
   int x,y,i;
   unsigned char *op= (*output)->data;
   for (y=0; y<wheight; y++) {
-    for (x=0; x<wwidth; x++) {
-      long xrgb= XGetPixel(im_use,x,y);
-      for (i=0; i<3; i++) {
-       unsigned long sample=
-         ((xrgb << shiftmasks[i].lshift) >> shiftmasks[i].rshift)
-         & SAMPLEMASK;
-       *op++= sample;
+    if (im_use->xoffset == 0 &&
+       im_use->format == ZPixmap &&
+       im_use->byte_order == LSBFirst &&
+       im_use->depth == 24 &&
+       im_use->bits_per_pixel == 32 &&
+       im_use->red_mask   == 0x0000ffU &&
+       im_use->green_mask == 0x00ff00U &&
+       im_use->blue_mask  == 0xff0000U) {
+      const char *p= im_use->data + y * im_use->bytes_per_line;
+//      debugf("optimised copy y=%d",y);
+      for (x=0; x<wwidth; x++) {
+       *op++ = *p++;
+       *op++ = *p++;
+       *op++ = *p++;
+       p++;
+      }
+    } else {
+      for (x=0; x<wwidth; x++) {
+       long xrgb= XGetPixel(im_use,x,y);
+       for (i=0; i<3; i++) {
+         unsigned long sample=
+           ((xrgb << shiftmasks[i].lshift) >> shiftmasks[i].rshift)
+           & SAMPLEMASK;
+         *op++= sample;
+       }
       }
     }
   }
@@ -412,6 +436,9 @@ static void raise_and_get_details(void) {
   if (!(wwidth >= 320 && wheight >= 320))
     fatal("YPP client window is implausibly small?");
 
+  if (attr.depth < 24)
+    fatal("Display is not 24bpp.");
+
   check_client_window_all_on_screen();
 
   Bool shmpixmaps=0;
@@ -474,7 +501,7 @@ static void set_focus_commodity(void) {
 
   debugf("PAGING set_focus\n");
 
-  mouse_1_updown(160,160);
+  mouse_1_updown(commod_focus_point.x, commod_focus_point.y);
   sync_after_input();
 
   delay(0.5);
@@ -485,26 +512,24 @@ static void set_focus_commodity(void) {
                        ) );
 
   int xpos,ypos;
-  translate_coords_toroot(10,10, &xpos,&ypos);
-  XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
+  translate_coords_toroot_p(commod_page_point, &xpos,&ypos);
+  XTestFakeMotionEvent(disp, screen, xpos,ypos, 0);
 
   sync_after_input();
 
   debugf("PAGING raise_and_set_focus done.\n");
 }
 
-static CanonImage *convert_page(Snapshot *sn) {
+static CanonImage *convert_page(const Snapshot *sn) {
   CanonImage *im;
 
   fwrite_ppmraw(screenshot_file, sn);
 
-  unsigned char *pixel= sn->data;
+  const unsigned char *pixel= sn->data;
   CANONICALISE_IMAGE(im, sn->w, sn->h, {
-    rgb=
-      (pixel[0] << 16) |
-      (pixel[1] <<  8) |
-      (pixel[2]      );
-    pixel += 3;
+    r= *pixel++;
+    g= *pixel++;
+    b= *pixel++;
   });
     
   sysassert(!ferror(screenshot_file));
@@ -522,7 +547,10 @@ static void prepare_ypp_client(void) {
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
 
   test= convert_page(current);
-  find_structure(test, &max_relevant_y);
+  find_structure(test, &max_relevant_y,
+                &commod_focus_point,
+                &commod_page_point,
+                &commod_focuslast_point);
   check_correct_commodities();
   Rect sunshine= find_sunshine_widget();
 
@@ -582,11 +610,14 @@ void take_screenshots(void) {
       break;
     }
 
-    send_pgdown();
+    pgdown_by_mouse();
     npages++;
   }
   progress("finishing with the YPP client...");
+  mouse_1_updown(commod_focuslast_point.x, commod_focuslast_point.y);
+  sync_after_input();
   send_pgdown_torestore();
+  sync_after_input();
 
   debugf("PAGING all done.\n");
   progress_log("collected %d screenshots.",npages);