--- rxvt-unicode/src/background.C 2012/01/01 14:31:29 1.193 +++ rxvt-unicode/src/background.C 2012/04/10 15:08:47 1.203 @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ -#include +#include #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ @@ -34,6 +34,10 @@ #define FilterConvolution "convolution" #endif +#ifndef RepeatPad +#define RepeatPad True +#endif + #ifdef HAVE_BG_PIXMAP # if XRENDER static Picture @@ -56,15 +60,6 @@ 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); @@ -127,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) { @@ -189,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; } @@ -199,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) @@ -319,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; } @@ -376,241 +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; - 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, @@ -696,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; @@ -751,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; @@ -819,7 +552,7 @@ } #if XRENDER - if (tr_flags) + if (transparent) { XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); @@ -853,7 +586,7 @@ if (result != pixbuf) g_object_unref (result); - if (tr_flags) + if (transparent) XFreePixmap (dpy, root_pmap); return ret; @@ -878,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) @@ -969,32 +688,29 @@ void rxvt_term::set_tint_shade_flags () { - rgba c; - bool has_shade = shade != 100; - - bg_flags &= ~BG_TINT_FLAGS; - - tint.get (c); - - if (!has_shade - && (c.r <= 0x00ff || c.r >= 0xff00) - && (c.g <= 0x00ff || c.g >= 0xff00) - && (c.b <= 0x00ff || c.b >= 0xff00)) - bg_flags |= BG_TINT_BITAND; - - if (has_shade - || c.r < 0xff00 - || c.g < 0xff00 - || c.b < 0xff00) + if (shade != 100 || (bg_flags & BG_TINT_SET)) bg_flags |= BG_NEEDS_TINT; + else + bg_flags &= ~BG_NEEDS_TINT; } bool rxvt_term::bg_set_tint (rxvt_color &new_tint) { - if (tint != new_tint) + if (!(bg_flags & BG_TINT_SET) || tint != new_tint) { tint = new_tint; + bg_flags |= BG_TINT_SET; + + rgba c; + tint.get (c); + if ((c.r <= 0x00ff || c.r >= 0xff00) + && (c.g <= 0x00ff || c.g >= 0xff00) + && (c.b <= 0x00ff || c.b >= 0xff00)) + bg_flags |= BG_TINT_BITAND; + else + bg_flags &= ~BG_TINT_BITAND; + set_tint_shade_flags (); return true; } @@ -1045,7 +761,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 @@ -1056,10 +772,14 @@ double *kernel = (double *)malloc (size * sizeof (double)); XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); + XRenderPictureAttributes pa; XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); - Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0); - Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0); + 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) { @@ -1077,6 +797,8 @@ 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]); @@ -1108,7 +830,7 @@ { bool ret = false; - if (bg_flags & BG_TINT_BITAND) + if (shade == 100 && (bg_flags & BG_TINT_BITAND)) { XGCValues gcv; GC gc; @@ -1130,9 +852,10 @@ # if XRENDER else if (bg_flags & BG_HAS_RENDER) { - rgba c; + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - tint.get (c); + if (bg_flags & BG_TINT_SET) + tint.get (c); if (shade <= 100) { @@ -1198,10 +921,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 : @@ -1292,22 +1015,22 @@ if (gc) { XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); - result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); + 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; } -# ifndef HAVE_AFTERIMAGE - if (result & 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) @@ -1319,7 +1042,6 @@ XDestroyImage (ximage); } } -# endif } /* server side rendering completed */ XFreeGC (dpy, gc); @@ -1328,7 +1050,7 @@ if (recoded_root_pmap != root_pixmap) XFreePixmap (dpy, recoded_root_pmap); - return result; + return ret; } void @@ -1345,25 +1067,23 @@ 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 @@ -1389,8 +1109,6 @@ rxvt_term::bg_init () { #ifdef ENABLE_TRANSPARENCY - rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - tint.set (this, c); shade = 100; #endif @@ -1413,7 +1131,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 @@ -1503,9 +1221,10 @@ return; /* we do not support this color depth */ } - rgba c; + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - tint.get (c); + if (bg_flags & BG_TINT_SET) + tint.get (c); /* prepare limits for color transformation (each channel is handled separately) */ if (shade > 100) @@ -1568,4 +1287,4 @@ free (lookup); } -#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ +#endif /* ENABLE_TRANSPARENCY */