--- rxvt-unicode/src/rxvtimg.C	2012/06/05 15:18:23	1.22
+++ rxvt-unicode/src/rxvtimg.C	2012/06/07 06:08:09	1.31
@@ -4,16 +4,14 @@
 
 #if HAVE_IMG
 
-#define float_to_component(d) ((d) * 65535.99)
-
 rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
-: s(screen), w(width), h(height), format(format), shared(false)
+: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false)
 {
   pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
 }
 
 rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
-: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false)
+: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
 {
 }
 
@@ -67,6 +65,8 @@
 
   img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
 
+  g_object_unref (pb);
+
   return img;
 }
 
@@ -200,24 +200,27 @@
 }
 
 void
-rxvt_img::brightness (double r, double g, double b, double a)
+rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
 {
   Display *dpy = s->display->dpy;
   Picture src = create_xrender_mask (dpy, pm, True);
   Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
 
   XRenderColor mask_c;
-  mask_c.red   = float_to_component (r);
-  mask_c.green = float_to_component (g);
-  mask_c.blue  = float_to_component (b);
-  mask_c.alpha = float_to_component (a);
+  mask_c.red   = r;
+  mask_c.green = g;
+  mask_c.blue  = b;
+  mask_c.alpha = a;
   XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
 
   XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
+
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
 }
 
 void
-rxvt_img::contrast (double r, double g, double b, double a)
+rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
 {
   if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
     return;
@@ -227,13 +230,16 @@
   Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
 
   XRenderColor mask_c;
-  mask_c.red   = float_to_component (r);
-  mask_c.green = float_to_component (g);
-  mask_c.blue  = float_to_component (b);
-  mask_c.alpha = float_to_component (a);
+  mask_c.red   = r;
+  mask_c.green = g;
+  mask_c.blue  = b;
+  mask_c.alpha = a;
   XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
 
   XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
+
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
 }
 
 bool
@@ -288,18 +294,6 @@
   unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
   char *line = ximage->data;
 
-  rgba c (0, 0, 0);
-
-  if (channels == 4 && alpha_mask == 0)
-    {
-      //pix_colors[Color_bg].get (c);
-      //TODO
-      c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
-      c.r >>= 8;
-      c.g >>= 8;
-      c.b >>= 8;
-    }
-
   for (int y = 0; y < height; y++)
     {
       for (int x = 0; x < width; x++)
@@ -311,9 +305,9 @@
           if (channels == 4)
             {
               a = pixel[3];
-              r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
-              g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
-              b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
+              r = pixel[0] * a / 0xff;
+              g = pixel[1] * a / 0xff;
+              b = pixel[2] * a / 0xff;
             }
           else
             {
@@ -358,7 +352,7 @@
 }
 
 rxvt_img *
-rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)
+rxvt_img::sub_rect (int x, int y, int width, int height)
 {
   rxvt_img *img = new rxvt_img (s, format, width, height);
 
@@ -377,7 +371,7 @@
 }
 
 rxvt_img *
-rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
+rxvt_img::transform (int new_width, int new_height, double matrix[9])
 {
   rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
 
@@ -416,7 +410,7 @@
 }
 
 rxvt_img *
-rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)
+rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
 {
   double s = sin (phi);
   double c = cos (phi);
@@ -427,19 +421,32 @@
     0,  0,                  1
   };
 
-  return transform (new_width, new_height, matrix, repeat);
+  return transform (new_width, new_height, matrix);
 }
 
 rxvt_img *
-rxvt_img::convert_to (XRenderPictFormat *new_format)
+rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
 {
   rxvt_img *img = new rxvt_img (s, new_format, w, h);
 
   Display *dpy = s->display->dpy;
   Picture src = XRenderCreatePicture (dpy,      pm,     format, 0, 0);
   Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
+  int op = PictOpSrc;
+
+  if (format->direct.alphaMask && !new_format->direct.alphaMask)
+    {
+      // does it have to be that complicated
+      rgba c;
+      bg.get (c);
 
-  XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
+      XRenderColor rc = { c.r, c.g, c.b, 0xffff };
+      XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
+
+      op = PictOpOver;
+    }
+
+  XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
 
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
@@ -447,5 +454,31 @@
   return img;
 }
 
+rxvt_img *
+rxvt_img::blend (rxvt_img *img, double factor)
+{
+  rxvt_img *img2 = clone ();
+  Display *dpy = s->display->dpy;
+  Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
+  Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
+  Picture mask = create_xrender_mask (dpy, img->pm, False);
+
+  XRenderColor mask_c;
+
+  mask_c.alpha = float_to_component (factor);
+  mask_c.red   =
+  mask_c.green =
+  mask_c.blue  = 0;
+  XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
+
+  XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
+
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
+  XRenderFreePicture (dpy, mask);
+
+  return img2;
+}
+
 #endif