X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=5978f74e365d5e62866422e0d3a59edb43b48d35;hb=5d58a08423953756871493042a9cfff032b66e18;hp=39690388ebc41589c583653916aaaefc7a8adf3e;hpb=ae2213ef391622c3365442baa088fa42bf7586b2;p=ypp-sc-tools.db-test.git diff --git a/pctb/pages.c b/pctb/pages.c index 3969038..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,20 +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); eassert(WIFEXITED(r) && !WEXITSTATUS(r)); + r= pclose(f); eassert(r>=0); check_exitstatus(r); free(cmd); } -#if 0 static CanonImage *screenshot_now(void) { char *cmd; CanonImage *ci; @@ -58,14 +65,11 @@ static CanonImage *single_page(void) { /*---------- pager ----------*/ -typedef struct { - size_t len; - unsigned char d[]; -} Snapshot; +typedef XImage Snapshot; -static size_t snapshot_alloc= 1024; +//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; @@ -107,49 +111,34 @@ static void send_pgdown(void) { 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; + free_snapshot(output); fprintf(stderr,"PAGING snapshot\n"); - r= asprintf(&cmd, "xwd -silent -id 0x%lx", (unsigned long)id); eassert(r>=0); - FILE *f= popen(cmd,"r"); eassert(f); - - 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); + fprintf(stderr,"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, @@ -183,7 +172,7 @@ static void wait_for_stability(Snapshot **output, fprintf(stderr,"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,7 +180,7 @@ static void wait_for_stability(Snapshot **output, delay(0.5); } - free(last); + free_snapshot(&last); fprintf(stderr,"PAGING wait_for_stability done.\n"); } @@ -199,7 +188,7 @@ static void raise_and_set_focus(void) { int r; XWindowAttributes attr; int xpos,ypos, evbase,errbase,majver,minver; - unsigned width,height,bd,depth; + unsigned bd,depth; Window dummy; fprintf(stderr,"PAGING raise_and_set_focus\n"); @@ -210,7 +199,9 @@ 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, + &xpos,&ypos, &wwidth,&wheight, + &bd,&depth); eassert(r); r= XTranslateCoordinates(disp, id,attr.root, 160,160, &xpos,&ypos, @@ -227,7 +218,56 @@ static void raise_and_set_focus(void) { 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) { Snapshot *current=0, *last=0; @@ -235,23 +275,22 @@ static void read_pages(void) { raise_and_set_focus(); /* page to the top - keep pressing page up until the image stops changing */ - wait_for_stability(&last,0, send_pgup_many); + 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++]= + 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; } - free(last); last=current; current=0; - send_pgdown(); npages++; }