Properly wait for /w output to appear

[ypp-sc-tools.db-live.git] / pctb / pages.c

diff --git a/pctb/pages.c b/pctb/pages.c
index 8914bd64fa82d01b3283eeb2fcfb1e98df623f0e..a87b0214753316fe293be0e52712a4a14cf0a9a9 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -322,7 +322,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"
@@ -512,28 +513,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 +534,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) {