X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=b9e1ac1649dc2c5aa8a57997e58cabba430b54f1;hb=451e1b1ed16a7a53395c030598a83031e266f973;hp=9b05fcd046ae5989f25f1c9695837b66e910e619;hpb=cd124e1675276f26b594f23367da63637673698f;p=ypp-sc-tools.web-live.git diff --git a/pctb/pages.c b/pctb/pages.c index 9b05fcd..b9e1ac1 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -1,7 +1,7 @@ /* */ -#include "ocr.h" +#include "structure.h" #include #include @@ -11,6 +11,8 @@ CanonImage *page_images[MAX_PAGES]; int npages; +char *ocean, *pirate; + static XWindowAttributes attr; static Window id; static Display *disp; @@ -18,58 +20,22 @@ static struct timeval tv_startup; static unsigned wwidth, wheight; static int wxpos, wypos; +DEBUG_DEFINE_DEBUGF(pages) + static KeyCode keycode(KeySym sym) { return XKeysymToKeycode(disp,sym); } -#if 0 -static void check_exitstatus(int st) { - eassert(WIFEXITED(st)); - eassert(!WEXITSTATUS(st)); -} - -static void check_pclose(FILE *f, char *cmd) { - int r; - eassert(!ferror(f)); - r= fgetc(f); eassert(r==EOF); eassert(feof(f)); - r= pclose(f); eassert(r>=0); check_exitstatus(r); - free(cmd); -} - -static CanonImage *screenshot_now(void) { - char *cmd; - CanonImage *ci; - int r; - - r= asprintf(&cmd, "xwd -silent -id 0x%lx | xwdtopnm", (unsigned long)id); - eassert(r>=0); - FILE *f= popen(cmd,"r"); eassert(f); - ci= file_read_image(f); - check_pclose(f, cmd); - return ci; -} -#endif - -static void screenshot_startup(void) { +void screenshot_startup(void) { int r; disp= XOpenDisplay(0); eassert(disp); r= gettimeofday(&tv_startup,0); eassert(!r); } -#if 0 -static CanonImage *single_page(void) { - int r; - r= XRaiseWindow(disp, id); eassert(r); - r= XSync(disp, False); eassert(r); - return screenshot_now(); -} -#endif - /*---------- pager ----------*/ typedef XImage Snapshot; -//static size_t snapshot_alloc= 1024; static double last_input; static const double min_update_allowance= 0.25; @@ -80,12 +46,12 @@ static double timestamp(void) { r= gettimeofday(&tv,0); eassert(!r); double t= (tv.tv_sec - tv_startup.tv_sec) + (tv.tv_usec - tv_startup.tv_usec) * 1e-6; - fprintf(stderr,"%f\n",t); + debugf("PAGING %f\n",t); return t; } static void delay(double need_sleep) { int r; - fprintf(stderr,"PAGING delay %f\n",need_sleep); + debugf("PAGING delay %f\n",need_sleep); r= usleep(need_sleep * 1e6); eassert(!r); } @@ -104,12 +70,12 @@ static void send_pgup_many(void) { int i; for (i=0; i<25; i++) send_key(XK_Prior); - fprintf(stderr,"PAGING PageUp x %d\n",i); + debugf("PAGING PageUp x %d\n",i); sync_after_input(); } static void send_pgdown(void) { send_key(XK_Next); - fprintf(stderr,"PAGING PageDown\n"); + debugf("PAGING PageDown\n"); sync_after_input(); } @@ -125,13 +91,13 @@ static void snapshot(Snapshot **output) { free_snapshot(output); - fprintf(stderr,"PAGING snapshot\n"); + debugf("PAGING snapshot\n"); timestamp(); *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap); timestamp(); - fprintf(stderr,"PAGING snapshot done.\n"); + debugf("PAGING snapshot done.\n"); } static int identical(const Snapshot *a, const Snapshot *b) { @@ -150,7 +116,7 @@ static void wait_for_stability(Snapshot **output, /* waits longer if we're going to return an image identical to previously * if previously==0, all images are considered identical to it */ - fprintf(stderr,"PAGING wait_for_stability" + debugf("PAGING wait_for_stability" " last_input=%f previously=%p\n", last_input, previously); @@ -163,16 +129,16 @@ static void wait_for_stability(Snapshot **output, if (!with_keypress && !(previously && identical(*output,previously))) { - fprintf(stderr,"PAGING wait_for_stability simple\n"); + debugf("PAGING wait_for_stability simple\n"); break; } if (last && identical(*output,last)) { - fprintf(stderr,"PAGING wait_for_stability stabilised\n"); + debugf("PAGING wait_for_stability stabilised\n"); break; } - fprintf(stderr,"PAGING wait_for_stability retry\n"); + debugf("PAGING wait_for_stability retry\n"); free_snapshot(&last); last=*output; *output=0; @@ -183,7 +149,7 @@ static void wait_for_stability(Snapshot **output, } free_snapshot(&last); - fprintf(stderr,"PAGING wait_for_stability done.\n"); + debugf("PAGING wait_for_stability done.\n"); } static void raise_and_get_details(void) { @@ -192,7 +158,7 @@ static void raise_and_get_details(void) { unsigned bd,depth; Window dummy; - fprintf(stderr,"PAGING raise_and_get_details\n"); + debugf("PAGING raise_and_get_details\n"); r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver); eassert(r==True); @@ -213,7 +179,7 @@ static void raise_and_get_details(void) { static void set_focus(void) { int screen= XScreenNumberOfScreen(attr.screen); - fprintf(stderr,"PAGING set_focus\n"); + debugf("PAGING set_focus\n"); XTestFakeMotionEvent(disp,screen, wxpos,wypos, 0); @@ -221,27 +187,23 @@ static void set_focus(void) { XTestFakeButtonEvent(disp,1,0, 50); sync_after_input(); - fprintf(stderr,"PAGING raise_and_set_focus done.\n"); + debugf("PAGING raise_and_set_focus done.\n"); } +#define SAMPLEMASK 0xfful + typedef struct { - unsigned long mask; int lshift, rshift; } ShMask; -static void compute_shift_mask(ShMask *sm, int targshift, - unsigned long ximage_mask) { - unsigned long below; - +static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { sm->lshift= 0; sm->rshift= 0; - sm->mask= 0xfful << targshift; - below= ~0ul << targshift; for (;;) { - if (ximage_mask < sm->mask) { + if (ximage_mask <= (SAMPLEMASK>>1)) { sm->lshift++; ximage_mask <<= 1; - } else if ((ximage_mask & ~below) > sm->mask) { + } else if (ximage_mask > SAMPLEMASK) { sm->rshift++; ximage_mask >>= 1; } else { break; @@ -256,31 +218,43 @@ static CanonImage *convert_page(Snapshot *sn) { ShMask shiftmasks[3]; CanonImage *im; -#define COMPUTE_SHIFT_MASK(ix, targshift, rgb) \ - compute_shift_mask(&shiftmasks[ix], targshift, sn->rgb##_mask) - COMPUTE_SHIFT_MASK(0, 16, red); - COMPUTE_SHIFT_MASK(1, 8, green); - COMPUTE_SHIFT_MASK(2, 0, blue); + fprintf(screenshots_file, + "P6\n" + "%d %d\n" + "255\n", sn->width, sn->height); + +#define COMPUTE_SHIFT_MASK(ix, rgb) \ + compute_shift_mask(&shiftmasks[ix], sn->rgb##_mask) + COMPUTE_SHIFT_MASK(0, red); + COMPUTE_SHIFT_MASK(1, green); + COMPUTE_SHIFT_MASK(2, blue); CANONICALISE_IMAGE(im, sn->width, sn->height, { long xrgb= XGetPixel(sn, x, y); int i; rgb= 0; - for (i=0; i<3; i++) - rgb |= ((xrgb << shiftmasks[i].lshift) - >> shiftmasks[i].rshift) & shiftmasks[i].mask; + for (i=0; i<3; i++) { + rgb <<= 8; + unsigned long sample= + ((xrgb << shiftmasks[i].lshift) + >> shiftmasks[i].rshift) & SAMPLEMASK; + rgb |= sample; + fputc(sample, screenshots_file); + } }); + eassert(!fflush(screenshots_file)); + return im; } -static void read_pages(void) { +void take_screenshots(void) { Snapshot *current=0, *last=0; CanonImage *test; /* find the window and check it's on the right kind of screen */ raise_and_get_details(); - snapshot(¤t); + wait_for_stability(¤t,0,0); test= convert_page(current); find_structure(test); free(test); @@ -291,13 +265,13 @@ static void read_pages(void) { /* now to actually page down */ for (;;) { - fprintf(stderr,"paging page %d\n",npages); + debugf("paging page %d\n",npages); eassert(npages < MAX_PAGES); page_images[npages]= convert_page(current); free_snapshot(&last); last=current; current=0; - fprintf(stderr,"PAGING page %d converted\n",npages); + debugf("PAGING page %d converted\n",npages); wait_for_stability(¤t,last, 0); if (npages && /* first pagedown doesn't do much */ @@ -309,15 +283,126 @@ static void read_pages(void) { send_pgdown(); npages++; } - fprintf(stderr,"PAGING all done.\n"); + debugf("PAGING all done.\n"); } -int main(int argc, char **argv) { - screenshot_startup(); - - id= strtoul(*++argv,0,0); +void take_one_screenshot(void) { + Snapshot *current=0; + + raise_and_get_details(); + sync_after_input(); + wait_for_stability(¤t,0,0); + page_images[0]= convert_page(current); + npages= 1; +} - read_pages(); - return 0; +void set_yppclient_window(unsigned long wul) { + id= wul; } +DEBUG_DEFINE_SOME_DEBUGF(findypp,debugfind) + +void find_yppclient_window(void) { + Window root, gotroot, gotparent; + int screen, r; + int nfound=0; + + if (id) return; + + 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); + eassert(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) do { \ + r= asprintf(&what, "%.*s", end - start, start); eassert(r>0); \ + }while(0) + ASSIGN(ocean, title + S(prefix), spc1); + ASSIGN(pirate, spc1 + S(onthe), (title + len) - S(suffix)); + + debugfind(" YES!\n"); + id= w2; + nfound++; + } + if (children2) XFree(children2); + } + if (children1) XFree(children1); + } + eassert(nfound==1); +}