compare ::VERSION with 2.0 as that's clearer

[ypp-sc-tools.web-live.git] / pctb / pages.c

diff --git a/pctb/pages.c b/pctb/pages.c
index c5cc941b7a942c655d03b4709cbd54707d01c555..c504c951e75956e77b2a3c2ad6e9504d169bab62 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -43,7 +43,6 @@
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
-RgbImage *page0_rgbimage;
 
 const char *ocean, *pirate;
 
@@ -226,6 +225,8 @@ static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
   }
   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) {
@@ -274,13 +275,31 @@ static void snapshot(Snapshot **output) {
   int x,y,i;
   unsigned char *op= (*output)->data;
   for (y=0; y<wheight; y++) {
-    for (x=0; x<wwidth; x++) {
-      long xrgb= XGetPixel(im_use,x,y);
-      for (i=0; i<3; i++) {
-       unsigned long sample=
-         ((xrgb << shiftmasks[i].lshift) >> shiftmasks[i].rshift)
-         & SAMPLEMASK;
-       *op++= sample;
+    if (im_use->xoffset == 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<wwidth; x++) {
+       *op++ = *p++;
+       *op++ = *p++;
+       *op++ = *p++;
+       p++;
+      }
+    } else {
+      for (x=0; x<wwidth; x++) {
+       long xrgb= XGetPixel(im_use,x,y);
+       for (i=0; i<3; i++) {
+         unsigned long sample=
+           ((xrgb << shiftmasks[i].lshift) >> shiftmasks[i].rshift)
+           & SAMPLEMASK;
+         *op++= sample;
+       }
       }
     }
   }
@@ -349,7 +368,7 @@ static void wait_for_stability(Snapshot **output,
       last=*output; *output=0;
     } else if (!identical(*output,last)) {
       debugf("PAGING  wait_for_stability changed...\n");
-      free(last); last=*output; *output=0;
+      free_snapshot(&last); last=*output; *output=0;
       nidentical=0;
       if (!with_keypress) {
        min_interval *= 3.0;
@@ -413,6 +432,9 @@ 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;
@@ -494,19 +516,16 @@ static void set_focus_commodity(void) {
   debugf("PAGING raise_and_set_focus done.\n");
 }
 
-static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) {
+static CanonImage *convert_page(Snapshot *sn) {
   CanonImage *im;
 
   fwrite_ppmraw(screenshot_file, sn);
-  if (ri) memcpy(ri->data, sn->data, ri->h * ri->w * 3);
 
   unsigned char *pixel= sn->data;
   CANONICALISE_IMAGE(im, sn->w, sn->h, {
-    rgb=
-      (pixel[0] << 16) |
-      (pixel[1] <<  8) |
-      (pixel[2]      );
-    pixel += 3;
+    r= *pixel++;
+    g= *pixel++;
+    b= *pixel++;
   });
     
   sysassert(!ferror(screenshot_file));
@@ -523,7 +542,7 @@ static void prepare_ypp_client(void) {
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
 
-  test= convert_page(current, 0);
+  test= convert_page(current);
   find_structure(test, &max_relevant_y);
   check_correct_commodities();
   Rect sunshine= find_sunshine_widget();
@@ -569,7 +588,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);
@@ -599,8 +618,7 @@ void take_one_screenshot(void) {
 
   prepare_ypp_client();
   wait_for_stability(&current,0,0, "taking screenshot...");
-  page0_rgbimage= alloc_rgb_image(current->w, current->h);
-  page_images[0]= convert_page(current, page0_rgbimage);
+  page_images[0]= convert_page(current);
   npages= 1;
   progress_log("collected single screenshot.");
 }
@@ -624,7 +642,7 @@ static void findypp_recurse(int depth, int targetdepth, Window w) {
   static const char prefix[]= "Puzzle Pirates - ";
   static const char onthe[]= " on the ";
   static const char suffix[]= " ocean";
-#define S(x) (sizeof((x))-1)
+#define S(x) ((int)sizeof((x))-1)
 
   debugfind("FINDYPP %d/%d screen %d  %*s %lx",
            depth,targetdepth,screen,
@@ -687,7 +705,7 @@ static void findypp_recurse(int depth, int targetdepth, Window w) {
   REQUIRE( !memcmp(spc1,                    onthe,  S(onthe))  );
 
 #define ASSIGN(what, start, end)                       \
-  what= masprintf("%.*s", (end)-(start), start);       \
+  what= masprintf("%.*s", (int)((end)-(start)), start);        \
   if (o_##what) REQUIRE( !strcasecmp(o_##what, what) );        \
   else