X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=3eb33ce1cb402e01a630e0c29d8235edd7025628;hb=2f6ec1e7e5b3649a58ae20211eb18511550246ae;hp=39690388ebc41589c583653916aaaefc7a8adf3e;hpb=ae2213ef391622c3365442baa088fa42bf7586b2;p=ypp-sc-tools.db-test.git diff --git a/pctb/pages.c b/pctb/pages.c index 3969038..3eb33ce 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -6,6 +6,9 @@ #include #include #include +#include + +#include CanonImage *page_images[MAX_PAGES]; int npages; @@ -13,20 +16,28 @@ int npages; static Window id; static Display *disp; static struct timeval tv_startup; +static unsigned wwidth, wheight; + +static XpmAttributes xpma; 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,12 +69,9 @@ 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; @@ -107,49 +115,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 +176,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 +184,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 +192,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 +203,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 +222,84 @@ 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); + } + + close(paste[0]); + close(paste[1]); + close(results[1]); + + XpmFree(xpmdata); + + 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); + } + + pid_t got_conv,got_paste; + int st_conv, st_paste; + + got_conv= waitpid(converter,&st_conv,0); eassert(got_conv==converter); + got_paste= waitpid(paster,&st_paste,0); eassert(got_paste==paster); + + 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); +} static void read_pages(void) { Snapshot *current=0, *last=0; @@ -235,23 +307,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++; }