X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=dae3d2138bd0d8a3ae0a874b3fc8ff74ff8562f7;hb=4d7eb93b7c82da31f928349ac7c6cd551d78ca57;hp=360e71858fd5699ac0a8f933e67c4f4fad818e08;hpb=2ca58afcdf02d87e31115110ecd6c83ecc5dabc7;p=ypp-sc-tools.web-live.git

diff --git a/pctb/pages.c b/pctb/pages.c
index 360e718..dae3d21 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -11,12 +11,15 @@
 CanonImage *page_images[MAX_PAGES];
 int npages;
 
+char *ocean, *pirate;
+
 static XWindowAttributes attr;
 static Window id;
 static Display *disp;
 static struct timeval tv_startup;
 static unsigned wwidth, wheight;
-static int wxpos, wypos;
+
+DEBUG_DEFINE_DEBUGF(pages)
 
 static KeyCode keycode(KeySym sym) {
   return XKeysymToKeycode(disp,sym);
@@ -24,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);
 }
@@ -42,12 +46,12 @@ static double timestamp(void) {
   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);
+  debugf("PAGING %f\n",t);
   return t;
 }
 static void delay(double need_sleep) {
   int r;
-  fprintf(stderr,"PAGING     delay %f\n",need_sleep);
+  debugf("PAGING     delay %f\n",need_sleep);
   r= usleep(need_sleep * 1e6);  eassert(!r);
 }
 
@@ -57,6 +61,58 @@ static void sync_after_input(void) {
   last_input= timestamp();
 }
 
+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 check_client_window_all_on_screen(void) {
+  int r;
+  int rxpos, rypos;
+  unsigned rwidth, rheight;
+  Window dummy;
+  unsigned bd, depth;
+
+  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 check_not_disturbed(void) {
+  XEvent ev;
+  int r;
+  
+  for (;;) {
+    r= XCheckMaskEvent(disp, ~0, &ev);
+    if (r==False) return;
+
+    switch (ev.type) {
+    case VisibilityNotify:
+      eassert(ev.xvisibility.state == VisibilityUnobscured);
+      break;
+    case ConfigureNotify:
+      check_client_window_all_on_screen();
+      break;
+    case FocusOut:
+      eassert(!"focus left YPP client window");
+      break;
+    case FocusIn:
+      warning("focus entered YPP client window ?!");
+      break;
+    default:
+      eassert(!"unexpected X11 event");
+    }
+  }
+}      
+
 static void send_key(KeySym sym) {
   XTestFakeKeyEvent(disp, keycode(sym),1, 10);
   XTestFakeKeyEvent(disp, keycode(sym),0, 10);
@@ -66,12 +122,12 @@ static void send_pgup_many(void) {
   int i;
   for (i=0; i<25; i++)
     send_key(XK_Prior);
-  fprintf(stderr,"PAGING   PageUp x %d\n",i);
+  debugf("PAGING   PageUp x %d\n",i);
   sync_after_input();
 }
 static void send_pgdown(void) {
   send_key(XK_Next);
-  fprintf(stderr,"PAGING   PageDown\n");
+  debugf("PAGING   PageDown\n");
   sync_after_input();
 }
 
@@ -81,19 +137,17 @@ static void free_snapshot(Snapshot **io) {
 }
 
 static void snapshot(Snapshot **output) {
-//  char *cmd;
-//  int r;
-//  XImage *xim;
-  
   free_snapshot(output);
 
-  fprintf(stderr,"PAGING   snapshot\n");
+  debugf("PAGING   snapshot\n");
 
   timestamp();
   *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap);
   timestamp();
-  
-  fprintf(stderr,"PAGING   snapshot done.\n");
+
+  check_not_disturbed();
+
+  debugf("PAGING   snapshot done.\n");
 }
 
 static int identical(const Snapshot *a, const Snapshot *b) {
@@ -107,15 +161,31 @@ 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, ...)
+     FMT(4,5);
+
+static void wait_for_stability(Snapshot **output,
+			       const Snapshot *previously,
+			       void (*with_keypress)(void),
+			       const char *fmt, ...) {
+  va_list al;
+  va_start(al,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 */
 
-  fprintf(stderr,"PAGING  wait_for_stability"
+  debugf("PAGING  wait_for_stability"
 	  "  last_input=%f previously=%p\n",
 	  last_input, previously);
 
+  char *doing;
+  r= vasprintf(&doing,fmt,al);  eassert(r>=0);
+
+  progress("%s",doing);
+
   for (;;) {
     double at_snapshot= timestamp();
     double need_sleep= min_update_allowance - (at_snapshot - last_input);
@@ -125,16 +195,18 @@ static void wait_for_stability(Snapshot **output,
 
     if (!with_keypress &&
 	!(previously && identical(*output,previously))) {
-      fprintf(stderr,"PAGING  wait_for_stability  simple\n");
+      debugf("PAGING  wait_for_stability  simple\n");
       break;
     }
 
     if (last && identical(*output,last)) {
-      fprintf(stderr,"PAGING  wait_for_stability  stabilised\n");
+      debugf("PAGING  wait_for_stability  stabilised\n");
       break;
     }
     
-    fprintf(stderr,"PAGING  wait_for_stability  retry\n");
+    progress_spinner("%s",doing);
+
+    debugf("PAGING  wait_for_stability  retry\n");
 
     free_snapshot(&last); last=*output; *output=0;
 
@@ -145,45 +217,77 @@ static void wait_for_stability(Snapshot **output,
   }
 
   free_snapshot(&last);
-  fprintf(stderr,"PAGING  wait_for_stability done.\n");
+  free(doing);
+  debugf("PAGING  wait_for_stability done.\n");
+  va_end(al);
 }
 
 static void raise_and_get_details(void) {
   int r;
   int evbase,errbase,majver,minver;
+  int wxpos, wypos;
   unsigned bd,depth;
-  Window dummy;
-  
-  fprintf(stderr,"PAGING raise_and_get_details\n");
+
+  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);
+
+  check_client_window_all_on_screen();
 }
 
 static void set_focus(void) {
+  int r;
   int screen= XScreenNumberOfScreen(attr.screen);
 
-  fprintf(stderr,"PAGING set_focus\n");
+  progress("taking control of YPP client window...");
 
-  XTestFakeMotionEvent(disp,screen, wxpos,wypos, 0);
+  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);
 
   sync_after_input();
-  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
+
+  delay(0.5);
+  r= XSelectInput(disp, id,
+		  StructureNotifyMask|
+		  VisibilityChangeMask|
+		  FocusChangeMask
+		  );  eassert(r);
+
+  translate_coords_toroot(10,10, &xpos,&ypos);
+  XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
+
+  sync_after_input();
+
+  debugf("PAGING raise_and_set_focus done.\n");
 }
 
 #define SAMPLEMASK 0xfful
@@ -229,7 +333,8 @@ static CanonImage *convert_page(Snapshot *sn) {
     long xrgb= XGetPixel(sn, x, y);
     int i;
     rgb= 0;
-    for (i=0; i<3; i++, rgb <<= 8) {
+    for (i=0; i<3; i++) {
+      rgb <<= 8;
       unsigned long sample=
 	((xrgb << shiftmasks[i].lshift)
 	      >> shiftmasks[i].rshift) & SAMPLEMASK;
@@ -249,26 +354,30 @@ 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 (;;) {
-    fprintf(stderr,"paging page %d\n",npages);
+    debugf("paging page %d\n",npages);
 
     eassert(npages < MAX_PAGES);
     page_images[npages]= convert_page(current);
     free_snapshot(&last); last=current; current=0;
 
-    fprintf(stderr,"PAGING page %d converted\n",npages);
+    debugf("PAGING page %d converted\n",npages);
+
+    wait_for_stability(&current,last, 0,
+		       "collecting screenshot of page %d...",
+		       npages+1);
 
-    wait_for_stability(&current,last, 0);
     if (npages &&  /* first pagedown doesn't do much */
 	identical(current,last)) {
       free_snapshot(&current);
@@ -278,7 +387,8 @@ void take_screenshots(void) {
     send_pgdown();
     npages++;
   }
-  fprintf(stderr,"PAGING all done.\n");
+  debugf("PAGING all done.\n");
+  progress_log("collected %d screenshots.",npages);
 }    
 
 void take_one_screenshot(void) {
@@ -286,16 +396,124 @@ 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) {
   id= wul;
 }
 
+DEBUG_DEFINE_SOME_DEBUGF(findypp,debugfind)
+
 void find_yppclient_window(void) {
+  Window root, gotroot, gotparent;
+  int screen, r;
+  int nfound=0;
+  
   if (id) return;
-  eassert(!"finding client window NYI");
+  
+  progress("looking for YPP client window...");
+
+  static const char prefix[]= "Puzzle Pirates - ";
+  static const char onthe[]= " on the ";
+  static const char suffix[]= " ocean";
+#define S(x) (sizeof((x))-1)
+
+  Atom wm_name= XInternAtom(disp,"WM_NAME",True);
+  eassert(wm_name != None);
+
+  for (screen=0; screen<ScreenCount(disp); screen++) {
+    debugfind("FINDYPP screen %d\n", screen);
+    root= RootWindow(disp,screen);
+    unsigned int nchildren1;
+    Window *children1=0;
+
+    r= XQueryTree(disp,root,
+		  &gotroot,&gotparent,
+		  &children1,&nchildren1);
+    eassert(r);
+    debugfind("FINDYPP screen %d nchildren1=%d\n", screen, nchildren1);
+
+    int i;
+    for (i=0; i<nchildren1; i++) {
+      Window w1= children1[i];
+      unsigned int nchildren2;
+      Window *children2=0;
+
+      r= XQueryTree(disp,w1,
+		    &gotroot,&gotparent,
+		    &children2,&nchildren2);
+      eassert(r);
+      debugfind("FINDYPP screen %d c1[%2d]=0x%08lx nchildren2=%d\n",
+		screen, i, (unsigned long)w1, nchildren2);
+
+      int j;
+      for (j=-1; j<(int)nchildren2; j++) {
+	Window w2= j<0 ? w1 : children2[j];
+	debugfind("FINDYPP screen %d c1[%2d]=0x%08lx c2[%2d]=0x%08lx",
+		  screen, i, (unsigned long)w1, j, (unsigned long)w2);
+
+	int gotfmt;
+	Atom gottype;
+	unsigned long len, gotbytesafter;
+	char *title;
+	unsigned char *gottitle=0;
+	r= XGetWindowProperty(disp,w2, wm_name,0,512, False,
+			      AnyPropertyType,&gottype, &gotfmt, &len,
+			      &gotbytesafter, &gottitle);
+	eassert(!r);
+	title= (char*)gottitle;
+
+	if (DEBUGP(findypp)) {
+	  debugfind(" gf=%d len=%lu gba=%lu \"", gotfmt,len,gotbytesafter);
+	  char *p;
+	  for (p=title; p < title+len; p++) {
+	    char c= *p;
+	    if (c>=' ' && c<=126) fputc(c,debug);
+	    else fprintf(debug,"\\x%02x",c & 0xff);
+	  }
+	  fputs("\": ",debug);
+	}
+
+#define REQUIRE(pred)							   \
+        if (!(pred)) { debugfind(" failed test  %s\n", #pred); continue; } \
+        else
+
+	REQUIRE( gottype!=None );
+	REQUIRE( len );
+	REQUIRE( gotfmt==8 );
+
+	REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) );
+
+	char *spc1= strchr(  title        + S(prefix), ' ');  REQUIRE(spc1);
+	char *spc2= strrchr((title + len) - S(suffix), ' ');  REQUIRE(spc2);
+
+	REQUIRE( (title + len) - spc1  >= S(onthe)  + S(suffix) );
+	REQUIRE(  spc2         - title >= S(prefix) + S(onthe) );
+
+	REQUIRE( !memcmp(title,                   prefix, S(prefix)) );
+	REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix))  );
+	REQUIRE( !memcmp(spc1,                    onthe,  S(onthe))  );
+
+#define ASSIGN(what, start, end) do {					 \
+	r= asprintf(&what, "%.*s", (end)-(start), start);  eassert(r>0); \
+     }while(0)
+	ASSIGN(pirate, title + S(prefix),  spc1);
+	ASSIGN(ocean,  spc1 + S(onthe),   (title + len) - S(suffix));
+
+	debugfind(" YES!\n");
+	id= w2;
+	nfound++;
+	progress_log("found YPP client [--window-id 0x%lx]:"
+		     " %s ocean - %s.",
+		     (unsigned long)id, ocean, pirate);
+      }
+      if (children2) XFree(children2);
+    }
+    if (children1) XFree(children1);
+  }
+  eassert(nfound==1);
 }