--- rxvt-unicode/src/background.C	2010/10/05 20:22:25	1.70
+++ rxvt-unicode/src/background.C	2010/10/10 21:58:00	1.75
@@ -106,6 +106,9 @@
   h_scale = v_scale = 0;
   h_align = v_align = 0;
 #endif
+#ifdef ENABLE_TRANSPARENCY
+  shade = 100;
+#endif
   flags = 0;
   pixmap = None;
   valid_since = invalid_since = 0;
@@ -501,7 +504,7 @@
   if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
     {
       ShadingInfo as_shade;
-      as_shade.shading = (shade == 0) ? 100 : shade;
+      as_shade.shading = shade;
 
       rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
       if (flags & tintSet)
@@ -618,7 +621,7 @@
           layers[0].tint = background_tint;
           layers[1].im = result;
 
-          if (w <= 0)
+          if (h_scale == 0 || v_scale == 0)
             {
               /* tile horizontally */
               while (x > 0) x -= (int)result->width;
@@ -632,7 +635,7 @@
               layers[1].clip_width = result->width;
             }
 
-          if (h <= 0)
+          if (h_scale == 0 || v_scale == 0)
             {
               while (y > 0) y -= (int)result->height;
               layers[1].dst_y = y;
@@ -961,7 +964,7 @@
 {
   unsigned long flags = 0;
   rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
-  bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200);
+  bool has_shade = shade != 100;
 
   if (tint)
     {
@@ -1003,7 +1006,7 @@
 bool
 bgPixmap_t::set_tint (rxvt_color &new_tint)
 {
-  if (tint != new_tint)
+  if (!(flags & tintSet) || tint != new_tint)
     {
       unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
       tint = new_tint;
@@ -1031,12 +1034,11 @@
 bool
 bgPixmap_t::set_shade (const char *shade_str)
 {
-  int new_shade = (shade_str) ? atoi (shade_str) : 0;
+  int new_shade = (shade_str) ? atoi (shade_str) : 100;
 
-  if (new_shade < 0 && new_shade > -100)
+  clamp_it (new_shade, -100, 200);
+  if (new_shade < 0)
     new_shade = 200 - (100 + new_shade);
-  else if (new_shade == 100)
-    new_shade = 0;
 
   if (new_shade != shade)
     {
@@ -1082,36 +1084,20 @@
       if (flags & tintSet)
         tint.get (c);
 
-      if (shade > 0 && shade < 100)
+      if (shade <= 100)
         {
           c.r = (c.r * shade) / 100;
           c.g = (c.g * shade) / 100;
           c.b = (c.b * shade) / 100;
         }
-      else if (shade > 100 && shade < 200)
+      else
         {
-          c.r = (c.r * (200 - shade)) / 100;
-          c.g = (c.g * (200 - shade)) / 100;
-          c.b = (c.b * (200 - shade)) / 100;
-        }
-
-      XRenderPictFormat pf;
-      pf.type = PictTypeDirect;
-      pf.depth = 32;
-      pf.direct.redMask = 0xff;
-      pf.direct.greenMask = 0xff;
-      pf.direct.blueMask = 0xff;
-      pf.direct.alphaMask = 0xff;
-
-      XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
-                                                           (PictFormatType|
-                                                            PictFormatDepth|
-                                                            PictFormatRedMask|
-                                                            PictFormatGreenMask|
-                                                            PictFormatBlueMask|
-                                                            PictFormatAlphaMask),
-                                                           &pf,
-                                                           0);
+          c.r = ((0xffff - c.r) * (200 - shade)) / 100;
+          c.g = ((0xffff - c.g) * (200 - shade)) / 100;
+          c.b = ((0xffff - c.b) * (200 - shade)) / 100;
+        }
+
+      XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
       XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
       XRenderPictureAttributes pa;
 
@@ -1546,9 +1532,6 @@
 
   if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
 
-  if (shade == 0)
-    shade = 100;
-
   /* for convenience */
   mask_r = visual->red_mask;
   mask_g = visual->green_mask;
@@ -1613,10 +1596,8 @@
   }
 
   /* prepare limits for color transformation (each channel is handled separately) */
-  if (shade < 0) {
-    shade = -shade;
-    if (shade < 0) shade = 0;
-    if (shade > 100) shade = 100;
+  if (shade > 100) {
+    shade = 200 - shade;
 
     lower_lim_r = 65535-rm;
     lower_lim_g = 65535-gm;
@@ -1628,8 +1609,6 @@
 
     upper_lim_r = upper_lim_g = upper_lim_b = 65535;
   } else {
-    if (shade < 0) shade = 0;
-    if (shade > 100) shade = 100;
 
     lower_lim_r = lower_lim_g = lower_lim_b = 0;