X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=de967310454085a02ce4ce467b1fa144cf7c2ba4;hb=4d7fdf03d6fc476d7f591c9f8e5c41ebe6c06176;hp=5978f74e365d5e62866422e0d3a59edb43b48d35;hpb=5d58a08423953756871493042a9cfff032b66e18;p=ypp-sc-tools.db-live.git diff --git a/pctb/pages.c b/pctb/pages.c index 5978f74..de96731 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -1,7 +1,7 @@ /* */ -#include "ocr.h" +#include "structure.h" #include #include @@ -11,63 +11,27 @@ 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; 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; @@ -184,14 +148,13 @@ static void wait_for_stability(Snapshot **output, fprintf(stderr,"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; + int evbase,errbase,majver,minver; unsigned bd,depth; Window dummy; - fprintf(stderr,"PAGING raise_and_set_focus\n"); + fprintf(stderr,"PAGING raise_and_get_details\n"); r= XTestQueryExtension(disp, &evbase,&errbase,&majver,&minver); eassert(r==True); @@ -200,16 +163,21 @@ static void raise_and_set_focus(void) { r= XGetWindowAttributes(disp, id, &attr); eassert(r); r= XGetGeometry(disp,id, &attr.root, - &xpos,&ypos, &wwidth,&wheight, + &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); + + fprintf(stderr,"PAGING set_focus\n"); + + XTestFakeMotionEvent(disp,screen, wxpos,wypos, 0); XTestFakeButtonEvent(disp,1,1, 50); XTestFakeButtonEvent(disp,1,0, 50); @@ -218,24 +186,20 @@ static void raise_and_set_focus(void) { fprintf(stderr,"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; @@ -246,42 +210,63 @@ static void compute_shift_mask(ShMask *sm, int targshift, assert(sm->rshift < LONG_BIT); } -static void store_page(int pageno, Snapshot *sn) { - eassert(pageno < MAX_PAGES); +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); + } }); - - page_images[pageno]= im; + + eassert(!fflush(screenshots_file)); + + return im; } -static void read_pages(void) { +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 */ + set_focus(); wait_for_stability(¤t,0, send_pgup_many); /* now to actually page down */ for (;;) { - fprintf(stderr,"PAGING page %d\n",npages); - store_page(npages, current); + fprintf(stderr,"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); wait_for_stability(¤t,last, 0); @@ -297,12 +282,21 @@ static void read_pages(void) { fprintf(stderr,"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"); +}