--- rxvt-unicode/src/background.C 2010/09/08 22:17:06 1.59 +++ rxvt-unicode/src/background.C 2010/10/14 17:39:42 1.83 @@ -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 */ @@ -106,6 +108,9 @@ h_scale = v_scale = 0; h_align = v_align = 0; #endif +#ifdef ENABLE_TRANSPARENCY + shade = 100; +#endif flags = 0; pixmap = None; valid_since = invalid_since = 0; @@ -140,8 +145,7 @@ # ifdef BG_IMAGE_FROM_FILE if (have_image) { - if (h_scale != 0 || v_scale != 0 - || h_align != 0 || v_align != 0) + if (flags & sizeSensitive) return true; } # endif @@ -160,7 +164,7 @@ # ifdef BG_IMAGE_FROM_FILE if (have_image) { - if (h_align == rootAlign || v_align == rootAlign) + if (flags & rootAlign) return true; } # endif @@ -174,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; } @@ -210,13 +203,10 @@ { if (geom_flags & flag) { - if (new_value != bgPixmap_t::rootAlign) - { - if (new_value < -100) - new_value = -100; - else if (new_value > 200) - new_value = 200; - } + if (new_value < -100) + new_value = -100; + else if (new_value > 200) + new_value = 200; if (new_value != align) { align = new_value; @@ -232,13 +222,11 @@ int diff = window_size - image_size; int smaller = min (image_size, window_size); - if (align >= 0 && align <= 50) + if (align >= 0 && align <= 100) return diff * align / 100; - else if (align > 50 && align <= 100) - return window_size - image_size - diff * (100 - align) / 100; else if (align > 100 && align <= 200 ) return ((align - 100) * smaller / 100) + window_size - smaller; - else if (align > -100 && align < 0) + else if (align >= -100 && align < 0) return ((align + 100) * smaller / 100) - image_size; return 0; } @@ -247,15 +235,14 @@ make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) { int src_pos = 0; - dst_pos = 0; + dst_pos = pos; dst_size = size; - if (pos < 0 && size > target_size) + if (pos < 0) { src_pos = -pos; + dst_pos = 0; dst_size += pos; } - else if (pos > 0) - dst_pos = pos; if (dst_pos + dst_size > target_size) dst_size = target_size - dst_pos; @@ -390,11 +377,6 @@ } else if (CHECK_GEOM_OPS ("propscale")) { - if (w == 0 && h == 0) - { - w = windowScale; - geom_flags |= WidthValue; - } new_flags |= propScale; } else if (CHECK_GEOM_OPS ("hscale")) @@ -426,9 +408,9 @@ } else if (CHECK_GEOM_OPS ("root")) { + new_flags |= rootAlign; w = h = noScale; - x = y = rootAlign; - geom_flags |= WidthValue|HeightValue|XValue|YValue; + geom_flags |= WidthValue|HeightValue; } # undef CHECK_GEOM_OPS @@ -459,21 +441,39 @@ int target_width = target->szHint.width; int target_height = target->szHint.height; - w = h_scale * target_width / 100; - h = v_scale * target_height / 100; + if (flags & propScale) + { + float scale = (float)target_width / image_width; + min_it (scale, (float)target_height / image_height); + w = image_width * scale + 0.5; + h = image_height * scale + 0.5; + } + else + { + w = h_scale * target_width / 100; + h = v_scale * target_height / 100; + } + + if (!w) w = image_width; + if (!h) h = image_height; - if (h_align == rootAlign || v_align == rootAlign) + if (flags & rootAlign) { target->get_window_origin (x, y); x = -x; y = -y; } + else + { + x = make_align_position (h_align, target_width, w); + y = make_align_position (v_align, target_height, h); + } - if (h_align != rootAlign) - x = make_align_position (h_align, target_width, w > 0 ? w : image_width); - - if (v_align != rootAlign) - y = make_align_position (v_align, target_height, h > 0 ? h : image_height); + flags &= ~sizeSensitive; + if (h_scale != 0 || v_scale != 0 + || h_align != 0 || v_align != 0 + || w > target_width || h > target_height) + flags |= sizeSensitive; } # ifdef HAVE_AFTERIMAGE @@ -495,7 +495,7 @@ if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) { ShadingInfo as_shade; - as_shade.shading = (shade == 0) ? 100 : shade; + as_shade.shading = shade; rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) @@ -507,7 +507,7 @@ background_tint = shading2tint32 (&as_shade); } - if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) + if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) { ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, @@ -538,10 +538,11 @@ get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); if (!original_asim - || x >= target_width - || y >= target_height - || (w > 0 && x + w <= 0) - || (h > 0 && y + h <= 0)) + || (!(flags & rootAlign) + && (x >= target_width + || y >= target_height + || (x + w <= 0) + || (y + h <= 0)))) { if (background) { @@ -565,12 +566,11 @@ { result = original_asim; - if ((w > 0 && w != original_asim->width) - || (h > 0 && h != original_asim->height)) + if ((w != original_asim->width) + || (h != original_asim->height)) { result = scale_asimage (target->asv, original_asim, - w > 0 ? w : original_asim->width, - h > 0 ? h : original_asim->height, + w, h, background ? ASA_ASImage : ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); } @@ -612,7 +612,7 @@ layers[0].tint = background_tint; layers[1].im = result; - if (w <= 0) + if (h_scale == 0 || v_scale == 0) { /* tile horizontally */ while (x > 0) x -= (int)result->width; @@ -626,7 +626,7 @@ layers[1].clip_width = result->width; } - if (h <= 0) + if (h_scale == 0 || v_scale == 0) { while (y > 0) y -= (int)result->height; layers[1].dst_y = y; @@ -737,9 +737,10 @@ if (!pixbuf) return false; - // TODO: add alpha blending +#if !XFT if (background_flags) return false; +#endif GdkPixbuf *result; @@ -758,20 +759,20 @@ get_image_geometry (image_width, image_height, w, h, x, y); - if (x >= target_width - || y >= target_height - || (w > 0 && x + w <= 0) - || (h > 0 && y + h <= 0)) + if (!(flags & rootAlign) + && (x >= target_width + || y >= target_height + || (x + w <= 0) + || (y + h <= 0))) return false; result = pixbuf; - if ((w > 0 && w != image_width) - || (h > 0 && h != image_height)) + if ((w != image_width) + || (h != image_height)) { result = gdk_pixbuf_scale_simple (pixbuf, - w > 0 ? w : image_width, - h > 0 ? h : image_height, + w, h, GDK_INTERP_BILINEAR); } @@ -781,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) @@ -854,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); @@ -885,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 } @@ -930,6 +988,9 @@ if (!(geom_flags & HeightValue)) vr = hr; + min_it (hr, 128); + min_it (vr, 128); + if (h_blurRadius != hr) { ++changed; @@ -947,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); } @@ -955,7 +1028,7 @@ { unsigned long flags = 0; rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); + bool has_shade = shade != 100; if (tint) { @@ -997,7 +1070,7 @@ bool bgPixmap_t::set_tint (rxvt_color &new_tint) { - if (tint != new_tint) + if (!(flags & tintSet) || tint != new_tint) { unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); tint = new_tint; @@ -1025,12 +1098,11 @@ bool bgPixmap_t::set_shade (const char *shade_str) { - int new_shade = (shade_str) ? atoi (shade_str) : 0; + int new_shade = (shade_str) ? atoi (shade_str) : 100; - if (new_shade < 0 && new_shade > -100) + clamp_it (new_shade, -100, 200); + if (new_shade < 0) new_shade = 200 - (100 + new_shade); - else if (new_shade == 100) - new_shade = 0; if (new_shade != shade) { @@ -1043,6 +1115,183 @@ 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) +{ + Display *dpy = target->dpy; + bool ret = false; + + if (flags & tintWholesome) + { + XGCValues gcv; + GC gc; + + /* In this case we can tint image server-side getting significant + * performance improvements, as we eliminate XImage transfer + */ + gcv.foreground = Pixel (tint); + gcv.function = GXand; + gcv.fill_style = FillSolid; + gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv); + if (gc) + { + XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); + ret = true; + XFreeGC (dpy, gc); + } + } + else + { +# if XFT + rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + + if (flags & tintSet) + tint.get (c); + + if (shade <= 100) + { + c.r = (c.r * shade) / 100; + c.g = (c.g * shade) / 100; + c.b = (c.b * shade) / 100; + } + else + { + c.r = ((0xffff - c.r) * (200 - shade)) / 100; + c.g = ((0xffff - c.g) * (200 - shade)) / 100; + c.b = ((0xffff - c.b) * (200 - shade)) / 100; + } + + XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); + XRenderPictureAttributes pa; + + Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + + pa.repeat = True; + + 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, pixmap, 1, 1, 32); + Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); + XFreePixmap (dpy, mask_pmap); + + if (mask_pic && overlay_pic && back_pic) + { + XRenderColor mask_c; + + memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); + mask_c.alpha = 0xffff; + XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); + + mask_c.alpha = 0; + mask_c.red = 0xffff - c.r; + mask_c.green = 0xffff - c.g; + mask_c.blue = 0xffff - c.b; + XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); + XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); + ret = true; + } + + XRenderFreePicture (dpy, mask_pic); + XRenderFreePicture (dpy, overlay_pic); + XRenderFreePicture (dpy, back_pic); +# if DO_TIMING_TEST + XSync (dpy, False); +# endif +# endif + } + + return ret; +} + /* make_transparency_pixmap() * Builds a pixmap sized the same as terminal window, with depth same as the root window * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by @@ -1069,6 +1318,7 @@ int window_height = target->szHint.height; int sx, sy; XGCValues gcv; + GC gc; TIMING_TEST_START (tp); target->get_window_origin (sx, sy); @@ -1080,7 +1330,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 */ @@ -1092,85 +1342,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); @@ -1178,106 +1373,15 @@ { if (!need_client_side_rendering ()) { - if ((flags & tintNeeded)) + if (flags & (blurNeeded | blurServerSide)) { - if (flags & tintWholesome) - { - /* In this case we can tint image server-side getting significant - * performance improvements, as we eliminate XImage transfer - */ - gcv.foreground = Pixel (tint); - gcv.function = GXand; - gcv.fill_style = FillSolid; - if (gc) - XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv); - else - gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); - if (gc) - { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); - result |= transpPmapTinted; - } - } - else - { -# if XFT - Picture back_pic = 0; - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - - if (flags & tintSet) - tint.get (c); - - if (shade > 0 && shade < 100) - { - c.r = (c.r * shade) / 100; - c.g = (c.g * shade) / 100; - c.b = (c.b * shade) / 100; - } - else if (shade > 100 && shade < 200) - { - c.r = (c.r * (200 - shade)) / 100; - c.g = (c.g * (200 - shade)) / 100; - c.b = (c.b * (200 - shade)) / 100; - } - - XRenderPictFormat pf; - pf.type = PictTypeDirect; - pf.depth = 32; - pf.direct.redMask = 0xff; - pf.direct.greenMask = 0xff; - pf.direct.blueMask = 0xff; - pf.direct.alphaMask = 0xff; - - XRenderPictFormat *solid_format = XRenderFindFormat (dpy, - (PictFormatType| - PictFormatDepth| - PictFormatRedMask| - PictFormatGreenMask| - PictFormatBlueMask| - PictFormatAlphaMask), - &pf, - 0); - XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); - XRenderPictureAttributes pa ; - - back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); - - pa.repeat = True; - - Pixmap overlay_pmap = XCreatePixmap (dpy, root, 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); - Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); - XFreePixmap (dpy, mask_pmap); - - if (mask_pic && overlay_pic && back_pic) - { - XRenderColor mask_c; - - memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); - mask_c.alpha = 0xffff; - XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); - - mask_c.alpha = 0; - mask_c.red = 0xffff - c.r; - mask_c.green = 0xffff - c.g; - mask_c.blue = 0xffff - c.b; - XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); - XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); - result |= transpPmapTinted; - } - - XRenderFreePicture (dpy, mask_pic); - XRenderFreePicture (dpy, overlay_pic); - XRenderFreePicture (dpy, back_pic); -# if DO_TIMING_TEST - XSync (dpy, False); -# endif -# endif - } + 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, DefaultVisual (dpy, target->display->screen), window_width, window_height)) + result |= transpPmapTinted; } } /* server side rendering completed */ @@ -1290,9 +1394,6 @@ pmap_depth = root_depth; } - if (gc) - XFreeGC (dpy, gc); - TIMING_TEST_PRINT_RESULT (tp); return result; @@ -1528,9 +1629,6 @@ if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; - if (shade == 0) - shade = 100; - /* for convenience */ mask_r = visual->red_mask; mask_g = visual->green_mask; @@ -1595,10 +1693,8 @@ } /* prepare limits for color transformation (each channel is handled separately) */ - if (shade < 0) { - shade = -shade; - if (shade < 0) shade = 0; - if (shade > 100) shade = 100; + if (shade > 100) { + shade = 200 - shade; lower_lim_r = 65535-rm; lower_lim_g = 65535-gm; @@ -1610,8 +1706,6 @@ upper_lim_r = upper_lim_g = upper_lim_b = 65535; } else { - if (shade < 0) shade = 0; - if (shade > 100) shade = 100; lower_lim_r = lower_lim_g = lower_lim_b = 0;