static struct timeval tv_startup;
static unsigned wwidth, wheight;
static int max_relevant_y= -1;
+static Point commod_focus_point, commod_page_point, commod_focuslast_point;
static XImage *shmim;
static XShmSegmentInfo shminfo;
Window dummy;
xassert( XTranslateCoordinates(disp, id,attr.root, wx,wy, rx,ry, &dummy) );
}
+static void translate_coords_toroot_p(Point w, int *rx, int *ry) {
+ translate_coords_toroot(w.x, w.y, rx, ry);
+}
static void check_client_window_all_on_screen(void) {
Rect onroot;
}
static void mouse_1_updown_here(void) {
check_not_disturbed();
- XTestFakeButtonEvent(disp,1,1, 50);
- XTestFakeButtonEvent(disp,1,0, 50);
+ XTestFakeButtonEvent(disp,1,1, 10);
+ XTestFakeButtonEvent(disp,1,0, 10);
}
static void mouse_1_updown(int x, int y) {
check_not_disturbed();
XTestFakeMotionEvent(disp, screen, xpos,ypos, 0);
mouse_1_updown_here();
}
+static void pgdown_by_mouse(void) {
+ check_not_disturbed();
+ debugf("PAGING Mouse\n");
+ mouse_1_updown_here();
+ sync_after_input();
+}
static int pgupdown;
debugf("PAGING PageUp x %d\n",i);
sync_after_input();
}
-static void send_pgdown(void) {
- send_key(XK_Next);
- pgupdown++;
- debugf("PAGING PageDown\n");
- sync_after_input();
-}
static void send_pgdown_torestore(void) {
debugf("PAGING PageDown x %d\n", -pgupdown);
while (pgupdown < 0) {
" last_input=%f previously=%p `%s'\n",
last_input, previously, doing);
- double min_interval= 25000; /*us*/
+ double min_interval= 0.025; /*us*/
for (;;) {
progress_spinner("%s",doing);
double this_interval= min_interval - since_last_input;
if (this_interval >= 0)
- usleep(this_interval);
+ delay(this_interval);
snapshot(output);
nidentical=0;
if (!with_keypress) {
min_interval *= 3.0;
- min_interval += 0.5;
+ min_interval += 0.1;
}
} else {
nidentical++;
if (nidentical >= threshold)
break;
- min_interval += 0.5;
+ min_interval += 0.1;
min_interval *= 2.0;
}
debugf("PAGING set_focus\n");
- mouse_1_updown(160,160);
+ mouse_1_updown(commod_focus_point.x, commod_focus_point.y);
sync_after_input();
delay(0.5);
) );
int xpos,ypos;
- translate_coords_toroot(10,10, &xpos,&ypos);
- XTestFakeMotionEvent(disp,screen, xpos,ypos, 0);
+ translate_coords_toroot_p(commod_page_point, &xpos,&ypos);
+ XTestFakeMotionEvent(disp, screen, xpos,ypos, 0);
sync_after_input();
debugf("PAGING raise_and_set_focus done.\n");
}
-static CanonImage *convert_page(Snapshot *sn) {
+static CanonImage *convert_page(const Snapshot *sn) {
CanonImage *im;
fwrite_ppmraw(screenshot_file, sn);
- unsigned char *pixel= sn->data;
+ const unsigned char *pixel= sn->data;
CANONICALISE_IMAGE(im, sn->w, sn->h, {
- rgb=
- (pixel[0] << 16) |
- (pixel[1] << 8) |
- (pixel[2] );
- pixel += 3;
+ r= *pixel++;
+ g= *pixel++;
+ b= *pixel++;
});
sysassert(!ferror(screenshot_file));
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
test= convert_page(current);
- find_structure(test, &max_relevant_y);
+ find_structure(test, &max_relevant_y,
+ &commod_focus_point,
+ &commod_page_point,
+ &commod_focuslast_point);
check_correct_commodities();
Rect sunshine= find_sunshine_widget();
if (npages && /* first pagedown doesn't do much */
identical(current,last)) {
+ npages++;
free_snapshot(¤t);
break;
}
- send_pgdown();
+ pgdown_by_mouse();
npages++;
}
progress("finishing with the YPP client...");
+ mouse_1_updown(commod_focuslast_point.x, commod_focuslast_point.y);
+ sync_after_input();
send_pgdown_torestore();
+ sync_after_input();
debugf("PAGING all done.\n");
progress_log("collected %d screenshots.",npages);