X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=b3ddceba81f921c2dc1d46661053e77da3215680;hp=1a9970162ce10c8fd667208b5476f1ca9cde44f8;hb=9334b48a221df6f96a88933be8fde35e2ef41b35;hpb=c66cfd9d90974888907605f6d9888bcadd5fa433 diff --git a/pctb/pages.c b/pctb/pages.c index 1a99701..b3ddceb 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -43,7 +43,6 @@ CanonImage *page_images[MAX_PAGES]; int npages; -RgbImage *page0_rgbimage; const char *ocean, *pirate; @@ -301,7 +300,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); @@ -327,14 +326,21 @@ static void wait_for_stability(Snapshot **output, 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= 25000; /*us*/ for (;;) { - usleep(250000); + progress_spinner("%s",doing); + + double since_last_input= timestamp() - last_input; + double this_interval= min_interval - since_last_input; + + if (this_interval >= 0) + usleep(this_interval); + snapshot(output); if (!last) { @@ -342,25 +348,29 @@ static void wait_for_stability(Snapshot **output, last=*output; *output=0; } else if (!identical(*output,last)) { debugf("PAGING wait_for_stability changed...\n"); - free(last); last=*output; *output=0; + free_snapshot(&last); last=*output; *output=0; nidentical=0; + if (!with_keypress) { + min_interval *= 3.0; + min_interval += 0.5; + } } else { nidentical++; int threshold= !previously ? 3 : - identical(*output,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.5; + min_interval *= 2.0; } - progress_spinner("%s",doing); if (with_keypress) with_keypress(); - - usleep(250000); } free_snapshot(&last); @@ -483,27 +493,20 @@ static void set_focus_commodity(void) { debugf("PAGING raise_and_set_focus done.\n"); } -static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) { +static CanonImage *convert_page(Snapshot *sn) { CanonImage *im; - fprintf(screenshot_file, - "P6\n" - "%d %d\n" - "255\n", sn->w, sn->h); + fwrite_ppmraw(screenshot_file, sn); + unsigned char *pixel= sn->data; 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); + rgb= + (pixel[0] << 16) | + (pixel[1] << 8) | + (pixel[2] ); + pixel += 3; }); - + sysassert(!ferror(screenshot_file)); sysassert(!fflush(screenshot_file)); @@ -518,7 +521,7 @@ 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); + test= convert_page(current); find_structure(test, &max_relevant_y); check_correct_commodities(); Rect sunshine= find_sunshine_widget(); @@ -564,7 +567,7 @@ void take_screenshots(void) { fatal("Paging down seems to generate too many pages - max is %d.", MAX_PAGES); - page_images[npages]= convert_page(current, 0); + page_images[npages]= convert_page(current); free_snapshot(&last); last=current; current=0; debugf("PAGING page %d converted\n",npages); @@ -594,8 +597,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); + page_images[0]= convert_page(current); npages= 1; progress_log("collected single screenshot."); } @@ -606,112 +608,116 @@ void set_yppclient_window(unsigned long wul) { DEBUG_DEFINE_SOME_DEBUGF(findypp,debugfind) +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) + + 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); + } + +#define REQUIRE(pred) \ + if (!(pred)) { debugfind(" failed test %s\n", #pred); return; } \ + else + + REQUIRE( gottype!=None ); + REQUIRE( len ); + REQUIRE( gotfmt==8 ); + + REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) ); + + char *spc1= strchr( title + S(prefix), ' '); REQUIRE(spc1); + char *spc2= strrchr((title + len) - S(suffix), ' '); REQUIRE(spc2); + + REQUIRE( (title + len) - spc1 >= S(onthe) + S(suffix) ); + REQUIRE( spc2 - title >= S(prefix) + S(onthe) ); + + REQUIRE( !memcmp(title, prefix, S(prefix)) ); + REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); + REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); + +#define ASSIGN(what, start, end) \ + what= masprintf("%.*s", (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) { - Window root, gotroot, gotparent; - int screen; - int nfound=0; + int targetdepth; + + nfound=0; if (id) return; progress("looking for YPP client window..."); - static const char prefix[]= "Puzzle Pirates - "; - static const char onthe[]= " on the "; - static const char suffix[]= " ocean"; -#define S(x) (sizeof((x))-1) + xassert( (wm_name= XInternAtom(disp,"WM_NAME",True)) != None); - 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 REQUIRE(pred) \ - if (!(pred)) { debugfind(" failed test %s\n", #pred); continue; } \ - else - - REQUIRE( gottype!=None ); - REQUIRE( len ); - REQUIRE( gotfmt==8 ); - - REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) ); - - char *spc1= strchr( title + S(prefix), ' '); REQUIRE(spc1); - char *spc2= strrchr((title + len) - S(suffix), ' '); REQUIRE(spc2); - - REQUIRE( (title + len) - spc1 >= S(onthe) + S(suffix) ); - REQUIRE( spc2 - title >= S(prefix) + S(onthe) ); - - REQUIRE( !memcmp(title, prefix, S(prefix)) ); - REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); - REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); - -#define ASSIGN(what, start, end) \ - what= masprintf("%.*s", (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= w2; - nfound++; - progress_log("found YPP client (0x%lx):" - " %s ocean - %s.", - (unsigned long)id, ocean, pirate); - } - if (children2) XFree(children2); + for (targetdepth=1; targetdepth<4; targetdepth++) { + for (screen=0; screen1) fatal("Found several possible YPP clients. Close one,\n" " disambiguate with --pirate or --ocean,"