Some fixes already done

[ypp-sc-tools.db-test.git] / yarrg / pages.c

diff --git a/yarrg/pages.c b/yarrg/pages.c
index 02cacd95bbc5d0f556d99fdcc33ed5470ddf80e5..28364a07381d0035b21b5907af7486bc7aaab53f 100644 (file)
--- a/yarrg/pages.c
+++ b/yarrg/pages.c
@@ -154,6 +154,28 @@ static void check_not_disturbed(void) {
   }
 }      
 
+static void check_pointer_not_disturbed(void) {
+  Window got_root, got_child;
+  int got_root_x, got_root_y;
+  int got_win_x, got_win_y;
+  unsigned got_mask;
+
+  int r= XQueryPointer(disp,id, &got_root,&got_child,
+                      &got_root_x, &got_root_y,
+                      &got_win_x, &got_win_y,
+                      &got_mask);
+  if (!r ||
+      got_win_x!=commod_page_point.x ||
+      got_win_y!=commod_page_point.y) {
+    progress("");
+    fprintf(stderr,"\nunexpected mouse position:"
+           " samescreen=%d got=%dx%d want=%dx%d",
+           r, got_win_x,got_win_y,
+           commod_page_point.x,commod_page_point.y);
+    fatal("Mouse pointer moved.");
+  }
+}
+
 static void send_key(KeySym sym) {
   check_not_disturbed();
   XTestFakeKeyEvent(disp, keycode(sym),1, 0);
@@ -174,6 +196,7 @@ static void send_mouse_1_updown(int x, int y) {
 }
 static void pgdown_by_mouse(void) {
   check_not_disturbed();
+  check_pointer_not_disturbed();
   debugf("PAGING   Mouse\n");
   send_mouse_1_updown_here();
   sync_after_input();
@@ -350,7 +373,7 @@ static void wait_for_stability(Snapshot **output,
          "  last_input=%f previously=%p `%s'\n",
          last_input, previously, doing);
 
-  double max_interval= 5.000;
+  double max_interval= 1.000;
   double min_interval= 0.100;
   for (;;) {
     progress_spinner("%s",doing);