--- rxvt-unicode/src/background.C 2011/12/26 14:53:56 1.185 +++ rxvt-unicode/src/background.C 2012/02/25 22:20:47 1.202 @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ -#include +#include #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ @@ -34,19 +34,32 @@ #define FilterConvolution "convolution" #endif +#ifndef RepeatPad +#define RepeatPad True +#endif + #ifdef HAVE_BG_PIXMAP +# if XRENDER +static Picture +create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) +{ + Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); + + XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); + XRenderPictureAttributes pa; + pa.repeat = True; + pa.component_alpha = component_alpha; + Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa); + + XFreePixmap (dpy, pixmap); + + return mask; +} +# endif + void rxvt_term::bg_destroy () { -#ifdef HAVE_AFTERIMAGE - if (original_asim) - safe_asimage_destroy (original_asim); - if (asv) - destroy_asvisual (asv, 0); - if (asimman) - destroy_image_manager (asimman, 0); -#endif - #ifdef HAVE_PIXBUF if (pixbuf) g_object_unref (pixbuf); @@ -109,40 +122,6 @@ } # ifdef BG_IMAGE_FROM_FILE -static inline bool -check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) -{ - if (geom_flags & flag) - { - if (new_value > 1000) - new_value = 1000; - if (new_value != scale) - { - scale = new_value; - return true; - } - } - return false; -} - -static inline bool -check_set_align_value (int geom_flags, int flag, int &align, int new_value) -{ - if (geom_flags & flag) - { - if (new_value < -100) - new_value = -100; - else if (new_value > 200) - new_value = 200; - if (new_value != align) - { - align = new_value; - return true; - } - } - return false; -} - static inline int make_align_position (int align, int window_size, int image_size) { @@ -171,8 +150,7 @@ dst_size += pos; } - if (dst_pos + dst_size > target_size) - dst_size = target_size - dst_pos; + min_it (dst_size, target_size - dst_pos); return src_pos; } @@ -181,8 +159,10 @@ { bool changed = false; int geom_flags = 0; - int x = 0, y = 0; - unsigned int w = 0, h = 0; + int x = h_align; + int y = v_align; + unsigned int w = h_scale; + unsigned int h = v_scale; unsigned long new_flags = 0; if (geom == NULL) @@ -301,18 +281,24 @@ h = w; else if (!(geom_flags & WidthValue)) w = h; - - geom_flags |= WidthValue|HeightValue|XValue|YValue; } - if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; - if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; - if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; - if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; - - if (new_flags != bg_flags) + min_it (w, 1000); + min_it (h, 1000); + clamp_it (x, -100, 200); + clamp_it (y, -100, 200); + + if (bg_flags != new_flags + || h_scale != w + || v_scale != h + || h_align != x + || v_align != y) { bg_flags = new_flags; + h_scale = w; + v_scale = h; + h_align = x; + v_align = y; changed = true; } @@ -358,242 +344,6 @@ bg_flags |= BG_IS_SIZE_SENSITIVE; } -# ifdef HAVE_AFTERIMAGE -bool -rxvt_term::render_image (unsigned long tr_flags) -{ - init_asv (); - - ASImage *background = NULL; - ARGB32 background_tint = TINT_LEAVE_SAME; - -# ifdef ENABLE_TRANSPARENCY - if (tr_flags) - background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100); - - if (tr_flags & BG_NEEDS_TINT) - { - ShadingInfo as_shade; - as_shade.shading = shade; - - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (bg_flags & BG_TINT_SET) - tint.get (c); - as_shade.tintColor.red = c.r; - as_shade.tintColor.green = c.g; - as_shade.tintColor.blue = c.b; - - background_tint = shading2tint32 (&as_shade); - } - - if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) - { - ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, - ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - { - destroy_asimage (&background); - background = tmp; - } - } -# endif - - ASImage *result = 0; - - int target_width = szHint.width; - int target_height = szHint.height; - int new_pmap_width = target_width; - int new_pmap_height = target_height; - - int x = 0; - int y = 0; - int w = 0; - int h = 0; - - if (original_asim) - get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); - - if (!original_asim - || (!(bg_flags & BG_ROOT_ALIGN) - && (x >= target_width - || y >= target_height - || x + w <= 0 - || y + h <= 0))) - { - if (background) - { - new_pmap_width = background->width; - new_pmap_height = background->height; - result = background; - - if (background_tint != TINT_LEAVE_SAME) - { - ASImage *tmp = tile_asimage (asv, background, 0, 0, - target_width, target_height, background_tint, - ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - result = tmp; - } - } - else - new_pmap_width = new_pmap_height = 0; - } - else - { - result = original_asim; - - if (w != original_asim->width - || h != original_asim->height) - { - result = scale_asimage (asv, original_asim, - w, h, - ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); - } - - if (background == NULL) - { - if (bg_flags & BG_TILE) - { - /* if tiling - pixmap has to be sized exactly as the image, - but there is no need to make it bigger than the window! */ - new_pmap_width = min (result->width, target_width); - new_pmap_height = min (result->height, target_height); - - /* we also need to tile our image in both directions */ - ASImage *tmp = tile_asimage (asv, result, - (int)result->width - x, - (int)result->height - y, - new_pmap_width, - new_pmap_height, - TINT_LEAVE_SAME, ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - { - if (result != original_asim) - destroy_asimage (&result); - - result = tmp; - } - } - } - else - { - /* if blending background and image - pixmap has to be sized same as target window */ - ASImageLayer *layers = create_image_layers (2); - - layers[0].im = background; - layers[0].clip_width = target_width; - layers[0].clip_height = target_height; - layers[0].tint = background_tint; - layers[1].im = result; - - if (bg_flags & BG_TILE) - { - /* tile horizontally */ - while (x > 0) x -= (int)result->width; - layers[1].dst_x = x; - layers[1].clip_width = result->width+target_width; - } - else - { - /* clip horizontally */ - layers[1].dst_x = x; - layers[1].clip_width = result->width; - } - - if (bg_flags & BG_TILE) - { - while (y > 0) y -= (int)result->height; - layers[1].dst_y = y; - layers[1].clip_height = result->height + target_height; - } - else - { - layers[1].dst_y = y; - layers[1].clip_height = result->height; - } - - if (rs[Rs_blendtype]) - { - layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]); - if (layers[1].merge_scanlines == NULL) - layers[1].merge_scanlines = alphablend_scanlines; - } - - ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height, - ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); - - if (tmp) - { - if (result != original_asim) - destroy_asimage (&result); - - result = tmp; - } - - free (layers); - } - } - - bool ret = false; - - if (result) - { - XGCValues gcv; - GC gc; - - /* create Pixmap */ - if (bg_pixmap == None - || bg_pmap_width != new_pmap_width - || bg_pmap_height != new_pmap_height) - { - if (bg_pixmap) - XFreePixmap (dpy, bg_pixmap); - bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); - bg_pmap_width = new_pmap_width; - bg_pmap_height = new_pmap_height; - } - /* fill with background color (if result's not completely overlapping it) */ - gcv.foreground = pix_colors[Color_bg]; - gc = XCreateGC (dpy, vt, GCForeground, &gcv); - - int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; - int dst_width = result->width, dst_height = result->height; - if (background == NULL) - { - if (!(bg_flags & BG_TILE)) - { - src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); - src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); - } - - if (dst_x > 0 || dst_y > 0 - || dst_x + dst_width < new_pmap_width - || dst_y + dst_height < new_pmap_height) - XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); - } - - /* put result on pixmap */ - if (dst_x < new_pmap_width && dst_y < new_pmap_height) - asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); - - if (result != background && result != original_asim) - destroy_asimage (&result); - - XFreeGC (dpy, gc); - - ret = true; - } - - if (background) - destroy_asimage (&background); - - return ret; -} -# endif /* HAVE_AFTERIMAGE */ - # ifdef HAVE_PIXBUF bool rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, @@ -679,12 +429,12 @@ } bool -rxvt_term::render_image (unsigned long tr_flags) +rxvt_term::render_image (bool transparent) { if (!pixbuf) return false; - if (tr_flags + if (transparent && !(bg_flags & BG_HAS_RENDER)) return false; @@ -734,7 +484,7 @@ image_width = gdk_pixbuf_get_width (result); image_height = gdk_pixbuf_get_height (result); - if (tr_flags) + if (transparent) { root_pmap = bg_pixmap; bg_pixmap = None; @@ -802,29 +552,24 @@ } #if XRENDER - if (tr_flags) + if (transparent) { - XRenderPictureAttributes pa; + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); - XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); - Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); + Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); - XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); - Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); + Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0); - pa.repeat = True; - Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); - XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); - Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); - XFreePixmap (dpy, mask_pmap); + Picture mask = create_xrender_mask (dpy, vt, False, False); XRenderColor mask_c; mask_c.alpha = 0x8000; - mask_c.red = 0; - mask_c.green = 0; - mask_c.blue = 0; + 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, target_width, target_height); XRenderFreePicture (dpy, src); @@ -841,7 +586,7 @@ if (result != pixbuf) g_object_unref (result); - if (tr_flags) + if (transparent) XFreePixmap (dpy, root_pmap); return ret; @@ -866,20 +611,6 @@ file = f; } -# ifdef HAVE_AFTERIMAGE - if (!asimman) - asimman = create_generic_imageman (rs[Rs_path]); - ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100); - if (image) - { - if (original_asim) - safe_asimage_destroy (original_asim); - original_asim = image; - bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; - ret = true; - } -# endif - # ifdef HAVE_PIXBUF GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); if (image) @@ -946,7 +677,7 @@ v_blurRadius = vr; } - if (v_blurRadius == 0 && h_blurRadius == 0) + if (h_blurRadius == 0 || v_blurRadius == 0) bg_flags &= ~BG_NEEDS_BLUR; else bg_flags |= BG_NEEDS_BLUR; @@ -993,7 +724,7 @@ bool rxvt_term::bg_set_shade (const char *shade_str) { - int new_shade = (shade_str) ? atoi (shade_str) : 100; + int new_shade = atoi (shade_str); clamp_it (new_shade, -100, 200); if (new_shade < 0) @@ -1033,7 +764,7 @@ #endif bool -rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) +rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) { bool ret = false; #if XRENDER @@ -1047,45 +778,44 @@ XRenderPictureAttributes pa; XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); - Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); - Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + pa.repeat = RepeatPad; + Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); + Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth); + Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa); + XFreePixmap (dpy, tmp); if (kernel && params) { - 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); - } + size = h_blurRadius * 2 + 1; + get_gaussian_kernel (h_blurRadius, size, kernel, params); - 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); - } + XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); + XRenderComposite (dpy, + PictOpSrc, + src, + None, + dst, + 0, 0, + 0, 0, + 0, 0, + width, height); + + ::swap (src, dst); + + 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; } @@ -1143,22 +873,13 @@ c.b = 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; + Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0); - Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); - Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); - XFreePixmap (dpy, overlay_pmap); + Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); - 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); + Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True); XRenderColor mask_c; @@ -1173,12 +894,15 @@ 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); if (shade > 100) { - mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100; mask_c.alpha = 0; + mask_c.red = + mask_c.green = + mask_c.blue = 0xffff * (shade - 100) / 100; XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); @@ -1200,10 +924,10 @@ * the tiled portion of the root pixmap that is supposed to be covered by * our window. */ -unsigned long +bool rxvt_term::make_transparency_pixmap () { - unsigned long result = 0; + bool ret = false; /* root dimensions may change from call to call - but Display structure should * be always up-to-date, so let's use it : @@ -1251,13 +975,11 @@ { recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); - XRenderPictureAttributes pa; - XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); - Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); + Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0); XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); - Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); + Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0); XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); @@ -1296,28 +1018,42 @@ if (gc) { XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); - result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); - XFreeGC (dpy, gc); + ret = true; + unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS; if (!(bg_flags & BG_CLIENT_RENDER)) { if (bg_flags & BG_NEEDS_BLUR) { - if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) - result &= ~BG_NEEDS_BLUR; + if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth)) + tr_flags &= ~BG_NEEDS_BLUR; } if (bg_flags & BG_NEEDS_TINT) { if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) - result &= ~BG_NEEDS_TINT; + tr_flags &= ~BG_NEEDS_TINT; + } + if (tr_flags & BG_NEEDS_TINT) + { + XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); + if (ximage) + { + /* our own client-side tinting */ + tint_ximage (DefaultVisual (dpy, display->screen), ximage); + + XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); + XDestroyImage (ximage); + } } } /* server side rendering completed */ + + XFreeGC (dpy, gc); } if (recoded_root_pmap != root_pixmap) XFreePixmap (dpy, recoded_root_pmap); - return result; + return ret; } void @@ -1334,57 +1070,27 @@ bool rxvt_term::bg_render () { - unsigned long tr_flags = 0; + bool transparent = false; bg_invalidate (); # ifdef ENABLE_TRANSPARENCY if (bg_flags & BG_IS_TRANSPARENT) { /* we need to re-generate transparency pixmap in that case ! */ - tr_flags = make_transparency_pixmap (); - if (tr_flags == 0) - return false; - bg_flags |= BG_IS_VALID; + transparent = make_transparency_pixmap (); + if (transparent) + bg_flags |= BG_IS_VALID; } # endif # ifdef BG_IMAGE_FROM_FILE - if ((bg_flags & BG_IS_FROM_FILE) - || (tr_flags & BG_EFFECTS_FLAGS)) + if (bg_flags & BG_IS_FROM_FILE) { - if (render_image (tr_flags)) + if (render_image (transparent)) bg_flags |= BG_IS_VALID; } # endif -# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) - XImage *result = NULL; - - if (tr_flags & BG_NEEDS_TINT) - { - result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); - } - - if (result) - { - /* our own client-side tinting */ - //if (tr_flags & BG_NEEDS_TINT) - if (1) - tint_ximage (DefaultVisual (dpy, display->screen), result); - - GC gc = XCreateGC (dpy, vt, 0UL, NULL); - - if (gc) - { - XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); - - XFreeGC (dpy, gc); - } - - XDestroyImage (result); - } -# endif - if (!(bg_flags & BG_IS_VALID)) { if (bg_pixmap != None) @@ -1428,7 +1134,7 @@ #endif /* HAVE_BG_PIXMAP */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) +#ifdef ENABLE_TRANSPARENCY /* based on code from aterm-0.4.2 */ static inline void @@ -1584,4 +1290,4 @@ free (lookup); } -#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ +#endif /* ENABLE_TRANSPARENCY */