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

diff --git a/pctb/pages.c b/pctb/pages.c
index 69f097d..dae3d21 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -1,76 +1,43 @@
 /*
   */
 
-#include "ocr.h"
+#include "structure.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
 
 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;
+
+DEBUG_DEFINE_DEBUGF(pages)
 
 static KeyCode keycode(KeySym sym) {
   return XKeysymToKeycode(disp,sym);
 }
 
-static void check_exitstatus(int st) {
-  eassert(WIFEXITED(st));
-  eassert(!WEXITSTATUS(st));
-}
-
-static void check_pclose(FILE *f, char *cmd) {
-  int r;
-  eassert(!ferror(f));
-  r= fgetc(f);  eassert(r==EOF);  eassert(feof(f));
-  r= pclose(f);  eassert(r>=0);  check_exitstatus(r);
-  free(cmd);
-}
-
-#if 0
-static CanonImage *screenshot_now(void) {
-  char *cmd;
-  CanonImage *ci;
-  int r;
-  
-  r= asprintf(&cmd, "xwd -silent -id 0x%lx | xwdtopnm", (unsigned long)id);
-  eassert(r>=0);
-  FILE *f= popen(cmd,"r");  eassert(f);
-  ci= file_read_image(f);
-  check_pclose(f, cmd);
-  return ci;
-}
-#endif
-
-static void screenshot_startup(void) {
+void screenshot_startup(void) {
   int r;
+  progress("starting...");
   disp= XOpenDisplay(0);  eassert(disp);
   r= gettimeofday(&tv_startup,0);  eassert(!r);
 }
 
-#if 0
-static CanonImage *single_page(void) {
-  int r;
-  r= XRaiseWindow(disp, id);  eassert(r);
-  r= XSync(disp, False);  eassert(r);
-  return screenshot_now();
-}
-#endif
-
 /*---------- pager ----------*/
 
-typedef struct {
-  size_t len;
-  unsigned char d[];
-} Snapshot;
+typedef XImage Snapshot;
 
-static size_t snapshot_alloc= 1024;
 static double last_input;
-static const double min_update_allowance= 0.5;
+static const double min_update_allowance= 0.25;
 
 static double timestamp(void) {
   struct timeval tv;
@@ -79,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);
 }
 
@@ -94,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);
@@ -103,71 +122,70 @@ 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();
 }
 
+static void free_snapshot(Snapshot **io) {
+  if (*io) XDestroyImage(*io);
+  *io= 0;
+}
+
 static void snapshot(Snapshot **output) {
-  char *cmd;
-  int r;
-  
-  free(*output);  *output=0;
+  free_snapshot(output);
 
-  fprintf(stderr,"PAGING   snapshot\n");
+  debugf("PAGING   snapshot\n");
 
-  r= asprintf(&cmd, "xwd -silent -id 0x%lx", (unsigned long)id); eassert(r>=0);
-  FILE *f= popen(cmd,"r"); eassert(f);
+  timestamp();
+  *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap);
+  timestamp();
 
-  int need_alloc=1;
-  size_t used=0;
-  for (;;) {
-    size_t allow= snapshot_alloc - used;
-    if (!allow) {
-      snapshot_alloc <<= 1;
-      need_alloc= 1;
-      fprintf(stderr,"PAGING   snapshot   grow %ld\n", (long)snapshot_alloc);
-      continue;
-    }
-    if (need_alloc) {
-      *output= realloc(*output, sizeof(**output) + snapshot_alloc);
-      eassert(*output);
-      need_alloc= 0;
-    }
-    size_t got= fread((*output)->d, 1, allow, f);
-    if (got==0) break;
-    used += got;
-  }
-  check_pclose(f,cmd);
+  check_not_disturbed();
 
-  (*output)->len= used;
-  snapshot_alloc= used+1;
-  *output= realloc(*output, sizeof(**output) + snapshot_alloc);
-  eassert(*output);
-  
-  fprintf(stderr,"PAGING   snapshot len=%ld\n", (long)used);
+  debugf("PAGING   snapshot done.\n");
 }
 
 static int identical(const Snapshot *a, const Snapshot *b) {
-  return !(memcmp(a,    b,    sizeof(*a)) ||
-	   memcmp(a->d, b->d, a->len));
+  if (!(a->width == b->width &&
+	a->height == b->height &&
+	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);
 }
 
 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);
@@ -177,18 +195,20 @@ 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);
 
-    free(last); last=*output; *output=0;
+    debugf("PAGING  wait_for_stability  retry\n");
+
+    free_snapshot(&last); last=*output; *output=0;
 
     if (with_keypress)
       with_keypress();
@@ -196,147 +216,304 @@ static void wait_for_stability(Snapshot **output,
     delay(0.5);
   }
 
-  free(last);
-  fprintf(stderr,"PAGING  wait_for_stability done.\n");
+  free_snapshot(&last);
+  free(doing);
+  debugf("PAGING  wait_for_stability done.\n");
+  va_end(al);
 }
 
-static void raise_and_set_focus(void) {
+static void raise_and_get_details(void) {
   int r;
-  XWindowAttributes attr;
-  int xpos,ypos, evbase,errbase,majver,minver;
-  unsigned width,height,bd,depth;
-  Window dummy;
-  
-  fprintf(stderr,"PAGING raise_and_set_focus\n");
+  int evbase,errbase,majver,minver;
+  int wxpos, wypos;
+  unsigned bd,depth;
+
+  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,&xpos,&ypos,&width,&height, &bd,&depth);
-  eassert(r);
+  r= XGetGeometry(disp,id, &attr.root,
+		  &wxpos,&wypos, &wwidth,&wheight,
+		  &bd,&depth);
 
-  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos,
-			   &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);
-  XTestFakeMotionEvent(disp,screen, xpos, ypos, 0);
+
+  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);
 
   sync_after_input();
-  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
-}
 
-static void store_page(int pageno, Snapshot *sn) {
-  pid_t converter, paster;
-  eassert(pageno < MAX_PAGES);
-  int paste[2], results[2];
-  FILE *err;
-  int r;
+  delay(0.5);
+  r= XSelectInput(disp, id,
+		  StructureNotifyMask|
+		  VisibilityChangeMask|
+		  FocusChangeMask
+		  );  eassert(r);
 
-  eassert(!fflush(stdout));
-  eassert(!fflush(stderr));
-  
-  r= pipe(paste);  eassert(!r);
-  r= pipe(results);  eassert(!r);
-  err= tmpfile();  eassert(err);
-
-  converter= fork();  eassert(converter!=-1);
-  if (!converter) {
-    r= dup2(paste[0],0);  eassert(r==0);
-    r= dup2(results[1],1);  eassert(r==1);
-    r= dup2(2,4);            eassert(r==4); /* fileno(errn) > 4, see above */
-    r= dup2(fileno(err),2);  eassert(r==2);
-    close(paste[0]);
-    close(paste[1]);
-    close(results[0]);
-    close(results[1]);
-    execlp("xwdtopnm", "xwdtopnm",(char*)0);
-    dup2(4,2);
-    eassert(!"xwdtopnm exec failure");
-  }
+  translate_coords_toroot(10,10, &xpos,&ypos);
+  XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
 
-  paster= fork();  eassert(paster!=-1);
-  if (!paster) {
-    FILE *f= fdopen(paste[1],"w");  eassert(f);
-    close(paste[0]);
-    close(results[0]);
-    close(results[1]);
-    size_t did= fwrite(sn->d, 1, sn->len, f);
-    eassert(did==sn->len);
-    eassert(!fclose(f));
-    exit(0);
-  }
+  sync_after_input();
 
-  close(paste[0]);
-  close(paste[1]);
-  close(results[1]);
-
-  FILE *f= fdopen(results[0],"r");
-  int c1= fgetc(f);
-  if (c1!=EOF) {
-    ungetc(c1,f);
-    page_images[pageno]= file_read_image(f);
-    r= fgetc(f);  eassert(r==EOF);  eassert(!ferror(f));  eassert(feof(f));
-    fclose(f);
-  }
+  debugf("PAGING raise_and_set_focus done.\n");
+}
 
-  pid_t got_conv,got_paste;
-  int st_conv, st_paste;
+#define SAMPLEMASK 0xfful
 
-  got_conv= waitpid(converter,&st_conv,0);  eassert(got_conv==converter);
-  got_paste= waitpid(paster,&st_paste,0);  eassert(got_paste==paster);
+typedef struct {
+  int lshift, rshift;
+} ShMask;
 
-  if (!st_conv &&
-      (!st_paste || (WIFSIGNALED(st_paste) && WTERMSIG(st_paste)==SIGPIPE))
-      && c1!=EOF) {
-    fclose(err);
-    return;
+static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
+  sm->lshift= 0;
+  sm->rshift= 0;
+  
+  for (;;) {
+    if (ximage_mask <= (SAMPLEMASK>>1)) {
+      sm->lshift++;  ximage_mask <<= 1;
+    } else if (ximage_mask > SAMPLEMASK) {
+      sm->rshift++;  ximage_mask >>= 1;
+    } else {
+      break;
+    }
+    assert(!(sm->lshift && sm->rshift));
   }
-  rewind(err); int c; while ((c=getc(err))!=EOF) fputc(c,stderr);
-  fprintf(stderr, "convert: subprocess statuses: %d %d\n", st_conv, st_paste);
-  _exit(127);
+  assert(sm->lshift < LONG_BIT);
+  assert(sm->rshift < LONG_BIT);
 }
 
-static void read_pages(void) {
+static CanonImage *convert_page(Snapshot *sn) {
+  ShMask shiftmasks[3];
+  CanonImage *im;
+
+  fprintf(screenshots_file,
+	  "P6\n"
+	  "%d %d\n"
+	  "255\n", sn->width, sn->height);
+
+#define COMPUTE_SHIFT_MASK(ix, rgb) \
+  compute_shift_mask(&shiftmasks[ix], sn->rgb##_mask)
+  COMPUTE_SHIFT_MASK(0, red);
+  COMPUTE_SHIFT_MASK(1, green);
+  COMPUTE_SHIFT_MASK(2, blue);
+
+  CANONICALISE_IMAGE(im, sn->width, sn->height, {
+    long xrgb= XGetPixel(sn, x, y);
+    int i;
+    rgb= 0;
+    for (i=0; i<3; i++) {
+      rgb <<= 8;
+      unsigned long sample=
+	((xrgb << shiftmasks[i].lshift)
+	      >> shiftmasks[i].rshift) & SAMPLEMASK;
+      rgb |= sample;
+      fputc(sample, screenshots_file);
+    }
+  });
+
+  eassert(!fflush(screenshots_file));
+
+  return im;
+}
+
+void take_screenshots(void) {
   Snapshot *current=0, *last=0;
+  CanonImage *test;
 
-  raise_and_set_focus();
+  /* 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);
+  free(test);
 
   /* page to the top - keep pressing page up until the image stops changing */
-  wait_for_stability(&current,0, send_pgup_many);
+  set_focus();
+  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);
-    store_page(npages, current);
-    free(last); last=current; current=0;
-    fprintf(stderr,"PAGING page %d converted\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;
+
+    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(current);
+      free_snapshot(&current);
       break;
     }
 
     send_pgdown();
     npages++;
   }
-  fprintf(stderr,"PAGING all done.\n");
+  debugf("PAGING all done.\n");
+  progress_log("collected %d screenshots.",npages);
 }    
 
-int main(int argc, char **argv) {
-  screenshot_startup();
-
-  id= strtoul(*++argv,0,0);
+void take_one_screenshot(void) {
+  Snapshot *current=0;
+  
+  raise_and_get_details();
+  sync_after_input();
+  wait_for_stability(&current,0,0, "taking screenshot...");
+  page_images[0]= convert_page(current);
+  npages= 1;
+  progress_log("collected single screenshot.");
+}
 
-  read_pages();
-  return 0;
+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;
+  
+  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);
+}