X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=2f4f6695484033aac96a6f09e8800c1616a109d4;hb=40e9c021a64bf3ab2fc56629d0e7530b53b56562;hp=39690388ebc41589c583653916aaaefc7a8adf3e;hpb=ae2213ef391622c3365442baa088fa42bf7586b2;p=ypp-sc-tools.db-test.git diff --git a/pctb/pages.c b/pctb/pages.c index 3969038..2f4f669 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -1,71 +1,41 @@ /* */ -#include "ocr.h" +#include "structure.h" #include #include #include +#include CanonImage *page_images[MAX_PAGES]; int npages; +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); } -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); eassert(WIFEXITED(r) && !WEXITSTATUS(r)); - free(cmd); -} - -#if 0 -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 struct { - size_t len; - unsigned char d[]; -} Snapshot; +typedef XImage Snapshot; -static size_t snapshot_alloc= 1024; static double last_input; -static const double min_update_allowance= 0.5; +static const double min_update_allowance= 0.25; static double timestamp(void) { struct timeval tv; @@ -74,12 +44,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); } @@ -98,58 +68,43 @@ 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(); } +static void free_snapshot(Snapshot **io) { + if (*io) XDestroyImage(*io); + *io= 0; +} + static void snapshot(Snapshot **output) { - char *cmd; - int r; +// char *cmd; +// int r; +// XImage *xim; - free(*output); *output=0; - - fprintf(stderr,"PAGING snapshot\n"); + free_snapshot(output); - r= asprintf(&cmd, "xwd -silent -id 0x%lx", (unsigned long)id); eassert(r>=0); - FILE *f= popen(cmd,"r"); eassert(f); + debugf("PAGING snapshot\n"); - int need_alloc=1; - size_t used=0; - for (;;) { - size_t allow= snapshot_alloc - used; - if (!allow) { - snapshot_alloc <<= 1; - need_alloc= 1; - fprintf(stderr,"PAGING snapshot grow %ld\n", (long)snapshot_alloc); - continue; - } - if (need_alloc) { - *output= realloc(*output, sizeof(**output) + snapshot_alloc); - eassert(*output); - need_alloc= 0; - } - size_t got= fread((*output)->d, 1, allow, f); - if (got==0) break; - used += got; - } - check_pclose(f,cmd); - - (*output)->len= used; - snapshot_alloc= used+1; - *output= realloc(*output, sizeof(**output) + snapshot_alloc); - eassert(*output); + timestamp(); + *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap); + timestamp(); - fprintf(stderr,"PAGING snapshot len=%ld\n", (long)used); + debugf("PAGING snapshot done.\n"); } static int identical(const Snapshot *a, const Snapshot *b) { - return !(memcmp(a, b, sizeof(*a)) || - memcmp(a->d, b->d, a->len)); + 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(Snapshot **output, @@ -159,7 +114,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); @@ -172,18 +127,18 @@ 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(last); last=*output; *output=0; + free_snapshot(&last); last=*output; *output=0; if (with_keypress) with_keypress(); @@ -191,18 +146,17 @@ static void wait_for_stability(Snapshot **output, delay(0.5); } - free(last); - fprintf(stderr,"PAGING wait_for_stability done.\n"); + free_snapshot(&last); + debugf("PAGING wait_for_stability done.\n"); } -static void raise_and_set_focus(void) { +static void raise_and_get_details(void) { int r; - XWindowAttributes attr; - int xpos,ypos, evbase,errbase,majver,minver; - unsigned width,height,bd,depth; + int evbase,errbase,majver,minver; + unsigned bd,depth; Window dummy; - fprintf(stderr,"PAGING raise_and_set_focus\n"); + debugf("PAGING raise_and_get_details\n"); r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver); eassert(r==True); @@ -210,60 +164,141 @@ static void raise_and_set_focus(void) { r= XRaiseWindow(disp, id); eassert(r); r= XGetWindowAttributes(disp, id, &attr); eassert(r); - r= XGetGeometry(disp,id, &attr.root,&xpos,&ypos,&width,&height, &bd,&depth); + r= XGetGeometry(disp,id, &attr.root, + &wxpos,&wypos, &wwidth,&wheight, + &bd,&depth); eassert(r); - r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos, + r= XTranslateCoordinates(disp, id,attr.root, 160,160, &wxpos,&wypos, &dummy); eassert(r); +} +static void set_focus(void) { int screen= XScreenNumberOfScreen(attr.screen); - XTestFakeMotionEvent(disp,screen, xpos, ypos, 0); + + debugf("PAGING set_focus\n"); + + XTestFakeMotionEvent(disp,screen, wxpos,wypos, 0); XTestFakeButtonEvent(disp,1,1, 50); 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 { + int lshift, rshift; +} ShMask; + +static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { + sm->lshift= 0; + sm->rshift= 0; + + for (;;) { + if (ximage_mask <= (SAMPLEMASK>>1)) { + sm->lshift++; ximage_mask <<= 1; + } else if (ximage_mask > SAMPLEMASK) { + sm->rshift++; ximage_mask >>= 1; + } else { + break; + } + assert(!(sm->lshift && sm->rshift)); + } + assert(sm->lshift < LONG_BIT); + assert(sm->rshift < LONG_BIT); +} +static CanonImage *convert_page(Snapshot *sn) { + ShMask shiftmasks[3]; + CanonImage *im; + + 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 <<= 8; + unsigned long sample= + ((xrgb << shiftmasks[i].lshift) + >> shiftmasks[i].rshift) & SAMPLEMASK; + rgb |= sample; + fputc(sample, screenshots_file); + } + }); -static void read_pages(void) { + eassert(!fflush(screenshots_file)); + + return im; +} + +void take_screenshots(void) { Snapshot *current=0, *last=0; + CanonImage *test; - raise_and_set_focus(); + /* find the window and check it's on the right kind of screen */ + raise_and_get_details(); + wait_for_stability(¤t,0,0); + test= convert_page(current); + find_structure(test); + free(test); /* page to the top - keep pressing page up until the image stops changing */ - wait_for_stability(&last,0, send_pgup_many); + set_focus(); + 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++]= + debugf("paging page %d\n",npages); + + eassert(npages < MAX_PAGES); + page_images[npages]= convert_page(current); + free_snapshot(&last); last=current; current=0; + + debugf("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; } - free(last); last=current; current=0; - 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; } +void find_yppclient_window(void) { + if (id) return; + eassert(!"finding client window NYI"); +}