X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=ab3a2b0b118125fcbe13e816d607c3ac834459ca;hp=42dd5bc88413c35020674c3d67f9c70e722fb6b6;hb=da2f43597c757ea14a9226e115e1dbe758321251;hpb=f2c5d45ada202f2ad2640b260cac2fd7bb83eb3e;ds=inline

diff --git a/pctb/pages.c b/pctb/pages.c
index 42dd5bc..ab3a2b0 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -47,6 +47,7 @@ static Window id;
 static Display *disp;
 static struct timeval tv_startup;
 static unsigned wwidth, wheight;
+static int max_relevant_y= -1;
 
 DEBUG_DEFINE_DEBUGF(pages)
 
@@ -146,22 +147,36 @@ static void check_not_disturbed(void) {
 }      
 
 static void send_key(KeySym sym) {
+  check_not_disturbed();
   XTestFakeKeyEvent(disp, keycode(sym),1, 10);
   XTestFakeKeyEvent(disp, keycode(sym),0, 10);
 }
 
+static int pgupdown;
+
 static void send_pgup_many(void) {
   int i;
-  for (i=0; i<25; i++)
+  for (i=0; i<25; i++) {
     send_key(XK_Prior);
+    pgupdown--;
+  }
   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) {
+    send_key(XK_Next);
+    pgupdown++;
+  }
+  sync_after_input();
+}
 
 static void free_snapshot(Snapshot **io) {
   if (*io) XDestroyImage(*io);
@@ -188,7 +203,12 @@ static int identical(const Snapshot *a, const Snapshot *b) {
 	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);
+
+  int compare_to= a->height;
+  if (max_relevant_y && compare_to > max_relevant_y)
+    compare_to= max_relevant_y;
+  
+  return !memcmp(a->data, b->data, a->bytes_per_line * compare_to);
 }
 
 static void wait_for_stability(Snapshot **output,
@@ -348,7 +368,7 @@ static CanonImage *convert_page(Snapshot *sn) {
   ShMask shiftmasks[3];
   CanonImage *im;
 
-  fprintf(screenshots_file,
+  fprintf(screenshot_file,
 	  "P6\n"
 	  "%d %d\n"
 	  "255\n", sn->width, sn->height);
@@ -369,12 +389,12 @@ static CanonImage *convert_page(Snapshot *sn) {
 	((xrgb << shiftmasks[i].lshift)
 	      >> shiftmasks[i].rshift) & SAMPLEMASK;
       rgb |= sample;
-      fputc(sample, screenshots_file);
+      fputc(sample, screenshot_file);
     }
   });
 
-  sysassert(!ferror(screenshots_file));
-  sysassert(!fflush(screenshots_file));
+  sysassert(!ferror(screenshot_file));
+  sysassert(!fflush(screenshot_file));
 
   return im;
 }
@@ -387,7 +407,8 @@ void take_screenshots(void) {
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
   test= convert_page(current);
-  find_structure(test);
+  find_structure(test, &max_relevant_y);
+  check_correct_commodities();
   free(test);
 
   /* page to the top - keep pressing page up until the image stops changing */
@@ -421,6 +442,9 @@ void take_screenshots(void) {
     send_pgdown();
     npages++;
   }
+  progress("finishing with the YPP client...");
+  send_pgdown_torestore();
+
   debugf("PAGING all done.\n");
   progress_log("collected %d screenshots.",npages);
 }