#include <X11/Xlib.h>
#include <X11/extensions/XTest.h>
#include <X11/keysym.h>
+#include <X11/Xutil.h>
CanonImage *page_images[MAX_PAGES];
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));
free(cmd);
}
-#if 0
static CanonImage *screenshot_now(void) {
char *cmd;
CanonImage *ci;
/*---------- 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;
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,
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();
delay(0.5);
}
- free(last);
+ free_snapshot(&last);
fprintf(stderr,"PAGING wait_for_stability done.\n");
}
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");
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,
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;
+typedef struct {
+ unsigned long mask;
+ int lshift, rshift;
+} ShMask;
- eassert(!fflush(stdout));
- eassert(!fflush(stderr));
+static void compute_shift_mask(ShMask *sm, int targshift,
+ unsigned long ximage_mask) {
+ unsigned long below;
- 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("xwdtopnm", "xwdtopnm",(char*)0);
- dup2(4,2);
- eassert(!"xwdtopnm exec failure");
- }
-
- paster= fork(); eassert(paster!=-1);
- if (!paster) {
- FILE *f= fdopen(paste[1],"w"); eassert(f);
- close(paste[0]);
- close(results[0]);
- close(results[1]);
- 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]);
-
- 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);
+ 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);
+}
- 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 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) {
for (;;) {
fprintf(stderr,"PAGING page %d\n",npages);
store_page(npages, current);
- free(last); last=current; current=0;
+ 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;
}
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff