X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=5978f74e365d5e62866422e0d3a59edb43b48d35;hb=5d58a08423953756871493042a9cfff032b66e18;hp=66c3ad8d8c59f1f850e5dffea6b5df94ba873efd;hpb=024dcba9bc55d02e5c05100ed65f8d64a1eb3bbf;p=ypp-sc-tools.db-test.git diff --git a/pctb/pages.c b/pctb/pages.c index 66c3ad8..5978f74 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -6,6 +6,7 @@ #include #include #include +#include CanonImage *page_images[MAX_PAGES]; int npages; @@ -13,11 +14,26 @@ int npages; static Window id; static Display *disp; static struct timeval tv_startup; +static unsigned wwidth, wheight; 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; @@ -27,11 +43,10 @@ static CanonImage *screenshot_now(void) { eassert(r>=0); FILE *f= popen(cmd,"r"); eassert(f); ci= file_read_image(f); - r= fgetc(f); eassert(r==EOF); eassert(feof(f)); - r= pclose(f); eassert(r>=0); eassert(WIFEXITED(r) && !WEXITSTATUS(r)); - free(cmd); + check_pclose(f, cmd); return ci; } +#endif static void screenshot_startup(void) { int r; @@ -48,163 +63,236 @@ static CanonImage *single_page(void) { } #endif -static void raise_and_set_focus(void) { - int r; - XWindowAttributes attr; - int xpos,ypos, evbase,errbase,majver,minver; - unsigned width,height,bd,depth; - Window dummy; - - fprintf(stderr,"PAGING raise_and_set_focus\n"); - - r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver); - eassert(r==True); - - r= XRaiseWindow(disp, id); eassert(r); +/*---------- pager ----------*/ - r= XGetWindowAttributes(disp, id, &attr); eassert(r); - r= XGetGeometry(disp,id, &attr.root,&xpos,&ypos,&width,&height, &bd,&depth); - eassert(r); +typedef XImage Snapshot; - r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos, - &dummy); - eassert(r); +//static size_t snapshot_alloc= 1024; +static double last_input; +static const double min_update_allowance= 0.25; - int screen= XScreenNumberOfScreen(attr.screen); - XTestFakeMotionEvent(disp,screen, xpos, ypos, 0); +static double timestamp(void) { + struct timeval tv; + int r; + + 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); + return t; +} +static void delay(double need_sleep) { + int r; + fprintf(stderr,"PAGING delay %f\n",need_sleep); + r= usleep(need_sleep * 1e6); eassert(!r); +} - XTestFakeButtonEvent(disp,1,1, 50); - XTestFakeButtonEvent(disp,1,0, 50); +static void sync_after_input(void) { + int r; r= XSync(disp, False); eassert(r); - - fprintf(stderr,"PAGING raise_and_set_focus done.\n"); + last_input= timestamp(); } static void send_key(KeySym sym) { - int r; XTestFakeKeyEvent(disp, keycode(sym),1, 10); XTestFakeKeyEvent(disp, keycode(sym),0, 10); - r= XSync(disp, False); eassert(r); } -static void send_pgup(void) { - fprintf(stderr,"PAGING PageUp\n"); - send_key(XK_Prior); +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); + sync_after_input(); } static void send_pgdown(void) { - fprintf(stderr,"PAGING PageDown\n"); send_key(XK_Next); + fprintf(stderr,"PAGING PageDown\n"); + sync_after_input(); } -static double timestamp(void) { - struct timeval tv; - int r; - - r= gettimeofday(&tv,0); eassert(!r); - return (tv.tv_sec - tv_startup.tv_sec) + - (tv.tv_usec - tv_startup.tv_usec) * 1e-6; +static void free_snapshot(Snapshot **io) { + if (*io) XDestroyImage(*io); + *io= 0; } -static double worst_snapshot= 0.050, worst_stabilise= 0.100; +static void snapshot(Snapshot **output) { +// char *cmd; +// int r; +// XImage *xim; + + free_snapshot(output); -static void snapshot(CanonImage **output) { - free(*output); - double a= timestamp(); - *output= screenshot_now(); fprintf(stderr,"PAGING snapshot\n"); - double b= timestamp(); - double it_took= b-a; - fprintf(stderr,"PAGING snapshot took=%f\n",it_took); - if (it_took > worst_snapshot) - worst_snapshot= it_took; -} -static void snapshot_idle(void) { - int r; - r= usleep(worst_snapshot * 1e6 * 2); - /* spend no more than 1/3 of our time constantly snapshotting */ - eassert(!r); + timestamp(); + *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap); + timestamp(); + + fprintf(stderr,"PAGING snapshot done.\n"); } -static int identical(const CanonImage *a, const CanonImage *b) { - return !(memcmp(a, b, sizeof(*a)) || - memcmp(a->d, b->d, a->w * a->h)); +static int identical(const Snapshot *a, const Snapshot *b) { + if (!(a->width == b->width && + a->height == b->height && + a->bytes_per_line == b->bytes_per_line && + a->format == b->format)) + return 0; + return !memcmp(a->data, b->data, a->bytes_per_line * a->height); } -static void wait_for_stability(CanonImage **output, - const CanonImage *previously, +static void wait_for_stability(Snapshot **output, + const Snapshot *previously, void (*with_keypress)(void)) { - CanonImage *last=0; + Snapshot *last=0; /* waits longer if we're going to return an image identical to previously * if previously==0, all images are considered identical to it */ - double when_started= timestamp(); - double last_change= when_started; - double it_took= -1; - fprintf(stderr,"PAGING wait_for_stability" - " worst_snapshot=%f worst_stabilise=%f\n", - worst_snapshot, worst_stabilise); + " last_input=%f previously=%p\n", + last_input, previously); for (;;) { + double at_snapshot= timestamp(); + double need_sleep= min_update_allowance - (at_snapshot - last_input); + if (need_sleep > 0) { delay(need_sleep); continue; } + snapshot(output); - double right_now= timestamp(); - if (!last || !identical(*output,last)) { - fprintf(stderr,"PAGING wait_for_stability changed...\n"); - last_change= right_now; - free(last); last=*output; *output=0; - it_took= -1; - } else { - if (it_took<0) - it_took= right_now - when_started; - - double threshold= (worst_stabilise + worst_snapshot) * 3; - if (!previously || identical(*output,previously)) - threshold *= 2; threshold += 1.5; - - double stable_for= right_now - last_change; - fprintf(stderr,"PAGING wait_for_stability" - " worst_snapshot=%f worst_stabilise=%f" - " stable for %f thresh %f...\n", - worst_snapshot, worst_stabilise, - stable_for, threshold); - - if (stable_for > threshold) - break; + if (!with_keypress && + !(previously && identical(*output,previously))) { + fprintf(stderr,"PAGING wait_for_stability simple\n"); + break; } + + if (last && identical(*output,last)) { + fprintf(stderr,"PAGING wait_for_stability stabilised\n"); + break; + } + + fprintf(stderr,"PAGING wait_for_stability retry\n"); + + free_snapshot(&last); last=*output; *output=0; + if (with_keypress) with_keypress(); - snapshot_idle(); - } - if (it_took > worst_stabilise) - worst_stabilise= it_took; + delay(0.5); + } - free(last); + free_snapshot(&last); fprintf(stderr,"PAGING wait_for_stability done.\n"); } +static void raise_and_set_focus(void) { + int r; + XWindowAttributes attr; + int xpos,ypos, evbase,errbase,majver,minver; + unsigned bd,depth; + Window dummy; + + fprintf(stderr,"PAGING raise_and_set_focus\n"); + + r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver); + eassert(r==True); + + r= XRaiseWindow(disp, id); eassert(r); + + r= XGetWindowAttributes(disp, id, &attr); eassert(r); + r= XGetGeometry(disp,id, &attr.root, + &xpos,&ypos, &wwidth,&wheight, + &bd,&depth); + eassert(r); + + r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos, + &dummy); + eassert(r); + + int screen= XScreenNumberOfScreen(attr.screen); + XTestFakeMotionEvent(disp,screen, xpos, ypos, 0); + + XTestFakeButtonEvent(disp,1,1, 50); + XTestFakeButtonEvent(disp,1,0, 50); + + sync_after_input(); + fprintf(stderr,"PAGING raise_and_set_focus done.\n"); +} + +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; + + sm->lshift= 0; + sm->rshift= 0; + sm->mask= 0xfful << targshift; + below= ~0ul << targshift; + + for (;;) { + if (ximage_mask < sm->mask) { + sm->lshift++; ximage_mask <<= 1; + } else if ((ximage_mask & ~below) > sm->mask) { + sm->rshift++; ximage_mask >>= 1; + } else { + break; + } + assert(!(sm->lshift && sm->rshift)); + } + assert(sm->lshift < LONG_BIT); + assert(sm->rshift < LONG_BIT); +} + +static void store_page(int pageno, Snapshot *sn) { + eassert(pageno < MAX_PAGES); + 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); + + 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; + }); + + page_images[pageno]= im; +} + static void read_pages(void) { - CanonImage *current=0, *last; + Snapshot *current=0, *last=0; raise_and_set_focus(); /* page to the top - keep pressing page up until the image stops changing */ - wait_for_stability(¤t,0, send_pgup); + wait_for_stability(¤t,0, send_pgup_many); /* now to actually page down */ for (;;) { fprintf(stderr,"PAGING page %d\n",npages); - eassert(npages < MAX_PAGES); - page_images[npages++]= last= current; - send_pgdown(); + store_page(npages, current); + free_snapshot(&last); last=current; current=0; + fprintf(stderr,"PAGING page %d converted\n",npages); + wait_for_stability(¤t,last, 0); if (npages && /* first pagedown doesn't do much */ identical(current,last)) { - free(current); + free_snapshot(¤t); break; } + + send_pgdown(); + npages++; } fprintf(stderr,"PAGING all done.\n"); }