--- rxvt-unicode/src/rxvtimg.C	2012/06/14 18:06:15	1.83
+++ rxvt-unicode/src/rxvtimg.C	2012/06/14 19:36:35	1.87
@@ -4,6 +4,38 @@
 
 #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)
 {
@@ -217,7 +249,7 @@
 }
 
 Picture
-rxvt_img::src_picture ()
+rxvt_img::picture ()
 {
   Display *dpy = s->display->dpy;
 
@@ -251,7 +283,7 @@
   XRenderColor rc = { c.r, c.g, c.b, c.a };
 
   Display *dpy = s->display->dpy;
-  Picture src = src_picture ();
+  Picture src = picture ();
   XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
   XRenderFreePicture (dpy, src);
 }
@@ -267,7 +299,7 @@
   rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
   img->alloc ();
 
-  Picture src = src_picture ();
+  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);
@@ -282,15 +314,15 @@
 }
 
 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];
     }
@@ -310,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 ();
@@ -451,7 +483,7 @@
 
   Display *dpy = s->display->dpy;
 
-  Picture src = src_picture ();
+  Picture src = picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
   Picture mul = create_xrender_mask (dpy, pm, True, True);
 
@@ -478,6 +510,32 @@
   delete img;
 }
 
+void
+rxvt_img::draw (rxvt_img *img, int op, nv mask)
+{
+  unshare ();
+
+  Display *dpy = s->display->dpy;
+  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);
+    }
+
+  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 *
 rxvt_img::clone ()
 {
@@ -500,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);
@@ -523,8 +581,8 @@
 {
   rxvt_img *img = clone ();
 
-  img->x += x;
-  img->y += y;
+  img->x -= x;
+  img->y -= y;
 
   if (w != width || h != height)
     {
@@ -540,13 +598,13 @@
 }
 
 static void
-mat_invert (double mat[3][3], double (&inv)[3][3])
+mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
 {
-  double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
-  double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
-  double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
+  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];
 
-  double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
+  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;
@@ -561,28 +619,28 @@
   inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
 }
 
-static double
-mat_apply (double mat[3][3], int i, double x, double y)
+static rxvt_img::nv
+mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
 {
-  double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
-  double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
+  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 (double matrix[3][3])
+rxvt_img::transform (nv matrix[3][3])
 {
   // find new offset
   int ox = mat_apply (matrix, 0, x, y);
   int oy = mat_apply (matrix, 1, x, y);
 
   // calculate new pixel bounding box coordinates
-  double d [2], rmin[2], rmax[2];
+  nv d [2], rmin[2], rmax[2];
 
   for (int i = 0; i < 2; ++i)
     {
-      double v;
+      nv v;
       v = mat_apply (matrix, i, 0, 0);         rmin [i] =            rmax [i] = v; d [i] = v;
       v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i],  v);
       v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i],  v);
@@ -595,14 +653,14 @@
   int new_width  = ceil (rmax [0] - dx);
   int new_height = ceil (rmax [1] - dy);
 
-  double inv[3][3];
+  nv inv[3][3];
   mat_invert (matrix, inv);
 
-  rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
+  rxvt_img *img = new rxvt_img (s, format, dx + d [0] - ox, dy + d [1] - oy, 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;
@@ -627,10 +685,10 @@
   if (w == new_width && h == new_height)
     return clone ();
 
-  double matrix[3][3] = {
-    { new_width / (double)w,  0, 0 },
-    { 0, new_height / (double)h, 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;
@@ -645,12 +703,12 @@
 }
 
 rxvt_img *
-rxvt_img::rotate (int cx, int cy, 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[3][3] = {
+  nv matrix[3][3] = {
     { c, -s, cx - c * cx + s * cy },
     { s,  c, cy - s * cx - c * cy },
     { 0,  0,                     1 }
@@ -677,7 +735,7 @@
   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;
 
@@ -699,11 +757,11 @@
 }
 
 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, False);