--- rxvt-unicode/src/rxvtimg.C	2012/06/05 18:52:48	1.24
+++ rxvt-unicode/src/rxvtimg.C	2012/06/07 08:45:34	1.36
@@ -4,18 +4,24 @@
 
 #if HAVE_IMG
 
-#define float_to_component(d) ((d) * 65535.99)
+rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height)
+: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(RepeatNormal),
+  pm(0), ref(0)
+{
+}
 
-rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
-: s(screen), w(width), h(height), format(format), shared(false)
+rxvt_img::rxvt_img (const rxvt_img &img)
+: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
 {
-  pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
+  ++ref->cnt;
 }
 
+#if 0
 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)
 {
 }
+#endif
 
 rxvt_img *
 rxvt_img::new_from_root (rxvt_screen *s)
@@ -39,12 +45,15 @@
   rxvt_img *img = new rxvt_img (
      s,
      XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
+     0,
+     0,
      root_pm_w,
-     root_pm_h,
-     root_pixmap
+     root_pm_h
   );
 
-  img->shared = true;
+  img->pm = root_pixmap;
+  img->ref = new pixref (root_pm_w, root_pm_h);
+  img->ref->ours = false;
 
   return img;
 }
@@ -61,33 +70,71 @@
   rxvt_img *img = new rxvt_img (
      s,
      XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
+     0,
+     0,
      gdk_pixbuf_get_width (pb),
      gdk_pixbuf_get_height (pb)
   );
-
+  img->alloc ();
   img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
 
+  g_object_unref (pb);
+
   return img;
 }
 
-rxvt_img::~rxvt_img ()
+void
+rxvt_img::destroy ()
 {
-  if (!shared)
+  if (--ref->cnt)
+    return;
+
+  if (pm && ref->ours)
     XFreePixmap (s->display->dpy, pm);
+
+  delete ref;
+}
+
+rxvt_img::~rxvt_img ()
+{
+  destroy ();
+}
+
+void
+rxvt_img::alloc ()
+{
+  pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
+  ref = new pixref (w, h);
+}
+
+Picture
+rxvt_img::src_picture ()
+{
+  Display *dpy = s->display->dpy;
+
+  XRenderPictureAttributes pa;
+  pa.repeat = repeat;
+  Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
+
+  return pic;
 }
 
 void
 rxvt_img::unshare ()
 {
-  if (!shared)
+  if (ref->cnt == 1 && ref->ours)
     return;
 
-  rxvt_img *img = clone ();
+  //TODO: maybe should reify instead
+  Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
+  GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
+  XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
+  XFreeGC (s->display->dpy, gc);
 
-  ::swap (pm    , img->pm);
-  ::swap (shared, img->shared);
+  destroy ();
 
-  delete img;
+  pm = pm2;
+  ref = new pixref (ref->w, ref->h);
 }
 
 void
@@ -131,12 +178,13 @@
   int size = max (rh, rv) * 2 + 1;
   double *kernel = (double *)malloc (size * sizeof (double));
   XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
-  rxvt_img *img = new rxvt_img (s, format, w, h);
+  rxvt_img *img = new rxvt_img (s, format, x, y, w, h);
+  img->alloc ();
 
-  XRenderPictureAttributes pa;
+  Picture src = src_picture ();
 
+  XRenderPictureAttributes pa;
   pa.repeat = RepeatPad;
-  Picture src = XRenderCreatePicture (dpy, pm     , format, CPRepeat, &pa);
   Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
 
   Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
@@ -200,17 +248,17 @@
 }
 
 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);
@@ -220,7 +268,7 @@
 }
 
 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;
@@ -230,10 +278,10 @@
   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);
@@ -294,18 +342,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++)
@@ -317,9 +353,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
             {
@@ -354,44 +390,58 @@
 rxvt_img *
 rxvt_img::clone ()
 {
-  rxvt_img *img = new rxvt_img (s, format, w, h);
+  return new rxvt_img (*this);
+}
 
-  GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
-  XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
-  XFreeGC (s->display->dpy, gc);
+rxvt_img *
+rxvt_img::reify ()
+{
+  if (x == 0 && y == 0 && w == ref->w && h == ref->h)
+    return clone ();
+
+  rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);
+  img->alloc ();
+
+  Display *dpy = s->display->dpy;
+
+  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);
+  
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
 
   return img;
 }
 
 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);
+  bool need_reify = w < width || h < height;
 
-  Display *dpy = s->display->dpy;
-  XRenderPictureAttributes pa;
-  pa.repeat = repeat;
-  Picture src = XRenderCreatePicture (dpy,      pm,      format, CPRepeat, &pa);
-  Picture dst = XRenderCreatePicture (dpy, img->pm, img->format,        0,   0);
+  rxvt_img *img = clone ();
 
-  XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
+  img->x += x;
+  img->y += y;
+  img->w = width;
+  img->h = height;
 
-  XRenderFreePicture (dpy, src);
-  XRenderFreePicture (dpy, dst);
+  if (need_reify)
+    img->reify ();
 
   return img;
 }
 
 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);
+  rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);
+  img->alloc ();
 
   Display *dpy = s->display->dpy;
-  XRenderPictureAttributes pa;
-  pa.repeat = repeat;
-  Picture src = XRenderCreatePicture (dpy,      pm,      format, CPRepeat, &pa);
-  Picture dst = XRenderCreatePicture (dpy, img->pm, img->format,        0,   0);
+  Picture src = src_picture ();
+  Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
 
   XTransform xfrm;
 
@@ -399,6 +449,9 @@
     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);
+
   XRenderSetPictureFilter (dpy, src, "good", 0, 0);
   XRenderSetPictureTransform (dpy, src, &xfrm);
   XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
@@ -422,7 +475,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);
@@ -433,19 +486,36 @@
     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);
+  if (new_format == format)
+    return clone ();
+
+  rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h);
+  img->alloc ();
 
   Display *dpy = s->display->dpy;
-  Picture src = XRenderCreatePicture (dpy,      pm,     format, 0, 0);
+  Picture src = src_picture ();
   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);
+
+      XRenderColor rc = { c.r, c.g, c.b, 0xffff };
+      XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
+
+      op = PictOpOver;
+    }
 
-  XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
+  XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
 
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
@@ -458,7 +528,7 @@
 {
   rxvt_img *img2 = clone ();
   Display *dpy = s->display->dpy;
-  Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
+  Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
   Picture mask = create_xrender_mask (dpy, img->pm, False);