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=a0a52b45e4da60e653a73dc76d67bef6226399de;hp=56fb4092b8e35650586c35a4ffd18c3b400e1f70;hb=c9a3c17ea04f27edc2a8c793665bc680ceae50f6;hpb=4c375a59891a4161e30bd67709a1ad5d1950a850 diff --git a/pctb/pages.c b/pctb/pages.c index 56fb409..a0a52b4 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -45,7 +45,7 @@ CanonImage *page_images[MAX_PAGES]; int npages; RgbImage *page0_rgbimage; -char *ocean, *pirate; +const char *ocean, *pirate; static XWindowAttributes attr; static Window id; @@ -77,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; @@ -200,36 +200,111 @@ 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); +} + +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; y> 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, @@ -246,46 +321,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(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); @@ -329,7 +415,10 @@ static void raise_and_get_details(void) { check_client_window_all_on_screen(); - int shm= XShmQueryExtension(disp); + 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) ); @@ -405,54 +494,20 @@ static void set_focus_commodity(void) { 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]; CanonImage *im; fprintf(screenshot_file, "P6\n" "%d %d\n" - "255\n", sn->width, sn->height); + "255\n", sn->w, sn->h); -#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); + CANONICALISE_IMAGE(im, sn->w, sn->h, { int i; rgb= 0; for (i=0; i<3; i++) { rgb <<= 8; - unsigned long sample= - ((xrgb << shiftmasks[i].lshift) - >> shiftmasks[i].rshift) & SAMPLEMASK; + unsigned long sample= RI_PIXEL(sn,x,y)[i]; rgb |= sample; fputc(sample, screenshot_file); } @@ -473,13 +528,19 @@ 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); 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(); @@ -489,6 +550,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) { @@ -539,8 +605,8 @@ 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); + page0_rgbimage= alloc_rgb_image(current->w, current->h); + page_images[0]= convert_page(current, page0_rgbimage); npages= 1; progress_log("collected single screenshot."); } @@ -638,11 +704,13 @@ void find_yppclient_window(void) { REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix)) ); REQUIRE( !memcmp(spc1, onthe, S(onthe)) ); -#define ASSIGN(what, start, end) do { \ - sysassert( asprintf(&what, "%.*s", (end)-(start), start) >0 ); \ - }while(0) - ASSIGN(pirate, title + S(prefix), spc1); +#define ASSIGN(what, start, end) \ + what= masprintf("%.*s", (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= w2; @@ -656,9 +724,11 @@ void find_yppclient_window(void) { if (children1) XFree(children1); } if (nfound>1) - 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 ": ""); }