--- rxvt-unicode/src/rxvtimg.C	2012/06/09 19:20:04	1.74
+++ rxvt-unicode/src/rxvtimg.C	2012/06/10 10:35:03	1.77
@@ -52,6 +52,7 @@
 }
 
 # if HAVE_PIXBUF
+
 rxvt_img *
 rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
 {
@@ -65,7 +66,6 @@
 
   // since we require rgb24/argb32 formats from xrender we assume
   // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
-  int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
 
   int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
 
@@ -79,7 +79,7 @@
   xi.bitmap_unit      = 0;         //XY only, unused
   xi.bitmap_bit_order = 0;         //XY only, unused
   xi.bitmap_pad       = BitmapPad (dpy);
-  xi.depth            = depth;
+  xi.depth            = 32;
   xi.bytes_per_line   = 0;
   xi.bits_per_pixel   = 32;         //Z only
   xi.red_mask         = 0x00000000; //Z only, unused
@@ -98,9 +98,9 @@
   xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
 
   int rowstride = gdk_pixbuf_get_rowstride (pb);
-
-  assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
+  bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
   unsigned char *row = gdk_pixbuf_get_pixels (pb);
+
   char *line = xi.data;
 
   for (int y = 0; y < height; y++)
@@ -108,14 +108,14 @@
       unsigned char *src = row;
       uint32_t      *dst = (uint32_t *)line;
 
-      if (depth == 24)
+      if (!pb_has_alpha)
         for (int x = 0; x < width; x++)
           {
             uint8_t r = *src++;
             uint8_t g = *src++;
             uint8_t b = *src++;
 
-            uint32_t v = (r << 16) | (g << 8) | b;
+            uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
             
             if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
               v = ecb_bswap32 (v);
@@ -142,7 +142,7 @@
       line += xi.bytes_per_line;
     }
 
-  rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
+  rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
   img->alloc ();
 
   GC gc = XCreateGC (dpy, img->pm, 0, 0);
@@ -169,6 +169,7 @@
 
   return img;
 }
+
 # endif
 
 void
@@ -227,11 +228,14 @@
 void
 rxvt_img::fill (const rxvt_color &c)
 {
-  XGCValues gcv;
-  gcv.foreground = c;
-  GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);
-  XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);
-  XFreeGC (s->display->dpy, gc);
+  rgba cc;
+  c.get (cc);
+  XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
+
+  Display *dpy = s->display->dpy;
+  Picture src = src_picture ();
+  XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
+  XRenderFreePicture (dpy, src);
 }
 
 static void
@@ -311,6 +315,7 @@
 
   free (kernel);
   free (params);
+
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
   XRenderFreePicture (dpy, tmp);
@@ -319,14 +324,15 @@
 }
 
 static Picture
-create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
+create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
 {
   Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
 
   XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
   XRenderPictureAttributes pa;
   pa.repeat = RepeatNormal;
-  Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
+  pa.component_alpha = component_alpha;
+  Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
 
   XFreePixmap (dpy, pixmap);
 
@@ -409,11 +415,7 @@
 
   Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
-  Picture mul = create_xrender_mask (dpy, pm, True);
-
-  XRenderPictureAttributes pa;
-  pa.component_alpha = 1;
-  XRenderChangePicture (dpy, mul, CPComponentAlpha, &pa);
+  Picture mul = create_xrender_mask (dpy, pm, True, True);
 
   //TODO: this operator does not yet implement some useful contrast
   while (r | g | b | a)
@@ -627,13 +629,7 @@
   Display *dpy = s->display->dpy;
   Picture src = img->src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
-
-  Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
-  XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
-  XRenderPictureAttributes pa;
-  pa.repeat = True;
-  Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
-  XFreePixmap (dpy, pixmap);
+  Picture mask = create_xrender_mask (dpy, img->pm, False, False);
 
   XRenderColor mask_c;