--- rxvt-unicode/src/rxvtimg.C	2012/06/09 14:18:53	1.71
+++ rxvt-unicode/src/rxvtimg.C	2012/06/14 19:44:31	1.89
@@ -4,6 +4,58 @@
 
 #if HAVE_IMG
 
+#if 0
+struct pict
+{
+  Display *dpy;
+  Picture pic;
+
+  operator Picture () const
+  {
+    return pic;
+  }
+
+  pict ()
+  : pic (0)
+  {
+  }
+
+  pict (rxvt_img *img, XRenderPictFormat *format = 0)
+  : dpy (img->s->display->dpy)
+  {
+    XRenderPictureAttributes pa;
+    pa.repeat = img->repeat;
+    pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
+  }
+
+  ~pict ()
+  {
+    if (pic)
+      XRenderFreePicture (dpy, pic);
+  }
+};
+#endif
+
+static XRenderPictFormat *
+find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
+{
+  if (format->direct.alphaMask)
+    return format; // already has alpha
+
+  // try to find a suitable alpha format, one bit alpha is enough for our purposes
+  if (format->type == PictTypeDirect)
+    for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
+      if (f->direct.alphaMask
+          && f->type == PictTypeDirect
+          && ecb_popcount32 (f->direct.redMask  ) >= ecb_popcount32 (format->direct.redMask  )
+          && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
+          && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
+        return f;
+
+  // should be a very good fallback
+  return XRenderFindStandardFormat (dpy, PictStandardARGB32);
+}
+
 rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
 : s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
   pm(0), ref(0)
@@ -51,6 +103,8 @@
   return img;
 }
 
+# if HAVE_PIXBUF
+
 rxvt_img *
 rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
 {
@@ -64,7 +118,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;
 
@@ -78,7 +131,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
@@ -97,9 +150,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++)
@@ -107,14 +160,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);
@@ -141,7 +194,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 +222,8 @@
   return img;
 }
 
+# endif
+
 void
 rxvt_img::destroy ()
 {
@@ -194,7 +249,7 @@
 }
 
 Picture
-rxvt_img::src_picture ()
+rxvt_img::picture ()
 {
   Display *dpy = s->display->dpy;
 
@@ -223,25 +278,51 @@
 }
 
 void
-rxvt_img::fill (const rxvt_color &c)
+rxvt_img::fill (const rgba &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);
+  XRenderColor rc = { c.r, c.g, c.b, c.a };
+
+  Display *dpy = s->display->dpy;
+  Picture src = picture ();
+  XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
+  XRenderFreePicture (dpy, src);
+}
+
+void
+rxvt_img::add_alpha ()
+{
+  if (format->direct.alphaMask)
+    return;
+
+  Display *dpy = s->display->dpy;
+
+  rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
+  img->alloc ();
+
+  Picture src = picture ();
+  Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
+  
+  XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
+
+  XRenderFreePicture (dpy, src);
+  XRenderFreePicture (dpy, dst);
+
+  ::swap (img->ref, ref);
+  ::swap (img->pm , pm );
+
+  delete img;
 }
 
 static void
-get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
+get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params)
 {
-  double sigma = radius / 2.0;
-  double scale = sqrt (2.0 * M_PI) * sigma;
-  double sum = 0.0;
+  rxvt_img::nv sigma = radius / 2.0;
+  rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma;
+  rxvt_img::nv sum = 0.0;
 
   for (int i = 0; i < width; i++)
     {
-      double x = i - width / 2;
+      rxvt_img::nv x = i - width / 2;
       kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
       sum += kernel[i];
     }
@@ -261,7 +342,7 @@
 
   Display *dpy = s->display->dpy;
   int size = max (rh, rv) * 2 + 1;
-  double *kernel = (double *)malloc (size * sizeof (double));
+  nv *kernel = (nv *)malloc (size * sizeof (nv));
   XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
   rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
   img->alloc ();
@@ -309,6 +390,7 @@
 
   free (kernel);
   free (params);
+
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
   XRenderFreePicture (dpy, tmp);
@@ -317,14 +399,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 = True;
-  Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
+  pa.repeat = RepeatNormal;
+  pa.component_alpha = component_alpha;
+  Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
 
   XFreePixmap (dpy, pixmap);
 
@@ -380,32 +463,77 @@
         }
     }
 
-
   XRenderFreePicture (dpy, dst);
 }
 
 void
 rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
 {
-  if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
+  if (r < 0 || g < 0 || b < 0 || a < 0)
+    rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
+
+  rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
+  img->alloc ();
+  img->fill (rgba (0, 0, 0, 0));
+
+  // premultiply (yeah, these are not exact, sue me or fix it)
+  r = (r * (a >> 8)) >> 8;
+  g = (g * (a >> 8)) >> 8;
+  b = (b * (a >> 8)) >> 8;
+
+  Display *dpy = s->display->dpy;
+
+  Picture src = picture ();
+  Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
+  Picture mul = create_xrender_mask (dpy, pm, True, True);
+
+  //TODO: this operator does not yet implement some useful contrast
+  while (r | g | b | a)
     {
-      rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
-      return;
+      unsigned short xr, xg, xb, xa;
+      XRenderColor mask_c;
+
+      if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
+        {
+          XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
+          XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
+        }
     }
 
+  XRenderFreePicture (dpy, mul);
+  XRenderFreePicture (dpy, dst);
+  XRenderFreePicture (dpy, src);
+
+  ::swap (img->ref, ref);
+  ::swap (img->pm , pm );
+
+  delete img;
+}
+
+void
+rxvt_img::draw (rxvt_img *img, int op, nv mask)
+{
   unshare ();
 
   Display *dpy = s->display->dpy;
-  Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
+  Picture src = img->picture ();
+  Picture dst = picture ();
+  Picture mask_p = 0;
+  
+  if (mask != 1.)
+    {
+      mask_p = create_xrender_mask (dpy, img->pm, False, False);
+      XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
+      XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
+    }
 
-  XRenderColor mask_c;
-  mask_c.red   = r;
-  mask_c.green = g;
-  mask_c.blue  = b;
-  mask_c.alpha = a;
-  XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
+  XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
 
+  XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
+
+  if (mask_p)
+    XRenderFreePicture (dpy, mask_p);
 }
 
 rxvt_img *
@@ -414,26 +542,6 @@
   return new rxvt_img (*this);
 }
 
-static XRenderPictFormat *
-find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
-{
-  if (format->direct.alphaMask)
-    return format; // already has alpha
-
-  // try to find a suitable alpha format, one bit alpha is enough for our purposes
-  if (format->type == PictTypeDirect)
-    for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
-      if (f->direct.alphaMask
-          && f->type == PictTypeDirect
-          && ecb_popcount32 (f->direct.redMask  ) >= ecb_popcount32 (format->direct.redMask  )
-          && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
-          && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
-        return f;
-
-  // should be a very good fallback
-  return XRenderFindStandardFormat (dpy, PictStandardARGB32);
-}
-
 rxvt_img *
 rxvt_img::reify ()
 {
@@ -450,17 +558,17 @@
   rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
   img->alloc ();
 
-  Picture src = src_picture ();
+  Picture src = picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
   
   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);
+      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);
+    XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
 
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
@@ -473,8 +581,8 @@
 {
   rxvt_img *img = clone ();
 
-  img->x += x;
-  img->y += y;
+  img->x -= x;
+  img->y -= y;
 
   if (w != width || h != height)
     {
@@ -489,28 +597,78 @@
   return img;
 }
 
+static void
+mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
+{
+  rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
+  rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
+  rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
+
+  rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
+
+  inv [0][0] = invdet * s0;
+  inv [0][1] = invdet * s1;
+  inv [0][2] = invdet * s2;
+
+  inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
+  inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
+  inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
+
+  inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
+  inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
+  inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
+}
+
+static rxvt_img::nv
+mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
+{
+  rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
+  rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
+
+  return v * (1. / w);
+}
+
 rxvt_img *
-rxvt_img::transform (int new_width, int new_height, double matrix[9])
+rxvt_img::transform (nv matrix[3][3])
 {
-  rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
+  // calculate new pixel bounding box coordinates
+  nv rmin[2], rmax[2];
+
+  for (int i = 0; i < 2; ++i)
+    {
+      nv v;
+      v = mat_apply (matrix, i, 0+x, 0+y);         rmin [i] =            rmax [i] = v;
+      v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i],  v);
+      v = mat_apply (matrix, i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i],  v);
+      v = mat_apply (matrix, i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i],  v);
+    }
+
+  // TODO: adjust matrix for subpixel accuracy
+  int dx = floor (rmin [0]);
+  int dy = floor (rmin [1]);
+
+  int new_width  = ceil (rmax [0] - dx);
+  int new_height = ceil (rmax [1] - dy);
+
+  nv inv[3][3];
+  mat_invert (matrix, inv);
+
+  rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat);
   img->alloc ();
 
   Display *dpy = s->display->dpy;
-  Picture src = src_picture ();
+  Picture src = picture ();
   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]);
-
-  xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
-  xfrm.matrix [1][2] -= XDoubleToFixed (y);
+      xfrm.matrix [i][j] = XDoubleToFixed (inv [i][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);
+  XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
 
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
@@ -524,16 +682,16 @@
   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
+  nv matrix[3][3] = {
+    { new_width / (nv)w,  0, 0 },
+    { 0, new_height / (nv)h, 0 },
+    { 0,                  0, 1 }
   };
 
   int old_repeat_mode = repeat;
-  repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
+  repeat = RepeatPad; // not right, but xrender can't properly scale it seems
 
-  rxvt_img *img = transform (new_width, new_height, matrix);
+  rxvt_img *img = transform (matrix);
 
   repeat = old_repeat_mode;
   img->repeat = repeat;
@@ -542,22 +700,30 @@
 }
 
 rxvt_img *
-rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
+rxvt_img::rotate (int cx, int cy, nv phi)
 {
-  double s = sin (phi);
-  double c = cos (phi);
+  nv s = sin (phi);
+  nv c = cos (phi);
 
-  double matrix[9] = {
-    c, -s, -c * x + s * y + x,
-    s,  c, -s * x - c * y + y,
-    0,  0,                  1
+  nv matrix[3][3] = {
+    { c, -s, cx - c * cx + s * cy  + 200 },
+    { s,  c, cy - s * cx - c * cy },
+    { 0,  0,                     1 }
+    //{ c, -s, 0 },
+    //{ s,  c, 0 },
+    //{ 0,  0, 1 }
   };
 
-  return transform (new_width, new_height, matrix);
+  //move (-cx, -cy);
+  rxvt_img *img = transform (matrix);
+  //move ( cx,  cy);
+  //img->move (cx, cy);
+
+  return img;
 }
 
 rxvt_img *
-rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
+rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
 {
   if (new_format == format)
     return clone ();
@@ -566,17 +732,14 @@
   img->alloc ();
 
   Display *dpy = s->display->dpy;
-  Picture src = src_picture ();
+  Picture 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 };
+      XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
       XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
 
       op = PictOpOver;
@@ -591,13 +754,13 @@
 }
 
 rxvt_img *
-rxvt_img::blend (rxvt_img *img, double factor)
+rxvt_img::blend (rxvt_img *img, nv factor)
 {
   rxvt_img *img2 = clone ();
   Display *dpy = s->display->dpy;
-  Picture src = img->src_picture ();
+  Picture src = img->picture ();
   Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
-  Picture mask = create_xrender_mask (dpy, img->pm, False);
+  Picture mask = create_xrender_mask (dpy, img->pm, False, False);
 
   XRenderColor mask_c;