[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtimg.C

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.25 by sf-exg, Tue Jun 5 22:00:15 2012 UTC vs.
Revision 1.28 by root, Wed Jun 6 20:22:03 2012 UTC

      gdk_pixbuf_get_width (pb),
      gdk_pixbuf_get_height (pb)
   );
   img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
+  g_object_unref (pb);
   return img;
 }
 rxvt_img::~rxvt_img ()
   return transform (new_width, new_height, matrix, repeat);
 }
 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;
+  printf ("fa %x,%x fb %x,%x\n", format->direct.alpha, format->direct.alphaMask, new_format->direct.alpha, new_format->direct.alphaMask);//D
+  if (format->direct.alpha && !new_format->direct.alpha)
+    {
+      // 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);
   return img;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines