X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=2e3edde72d4b3fb68ecd48f20e430cac1739252b;hb=af7006f2ffc8a3219fb4c70b0f62e423f18b5b5b;hp=c504c951e75956e77b2a3c2ad6e9504d169bab62;hpb=64063c86071bbfc2de0fe032e372e1321c4b34e5;p=ypp-sc-tools.web-live.git diff --git a/pctb/pages.c b/pctb/pages.c index c504c95..2e3edde 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -41,9 +41,6 @@ #include #include -CanonImage *page_images[MAX_PAGES]; -int npages; - const char *ocean, *pirate; static XWindowAttributes attr; @@ -52,6 +49,7 @@ static Display *disp; 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; @@ -104,6 +102,9 @@ static void translate_coords_toroot(int wx, int wy, int *rx, int *ry) { 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; @@ -160,8 +161,8 @@ static void send_key(KeySym sym) { } 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(); @@ -171,6 +172,12 @@ static void mouse_1_updown(int x, int y) { 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; @@ -183,12 +190,6 @@ static void send_pgup_many(void) { 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) { @@ -263,9 +264,9 @@ static void snapshot(Snapshot **output) { #define COMPUTE_SHIFT_MASK(ix, rgb) \ compute_shift_mask(&shiftmasks[ix], im_use->rgb##_mask) - COMPUTE_SHIFT_MASK(0, red); + COMPUTE_SHIFT_MASK(0, blue); COMPUTE_SHIFT_MASK(1, green); - COMPUTE_SHIFT_MASK(2, blue); + COMPUTE_SHIFT_MASK(2, red); if (!*output) *output= alloc_rgb_image(wwidth, wheight); @@ -273,7 +274,7 @@ static void snapshot(Snapshot **output) { rtimestamp(&begin, "compute_shift_masks+alloc_rgb_image"); int x,y,i; - unsigned char *op= (*output)->data; + uint32_t *op32= (*output)->data; for (y=0; yxoffset == 0 && im_use->format == ZPixmap && @@ -285,21 +286,19 @@ static void snapshot(Snapshot **output) { im_use->blue_mask == 0xff0000U) { const char *p= im_use->data + y * im_use->bytes_per_line; // debugf("optimised copy y=%d",y); - for (x=0; x> shiftmasks[i].rshift) & SAMPLEMASK; - *op++= sample; } + *op32++= sample; } } } @@ -351,7 +350,7 @@ static void wait_for_stability(Snapshot **output, " last_input=%f previously=%p `%s'\n", last_input, previously, doing); - double min_interval= 25000; /*us*/ + double min_interval= 0.025; for (;;) { progress_spinner("%s",doing); @@ -359,7 +358,7 @@ static void wait_for_stability(Snapshot **output, double this_interval= min_interval - since_last_input; if (this_interval >= 0) - usleep(this_interval); + delay(this_interval); snapshot(output); @@ -372,7 +371,7 @@ static void wait_for_stability(Snapshot **output, nidentical=0; if (!with_keypress) { min_interval *= 3.0; - min_interval += 0.5; + min_interval += 0.1; } } else { nidentical++; @@ -385,7 +384,7 @@ static void wait_for_stability(Snapshot **output, if (nidentical >= threshold) break; - min_interval += 0.5; + min_interval += 0.1; min_interval *= 2.0; } @@ -497,7 +496,7 @@ static void set_focus_commodity(void) { 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); @@ -508,29 +507,31 @@ static void set_focus_commodity(void) { ) ); 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, RgbImage **rgb_r) { CanonImage *im; + RgbImage *ri; fwrite_ppmraw(screenshot_file, sn); - unsigned char *pixel= sn->data; - CANONICALISE_IMAGE(im, sn->w, sn->h, { - r= *pixel++; - g= *pixel++; - b= *pixel++; + const Rgb *pixel= sn->data; + CANONICALISE_IMAGE(im, sn->w, sn->h, ri, { + rgb= *pixel++; }); - + sysassert(!ferror(screenshot_file)); sysassert(!fflush(screenshot_file)); + if (rgb_r) *rgb_r= ri; + else free(ri); + return im; } @@ -542,8 +543,11 @@ static void prepare_ypp_client(void) { raise_and_get_details(); wait_for_stability(¤t,0,0, "checking current YPP client screen..."); - test= convert_page(current); - find_structure(test, &max_relevant_y); + test= convert_page(current,0); + find_structure(test,0, &max_relevant_y, + &commod_focus_point, + &commod_page_point, + &commod_focuslast_point); check_correct_commodities(); Rect sunshine= find_sunshine_widget(); @@ -570,6 +574,20 @@ static void prepare_ypp_client(void) { free_snapshot(&status); } +static void convert_store_page(Snapshot *current) { + RgbImage *rgb; + CanonImage *ci; + PageStruct *pstruct; + + progress("page %d prescanning ...",npages); + ci= convert_page(current,&rgb); + + progress("page %d overview ...",npages); + find_structure(ci,&pstruct, 0,0,0,0); + + store_current_page(ci,pstruct,rgb); +} + void take_screenshots(void) { Snapshot *current=0, *last=0; @@ -582,32 +600,36 @@ void take_screenshots(void) { /* now to actually page down */ for (;;) { - debugf("paging page %d\n",npages); + debugf("page %d paging\n",npages); if (!(npages < MAX_PAGES)) fatal("Paging down seems to generate too many pages - max is %d.", MAX_PAGES); - - page_images[npages]= convert_page(current); + + convert_store_page(current); free_snapshot(&last); last=current; current=0; debugf("PAGING page %d converted\n",npages); wait_for_stability(¤t,last, 0, - "collecting screenshot of page %d...", + "page %d collecting ...", npages+1); 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); @@ -618,7 +640,7 @@ void take_one_screenshot(void) { prepare_ypp_client(); wait_for_stability(¤t,0,0, "taking screenshot..."); - page_images[0]= convert_page(current); + convert_store_page(current); npages= 1; progress_log("collected single screenshot."); }