X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=0a175ee56054b461121e3ee5ef5bc52aa6744a02;hp=32e429ab39df1be1220b2bedbe083a1be7ccf17d;hb=0c6894304b51f4920a73d3e9ec45cec483f842e3;hpb=0487d41d9c7796c6efebb8235c9aa39fe580ccf9

diff --git a/pctb/pages.c b/pctb/pages.c
index 32e429a..0a175ee 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -243,6 +243,7 @@ static void snapshot(Snapshot **output) {
 
   double begin= timestamp();
   if (shmim) {
+    rtimestamp(&begin, "XShmGetImage before");
     xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) );
     rtimestamp(&begin, "XShmGetImage");
 
@@ -253,6 +254,7 @@ static void snapshot(Snapshot **output) {
     memcpy(im_free->data, shmim->data, dsz);
     rtimestamp(&begin, "mmalloc/memcpy");
   } else {
+    rtimestamp(&begin, "XGetImage before");
     xassert( im_use= im_free=
 	     XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) );
     rtimestamp(&begin, "XGetImage");
@@ -322,15 +324,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);
@@ -403,7 +404,7 @@ static void raise_and_get_details(void) {
   check_client_window_all_on_screen();
 
   int shm= XShmQueryExtension(disp);
-    shm=0;
+  debugf("PAGING shm=%d\n",shm);
   if (shm) {
     xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
 				    0,&shminfo, wwidth,wheight) );
@@ -514,28 +515,18 @@ static void prepare_ypp_client(void) {
   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();
+  Rect sunshine= find_sunshine_widget();
+
+  progress("poking client...");
+  mouse_1_updown((sunshine.tl.x   + sunshine.br.x) / 2,
+		 (sunshine.tl.y*9 + sunshine.br.y) / 10);
+
   free(test);
-  free_snapshot(&current);
 
-  progress("requesting status information...");
+  wait_for_stability(&current,0,0, "checking basic YPP client screen...");
   mouse_1_updown(250, wheight-10);
   mouse_1_updown_here();
   mouse_1_updown_here();
@@ -545,6 +536,11 @@ timestamp();
   send_key(XK_w);
   send_key(XK_Return);
   sync_after_input();
+
+  Snapshot *status=0;
+  wait_for_stability(&status,current,0, "awaiting status information...");
+  free_snapshot(&current);
+  free_snapshot(&status);
 }
 
 void take_screenshots(void) {
@@ -596,7 +592,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.");
 }
@@ -696,7 +692,7 @@ void find_yppclient_window(void) {
 
 #define ASSIGN(what, start, end)				\
 	what= masprintf("%.*s", (end)-(start), start);		\
-	if (o_##what) REQUIRE( !strcmp(o_##what, what) );	\
+	if (o_##what) REQUIRE( !strcasecmp(o_##what, what) );	\
 	else
 
 	ASSIGN(ocean,  spc1 + S(onthe),   (title + len) - S(suffix));
@@ -714,8 +710,9 @@ void find_yppclient_window(void) {
     if (children1) XFree(children1);
   }
   if (nfound>1)
-    fatal("Found several possible 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 %sYPP client."
 	  " Use --window-id and/or report this as a fault.\n",