X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=99f4af2adb562be8e340981f78f5b0416b0e17b3;hb=4903e3f2fbd534bde1bc3ebc4d84328297e0b388;hp=de967310454085a02ce4ce467b1fa144cf7c2ba4;hpb=834081c7d780ba6d55d8f28328e2e3eb6c1067ab;p=ypp-sc-tools.web-live.git diff --git a/pctb/pages.c b/pctb/pages.c index de96731..99f4af2 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -11,12 +11,15 @@ CanonImage *page_images[MAX_PAGES]; int npages; +char *ocean, *pirate; + static XWindowAttributes attr; static Window id; static Display *disp; 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); @@ -24,6 +27,7 @@ static KeyCode keycode(KeySym sym) { void screenshot_startup(void) { int r; + progress("starting..."); disp= XOpenDisplay(0); eassert(disp); r= gettimeofday(&tv_startup,0); eassert(!r); } @@ -42,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); } @@ -66,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(); } @@ -87,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) { @@ -112,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); @@ -125,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; @@ -145,45 +149,85 @@ 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 translate_coords_toroot(int wx, int wy, int *rx, int *ry) { + int r; + Window dummy; + r= XTranslateCoordinates(disp, id,attr.root, wx,wy, rx,ry, &dummy); + eassert(r); } static void raise_and_get_details(void) { int r; int evbase,errbase,majver,minver; + int wxpos, wypos; unsigned bd,depth; Window dummy; - - fprintf(stderr,"PAGING raise_and_get_details\n"); + + progress("raising and checking YPP client window ...\n"); + + debugf("PAGING raise_and_get_details\n"); r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver); eassert(r==True); r= XRaiseWindow(disp, id); eassert(r); + /* in case VisibilityNotify triggers right away before we have had a + * change to raise; to avoid falsely detecting lowering in that case */ + + r= XSelectInput(disp, id, + StructureNotifyMask| + VisibilityChangeMask + ); eassert(r); + + r= XRaiseWindow(disp, id); eassert(r); + /* in case the window was lowered between our Raise and our SelectInput; + * to avoid failing to detect that lowering */ r= XGetWindowAttributes(disp, id, &attr); eassert(r); r= XGetGeometry(disp,id, &attr.root, &wxpos,&wypos, &wwidth,&wheight, &bd,&depth); - eassert(r); - r= XTranslateCoordinates(disp, id,attr.root, 160,160, &wxpos,&wypos, - &dummy); - eassert(r); + eassert(wwidth >= 320 && wheight >= 320); + + int rxpos, rypos; + unsigned rwidth, rheight; + r= XGetGeometry(disp,attr.root, &dummy, &rxpos,&rypos, + &rwidth, &rheight, + &bd,&depth); + + translate_coords_toroot(0,0, &rxpos,&rypos); + eassert(rxpos>=0 && rypos>=0); + + translate_coords_toroot(wwidth-1,wheight-1, &rxpos,&rypos); + eassert(rxpos=' ' && 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++; + progress_log("found YPP client window 0x%lx: %s on the %s ocean\n", + (unsigned long)id, pirate, ocean); + } + if (children2) XFree(children2); + } + if (children1) XFree(children1); + } + eassert(nfound==1); }