--- rxvt-unicode/src/rxvtimg.C	2012/06/07 11:34:09	1.41
+++ rxvt-unicode/src/rxvtimg.C	2012/06/07 13:12:08	1.44
@@ -411,8 +411,15 @@
   Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
   
-  XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
-  
+  if (alpha)
+    {
+      XRenderColor rc = { 0, 0, 0, 0 };
+      XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
+      XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
+    }
+  else
+    XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
+
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
 
@@ -456,8 +463,10 @@
     for (int j = 0; j < 3; ++j)
       xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
 
-  xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
-  xfrm.matrix [0][3] += XDoubleToFixed (y);
+#if 0
+  xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
+  xfrm.matrix [1][2] -= XDoubleToFixed (y);
+#endif
 
   XRenderSetPictureFilter (dpy, src, "good", 0, 0);
   XRenderSetPictureTransform (dpy, src, &xfrm);
@@ -472,13 +481,24 @@
 rxvt_img *
 rxvt_img::scale (int new_width, int new_height)
 {
+  if (w == new_width && h == new_height)
+    return clone ();
+
   double matrix[9] = {
     w  / (double)new_width, 0, 0,
     0, h / (double)new_height, 0,
     0,                      0, 1
   };
 
-  return transform (new_width, new_height, matrix);
+  int old_repeat_mode = repeat;
+  repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
+
+  rxvt_img *img = transform (new_width, new_height, matrix);
+
+  repeat = old_repeat_mode;
+  img->repeat = repeat;
+
+  return img;
 }
 
 rxvt_img *