X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=dfa9108537bbf7b5a9c19d507a443f6caa13851c;hb=3768c30b78a0afa7ca2c69c21365429c98cd868a;hp=04847107dde3f599473befe8f18c20ca0999d520;hpb=ae5d4e36af4f4a5567e1231958179d3a50eb4466;p=ypp-sc-tools.db-live.git

diff --git a/pctb/pages.c b/pctb/pages.c
index 0484710..dfa9108 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -39,6 +39,7 @@
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
+RgbImage *page0_rgbimage;
 
 char *ocean, *pirate;
 
@@ -47,6 +48,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 +148,49 @@ 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 void mouse_1_updown_here(void) {
+  check_not_disturbed();
+  XTestFakeButtonEvent(disp,1,1, 50);
+  XTestFakeButtonEvent(disp,1,0, 50);
+}
+static void mouse_1_updown(int x, int y) {
+  check_not_disturbed();
+  int screen= XScreenNumberOfScreen(attr.screen);
+  int xpos, ypos;
+  translate_coords_toroot(x,y, &xpos,&ypos);
+  XTestFakeMotionEvent(disp, screen, xpos,ypos, 0);
+  mouse_1_updown_here();
+}
+
+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 +217,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,
@@ -289,20 +323,14 @@ static void raise_and_get_details(void) {
   check_client_window_all_on_screen();
 }
 
-static void set_focus(void) {
+static void set_focus_commodity(void) {
   int screen= XScreenNumberOfScreen(attr.screen);
 
   progress("taking control of YPP client window...");
 
   debugf("PAGING set_focus\n");
 
-  int xpos, ypos;
-  translate_coords_toroot(160,160, &xpos,&ypos);
-  XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
-
-  XTestFakeButtonEvent(disp,1,1, 50);
-  XTestFakeButtonEvent(disp,1,0, 50);
-
+  mouse_1_updown(160,160);
   sync_after_input();
 
   delay(0.5);
@@ -312,6 +340,7 @@ static void set_focus(void) {
 			FocusChangeMask
 			) );
 
+  int xpos,ypos;
   translate_coords_toroot(10,10, &xpos,&ypos);
   XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
 
@@ -344,7 +373,7 @@ static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
   assert(sm->rshift < LONG_BIT);
 }
 
-static CanonImage *convert_page(Snapshot *sn) {
+static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) {
   ShMask shiftmasks[3];
   CanonImage *im;
 
@@ -371,6 +400,8 @@ static CanonImage *convert_page(Snapshot *sn) {
       rgb |= sample;
       fputc(sample, screenshot_file);
     }
+    if (ri)
+      CANONIMG_ALSO_STORERGB(ri);
   });
 
   sysassert(!ferror(screenshot_file));
@@ -379,19 +410,38 @@ static CanonImage *convert_page(Snapshot *sn) {
   return im;
 }
 
-void take_screenshots(void) {
-  Snapshot *current=0, *last=0;
+static void prepare_ypp_client(void) {
   CanonImage *test;
-
+  Snapshot *current=0;
+  
   /* find the window and check it's on the right kind of screen */
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
-  test= convert_page(current);
-  find_structure(test);
+  test= convert_page(current, 0);
+  find_structure(test, &max_relevant_y);
+  check_correct_commodities();
   free(test);
+  free_snapshot(&current);
+
+  progress("requesting status information...");
+  mouse_1_updown(250, wheight-10);
+  mouse_1_updown_here();
+  mouse_1_updown_here();
+  XSync(disp,False);
+  check_not_disturbed();
+  send_key(XK_slash);
+  send_key(XK_w);
+  send_key(XK_Return);
+  sync_after_input();
+}
 
+void take_screenshots(void) {
+  Snapshot *current=0, *last=0;
+
+  prepare_ypp_client();
+  
   /* page to the top - keep pressing page up until the image stops changing */
-  set_focus();
+  set_focus_commodity();
   wait_for_stability(&current,0, send_pgup_many,
 		     "paging up to top of commodity list...");
 
@@ -403,7 +453,7 @@ void take_screenshots(void) {
       fatal("Paging down seems to generate too many pages - max is %d.",
 	    MAX_PAGES);
     
-    page_images[npages]= convert_page(current);
+    page_images[npages]= convert_page(current, 0);
     free_snapshot(&last); last=current; current=0;
 
     debugf("PAGING page %d converted\n",npages);
@@ -421,17 +471,20 @@ 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);
 }    
 
 void take_one_screenshot(void) {
   Snapshot *current=0;
-  
-  raise_and_get_details();
-  sync_after_input();
+
+  prepare_ypp_client();
   wait_for_stability(&current,0,0, "taking screenshot...");
-  page_images[0]= convert_page(current);
+  page0_rgbimage= alloc_rgb_image(current->width, current->height);
+  page_images[0]= convert_page(current, 0);
   npages= 1;
   progress_log("collected single screenshot.");
 }