--- rxvt-unicode/src/background.C 2010/10/12 21:26:57 1.76 +++ rxvt-unicode/src/background.C 2010/10/18 10:49:19 1.86 @@ -5,6 +5,7 @@ * All portions of code are copyright by their respective author/s. * Copyright (c) 2005-2008 Marc Lehmann * Copyright (c) 2007 Sasha Vasko + * Copyright (c) 2010 Emanuele Giaquinta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ +#include #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ @@ -176,17 +178,6 @@ if (original_asim) return true; # endif -# ifdef ENABLE_TRANSPARENCY - if (flags & isTransparent) - { -# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways - if ((flags & blurNeeded) && !(flags & blurServerSide)) - return true; -# endif - if ((flags & tintNeeded) && !(flags & tintServerSide)) - return true; - } -# endif return false; } @@ -233,7 +224,7 @@ if (align >= 0 && align <= 100) return diff * align / 100; - else if (align > 100 && align <= 200 ) + else if (align > 100 && align <= 200) return ((align - 100) * smaller / 100) + window_size - smaller; else if (align >= -100 && align < 0) return ((align + 100) * smaller / 100) - image_size; @@ -479,8 +470,8 @@ } flags &= ~sizeSensitive; - if (h_scale != 0 || v_scale != 0 - || h_align != 0 || v_align != 0 + if ((flags & propScale) || h_scale || v_scale + || (!(flags & rootAlign) && (h_align || v_align)) || w > target_width || h > target_height) flags |= sizeSensitive; } @@ -746,9 +737,10 @@ if (!pixbuf) return false; - // TODO: add alpha blending +#if !XFT if (background_flags) return false; +#endif GdkPixbuf *result; @@ -790,14 +782,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 +864,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); @@ -894,17 +933,27 @@ # ifdef HAVE_AFTERIMAGE if (!target->asimman) target->asimman = create_generic_imageman (target->rs[Rs_path]); - original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); - if (original_asim) - have_image = true; - return have_image; + ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); + if (image) + { + if (original_asim) + safe_asimage_destroy (original_asim); + original_asim = image; + have_image = true; + return true; + } # endif # ifdef HAVE_PIXBUF - pixbuf = gdk_pixbuf_new_from_file (file, NULL); - if (pixbuf) - have_image = true; - return have_image; + GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); + if (image) + { + if (pixbuf) + g_object_unref (pixbuf); + pixbuf = image; + have_image = true; + return true; + } # endif } @@ -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,8 +1115,95 @@ return false; } +#if XFT +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); +} +#endif + +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, Window root, int width, int height) +bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) { Display *dpy = target->dpy; bool ret = false; @@ -1068,7 +1219,7 @@ gcv.foreground = Pixel (tint); gcv.function = GXand; gcv.fill_style = FillSolid; - gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); + gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv); if (gc) { XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); @@ -1098,19 +1249,19 @@ } XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); - XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); XRenderPictureAttributes pa; - Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); + Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); pa.repeat = True; - Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); + Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); XFreePixmap (dpy, overlay_pmap); pa.component_alpha = True; - Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); + Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); XFreePixmap (dpy, mask_pmap); @@ -1169,6 +1320,7 @@ int window_height = target->szHint.height; int sx, sy; XGCValues gcv; + GC gc; TIMING_TEST_START (tp); target->get_window_origin (sx, sy); @@ -1180,7 +1332,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 */ @@ -1192,85 +1344,30 @@ target->allowedxerror = 0; } + if (root_pixmap == None) + return 0; + Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); - GC gc = NULL; if (tiled_root_pmap == None) /* something really bad happened - abort */ return 0; - if (root_pixmap == None) - { - /* use tricks to obtain the root background image :*/ - /* we want to create Overrideredirect window overlapping out window - with background type of Parent Relative and then grab it */ - XSetWindowAttributes attr; - Window src; - bool success = false; - - attr.background_pixmap = ParentRelative; - attr.backing_store = Always; - attr.event_mask = ExposureMask; - attr.override_redirect = True; - src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, - CopyFromParent, CopyFromParent, CopyFromParent, - CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, - &attr); - - if (src != None) - { - XEvent event; - int ev_count = 0; - XGrabServer (dpy); - XMapRaised (dpy, src); - XSync (dpy, False); - - /* XSync should get window where it's properly exposed, - * but to be on the safe side - let's check for the actual event to arrive : */ - while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) - ++ev_count; - - if (ev_count > 0); - { - /* hooray! - we can grab the image! */ - gc = XCreateGC (dpy, root, 0, NULL); - if (gc) - { - XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); - success = true; - } - } - - XDestroyWindow (dpy, src); - XUngrabServer (dpy); - //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); - } + /* straightforward pixmap copy */ + gcv.tile = root_pixmap; + gcv.fill_style = FillTiled; + + while (sx < 0) sx += (int)root_width; + while (sy < 0) sy += (int)root_height; + + gcv.ts_x_origin = -sx; + gcv.ts_y_origin = -sy; + gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); - if (!success) - { - XFreePixmap (dpy, tiled_root_pmap); - tiled_root_pmap = None; - } - else - result |= transpPmapTiled; - } - else + if (gc) { - /* straightforward pixmap copy */ - gcv.tile = root_pixmap; - gcv.fill_style = FillTiled; - - while (sx < 0) sx += (int)root_width; - while (sy < 0) sy += (int)root_height; - - gcv.ts_x_origin = -sx; - gcv.ts_y_origin = -sy; - gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); - - if (gc) - { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); - result |= transpPmapTiled; - } + XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); + result |= transpPmapTiled; + XFreeGC (dpy, gc); } TIMING_TEST_PRINT_RESULT (tp); @@ -1278,9 +1375,14 @@ { if (!need_client_side_rendering ()) { - if ((flags & tintNeeded)) + if (flags & (blurNeeded | blurServerSide)) + { + if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) + result |= transpPmapBlurred; + } + if (flags & (tintNeeded | tintServerSide)) { - if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) + if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) result |= transpPmapTinted; } } /* server side rendering completed */ @@ -1294,9 +1396,6 @@ pmap_depth = root_depth; } - if (gc) - XFreeGC (dpy, gc); - TIMING_TEST_PRINT_RESULT (tp); return result; @@ -1530,7 +1629,7 @@ Visual *visual = term->visual; - if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; + if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; /* for convenience */ mask_r = visual->red_mask; @@ -1618,7 +1717,7 @@ } /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ - if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) + if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000)) { unsigned int tmp;