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=c504c951e75956e77b2a3c2ad6e9504d169bab62;hp=b3ddceba81f921c2dc1d46661053e77da3215680;hb=a1ba082dc5187f5818466ff9767a16edcd99b74c;hpb=9334b48a221df6f96a88933be8fde35e2ef41b35

diff --git a/pctb/pages.c b/pctb/pages.c
index b3ddceb..c504c95 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -225,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) {
@@ -273,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;
+	}
       }
     }
   }
@@ -412,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;
@@ -500,11 +523,9 @@ static CanonImage *convert_page(Snapshot *sn) {
 
   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));
@@ -621,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,
@@ -684,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