X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=de967310454085a02ce4ce467b1fa144cf7c2ba4;hp=3eb33ce1cb402e01a630e0c29d8235edd7025628;hb=834081c7d780ba6d55d8f28328e2e3eb6c1067ab;hpb=2f6ec1e7e5b3649a58ae20211eb18511550246ae diff --git a/pctb/pages.c b/pctb/pages.c index 3eb33ce..de96731 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -1,79 +1,39 @@ /* */ -#include "ocr.h" +#include "structure.h" #include #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 XpmAttributes xpma; +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.5; +static const double min_update_allowance= 0.25; static double timestamp(void) { struct timeval tv; @@ -188,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); @@ -204,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); @@ -222,98 +186,87 @@ static void raise_and_set_focus(void) { fprintf(stderr,"PAGING raise_and_set_focus done.\n"); } -static void store_page(int pageno, Snapshot *sn) { - pid_t converter, paster; - eassert(pageno < MAX_PAGES); - int paste[2], results[2]; - FILE *err; - int r; - - eassert(!fflush(stdout)); - eassert(!fflush(stderr)); - - r= pipe(paste); eassert(!r); - r= pipe(results); eassert(!r); - err= tmpfile(); eassert(err); - - converter= fork(); eassert(converter!=-1); - if (!converter) { - r= dup2(paste[0],0); eassert(r==0); - r= dup2(results[1],1); eassert(r==1); - r= dup2(2,4); eassert(r==4); /* fileno(errn) > 4, see above */ - r= dup2(fileno(err),2); eassert(r==2); - close(paste[0]); - close(paste[1]); - close(results[0]); - close(results[1]); - execlp("xpmtoppm", "xpmtoppm",(char*)0); - dup2(4,2); - eassert(!"xpmtoppm exec failure"); - } - - char *xpmdata=0; - r= XpmCreateBufferFromImage(disp, &xpmdata, sn, 0, &xpma); - eassert(!r); - eassert(xpmdata); - - paster= fork(); eassert(paster!=-1); - if (!paster) { - FILE *f= fdopen(paste[1],"w"); eassert(f); - close(paste[0]); - close(results[0]); - close(results[1]); - r= fputs(xpmdata,f); eassert(r!=EOF); - //size_t did= fwrite(sn->d, 1, sn->len, f); - //eassert(did==sn->len); - eassert(!fclose(f)); - exit(0); - } +#define SAMPLEMASK 0xfful - close(paste[0]); - close(paste[1]); - close(results[1]); +typedef struct { + int lshift, rshift; +} ShMask; - XpmFree(xpmdata); +static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { + sm->lshift= 0; + sm->rshift= 0; - FILE *f= fdopen(results[0],"r"); - int c1= fgetc(f); - if (c1!=EOF) { - ungetc(c1,f); - page_images[pageno]= file_read_image(f); - r= fgetc(f); eassert(r==EOF); eassert(!ferror(f)); eassert(feof(f)); - fclose(f); + 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); +} - pid_t got_conv,got_paste; - int st_conv, st_paste; +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); + } + }); - got_conv= waitpid(converter,&st_conv,0); eassert(got_conv==converter); - got_paste= waitpid(paster,&st_paste,0); eassert(got_paste==paster); + eassert(!fflush(screenshots_file)); - if (!st_conv && - (!st_paste || (WIFSIGNALED(st_paste) && WTERMSIG(st_paste)==SIGPIPE)) - && c1!=EOF) { - fclose(err); - return; - } - rewind(err); int c; while ((c=getc(err))!=EOF) fputc(c,stderr); - fprintf(stderr, "convert: subprocess statuses: %d %d\n", st_conv, st_paste); - _exit(127); + 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); @@ -329,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"); +}