--- rxvt-unicode/src/background.C 2010/10/12 22:14:04 1.77 +++ rxvt-unicode/src/background.C 2010/10/13 23:04:57 1.80 @@ -21,6 +21,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ +#include #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ @@ -179,7 +180,7 @@ # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) { -# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways +# ifdef HAVE_AFTERIMAGE if ((flags & blurNeeded) && !(flags & blurServerSide)) return true; # endif @@ -746,9 +747,10 @@ if (!pixbuf) return false; - // TODO: add alpha blending +#if !XFT if (background_flags) return false; +#endif GdkPixbuf *result; @@ -790,14 +792,23 @@ { XGCValues gcv; GC gc; + Pixmap root_pmap; image_width = gdk_pixbuf_get_width (result); image_height = gdk_pixbuf_get_height (result); - if (h_scale == 0 || v_scale == 0) + if (background_flags) { - new_pmap_width = min (image_width, target_width); - new_pmap_height = min (image_height, target_height); + root_pmap = pixmap; + pixmap = None; + } + else + { + if (h_scale == 0 || v_scale == 0) + { + new_pmap_width = min (image_width, target_width); + new_pmap_height = min (image_height, target_height); + } } if (pixmap) @@ -863,6 +874,44 @@ 0, 0); } +#if XFT + if (background_flags) + { + Display *dpy = target->dpy; + XRenderPictureAttributes pa; + + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); + Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); + + XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); + Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); + + pa.repeat = True; + Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); + XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); + Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); + XFreePixmap (dpy, mask_pmap); + + if (src && dst && mask) + { + XRenderColor mask_c; + + mask_c.alpha = 0x8000; + mask_c.red = 0; + mask_c.green = 0; + 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, target_width, target_height); + } + + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); + XRenderFreePicture (dpy, mask); + + XFreePixmap (dpy, root_pmap); + } +#endif + if (result != pixbuf) g_object_unref (result); @@ -939,6 +988,9 @@ if (!(geom_flags & HeightValue)) vr = hr; + min_it (hr, 128); + min_it (vr, 128); + if (h_blurRadius != hr) { ++changed; @@ -956,6 +1008,18 @@ else flags |= blurNeeded; +#if XFT + XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); + if (filters) + { + for (int i = 0; i < filters->nfilter; i++) + if (!strcmp (filters->filter[i], FilterConvolution)) + flags |= bgPixmap_t::blurServerSide; + + XFree (filters); + } +#endif + return (changed > 0); } @@ -1051,6 +1115,91 @@ return false; } +static void +get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) +{ + double sigma = radius / 2.0; + double scale = sqrt (2.0 * M_PI) * sigma; + double sum = 0.0; + + for (int i = 0; i < width; i++) + { + double x = i - width / 2; + kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; + sum += kernel[i]; + } + + params[0] = XDoubleToFixed (width); + params[1] = XDoubleToFixed (1); + + for (int i = 0; i < width; i++) + params[i+2] = XDoubleToFixed (kernel[i] / sum); +} + +bool +bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) +{ + bool ret = false; +#if XFT + int size = max (h_blurRadius, v_blurRadius) * 2 + 1; + double *kernel = (double *)malloc (size * sizeof (double)); + XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); + + Display *dpy = target->dpy; + XRenderPictureAttributes pa; + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); + + Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + + if (kernel && params && src && dst) + { + if (h_blurRadius) + { + size = h_blurRadius * 2 + 1; + get_gaussian_kernel (h_blurRadius, size, kernel, params); + + XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); + XRenderComposite (dpy, + PictOpSrc, + src, + None, + dst, + 0, 0, + 0, 0, + 0, 0, + width, height); + } + + if (v_blurRadius) + { + size = v_blurRadius * 2 + 1; + get_gaussian_kernel (v_blurRadius, size, kernel, params); + swap (params[0], params[1]); + + XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); + XRenderComposite (dpy, + PictOpSrc, + src, + None, + dst, + 0, 0, + 0, 0, + 0, 0, + width, height); + } + + ret = true; + } + + free (kernel); + free (params); + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); +#endif + return ret; +} + bool bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) { @@ -1180,7 +1329,7 @@ if (root_pixmap != None) { - /* we want to validate the pixmap and get it's size at the same time : */ + /* we want to validate the pixmap and get its size at the same time : */ int junk; unsigned int ujunk; /* root pixmap may be bad - allow a error */ @@ -1278,6 +1427,11 @@ { if (!need_client_side_rendering ()) { + if ((flags & blurNeeded)) + { + if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) + result |= transpPmapBlurred; + } if ((flags & tintNeeded)) { if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))