--- rxvt-unicode/src/rxvtimg.C	2012/06/03 18:49:55	1.6
+++ rxvt-unicode/src/rxvtimg.C	2012/06/07 07:53:12	1.32
@@ -4,27 +4,65 @@
 
 #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),
+  pm(0), refcnt(0)
 {
-  pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
 }
 
+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), refcnt(img.refcnt)
+{
+  if (refcnt)
+    ++*refcnt;
+}
+
+#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)
 {
+  Display *dpy = s->display->dpy;
+  unsigned int root_pm_w, root_pm_h;
+  Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
+  if (root_pixmap == None)
+    root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
+
+  if (root_pixmap == None)
+    return 0;
+
+  Window wdummy;
+  int idummy;
+  unsigned int udummy;
+
+  if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
+    return 0;
+
+  rxvt_img *img = new rxvt_img (
+     s,
+     XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
+     root_pm_w,
+     root_pm_h
+  );
+
+  img->pm = root_pixmap;
+
+  return img;
 }
 
 rxvt_img *
 rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
 {
-  GError *err;
+  GError *err = 0;
   GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
 
   if (!pb)
-    return 0;
+    rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
 
   rxvt_img *img = new rxvt_img (
      s,
@@ -32,16 +70,53 @@
      gdk_pixbuf_get_width (pb),
      gdk_pixbuf_get_height (pb)
   );
+  img->alloc ();
+  img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
 
-  img->render (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 (!refcnt || --*refcnt)
+    return;
+
+  if (pm)
     XFreePixmap (s->display->dpy, pm);
+
+  delete refcnt;
+}
+
+rxvt_img::~rxvt_img ()
+{
+  destroy ();
+}
+
+void
+rxvt_img::alloc ()
+{
+  pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
+  refcnt = new int (1);
+}
+
+void
+rxvt_img::unshare ()
+{
+  if (refcnt && *refcnt == 1)
+    return;
+
+  Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
+  GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
+  XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
+  XFreeGC (s->display->dpy, gc);
+
+  destroy ();
+
+  pm = pm2;
+  refcnt = new int (1);
 }
 
 void
@@ -75,24 +150,28 @@
     params[i+2] = XDoubleToFixed (kernel[i] / sum);
 }
 
-void
+rxvt_img *
 rxvt_img::blur (int rh, int rv)
 {
   if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
-    return;
+    return clone ();
 
   Display *dpy = s->display->dpy;
   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);
+  img->alloc ();
 
   XRenderPictureAttributes pa;
 
   pa.repeat = RepeatPad;
-  Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
-  Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);
-  Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
-  XFreePixmap (dpy, tmp);
+  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);
+  Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
+  XFreePixmap (dpy, tmp_pm);
 
   if (kernel && params)
     {
@@ -104,14 +183,12 @@
                         PictOpSrc,
                         src,
                         None,
-                        dst,
+                        tmp,
                         0, 0,
                         0, 0,
                         0, 0,
                         w, h);
 
-      ::swap (src, dst);
-
       size = rv * 2 + 1;
       get_gaussian_kernel (rv, size, kernel, params);
       ::swap (params[0], params[1]);
@@ -119,7 +196,7 @@
       XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
       XRenderComposite (dpy,
                         PictOpSrc,
-                        src,
+                        tmp,
                         None,
                         dst,
                         0, 0,
@@ -132,6 +209,9 @@
   free (params);
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
+  XRenderFreePicture (dpy, tmp);
+
+  return img;
 }
 
 static Picture
@@ -150,24 +230,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;
@@ -177,44 +260,255 @@
   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);
 }
 
-void
-rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
+bool
+rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
+{
+  Display *dpy = s->display->dpy;
+
+  if (s->visual->c_class != TrueColor)
+    return false;
+
+  uint32_t red_mask, green_mask, blue_mask, alpha_mask;
+
+  red_mask   = (uint32_t)format->direct.redMask   << format->direct.red;
+  green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
+  blue_mask  = (uint32_t)format->direct.blueMask  << format->direct.blue;
+  alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
+
+  int width_r = ecb_popcount32 (red_mask);
+  int width_g = ecb_popcount32 (green_mask);
+  int width_b = ecb_popcount32 (blue_mask);
+  int width_a = ecb_popcount32 (alpha_mask);
+
+  if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
+    return false;
+
+  int sh_r = ecb_ctz32 (red_mask);
+  int sh_g = ecb_ctz32 (green_mask);
+  int sh_b = ecb_ctz32 (blue_mask);
+  int sh_a = ecb_ctz32 (alpha_mask);
+
+  if (width > 32767 || height > 32767)
+    return false;
+
+  XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
+                                 width, height, 32, 0);
+  if (!ximage)
+    return false;
+
+  if (height > INT_MAX / ximage->bytes_per_line
+      || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
+    {
+      XDestroyImage (ximage);
+      return false;
+    }
+
+  GC gc = XCreateGC (dpy, pm, 0, 0);
+
+  ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
+
+  int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  int channels = gdk_pixbuf_get_n_channels (pixbuf);
+  unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
+  char *line = ximage->data;
+
+  for (int y = 0; y < height; y++)
+    {
+      for (int x = 0; x < width; x++)
+        {
+          unsigned char *pixel = row + x * channels;
+          uint32_t value;
+          unsigned char r, g, b, a;
+
+          if (channels == 4)
+            {
+              a = pixel[3];
+              r = pixel[0] * a / 0xff;
+              g = pixel[1] * a / 0xff;
+              b = pixel[2] * a / 0xff;
+            }
+          else
+            {
+              a = 0xff;
+              r = pixel[0];
+              g = pixel[1];
+              b = pixel[2];
+            }
+
+          value  = ((r >> (8 - width_r)) << sh_r)
+                 | ((g >> (8 - width_g)) << sh_g)
+                 | ((b >> (8 - width_b)) << sh_b)
+                 | ((a >> (8 - width_a)) << sh_a);
+
+          if (ximage->bits_per_pixel == 32)
+            ((uint32_t *)line)[x] = value;
+          else
+            XPutPixel (ximage, x, y, value);
+        }
+
+      row += rowstride;
+      line += ximage->bytes_per_line;
+    }
+
+  XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
+  XDestroyImage (ximage);
+  XFreeGC (dpy, gc);
+
+  return true;
+}
+
+rxvt_img *
+rxvt_img::clone ()
 {
-  //TODO
+  return new rxvt_img (*this);
 }
 
 rxvt_img *
-rxvt_img::copy ()
+rxvt_img::sub_rect (int x, int y, int width, int height)
 {
-  GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
-  Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
-  XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
-  XFreeGC (s->display->dpy, gc);
-  return new rxvt_img (s, format, w, h, pm2);
+  rxvt_img *img = new rxvt_img (s, format, width, 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);
+
+  XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
+
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
+
+  return img;
 }
 
 rxvt_img *
-rxvt_img::transform (int new_width, int new_height, double matrix[16])
+rxvt_img::transform (int new_width, int new_height, double matrix[9])
 {
-  //TODO
+  rxvt_img *img = new rxvt_img (s, format, 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);
+
+  XTransform xfrm;
+
+  for (int i = 0; i < 3; ++i)
+    for (int j = 0; j < 3; ++j)
+      xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
+
+  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);
+
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
+
+  return img;
 }
 
 rxvt_img *
 rxvt_img::scale (int new_width, int new_height)
 {
-  // use transform
-  //TODO
+  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);
 }
 
+rxvt_img *
+rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
+{
+  double s = sin (phi);
+  double c = cos (phi);
+
+  double matrix[9] = {
+    c, -s, -c * x + s * y + x,
+    s,  c, -s * x - c * y + y,
+    0,  0,                  1
+  };
+
+  return transform (new_width, new_height, matrix);
+}
+
+rxvt_img *
+rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
+{
+  if (new_format == format)
+    return clone ();
+
+  rxvt_img *img = new rxvt_img (s, new_format, w, h);
+  img->alloc ();
+
+  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);
+
+      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);
+
+  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