--- rxvt-unicode/src/rxvtimg.C 2012/06/05 15:18:23 1.22 +++ rxvt-unicode/src/rxvtimg.C 2012/06/06 18:13:03 1.26 @@ -67,6 +67,8 @@ img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0); + g_object_unref (pb); + return img; } @@ -214,6 +216,9 @@ 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 @@ -234,6 +239,9 @@ 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); } bool @@ -288,18 +296,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++) @@ -311,9 +307,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 { @@ -447,5 +443,31 @@ 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