X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=2e3edde72d4b3fb68ecd48f20e430cac1739252b;hp=0a175ee56054b461121e3ee5ef5bc52aa6744a02;hb=b3a5bc5d04aa5c9d52f3987965fdb2a4cd4c8e14;hpb=0c6894304b51f4920a73d3e9ec45cec483f842e3 diff --git a/pctb/pages.c b/pctb/pages.c index 0a175ee..2e3edde 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -41,10 +41,6 @@ #include #include -CanonImage *page_images[MAX_PAGES]; -int npages; -RgbImage *page0_rgbimage; - const char *ocean, *pirate; static XWindowAttributes attr; @@ -53,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; @@ -105,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; @@ -161,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(); @@ -172,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; @@ -184,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) { @@ -226,6 +226,8 @@ static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { } assert(sm->lshift < LONG_BIT); assert(sm->rshift < LONG_BIT); + debugf("SHIFTMASK %p={.lshift=%d, .rshift=%d} image_mask=%lx\n", + sm, sm->lshift, sm->rshift, ximage_mask); } static void rtimestamp(double *t, const char *wh) { @@ -262,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); @@ -272,15 +274,31 @@ 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; y> shiftmasks[i].rshift) - & SAMPLEMASK; - *op++= sample; + if (im_use->xoffset == 0 && + im_use->format == ZPixmap && + im_use->byte_order == LSBFirst && + im_use->depth == 24 && + im_use->bits_per_pixel == 32 && + im_use->red_mask == 0x0000ffU && + im_use->green_mask == 0x00ff00U && + im_use->blue_mask == 0xff0000U) { + const char *p= im_use->data + y * im_use->bytes_per_line; +// debugf("optimised copy y=%d",y); + memcpy(op32, p, wwidth*sizeof(*op32)); + op32 += wwidth; + } else { + for (x=0; x> shiftmasks[i].rshift) + & SAMPLEMASK; + } + *op32++= sample; } } } @@ -301,7 +319,7 @@ static int identical(const Snapshot *a, const Snapshot *b) { return 0; int compare_to= a->h; - if (max_relevant_y && compare_to > max_relevant_y) + if (max_relevant_y>=0 && compare_to > max_relevant_y) compare_to= max_relevant_y; return !memcmp(a->data, b->data, a->w * 3 * compare_to); @@ -321,45 +339,57 @@ static void wait_for_stability(Snapshot **output, va_start(al,fmt); Snapshot *last=0; + int nidentical=0; /* 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; sysassert( vasprintf(&doing,fmt,al) >=0 ); - progress("%s",doing); debugf("PAGING wait_for_stability" " last_input=%f previously=%p `%s'\n", last_input, previously, doing); + double min_interval= 0.025; for (;;) { - double at_snapshot= timestamp(); - double need_sleep= min_update_allowance - (at_snapshot - last_input); - if (need_sleep > 0) { delay(need_sleep); continue; } + progress_spinner("%s",doing); + + double since_last_input= timestamp() - last_input; + double this_interval= min_interval - since_last_input; - snapshot(output); + if (this_interval >= 0) + delay(this_interval); - if (!with_keypress && - !(previously && identical(*output,previously))) { - debugf("PAGING wait_for_stability simple\n"); - break; - } + snapshot(output); - if (last && identical(*output,last)) { - debugf("PAGING wait_for_stability stabilised\n"); - break; + if (!last) { + debugf("PAGING wait_for_stability first...\n"); + last=*output; *output=0; + } else if (!identical(*output,last)) { + debugf("PAGING wait_for_stability changed...\n"); + free_snapshot(&last); last=*output; *output=0; + nidentical=0; + if (!with_keypress) { + min_interval *= 3.0; + min_interval += 0.1; + } + } else { + nidentical++; + int threshold= + !previously ? 3 : + identical(*output,previously) ? 5 + : 1; + debugf("PAGING wait_for_stability nidentical=%d threshold=%d\n", + nidentical, threshold); + if (nidentical >= threshold) + break; + + min_interval += 0.1; + min_interval *= 2.0; } - - progress_spinner("%s",doing); - - debugf("PAGING wait_for_stability retry\n"); - - free_snapshot(&last); last=*output; *output=0; if (with_keypress) with_keypress(); - - delay(0.5); } free_snapshot(&last); @@ -401,10 +431,15 @@ static void raise_and_get_details(void) { if (!(wwidth >= 320 && wheight >= 320)) fatal("YPP client window is implausibly small?"); + if (attr.depth < 24) + fatal("Display is not 24bpp."); + check_client_window_all_on_screen(); - int shm= XShmQueryExtension(disp); - debugf("PAGING shm=%d\n",shm); + 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) ); @@ -461,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); @@ -472,38 +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, RgbImage *ri) { +static CanonImage *convert_page(const Snapshot *sn, RgbImage **rgb_r) { CanonImage *im; + RgbImage *ri; - fprintf(screenshot_file, - "P6\n" - "%d %d\n" - "255\n", sn->w, sn->h); - - CANONICALISE_IMAGE(im, sn->w, sn->h, { - int i; - rgb= 0; - for (i=0; i<3; i++) { - rgb <<= 8; - unsigned long sample= RI_PIXEL(sn,x,y)[i]; - rgb |= sample; - fputc(sample, screenshot_file); - } - if (ri) - CANONIMG_ALSO_STORERGB(ri); + fwrite_ppmraw(screenshot_file, sn); + + 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; } @@ -515,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, 0); - 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(); @@ -543,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; @@ -555,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, 0); + + 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); @@ -591,8 +640,7 @@ void take_one_screenshot(void) { prepare_ypp_client(); wait_for_stability(¤t,0,0, "taking screenshot..."); - page0_rgbimage= alloc_rgb_image(current->w, current->h); - page_images[0]= convert_page(current, page0_rgbimage); + convert_store_page(current); npages= 1; progress_log("collected single screenshot."); } @@ -603,112 +651,116 @@ void set_yppclient_window(unsigned long wul) { DEBUG_DEFINE_SOME_DEBUGF(findypp,debugfind) -void find_yppclient_window(void) { - Window root, gotroot, gotparent; - int screen; - int nfound=0; - - if (id) return; - - progress("looking for YPP client window..."); +static int nfound; +static Atom wm_name; +static int screen; + +static void findypp_recurse(int depth, int targetdepth, Window w) { + unsigned int nchildren; + int i; + Window *children=0; + Window gotroot, gotparent; static const char prefix[]= "Puzzle Pirates - "; static const char onthe[]= " on the "; static const char suffix[]= " ocean"; -#define S(x) (sizeof((x))-1) - - Atom wm_name= XInternAtom(disp,"WM_NAME",True); - xassert(wm_name != None); - - for (screen=0; screen=' ' && c<=126) fputc(c,debug); - else fprintf(debug,"\\x%02x",c & 0xff); - } - fputs("\": ",debug); - } +#define S(x) ((int)sizeof((x))-1) -#define REQUIRE(pred) \ - if (!(pred)) { debugfind(" failed test %s\n", #pred); continue; } \ - else + debugfind("FINDYPP %d/%d screen %d %*s %lx", + depth,targetdepth,screen, + depth,"",(unsigned long)w); + + if (depth!=targetdepth) { + xassert( XQueryTree(disp,w, + &gotroot,&gotparent, + &children,&nchildren) ); + debugfind(" nchildren=%d\n",nchildren); + + for (i=0; i=' ' && c<=126) fputc(c,debug); + else fprintf(debug,"\\x%02x",c & 0xff); + } + fputs("\": ",debug); + } - REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) ); +#define REQUIRE(pred) \ + if (!(pred)) { debugfind(" failed test %s\n", #pred); return; } \ + else - char *spc1= strchr( title + S(prefix), ' '); REQUIRE(spc1); - char *spc2= strrchr((title + len) - S(suffix), ' '); REQUIRE(spc2); + REQUIRE( gottype!=None ); + REQUIRE( len ); + REQUIRE( gotfmt==8 ); - REQUIRE( (title + len) - spc1 >= S(onthe) + S(suffix) ); - REQUIRE( spc2 - title >= S(prefix) + S(onthe) ); + REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) ); - REQUIRE( !memcmp(title, prefix, S(prefix)) ); - REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); - REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); + char *spc1= strchr( title + S(prefix), ' '); REQUIRE(spc1); + char *spc2= strrchr((title + len) - S(suffix), ' '); REQUIRE(spc2); -#define ASSIGN(what, start, end) \ - what= masprintf("%.*s", (end)-(start), start); \ - if (o_##what) REQUIRE( !strcasecmp(o_##what, what) ); \ - else + REQUIRE( (title + len) - spc1 >= S(onthe) + S(suffix) ); + REQUIRE( spc2 - title >= S(prefix) + S(onthe) ); - ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix)); - ASSIGN(pirate, title + S(prefix), spc1); + REQUIRE( !memcmp(title, prefix, S(prefix)) ); + REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); + REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); - debugfind(" YES!\n"); - id= w2; - nfound++; - progress_log("found YPP client (0x%lx):" - " %s ocean - %s.", - (unsigned long)id, ocean, pirate); - } - if (children2) XFree(children2); +#define ASSIGN(what, start, end) \ + what= masprintf("%.*s", (int)((end)-(start)), start); \ + if (o_##what) REQUIRE( !strcasecmp(o_##what, what) ); \ + else + + ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix)); + ASSIGN(pirate, title + S(prefix), spc1); + + debugfind(" YES!\n"); + id= w; + nfound++; + progress_log("found YPP client (0x%lx):" + " %s ocean - %s.", + (unsigned long)id, ocean, pirate); +} + +void find_yppclient_window(void) { + int targetdepth; + + nfound=0; + + if (id) return; + + progress("looking for YPP client window..."); + + xassert( (wm_name= XInternAtom(disp,"WM_NAME",True)) != None); + + for (targetdepth=1; targetdepth<4; targetdepth++) { + for (screen=0; screen1) fatal("Found several possible YPP clients. Close one,\n" " disambiguate with --pirate or --ocean,"