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=72f9bb478a982f5b0206af12c2cc0b6209c6df83;hp=dfa9108537bbf7b5a9c19d507a443f6caa13851c;hb=e2487a42fd29e7a15b92ce1a5855706dba1198dc;hpb=b4e128efc860c4416fe913abe97b190404e866dd diff --git a/pctb/pages.c b/pctb/pages.c index dfa9108..72f9bb4 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -37,11 +37,14 @@ #include #include +#include +#include +#include + CanonImage *page_images[MAX_PAGES]; int npages; -RgbImage *page0_rgbimage; -char *ocean, *pirate; +const char *ocean, *pirate; static XWindowAttributes attr; static Window id; @@ -49,6 +52,10 @@ static Display *disp; static struct timeval tv_startup; static unsigned wwidth, wheight; static int max_relevant_y= -1; +static Point commod_focus_point, commod_page_point, commod_focuslast_point; + +static XImage *shmim; +static XShmSegmentInfo shminfo; DEBUG_DEFINE_DEBUGF(pages) @@ -70,7 +77,7 @@ void screenshot_startup(void) { /*---------- pager ----------*/ -typedef XImage Snapshot; +typedef RgbImage Snapshot; static double last_input; static const double min_update_allowance= 0.25; @@ -98,6 +105,9 @@ static void translate_coords_toroot(int wx, int wy, int *rx, int *ry) { Window dummy; xassert( XTranslateCoordinates(disp, id,attr.root, wx,wy, rx,ry, &dummy) ); } +static void translate_coords_toroot_p(Point w, int *rx, int *ry) { + translate_coords_toroot(w.x, w.y, rx, ry); +} static void check_client_window_all_on_screen(void) { Rect onroot; @@ -154,8 +164,8 @@ static void send_key(KeySym sym) { } static void mouse_1_updown_here(void) { check_not_disturbed(); - XTestFakeButtonEvent(disp,1,1, 50); - XTestFakeButtonEvent(disp,1,0, 50); + XTestFakeButtonEvent(disp,1,1, 10); + XTestFakeButtonEvent(disp,1,0, 10); } static void mouse_1_updown(int x, int y) { check_not_disturbed(); @@ -165,6 +175,12 @@ static void mouse_1_updown(int x, int y) { XTestFakeMotionEvent(disp, screen, xpos,ypos, 0); mouse_1_updown_here(); } +static void pgdown_by_mouse(void) { + check_not_disturbed(); + debugf("PAGING Mouse\n"); + mouse_1_updown_here(); + sync_after_input(); +} static int pgupdown; @@ -177,12 +193,6 @@ static void send_pgup_many(void) { debugf("PAGING PageUp x %d\n",i); sync_after_input(); } -static void send_pgdown(void) { - send_key(XK_Next); - pgupdown++; - debugf("PAGING PageDown\n"); - sync_after_input(); -} static void send_pgdown_torestore(void) { debugf("PAGING PageDown x %d\n", -pgupdown); while (pgupdown < 0) { @@ -193,36 +203,131 @@ static void send_pgdown_torestore(void) { } static void free_snapshot(Snapshot **io) { - if (*io) XDestroyImage(*io); + free(*io); *io= 0; } +#define SAMPLEMASK 0xfful + +typedef struct { + int lshift, rshift; +} ShMask; + +static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { + sm->lshift= 0; + sm->rshift= 0; + + 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); + debugf("SHIFTMASK %p={.lshift=%d, .rshift=%d} image_mask=%lx\n", + sm, sm->lshift, sm->rshift, ximage_mask); +} + +static void rtimestamp(double *t, const char *wh) { + double n= timestamp(); + debugf("PAGING INTERVAL %f %s\n", n-*t, wh); + *t= n; +} + static void snapshot(Snapshot **output) { - free_snapshot(output); + XImage *im_use, *im_free=0; + + ShMask shiftmasks[3]; debugf("PAGING snapshot\n"); - timestamp(); - *output= XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap); - timestamp(); + double begin= timestamp(); + if (shmim) { + rtimestamp(&begin, "XShmGetImage before"); + xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) ); + rtimestamp(&begin, "XShmGetImage"); + + size_t dsz= shmim->bytes_per_line * shmim->height; + im_use= im_free= mmalloc(sizeof(*im_use) + dsz); + *im_free= *shmim; + im_free->data= (void*)(im_free+1); + memcpy(im_free->data, shmim->data, dsz); + rtimestamp(&begin, "mmalloc/memcpy"); + } else { + rtimestamp(&begin, "XGetImage before"); + xassert( im_use= im_free= + XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) ); + rtimestamp(&begin, "XGetImage"); + } +#define COMPUTE_SHIFT_MASK(ix, rgb) \ + compute_shift_mask(&shiftmasks[ix], im_use->rgb##_mask) + COMPUTE_SHIFT_MASK(0, red); + COMPUTE_SHIFT_MASK(1, green); + COMPUTE_SHIFT_MASK(2, blue); + + if (!*output) + *output= alloc_rgb_image(wwidth, wheight); + + rtimestamp(&begin, "compute_shift_masks+alloc_rgb_image"); + + int x,y,i; + unsigned char *op= (*output)->data; + for (y=0; yxoffset == 0 && + im_use->format == ZPixmap && + im_use->byte_order == LSBFirst && + im_use->depth == 24 && + im_use->bits_per_pixel == 32 && + im_use->red_mask == 0x0000ffU && + im_use->green_mask == 0x00ff00U && + im_use->blue_mask == 0xff0000U) { + const char *p= im_use->data + y * im_use->bytes_per_line; +// debugf("optimised copy y=%d",y); + for (x=0; x> shiftmasks[i].rshift) + & SAMPLEMASK; + *op++= sample; + } + } + } + } + + rtimestamp(&begin,"w*h*XGetPixel"); + if (im_free) + XDestroyImage(im_free); + + rtimestamp(&begin,"XDestroyImage"); check_not_disturbed(); debugf("PAGING snapshot done.\n"); } static int identical(const Snapshot *a, const Snapshot *b) { - if (!(a->width == b->width && - a->height == b->height && - a->bytes_per_line == b->bytes_per_line && - a->format == b->format)) + if (!(a->w == b->w && + a->h == b->h)) return 0; - int compare_to= a->height; - if (max_relevant_y && compare_to > max_relevant_y) + int compare_to= a->h; + if (max_relevant_y>=0 && compare_to > max_relevant_y) compare_to= max_relevant_y; - return !memcmp(a->data, b->data, a->bytes_per_line * compare_to); + return !memcmp(a->data, b->data, a->w * 3 * compare_to); } static void wait_for_stability(Snapshot **output, @@ -239,46 +344,57 @@ static void wait_for_stability(Snapshot **output, va_start(al,fmt); Snapshot *last=0; + int nidentical=0; /* waits longer if we're going to return an image identical to previously * if previously==0, all images are considered identical to it */ - debugf("PAGING wait_for_stability" - " last_input=%f previously=%p\n", - last_input, previously); - char *doing; - sysassert( vasprintf(&doing,fmt,al) >=0); + sysassert( vasprintf(&doing,fmt,al) >=0 ); - progress("%s",doing); + debugf("PAGING wait_for_stability" + " last_input=%f previously=%p `%s'\n", + last_input, previously, doing); + double min_interval= 25000; /*us*/ for (;;) { - double at_snapshot= timestamp(); - double need_sleep= min_update_allowance - (at_snapshot - last_input); - if (need_sleep > 0) { delay(need_sleep); continue; } + progress_spinner("%s",doing); + + double since_last_input= timestamp() - last_input; + double this_interval= min_interval - since_last_input; - snapshot(output); + if (this_interval >= 0) + usleep(this_interval); - if (!with_keypress && - !(previously && identical(*output,previously))) { - debugf("PAGING wait_for_stability simple\n"); - break; - } + snapshot(output); - if (last && identical(*output,last)) { - debugf("PAGING wait_for_stability stabilised\n"); - break; + if (!last) { + debugf("PAGING wait_for_stability first...\n"); + last=*output; *output=0; + } else if (!identical(*output,last)) { + debugf("PAGING wait_for_stability changed...\n"); + free_snapshot(&last); last=*output; *output=0; + nidentical=0; + if (!with_keypress) { + min_interval *= 3.0; + min_interval += 0.5; + } + } else { + nidentical++; + int threshold= + !previously ? 3 : + identical(*output,previously) ? 5 + : 1; + debugf("PAGING wait_for_stability nidentical=%d threshold=%d\n", + nidentical, threshold); + if (nidentical >= threshold) + break; + + min_interval += 0.5; + min_interval *= 2.0; } - - progress_spinner("%s",doing); - - debugf("PAGING wait_for_stability retry\n"); - - free_snapshot(&last); last=*output; *output=0; if (with_keypress) with_keypress(); - - delay(0.5); } free_snapshot(&last); @@ -320,7 +436,62 @@ static void raise_and_get_details(void) { if (!(wwidth >= 320 && wheight >= 320)) fatal("YPP client window is implausibly small?"); + if (attr.depth < 24) + fatal("Display is not 24bpp."); + check_client_window_all_on_screen(); + + Bool shmpixmaps=0; + int major=0,minor=0; + int shm= XShmQueryVersion(disp, &major,&minor,&shmpixmaps); + debugf("PAGING shm=%d %d.%d pixmaps=%d\n",shm,major,minor,shmpixmaps); + if (shm) { + xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap, + 0,&shminfo, wwidth,wheight) ); + + sigset_t oldset, all; + sigfillset(&all); + sysassert(! sigprocmask(SIG_BLOCK,&all,&oldset) ); + + int pfd[2]; + pid_t cleaner; + sysassert(! pipe(pfd) ); + sysassert( (cleaner= fork()) != -1 ); + if (!cleaner) { + sysassert(! close(pfd[1]) ); + for (;;) { + int r= read(pfd[0], &shminfo.shmid, sizeof(shminfo.shmid)); + if (!r) exit(0); + if (r==sizeof(shminfo.shmid)) break; + assert(r==-1 && errno==EINTR); + } + for (;;) { + char bc; + int r= read(pfd[0],&bc,1); + if (r>=0) break; + assert(r==-1 && errno==EINTR); + } + sysassert(! shmctl(shminfo.shmid,IPC_RMID,0) ); + exit(0); + } + sysassert(! close(pfd[0]) ); + + sysassert(! sigprocmask(SIG_SETMASK,&oldset,0) ); + + assert(shmim->height == wheight); + sysassert( (shminfo.shmid= + shmget(IPC_PRIVATE, shmim->bytes_per_line * wheight, + IPC_CREAT|0600)) >= 0 ); + + sysassert( write(pfd[1],&shminfo.shmid,sizeof(shminfo.shmid)) == + sizeof(shminfo.shmid) ); + sysassert( shminfo.shmaddr= shmat(shminfo.shmid,0,0) ); + shmim->data= shminfo.shmaddr; + shminfo.readOnly= False; + xassert( XShmAttach(disp,&shminfo) ); + + close(pfd[1]); /* causes IPC_RMID */ + } } static void set_focus_commodity(void) { @@ -330,7 +501,7 @@ static void set_focus_commodity(void) { debugf("PAGING set_focus\n"); - mouse_1_updown(160,160); + mouse_1_updown(commod_focus_point.x, commod_focus_point.y); sync_after_input(); delay(0.5); @@ -341,69 +512,26 @@ static void set_focus_commodity(void) { ) ); int xpos,ypos; - translate_coords_toroot(10,10, &xpos,&ypos); - XTestFakeMotionEvent(disp,screen, xpos,ypos, 0); + translate_coords_toroot_p(commod_page_point, &xpos,&ypos); + XTestFakeMotionEvent(disp, screen, xpos,ypos, 0); sync_after_input(); debugf("PAGING raise_and_set_focus done.\n"); } -#define SAMPLEMASK 0xfful - -typedef struct { - int lshift, rshift; -} ShMask; - -static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { - sm->lshift= 0; - sm->rshift= 0; - - 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); -} - -static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) { - ShMask shiftmasks[3]; +static CanonImage *convert_page(const Snapshot *sn) { CanonImage *im; - fprintf(screenshot_file, - "P6\n" - "%d %d\n" - "255\n", sn->width, sn->height); + fwrite_ppmraw(screenshot_file, sn); -#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, screenshot_file); - } - if (ri) - CANONIMG_ALSO_STORERGB(ri); + const unsigned char *pixel= sn->data; + CANONICALISE_IMAGE(im, sn->w, sn->h, { + r= *pixel++; + g= *pixel++; + b= *pixel++; }); - + sysassert(!ferror(screenshot_file)); sysassert(!fflush(screenshot_file)); @@ -417,13 +545,22 @@ static void prepare_ypp_client(void) { /* find the window and check it's on the right kind of screen */ raise_and_get_details(); wait_for_stability(¤t,0,0, "checking current YPP client screen..."); - test= convert_page(current, 0); - find_structure(test, &max_relevant_y); + + test= convert_page(current); + find_structure(test, &max_relevant_y, + &commod_focus_point, + &commod_page_point, + &commod_focuslast_point); check_correct_commodities(); + Rect sunshine= find_sunshine_widget(); + + progress("poking client..."); + mouse_1_updown((sunshine.tl.x + sunshine.br.x) / 2, + (sunshine.tl.y*9 + sunshine.br.y) / 10); + free(test); - free_snapshot(¤t); - progress("requesting status information..."); + wait_for_stability(¤t,0,0, "checking basic YPP client screen..."); mouse_1_updown(250, wheight-10); mouse_1_updown_here(); mouse_1_updown_here(); @@ -433,6 +570,11 @@ static void prepare_ypp_client(void) { send_key(XK_w); send_key(XK_Return); sync_after_input(); + + Snapshot *status=0; + wait_for_stability(&status,current,0, "awaiting status information..."); + free_snapshot(¤t); + free_snapshot(&status); } void take_screenshots(void) { @@ -453,7 +595,7 @@ void take_screenshots(void) { fatal("Paging down seems to generate too many pages - max is %d.", MAX_PAGES); - page_images[npages]= convert_page(current, 0); + page_images[npages]= convert_page(current); free_snapshot(&last); last=current; current=0; debugf("PAGING page %d converted\n",npages); @@ -468,11 +610,14 @@ void take_screenshots(void) { break; } - send_pgdown(); + pgdown_by_mouse(); npages++; } progress("finishing with the YPP client..."); + mouse_1_updown(commod_focuslast_point.x, commod_focuslast_point.y); + sync_after_input(); send_pgdown_torestore(); + sync_after_input(); debugf("PAGING all done.\n"); progress_log("collected %d screenshots.",npages); @@ -483,8 +628,7 @@ void take_one_screenshot(void) { prepare_ypp_client(); wait_for_stability(¤t,0,0, "taking screenshot..."); - page0_rgbimage= alloc_rgb_image(current->width, current->height); - page_images[0]= convert_page(current, 0); + page_images[0]= convert_page(current); npages= 1; progress_log("collected single screenshot."); } @@ -495,114 +639,122 @@ void set_yppclient_window(unsigned long wul) { DEBUG_DEFINE_SOME_DEBUGF(findypp,debugfind) -void find_yppclient_window(void) { - Window root, gotroot, gotparent; - int screen; - int nfound=0; - - if (id) return; - - progress("looking for YPP client window..."); +static int nfound; +static Atom wm_name; +static int screen; + +static void findypp_recurse(int depth, int targetdepth, Window w) { + unsigned int nchildren; + int i; + Window *children=0; + Window gotroot, gotparent; static const char prefix[]= "Puzzle Pirates - "; static const char onthe[]= " on the "; static const char suffix[]= " ocean"; -#define S(x) (sizeof((x))-1) - - Atom wm_name= XInternAtom(disp,"WM_NAME",True); - xassert(wm_name != None); - - for (screen=0; screen=' ' && c<=126) fputc(c,debug); - else fprintf(debug,"\\x%02x",c & 0xff); - } - fputs("\": ",debug); - } +#define S(x) ((int)sizeof((x))-1) -#define REQUIRE(pred) \ - if (!(pred)) { debugfind(" failed test %s\n", #pred); continue; } \ - else + debugfind("FINDYPP %d/%d screen %d %*s %lx", + depth,targetdepth,screen, + depth,"",(unsigned long)w); + + if (depth!=targetdepth) { + xassert( XQueryTree(disp,w, + &gotroot,&gotparent, + &children,&nchildren) ); + debugfind(" nchildren=%d\n",nchildren); + + for (i=0; i=' ' && c<=126) fputc(c,debug); + else fprintf(debug,"\\x%02x",c & 0xff); + } + fputs("\": ",debug); + } - REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) ); +#define REQUIRE(pred) \ + if (!(pred)) { debugfind(" failed test %s\n", #pred); return; } \ + else - char *spc1= strchr( title + S(prefix), ' '); REQUIRE(spc1); - char *spc2= strrchr((title + len) - S(suffix), ' '); REQUIRE(spc2); + REQUIRE( gottype!=None ); + REQUIRE( len ); + REQUIRE( gotfmt==8 ); - REQUIRE( (title + len) - spc1 >= S(onthe) + S(suffix) ); - REQUIRE( spc2 - title >= S(prefix) + S(onthe) ); + REQUIRE( len >= S(prefix) + 1 + S(onthe) + 1 + S(suffix) ); - REQUIRE( !memcmp(title, prefix, S(prefix)) ); - REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); - REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); + char *spc1= strchr( title + S(prefix), ' '); REQUIRE(spc1); + char *spc2= strrchr((title + len) - S(suffix), ' '); REQUIRE(spc2); -#define ASSIGN(what, start, end) do { \ - sysassert( asprintf(&what, "%.*s", (end)-(start), start) >0 ); \ - }while(0) - ASSIGN(pirate, title + S(prefix), spc1); - ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix)); + REQUIRE( (title + len) - spc1 >= S(onthe) + S(suffix) ); + REQUIRE( spc2 - title >= S(prefix) + S(onthe) ); - debugfind(" YES!\n"); - id= w2; - nfound++; - progress_log("found YPP client (0x%lx):" - " %s ocean - %s.", - (unsigned long)id, ocean, pirate); - } - if (children2) XFree(children2); + REQUIRE( !memcmp(title, prefix, S(prefix)) ); + REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); + REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); + +#define ASSIGN(what, start, end) \ + what= masprintf("%.*s", (int)((end)-(start)), start); \ + if (o_##what) REQUIRE( !strcasecmp(o_##what, what) ); \ + else + + ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix)); + ASSIGN(pirate, title + S(prefix), spc1); + + debugfind(" YES!\n"); + id= w; + nfound++; + progress_log("found YPP client (0x%lx):" + " %s ocean - %s.", + (unsigned long)id, ocean, pirate); +} + +void find_yppclient_window(void) { + int targetdepth; + + nfound=0; + + if (id) return; + + progress("looking for YPP client window..."); + + xassert( (wm_name= XInternAtom(disp,"WM_NAME",True)) != None); + + for (targetdepth=1; targetdepth<4; targetdepth++) { + for (screen=0; screen1) - fatal("Found several YPP clients." - " Close one, or specify the windowid with --window-id.\n"); + fatal("Found several possible YPP clients. Close one,\n" + " disambiguate with --pirate or --ocean," + " or specify --window-id.\n"); if (nfound<1) - fatal("Did not find YPP client." - " Use --window-id and/or report this as a fault.\n"); + fatal("Did not find %sYPP client." + " Use --window-id and/or report this as a fault.\n", + o_ocean || o_pirate ? "matching ": ""); }