X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=008116197046760211651d4b09af889631ac7f8e;hb=a5027ece716333370b103b7356582f7ef87ef3cf;hp=8914bd64fa82d01b3283eeb2fcfb1e98df623f0e;hpb=a0695472f2c33e386f5591e1b3c49e2f3b772828;p=ypp-sc-tools.main.git

diff --git a/pctb/pages.c b/pctb/pages.c
index 8914bd6..0081161 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,7 +324,8 @@ 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 */
 
-  char *doing= masprintf(fmt,al);
+  char *doing;
+  sysassert( vasprintf(&doing,fmt,al) >=0 );
   progress("%s",doing);
 
   debugf("PAGING  wait_for_stability"
@@ -400,8 +403,10 @@ static void raise_and_get_details(void) {
 
   check_client_window_all_on_screen();
 
-  int shm= XShmQueryExtension(disp);
-    shm=0;
+  Bool shmpixmaps=0;
+  int major=0,minor=0;
+  int shm= XShmQueryVersion(disp, &major,&minor,&shmpixmaps);
+  debugf("PAGING shm=%d %d.%d pixmaps=%d\n",shm,major,minor,shmpixmaps);
   if (shm) {
     xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
 				    0,&shminfo, wwidth,wheight) );
@@ -512,28 +517,18 @@ static void prepare_ypp_client(void) {
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
 
-#if 0
-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();
@@ -543,7 +538,11 @@ timestamp();
   send_key(XK_w);
   send_key(XK_Return);
   sync_after_input();
-  sysassert(! usleep(1000000) );
+
+  Snapshot *status=0;
+  wait_for_stability(&status,current,0, "awaiting status information...");
+  free_snapshot(&current);
+  free_snapshot(&status);
 }
 
 void take_screenshots(void) {