X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=0a175ee56054b461121e3ee5ef5bc52aa6744a02;hp=cdf7c05b41999e82190047b36ab524c3944cfa50;hb=0c6894304b51f4920a73d3e9ec45cec483f842e3;hpb=87f7f25f01e3c0af51cce64fb7f93dd7b0d0861a diff --git a/pctb/pages.c b/pctb/pages.c index cdf7c05..0a175ee 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; @@ -228,9 +228,9 @@ static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) { assert(sm->rshift < LONG_BIT); } -static void rtimestamp(double *t) { +static void rtimestamp(double *t, const char *wh) { double n= timestamp(); - debugf("PAGING INTERVAL %f\n", n-*t); + debugf("PAGING INTERVAL %f %s\n", n-*t, wh); *t= n; } @@ -243,13 +243,22 @@ static void snapshot(Snapshot **output) { double begin= timestamp(); if (shmim) { - im_use= 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"); } - rtimestamp(&begin); #define COMPUTE_SHIFT_MASK(ix, rgb) \ compute_shift_mask(&shiftmasks[ix], im_use->rgb##_mask) @@ -260,12 +269,12 @@ static void snapshot(Snapshot **output) { if (!*output) *output= alloc_rgb_image(wwidth, wheight); - rtimestamp(&begin); + rtimestamp(&begin, "compute_shift_masks+alloc_rgb_image"); int x,y,i; unsigned char *op= (*output)->data; - for (y=0; y=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); + for (;;) { double at_snapshot= timestamp(); double need_sleep= min_update_allowance - (at_snapshot - last_input); @@ -396,7 +404,7 @@ static void raise_and_get_details(void) { check_client_window_all_on_screen(); int shm= XShmQueryExtension(disp); - // shm=0; + debugf("PAGING shm=%d\n",shm); if (shm) { xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap, 0,&shminfo, wwidth,wheight) ); @@ -507,28 +515,18 @@ static void prepare_ypp_client(void) { raise_and_get_details(); wait_for_stability(¤t,0,0, "checking current YPP client screen..."); -#if 1 -timestamp(); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -snapshot(¤t); -timestamp(); -#endif - 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(); @@ -538,6 +536,11 @@ timestamp(); 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) { @@ -589,7 +592,7 @@ void take_one_screenshot(void) { prepare_ypp_client(); wait_for_stability(¤t,0,0, "taking screenshot..."); page0_rgbimage= alloc_rgb_image(current->w, current->h); - page_images[0]= convert_page(current, 0); + page_images[0]= convert_page(current, page0_rgbimage); npages= 1; progress_log("collected single screenshot."); } @@ -687,11 +690,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; @@ -705,9 +710,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 ": ""); }