--- rxvt-unicode/src/background.C	2010/10/18 16:02:48	1.90
+++ rxvt-unicode/src/background.C	2010/10/22 18:03:10	1.97
@@ -430,8 +430,6 @@
       changed++;
     }
 
-  //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
-  //         flags, h_scale, v_scale, h_align, v_align);
   return (changed > 0);
 }
 
@@ -532,8 +530,6 @@
   int w = 0;
   int h = 0;
 
-  TIMING_TEST_START (asim);
-
   if (original_asim)
     get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
 
@@ -659,7 +655,6 @@
           free (layers);
         }
     }
-  TIMING_TEST_PRINT_RESULT (asim);
 
   bool ret = false;
 
@@ -715,7 +710,6 @@
         destroy_asimage (&result);
 
       XFreeGC (target->dpy, gc);
-      TIMING_TEST_PRINT_RESULT (asim);
 
       ret = true;
     }
@@ -1149,7 +1143,7 @@
 
   Display *dpy = target->dpy;
   XRenderPictureAttributes pa;
-  XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
+  XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
 
   Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
   Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
@@ -1285,9 +1279,6 @@
       XRenderFreePicture (dpy, mask_pic);
       XRenderFreePicture (dpy, overlay_pic);
       XRenderFreePicture (dpy, back_pic);
-#   if DO_TIMING_TEST
-      XSync (dpy, False);
-#   endif
 #  endif
     }
 
@@ -1322,7 +1313,6 @@
   XGCValues gcv;
   GC gc;
 
-  TIMING_TEST_START (tp);
   target->get_window_origin (sx, sy);
 
   /* check if we are outside of the visible part of the virtual screen : */
@@ -1369,7 +1359,6 @@
       result |= transpPmapTiled;
       XFreeGC (dpy, gc);
     }
-  TIMING_TEST_PRINT_RESULT (tp);
 
   if (tiled_root_pmap != None)
     {
@@ -1396,8 +1385,6 @@
       pmap_depth = root_depth;
     }
 
-  TIMING_TEST_PRINT_RESULT (tp);
-
   return result;
 }
 
@@ -1419,7 +1406,7 @@
 # endif /* ENABLE_TRANSPARENCY */
 
 # ifndef HAVE_AFTERIMAGE
-static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
+static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
 # endif
 
 bool
@@ -1430,8 +1417,6 @@
   if (target == NULL)
     return false;
 
-  TIMING_TEST_START (tp);
-
   invalidate ();
 # ifdef ENABLE_TRANSPARENCY
   if (flags & isTransparent)
@@ -1473,7 +1458,7 @@
           rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
           if (flags & tintSet)
             tint.get (c);
-          ShadeXImage (target, result, shade, c.r, c.g, c.b);
+          ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
         }
 #  endif
 
@@ -1529,11 +1514,8 @@
 
   apply ();
 
-  XSync (target->dpy, False);
   valid_since = ev::now ();
 
-  TIMING_TEST_PRINT_RESULT (tp);
-
   return true;
 }
 
@@ -1558,8 +1540,6 @@
 {
   if (target)
     {
-      flags &= ~isVtOrigin;
-
       if (pixmap != None)
         {
           /* set target's background to pixmap */
@@ -1575,7 +1555,6 @@
           else
 # endif
             {
-              flags |= isVtOrigin;
               /* force old pixmap dereference in case it was transparent before :*/
               XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
               XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
@@ -1615,19 +1594,16 @@
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
 /* taken from aterm-0.4.2 */
 
-typedef uint32_t RUINT32T;
-
 static void
-ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
+ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
 {
   int sh_r, sh_g, sh_b;
-  RUINT32T mask_r, mask_g, mask_b;
-  RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
+  uint32_t mask_r, mask_g, mask_b;
+  uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
   unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
   unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
   int i;
-
-  Visual *visual = term->visual;
+  int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
 
   if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
 
@@ -1637,14 +1613,14 @@
   mask_b = visual->blue_mask;
 
   /* boring lookup table pre-initialization */
-  switch (srcImage->bits_per_pixel)
+  switch (srcImage->depth)
     {
       case 15:
         if ((mask_r != 0x7c00) ||
             (mask_g != 0x03e0) ||
             (mask_b != 0x001f))
           return;
-        lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
+        lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
         lookup_r = lookup;
         lookup_g = lookup+32;
         lookup_b = lookup+32+32;
@@ -1657,7 +1633,7 @@
             (mask_g != 0x07e0) ||
             (mask_b != 0x001f))
           return;
-        lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
+        lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
         lookup_r = lookup;
         lookup_g = lookup+32;
         lookup_b = lookup+32+64;
@@ -1670,7 +1646,7 @@
             (mask_g != 0x00ff00) ||
             (mask_b != 0x0000ff))
           return;
-        lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
+        lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
         lookup_r = lookup;
         lookup_g = lookup+256;
         lookup_b = lookup+256+256;
@@ -1683,7 +1659,7 @@
             (mask_g != 0x00ff00) ||
             (mask_b != 0x0000ff))
           return;
-        lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
+        lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
         lookup_r = lookup;
         lookup_g = lookup+256;
         lookup_b = lookup+256+256;
@@ -1704,9 +1680,9 @@
       lower_lim_g = 65535-gm;
       lower_lim_b = 65535-bm;
 
-      lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
-      lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
-      lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
+      lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
+      lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
+      lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
 
       upper_lim_r = upper_lim_g = upper_lim_b = 65535;
     }
@@ -1715,130 +1691,69 @@
 
       lower_lim_r = lower_lim_g = lower_lim_b = 0;
 
-      upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
-      upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
-      upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
-    }
-
-  /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
-  if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
-    {
-      unsigned int tmp;
-
-      tmp = lower_lim_r;
-      lower_lim_r = lower_lim_b;
-      lower_lim_b = tmp;
-
-      tmp = upper_lim_r;
-      upper_lim_r = upper_lim_b;
-      upper_lim_b = tmp;
+      upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
+      upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
+      upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
     }
 
   /* fill our lookup tables */
   for (i = 0; i <= mask_r>>sh_r; i++)
     {
-      RUINT32T tmp;
-      tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
-      tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
+      uint32_t tmp;
+      tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
+      tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
       lookup_r[i] = (tmp/65535)<<sh_r;
     }
   for (i = 0; i <= mask_g>>sh_g; i++)
     {
-      RUINT32T tmp;
-      tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
-      tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
+      uint32_t tmp;
+      tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
+      tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
       lookup_g[i] = (tmp/65535)<<sh_g;
     }
   for (i = 0; i <= mask_b>>sh_b; i++)
     {
-      RUINT32T tmp;
-      tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
-      tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
+      uint32_t tmp;
+      tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
+      tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
       lookup_b[i] = (tmp/65535)<<sh_b;
     }
 
   /* apply table to input image (replacing colors by newly calculated ones) */
-  switch (srcImage->bits_per_pixel)
-    {
-      case 15:
-        {
-          unsigned short *p1, *pf, *p, *pl;
-          p1 = (unsigned short *) srcImage->data;
-          pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
-          while (p1 < pf)
-            {
-              p = p1;
-              pl = p1 + srcImage->width;
-              for (; p < pl; p++)
-                {
-                  *p = lookup_r[(*p & 0x7c00)>>10] |
-                       lookup_g[(*p & 0x03e0)>> 5] |
-                       lookup_b[(*p & 0x001f)];
-                }
-              p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
+  if (srcImage->bits_per_pixel == 32
+      && (srcImage->depth == 24 || srcImage->depth == 32)
+      && srcImage->byte_order == host_byte_order)
+    {
+      uint32_t *p1, *pf, *p, *pl;
+      p1 = (uint32_t *) srcImage->data;
+      pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
+
+      while (p1 < pf)
+        {
+          p = p1;
+          pl = p1 + srcImage->width;
+          for (; p < pl; p++)
+            {
+              *p = lookup_r[(*p & 0xff0000) >> 16] |
+                   lookup_g[(*p & 0x00ff00) >> 8] |
+                   lookup_b[(*p & 0x0000ff)] |
+                   (*p & 0xff000000);
             }
-          break;
-        }
-      case 16:
-        {
-          unsigned short *p1, *pf, *p, *pl;
-          p1 = (unsigned short *) srcImage->data;
-          pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
-          while (p1 < pf)
-            {
-              p = p1;
-              pl = p1 + srcImage->width;
-              for (; p < pl; p++)
-                {
-                  *p = lookup_r[(*p & 0xf800)>>11] |
-                       lookup_g[(*p & 0x07e0)>> 5] |
-                       lookup_b[(*p & 0x001f)];
-                }
-              p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
-            }
-          break;
-        }
-      case 24:
-        {
-          unsigned char *p1, *pf, *p, *pl;
-          p1 = (unsigned char *) srcImage->data;
-          pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
-          while (p1 < pf)
-            {
-              p = p1;
-              pl = p1 + srcImage->width * 3;
-              for (; p < pl; p += 3)
-                {
-                  p[0] = lookup_r[(p[0] & 0xff0000)>>16];
-                  p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
-                  p[2] = lookup_r[(p[2] & 0x0000ff)];
-                }
-              p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
-            }
-          break;
-        }
-      case 32:
-        {
-          RUINT32T *p1, *pf, *p, *pl;
-          p1 = (RUINT32T *) srcImage->data;
-          pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
-
-          while (p1 < pf)
-            {
-              p = p1;
-              pl = p1 + srcImage->width;
-              for (; p < pl; p++)
-                {
-                  *p = lookup_r[(*p & 0xff0000)>>16] |
-                       lookup_g[(*p & 0x00ff00)>> 8] |
-                       lookup_b[(*p & 0x0000ff)] |
-                       (*p & ~0xffffff);
-                }
-              p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
-            }
-          break;
+          p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
         }
     }
+  else
+    {
+      for (int y = 0; y < srcImage->height; y++)
+        for (int x = 0; x < srcImage->width; x++)
+          {
+            unsigned long pixel = XGetPixel (srcImage, x, y);
+            pixel = lookup_r[(pixel & mask_r) >> sh_r] |
+                    lookup_g[(pixel & mask_g) >> sh_g] |
+                    lookup_b[(pixel & mask_b) >> sh_b];
+            XPutPixel (srcImage, x, y, pixel);
+          }
+    }
 
   free (lookup);
 }