better progress indication

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

diff --git a/pctb/pages.c b/pctb/pages.c
index b9e1ac1649dc2c5aa8a57997e58cabba430b54f1..fbf33171bd3a90182cc7e650361654767f0181d6 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -18,7 +18,6 @@ static Window id;
 static Display *disp;
 static struct timeval tv_startup;
 static unsigned wwidth, wheight;
-static int wxpos, wypos;
 
 DEBUG_DEFINE_DEBUGF(pages)
 
@@ -28,6 +27,7 @@ static KeyCode keycode(KeySym sym) {
 
 void screenshot_startup(void) {
   int r;
+  progress("starting...");
   disp= XOpenDisplay(0);  eassert(disp);
   r= gettimeofday(&tv_startup,0);  eassert(!r);
 }
@@ -85,10 +85,6 @@ static void free_snapshot(Snapshot **io) {
 }
 
 static void snapshot(Snapshot **output) {
-//  char *cmd;
-//  int r;
-//  XImage *xim;
-  
   free_snapshot(output);
 
   debugf("PAGING   snapshot\n");
@@ -111,8 +107,10 @@ static int identical(const Snapshot *a, const Snapshot *b) {
 
 static void wait_for_stability(Snapshot **output,
                               const Snapshot *previously,
-                              void (*with_keypress)(void)) {
+                              void (*with_keypress)(void),
+                              const char *fmt, ...) {
   Snapshot *last=0;
+  int r;
   /* waits longer if we're going to return an image identical to previously
    * if previously==0, all images are considered identical to it */
 
@@ -120,6 +118,14 @@ static void wait_for_stability(Snapshot **output,
          "  last_input=%f previously=%p\n",
          last_input, previously);
 
+  char *doing;
+  va_list al;
+  va_start(al,fmt);
+  r= asprintf(&doing,fmt,al);  eassert(r>=0);
+  va_end(al);
+
+  progress(doing);
+
   for (;;) {
     double at_snapshot= timestamp();
     double need_sleep= min_update_allowance - (at_snapshot - last_input);
@@ -138,6 +144,8 @@ static void wait_for_stability(Snapshot **output,
       break;
     }
     
+    progress_spinner(doing);
+
     debugf("PAGING  wait_for_stability  retry\n");
 
     free_snapshot(&last); last=*output; *output=0;
@@ -149,44 +157,85 @@ static void wait_for_stability(Snapshot **output,
   }
 
   free_snapshot(&last);
+  free(doing);
   debugf("PAGING  wait_for_stability done.\n");
 }
 
+static void translate_coords_toroot(int wx, int wy, int *rx, int *ry) {
+  int r;
+  Window dummy;
+  r= XTranslateCoordinates(disp, id,attr.root, wx,wy, rx,ry, &dummy);
+  eassert(r);
+}
+
 static void raise_and_get_details(void) {
   int r;
   int evbase,errbase,majver,minver;
+  int wxpos, wypos;
   unsigned bd,depth;
   Window dummy;
-  
+
+  progress("raising and checking YPP client window...");
+
   debugf("PAGING raise_and_get_details\n");
 
   r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
   eassert(r==True);
 
   r= XRaiseWindow(disp, id);  eassert(r);
+  /* in case VisibilityNotify triggers right away before we have had a
+   * change to raise; to avoid falsely detecting lowering in that case */
+  
+  r= XSelectInput(disp, id,
+                 StructureNotifyMask|
+                 VisibilityChangeMask
+                 );  eassert(r);
+
+  r= XRaiseWindow(disp, id);  eassert(r);
+  /* in case the window was lowered between our Raise and our SelectInput;
+   * to avoid failing to detect that lowering */
 
   r= XGetWindowAttributes(disp, id, &attr);  eassert(r);
   r= XGetGeometry(disp,id, &attr.root,
                  &wxpos,&wypos, &wwidth,&wheight,
                  &bd,&depth);
-  eassert(r);
 
-  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &wxpos,&wypos,
-                          &dummy);
-  eassert(r);
+  eassert(wwidth >= 320 && wheight >= 320);
+
+  int rxpos, rypos;
+  unsigned rwidth, rheight;
+  r= XGetGeometry(disp,attr.root, &dummy, &rxpos,&rypos,
+                 &rwidth, &rheight,
+                 &bd,&depth);
+  
+  translate_coords_toroot(0,0, &rxpos,&rypos);
+  eassert(rxpos>=0 && rypos>=0);
+
+  translate_coords_toroot(wwidth-1,wheight-1, &rxpos,&rypos);
+  eassert(rxpos<rwidth && rypos<rheight);
 }
 
 static void set_focus(void) {
   int screen= XScreenNumberOfScreen(attr.screen);
 
+  progress("taking control of YPP client window...");
+
   debugf("PAGING set_focus\n");
 
-  XTestFakeMotionEvent(disp,screen, wxpos,wypos, 0);
+  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);
 
   sync_after_input();
+
+  translate_coords_toroot(10,10, &xpos,&ypos);
+  XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
+
+  sync_after_input();
+
   debugf("PAGING raise_and_set_focus done.\n");
 }
 
@@ -254,14 +303,15 @@ void take_screenshots(void) {
 
   /* find the window and check it's on the right kind of screen */
   raise_and_get_details();
-  wait_for_stability(&current,0,0);
+  wait_for_stability(&current,0,0, "checking current YPP client screen...");
   test= convert_page(current);
   find_structure(test);
   free(test);
 
   /* page to the top - keep pressing page up until the image stops changing */
   set_focus();
-  wait_for_stability(&current,0, send_pgup_many);
+  wait_for_stability(&current,0, send_pgup_many,
+                    "paging up to top of commodity list...");
 
   /* now to actually page down */
   for (;;) {
@@ -273,7 +323,9 @@ void take_screenshots(void) {
 
     debugf("PAGING page %d converted\n",npages);
 
-    wait_for_stability(&current,last, 0);
+    wait_for_stability(&current,last, 0,
+                      "collecting screenshot of page %d...",npages+1);
+
     if (npages &&  /* first pagedown doesn't do much */
        identical(current,last)) {
       free_snapshot(&current);
@@ -284,6 +336,7 @@ void take_screenshots(void) {
     npages++;
   }
   debugf("PAGING all done.\n");
+  progress_log("collected %d screenshots.",npages);
 }    
 
 void take_one_screenshot(void) {
@@ -291,9 +344,10 @@ void take_one_screenshot(void) {
   
   raise_and_get_details();
   sync_after_input();
-  wait_for_stability(&current,0,0);
+  wait_for_stability(&current,0,0, "taking screenshot...");
   page_images[0]= convert_page(current);
   npages= 1;
+  progress_log("collected single screenshot.");
 }
 
 void set_yppclient_window(unsigned long wul) {
@@ -309,6 +363,8 @@ void find_yppclient_window(void) {
   
   if (id) return;
   
+  progress("looking for YPP client window...");
+
   static const char prefix[]= "Puzzle Pirates - ";
   static const char onthe[]= " on the ";
   static const char suffix[]= " ocean";
@@ -399,6 +455,8 @@ void find_yppclient_window(void) {
        debugfind(" YES!\n");
        id= w2;
        nfound++;
+       progress_log("found YPP client window (0x%lx): %s on the %s ocean.",
+                    (unsigned long)id, pirate, ocean);
       }
       if (children2) XFree(children2);
     }