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

diff --git a/pctb/pages.c b/pctb/pages.c
index 50a652c..80f176a 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -45,7 +45,7 @@ CanonImage *page_images[MAX_PAGES];
 int npages;
 RgbImage *page0_rgbimage;
 
-char *ocean, *pirate;
+const char *ocean, *pirate;
 
 static XWindowAttributes attr;
 static Window id;
@@ -322,15 +322,14 @@ static void wait_for_stability(Snapshot **output,
   /* waits longer if we're going to return an image identical to previously
    * if previously==0, all images are considered identical to it */
 
-  debugf("PAGING  wait_for_stability"
-	  "  last_input=%f previously=%p\n",
-	  last_input, previously);
-
   char *doing;
-  sysassert( vasprintf(&doing,fmt,al) >=0);
-
+  sysassert( vasprintf(&doing,fmt,al) >=0 );
   progress("%s",doing);
 
+  debugf("PAGING  wait_for_stability"
+	  "  last_input=%f previously=%p `%s'\n",
+	  last_input, previously, doing);
+
   for (;;) {
     double at_snapshot= timestamp();
     double need_sleep= min_update_allowance - (at_snapshot - last_input);
@@ -514,7 +513,7 @@ static void prepare_ypp_client(void) {
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
 
-#if 1
+#if 0
 timestamp();
 snapshot(&current);
 snapshot(&current);
@@ -545,6 +544,7 @@ timestamp();
   send_key(XK_w);
   send_key(XK_Return);
   sync_after_input();
+  sysassert(! usleep(1000000) );
 }
 
 void take_screenshots(void) {
@@ -596,7 +596,7 @@ void take_one_screenshot(void) {
   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);
+  page_images[0]= convert_page(current, page0_rgbimage);
   npages= 1;
   progress_log("collected single screenshot.");
 }
@@ -694,11 +694,13 @@ void find_yppclient_window(void) {
 	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);
+#define ASSIGN(what, start, end)				\
+	what= masprintf("%.*s", (end)-(start), start);		\
+	if (o_##what) REQUIRE( !strcasecmp(o_##what, what) );	\
+	else
+
 	ASSIGN(ocean,  spc1 + S(onthe),   (title + len) - S(suffix));
+	ASSIGN(pirate, title + S(prefix),  spc1);
 
 	debugfind(" YES!\n");
 	id= w2;
@@ -712,9 +714,11 @@ void find_yppclient_window(void) {
     if (children1) XFree(children1);
   }
   if (nfound>1)
-    fatal("Found several YPP clients."
-	  " Close one, or specify the windowid with --window-id.\n");
+    fatal("Found several possible YPP clients.   Close one,\n"
+	  " disambiguate with --pirate or --ocean,"
+	  " or specify --window-id.\n");
   if (nfound<1)
-    fatal("Did not find YPP client."
-	  " Use --window-id and/or report this as a fault.\n");
+    fatal("Did not find %sYPP client."
+	  " Use --window-id and/or report this as a fault.\n",
+	  o_ocean || o_pirate ? "matching ": "");
 }