X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=50a652c5946a02ffd1a82fc60780e19620217dbf;hp=14d0be20aeada9cc0088502cf39a672ff372dba1;hb=a16126118a4da57568f926c7082dcc28aac9b8f3;hpb=ff4afbbcb13fe8bbdb5676fd3581754412cbbbc3

diff --git a/pctb/pages.c b/pctb/pages.c
index 14d0be2..50a652c 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -1,286 +1,720 @@
 /*
-  */
+ * Interaction with the YPP client via X11
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
+
+/*
+ * Only this file #includes the X11 headers, as they're quite
+ * pollutant of the namespace.
+ */
 
-#include "ocr.h"
+#include "structure.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
+
+#include <X11/extensions/XShm.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
+RgbImage *page0_rgbimage;
+
+char *ocean, *pirate;
 
+static XWindowAttributes attr;
 static Window id;
 static Display *disp;
 static struct timeval tv_startup;
+static unsigned wwidth, wheight;
+static int max_relevant_y= -1;
+
+static XImage *shmim;
+static XShmSegmentInfo shminfo;
+
+DEBUG_DEFINE_DEBUGF(pages)
+
+#define xassert(what)					\
+  ((what) ? (void)0 :					\
+   fatal("X11 operation unexpectedly failed."		\
+	 " %s:%d: %s\n", __FILE__,__LINE__,#what))
 
 static KeyCode keycode(KeySym sym) {
   return XKeysymToKeycode(disp,sym);
 }
 
-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);  eassert(WIFEXITED(r) && !WEXITSTATUS(r));
-  free(cmd);
+void screenshot_startup(void) {
+  progress("starting...");
+  disp= XOpenDisplay(0);
+  if (!disp) fatal("Unable to open X11 display.");
+  sysassert(! gettimeofday(&tv_startup,0) );
 }
 
-#if 0
-static CanonImage *screenshot_now(void) {
-  char *cmd;
-  CanonImage *ci;
-  int r;
+/*---------- pager ----------*/
+
+typedef RgbImage Snapshot;
+
+static double last_input;
+static const double min_update_allowance= 0.25;
+
+static double timestamp(void) {
+  struct timeval tv;
   
-  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;
+  sysassert(! gettimeofday(&tv,0) );
+  double t= (tv.tv_sec - tv_startup.tv_sec) +
+            (tv.tv_usec - tv_startup.tv_usec) * 1e-6;
+  debugf("PAGING %f\n",t);
+  return t;
 }
-#endif
-
-static void screenshot_startup(void) {
-  int r;
-  disp= XOpenDisplay(0);  eassert(disp);
-  r= gettimeofday(&tv_startup,0);  eassert(!r);
+static void delay(double need_sleep) {
+  debugf("PAGING     delay %f\n",need_sleep);
+  sysassert(! usleep(need_sleep * 1e6) );
 }
 
-#if 0
-static CanonImage *single_page(void) {
-  int r;
-  r= XRaiseWindow(disp, id);  eassert(r);
-  r= XSync(disp, False);  eassert(r);
-  return screenshot_now();
+static void sync_after_input(void) {
+  xassert( XSync(disp, False) );
+  last_input= timestamp();
 }
-#endif
 
-static void raise_and_set_focus(void) {
-  int r;
-  XWindowAttributes attr;
-  int xpos,ypos, evbase,errbase,majver,minver;
-  unsigned width,height,bd,depth;
+static void translate_coords_toroot(int wx, int wy, int *rx, int *ry) {
   Window dummy;
-  
-  fprintf(stderr,"PAGING raise_and_set_focus\n");
-
-  r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
-  eassert(r==True);
-
-  r= XRaiseWindow(disp, id);  eassert(r);
-
-  r= XGetWindowAttributes(disp, id, &attr);  eassert(r);
-  r= XGetGeometry(disp,id, &attr.root,&xpos,&ypos,&width,&height, &bd,&depth);
-  eassert(r);
-
-  r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos,
-			   &dummy);
-  eassert(r);
-
-  int screen= XScreenNumberOfScreen(attr.screen);
-  XTestFakeMotionEvent(disp,screen, xpos, ypos, 0);
+  xassert( XTranslateCoordinates(disp, id,attr.root, wx,wy, rx,ry, &dummy) );
+}
 
-  XTestFakeButtonEvent(disp,1,1, 50);
-  XTestFakeButtonEvent(disp,1,0, 50);
-  r= XSync(disp, False);  eassert(r);
+static void check_client_window_all_on_screen(void) {
+  Rect onroot;
+  unsigned rwidth, rheight;
+  Window dummy;
+  unsigned bd, depth;
+  int rxpos, rypos;
 
-  fprintf(stderr,"PAGING raise_and_set_focus done.\n");
+  xassert( XGetGeometry(disp,attr.root, &dummy, &rxpos,&rypos,
+			&rwidth, &rheight,
+			&bd,&depth) );
+  
+  translate_coords_toroot(0,0, &onroot.tl.x,&onroot.tl.y);
+  translate_coords_toroot(wwidth-1,wheight-1, &onroot.br.x,&onroot.br.y);
+  if (!(onroot.tl.x >= 0 &&
+	onroot.tl.y >= 0 &&
+	onroot.br.x < rwidth &&
+	onroot.br.y < rheight))
+    fatal("YPP client window is not entirely on the screen.");
 }
 
-/*---------- pager ----------*/
+static void check_not_disturbed(void) {
+  XEvent ev;
+  int r;
+  
+  for (;;) {
+    r= XCheckMaskEvent(disp, ~0, &ev);
+    if (r==False) return;
 
-typedef struct {
-  size_t len;
-  unsigned char d[];
-} Snapshot;
+    switch (ev.type) {
+    case VisibilityNotify:
+      if (ev.xvisibility.state != VisibilityUnobscured)
+	fatal("YPP client window has become obscured.");
+      break;
+    case ConfigureNotify:
+      check_client_window_all_on_screen();
+      break;
+    case FocusOut:
+      fatal("Focus left YPP client window.");
+      break;
+    case FocusIn:
+      warning("focus entered YPP client window ?!");
+      break;
+    default:
+      fatal("Received unexpected X11 event (type code %d)!", ev.type);
+    }
+  }
+}      
 
 static void send_key(KeySym sym) {
-  int r;
+  check_not_disturbed();
   XTestFakeKeyEvent(disp, keycode(sym),1, 10);
   XTestFakeKeyEvent(disp, keycode(sym),0, 10);
-  r= XSync(disp, False);  eassert(r);
 }
+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;
-  fprintf(stderr,"PAGING   PageUp\n");
-  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) {
-  fprintf(stderr,"PAGING   PageDown\n");
   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 double timestamp(void) {
-  struct timeval tv;
-  int r;
-  
-  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);
-  return t;
+static void free_snapshot(Snapshot **io) {
+  free(*io);
+  *io= 0;
 }
 
-static double worst_snapshot= 0.050;
-static double worst_stabilise= 0.100;
-static size_t snapshot_alloc= 1024;
+#define SAMPLEMASK 0xfful
 
-static void snapshot(Snapshot **output) {
-  char *cmd;
-  int r;
+typedef struct {
+  int lshift, rshift;
+} ShMask;
+
+static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
+  sm->lshift= 0;
+  sm->rshift= 0;
   
-  free(*output);  *output=0;
-  double a= timestamp();
+  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));
+  }
+  assert(sm->lshift < LONG_BIT);
+  assert(sm->rshift < LONG_BIT);
+}
 
-  fprintf(stderr,"PAGING   snapshot\n");
+static void rtimestamp(double *t, const char *wh) {
+  double n= timestamp();
+  debugf("PAGING                INTERVAL %f  %s\n", n-*t, wh);
+  *t= n;
+}
 
-  r= asprintf(&cmd, "xwd -silent -id 0x%lx", (unsigned long)id); eassert(r>=0);
-  FILE *f= popen(cmd,"r"); eassert(f);
+static void snapshot(Snapshot **output) {
+  XImage *im_use, *im_free=0;
+
+  ShMask shiftmasks[3];
+
+  debugf("PAGING   snapshot\n");
+
+  double begin= timestamp();
+  if (shmim) {
+    xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) );
+    rtimestamp(&begin, "XShmGetImage");
+
+    size_t dsz= shmim->bytes_per_line * shmim->height;
+    im_use= im_free= mmalloc(sizeof(*im_use) + dsz);
+    *im_free= *shmim;
+    im_free->data= (void*)(im_free+1);
+    memcpy(im_free->data, shmim->data, dsz);
+    rtimestamp(&begin, "mmalloc/memcpy");
+  } else {
+    xassert( im_use= im_free=
+	     XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) );
+    rtimestamp(&begin, "XGetImage");
+  }
 
-  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;
+#define COMPUTE_SHIFT_MASK(ix, rgb) \
+  compute_shift_mask(&shiftmasks[ix], im_use->rgb##_mask)
+  COMPUTE_SHIFT_MASK(0, red);
+  COMPUTE_SHIFT_MASK(1, green);
+  COMPUTE_SHIFT_MASK(2, blue);
+  
+  if (!*output)
+    *output= alloc_rgb_image(wwidth, wheight);
+
+  rtimestamp(&begin, "compute_shift_masks+alloc_rgb_image");
+
+  int x,y,i;
+  unsigned char *op= (*output)->data;
+  for (y=0; y<wheight; y++) {
+    for (x=0; x<wwidth; x++) {
+      long xrgb= XGetPixel(im_use,x,y);
+      for (i=0; i<3; i++) {
+	unsigned long sample=
+	  ((xrgb << shiftmasks[i].lshift) >> shiftmasks[i].rshift)
+	  & SAMPLEMASK;
+	*op++= sample;
+      }
     }
-    size_t got= fread((*output)->d, 1, allow, f);
-    if (got==0) break;
-    used += got;
   }
-  check_pclose(f,cmd);
 
-  (*output)->len= used;
-  snapshot_alloc= used+1;
-  *output= realloc(*output, sizeof(**output) + snapshot_alloc);
-  eassert(*output);
+  rtimestamp(&begin,"w*h*XGetPixel");
+  if (im_free)
+    XDestroyImage(im_free);
   
-  double b= timestamp();
-  double it_took= b-a;
-  if (it_took > worst_snapshot)
-    worst_snapshot= it_took;
+  rtimestamp(&begin,"XDestroyImage");
+  check_not_disturbed();
 
-  fprintf(stderr,"PAGING   snapshot took=%f len=%ld\n",
-	  it_took, (long)used);
-}
-
-static void snapshot_idle(void) {
-  int r;
-  r= usleep(worst_snapshot * 1e6 * 0.5);
-  /* spend no more than 2/3 of our time constantly snapshotting */
-  eassert(!r);
+  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->w == b->w &&
+	a->h == b->h))
+    return 0;
+
+  int compare_to= a->h;
+  if (max_relevant_y && compare_to > max_relevant_y)
+    compare_to= max_relevant_y;
+  
+  return !memcmp(a->data, b->data, a->w * 3 * compare_to);
 }
 
 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;
   /* waits longer if we're going to return an image identical to previously
    * if previously==0, all images are considered identical to it */
 
-  double when_started= timestamp();
-  double last_change= when_started;
-  double it_took= -1;
+  debugf("PAGING  wait_for_stability"
+	  "  last_input=%f previously=%p\n",
+	  last_input, previously);
 
-  fprintf(stderr,"PAGING  wait_for_stability"
-	  "  worst_snapshot=%f worst_stabilise=%f  previously=%p\n",
-	  worst_snapshot, worst_stabilise, previously);
+  char *doing;
+  sysassert( vasprintf(&doing,fmt,al) >=0);
+
+  progress("%s",doing);
 
   for (;;) {
     double at_snapshot= timestamp();
+    double need_sleep= min_update_allowance - (at_snapshot - last_input);
+    if (need_sleep > 0) { delay(need_sleep); continue; }
+
     snapshot(output);
-    double right_now= timestamp();
-
-    if (!last) {
-      fprintf(stderr,"PAGING  wait_for_stability first...\n");
-      last_change= when_started= right_now;
-      last=*output; *output=0;
-    } else if (!identical(*output,last)) {
-      fprintf(stderr,"PAGING  wait_for_stability changed...\n");
-      last_change= right_now;
-      free(last); last=*output; *output=0;
-      it_took= -1;
-    } else {
-      if (it_took<0)
-	it_took= at_snapshot - when_started;
-
-      double threshold= worst_stabilise + worst_snapshot;
-      if (!previously || identical(*output,previously))
-	threshold *= 2;  threshold += 1.5;
-
-      double stable_for= right_now - last_change;
-      fprintf(stderr,"PAGING  wait_for_stability"
-	      "  worst_snapshot=%f worst_stabilise=%f"
-	      "  it_took=%f stable_for=%f threshold=%f...\n",
-	      worst_snapshot, worst_stabilise,
-	      it_took, stable_for, threshold);
-      
-      if (stable_for > threshold)
-	break;
+
+    if (!with_keypress &&
+	!(previously && identical(*output,previously))) {
+      debugf("PAGING  wait_for_stability  simple\n");
+      break;
     }
+
+    if (last && identical(*output,last)) {
+      debugf("PAGING  wait_for_stability  stabilised\n");
+      break;
+    }
+    
+    progress_spinner("%s",doing);
+
+    debugf("PAGING  wait_for_stability  retry\n");
+
+    free_snapshot(&last); last=*output; *output=0;
+
     if (with_keypress)
       with_keypress();
-    snapshot_idle();
+
+    delay(0.5);
   }
 
-  if (!with_keypress && it_took > worst_stabilise)
-    worst_stabilise= it_took;
+  free_snapshot(&last);
+  free(doing);
+  debugf("PAGING  wait_for_stability done.\n");
+  va_end(al);
+}
+
+static void raise_and_get_details(void) {
+  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");
+
+  int xtest= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver);
+  if (!xtest) fatal("X server does not support the XTEST extension.");
+
+  xassert( XRaiseWindow(disp, id) );
+  /* in case VisibilityNotify triggers right away before we have had a
+   * change to raise; to avoid falsely detecting lowering in that case */
+  
+  xassert( XSelectInput(disp, id,
+			StructureNotifyMask|
+			VisibilityChangeMask
+			) );
+
+  xassert( XRaiseWindow(disp, id) );
+  /* in case the window was lowered between our Raise and our SelectInput;
+   * to avoid failing to detect that lowering */
+
+  xassert( XGetWindowAttributes(disp, id, &attr) );
+  xassert( XGetGeometry(disp,id, &attr.root,
+			&wxpos,&wypos, &wwidth,&wheight,
+			&bd,&depth) );
+
+  if (!(wwidth >= 320 && wheight >= 320))
+    fatal("YPP client window is implausibly small?");
+
+  check_client_window_all_on_screen();
+
+  int shm= XShmQueryExtension(disp);
+    shm=0;
+  if (shm) {
+    xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
+				    0,&shminfo, wwidth,wheight) );
+
+    sigset_t oldset, all;
+    sigfillset(&all);
+    sysassert(! sigprocmask(SIG_BLOCK,&all,&oldset) );
+
+    int pfd[2];
+    pid_t cleaner;
+    sysassert(! pipe(pfd) );
+    sysassert( (cleaner= fork()) != -1 );
+    if (!cleaner) {
+      sysassert(! close(pfd[1]) );
+      for (;;) {
+	int r= read(pfd[0], &shminfo.shmid, sizeof(shminfo.shmid));
+	if (!r) exit(0);
+	if (r==sizeof(shminfo.shmid)) break;
+	assert(r==-1 && errno==EINTR);
+      }
+      for (;;) {
+	char bc;
+	int r= read(pfd[0],&bc,1);
+	if (r>=0) break;
+	assert(r==-1 && errno==EINTR);
+      }
+      sysassert(! shmctl(shminfo.shmid,IPC_RMID,0) );
+      exit(0);
+    }
+    sysassert(! close(pfd[0]) );
+
+    sysassert(! sigprocmask(SIG_SETMASK,&oldset,0) );
+
+    assert(shmim->height == wheight);
+    sysassert( (shminfo.shmid=
+		shmget(IPC_PRIVATE, shmim->bytes_per_line * wheight,
+		       IPC_CREAT|0600)) >= 0 );
+
+    sysassert( write(pfd[1],&shminfo.shmid,sizeof(shminfo.shmid)) ==
+	       sizeof(shminfo.shmid) );
+    sysassert( shminfo.shmaddr= shmat(shminfo.shmid,0,0) );
+    shmim->data= shminfo.shmaddr;
+    shminfo.readOnly= False;
+    xassert( XShmAttach(disp,&shminfo) );
 
-  free(last);
-  fprintf(stderr,"PAGING  wait_for_stability done.\n");
+    close(pfd[1]); /* causes IPC_RMID */
+  }
 }
 
-static void read_pages(void) {
-  Snapshot *current=0, *last=0;
+static void set_focus_commodity(void) {
+  int screen= XScreenNumberOfScreen(attr.screen);
+
+  progress("taking control of YPP client window...");
+
+  debugf("PAGING set_focus\n");
 
-  raise_and_set_focus();
+  mouse_1_updown(160,160);
+  sync_after_input();
+
+  delay(0.5);
+  xassert( XSelectInput(disp, id,
+			StructureNotifyMask|
+			VisibilityChangeMask|
+			FocusChangeMask
+			) );
+
+  int xpos,ypos;
+  translate_coords_toroot(10,10, &xpos,&ypos);
+  XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
+
+  sync_after_input();
+
+  debugf("PAGING raise_and_set_focus done.\n");
+}
 
+static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) {
+  CanonImage *im;
+
+  fprintf(screenshot_file,
+	  "P6\n"
+	  "%d %d\n"
+	  "255\n", sn->w, sn->h);
+
+  CANONICALISE_IMAGE(im, sn->w, sn->h, {
+    int i;
+    rgb= 0;
+    for (i=0; i<3; i++) {
+      rgb <<= 8;
+      unsigned long sample= RI_PIXEL(sn,x,y)[i];
+      rgb |= sample;
+      fputc(sample, screenshot_file);
+    }
+    if (ri)
+      CANONIMG_ALSO_STORERGB(ri);
+  });
+
+  sysassert(!ferror(screenshot_file));
+  sysassert(!fflush(screenshot_file));
+
+  return im;
+}
+
+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...");
+
+#if 1
+timestamp();
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+snapshot(&current);
+timestamp();
+#endif
+
+  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 */
-  wait_for_stability(&last,0, send_pgup_many);
+  set_focus_commodity();
+  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);
-    //eassert(npages < MAX_PAGES);
-    //page_images[npages++]=
-    npages++;
+    debugf("paging page %d\n",npages);
+
+    if (!(npages < MAX_PAGES))
+      fatal("Paging down seems to generate too many pages - max is %d.",
+	    MAX_PAGES);
+    
+    page_images[npages]= convert_page(current, 0);
+    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;
     }
 
-    free(last); last=current; current=0;
-
     send_pgdown();
+    npages++;
   }
-  fprintf(stderr,"PAGING all done.\n");
+  progress("finishing with the YPP client...");
+  send_pgdown_torestore();
+
+  debugf("PAGING all done.\n");
+  progress_log("collected %d screenshots.",npages);
 }    
 
-int main(int argc, char **argv) {
-  screenshot_startup();
+void take_one_screenshot(void) {
+  Snapshot *current=0;
 
-  id= strtoul(*++argv,0,0);
+  prepare_ypp_client();
+  wait_for_stability(&current,0,0, "taking screenshot...");
+  page0_rgbimage= alloc_rgb_image(current->w, current->h);
+  page_images[0]= convert_page(current, 0);
+  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;
+  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);
+  xassert(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;
+
+    xassert( XQueryTree(disp,root,
+		  &gotroot,&gotparent,
+		  &children1,&nchildren1) );
+    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;
+
+      xassert( XQueryTree(disp,w1,
+			  &gotroot,&gotparent,
+			  &children2,&nchildren2) );
+      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;
+	xassert( !XGetWindowProperty(disp,w2, wm_name,0,512, False,
+				     AnyPropertyType,&gottype, &gotfmt, &len,
+				     &gotbytesafter, &gottitle) );
+	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 {					\
+	sysassert( asprintf(&what, "%.*s", (end)-(start), start) >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 (0x%lx):"
+		     " %s ocean - %s.",
+		     (unsigned long)id, ocean, pirate);
+      }
+      if (children2) XFree(children2);
+    }
+    if (children1) XFree(children1);
+  }
+  if (nfound>1)
+    fatal("Found several YPP clients."
+	  " Close one, or specify the windowid with --window-id.\n");
+  if (nfound<1)
+    fatal("Did not find YPP client."
+	  " Use --window-id and/or report this as a fault.\n");
+}