X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fpages.c;h=58cb306b436f9c3d76937396e763e81fd50aa07f;hb=9c4bd3b7b5dde4ec8f37ffde2793437a299b3f2b;hp=1fba5a64fccc2b6ccbacc952bd9efb29daa86c1f;hpb=5b8cb7299a9e60f7bfeb3fe5f3d7556e2357d485;p=ypp-sc-tools.db-test.git diff --git a/pctb/pages.c b/pctb/pages.c index 1fba5a6..58cb306 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -43,6 +43,7 @@ CanonImage *page_images[MAX_PAGES]; int npages; +RgbImage *page0_rgbimage; char *ocean, *pirate; @@ -76,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; @@ -158,6 +159,19 @@ static void send_key(KeySym sym) { XTestFakeKeyEvent(disp, keycode(sym),1, 10); XTestFakeKeyEvent(disp, keycode(sym),0, 10); } +static void mouse_1_updown_here(void) { + check_not_disturbed(); + XTestFakeButtonEvent(disp,1,1, 50); + XTestFakeButtonEvent(disp,1,0, 50); +} +static void mouse_1_updown(int x, int y) { + check_not_disturbed(); + int screen= XScreenNumberOfScreen(attr.screen); + int xpos, ypos; + translate_coords_toroot(x,y, &xpos,&ypos); + XTestFakeMotionEvent(disp, screen, xpos,ypos, 0); + mouse_1_updown_here(); +} static int pgupdown; @@ -186,36 +200,109 @@ 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) { + 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 { + 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; + int compare_to= a->h; if (max_relevant_y && 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, @@ -316,6 +403,7 @@ static void raise_and_get_details(void) { check_client_window_all_on_screen(); int shm= XShmQueryExtension(disp); + shm=0; if (shm) { xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap, 0,&shminfo, wwidth,wheight) ); @@ -365,20 +453,14 @@ static void raise_and_get_details(void) { } } -static void set_focus(void) { +static void set_focus_commodity(void) { int screen= XScreenNumberOfScreen(attr.screen); progress("taking control of YPP client window..."); debugf("PAGING set_focus\n"); - int xpos, ypos; - translate_coords_toroot(160,160, &xpos,&ypos); - XTestFakeMotionEvent(disp,screen, xpos,ypos, 0); - - XTestFakeButtonEvent(disp,1,1, 50); - XTestFakeButtonEvent(disp,1,0, 50); - + mouse_1_updown(160,160); sync_after_input(); delay(0.5); @@ -388,6 +470,7 @@ static void set_focus(void) { FocusChangeMask ) ); + int xpos,ypos; translate_coords_toroot(10,10, &xpos,&ypos); XTestFakeMotionEvent(disp,screen, xpos,ypos, 0); @@ -396,57 +479,25 @@ static void set_focus(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) { - ShMask shiftmasks[3]; +static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) { CanonImage *im; fprintf(screenshot_file, "P6\n" "%d %d\n" - "255\n", sn->width, sn->height); - -#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); + "255\n", sn->w, sn->h); - 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); } + if (ri) + CANONIMG_ALSO_STORERGB(ri); }); sysassert(!ferror(screenshot_file)); @@ -455,20 +506,54 @@ static CanonImage *convert_page(Snapshot *sn) { return im; } -void take_screenshots(void) { - Snapshot *current=0, *last=0; +static void prepare_ypp_client(void) { CanonImage *test; - + Snapshot *current=0; + /* 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); + +#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(); free(test); + free_snapshot(¤t); + progress("requesting status information..."); + mouse_1_updown(250, wheight-10); + mouse_1_updown_here(); + mouse_1_updown_here(); + XSync(disp,False); + check_not_disturbed(); + send_key(XK_slash); + send_key(XK_w); + send_key(XK_Return); + sync_after_input(); +} + +void take_screenshots(void) { + Snapshot *current=0, *last=0; + + prepare_ypp_client(); + /* page to the top - keep pressing page up until the image stops changing */ - set_focus(); + set_focus_commodity(); wait_for_stability(¤t,0, send_pgup_many, "paging up to top of commodity list..."); @@ -480,7 +565,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); + page_images[npages]= convert_page(current, 0); free_snapshot(&last); last=current; current=0; debugf("PAGING page %d converted\n",npages); @@ -507,11 +592,11 @@ void take_screenshots(void) { void take_one_screenshot(void) { Snapshot *current=0; - - raise_and_get_details(); - sync_after_input(); + + prepare_ypp_client(); wait_for_stability(¤t,0,0, "taking screenshot..."); - page_images[0]= convert_page(current); + page0_rgbimage= alloc_rgb_image(current->w, current->h); + page_images[0]= convert_page(current, 0); npages= 1; progress_log("collected single screenshot."); }