--- rxvt-unicode/src/background.C 2011/12/29 16:45:22 1.189 +++ rxvt-unicode/src/background.C 2012/01/10 18:50:14 1.196 @@ -34,6 +34,10 @@ #define FilterConvolution "convolution" #endif +#ifndef RepeatPad +#define RepeatPad True +#endif + #ifdef HAVE_BG_PIXMAP # if XRENDER static Picture @@ -394,8 +398,9 @@ ShadingInfo as_shade; as_shade.shading = shade; - rgba c; - tint.get (c); + 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; @@ -821,23 +826,22 @@ #if XRENDER if (tr_flags) { - 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); 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); @@ -959,7 +963,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; @@ -975,27 +979,27 @@ bg_flags &= ~BG_TINT_FLAGS; - tint.get (c); + if (bg_flags & BG_TINT_SET) + { + 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 <= 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 (has_shade || (bg_flags & BG_TINT_SET)) 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; set_tint_shade_flags (); return true; } @@ -1046,7 +1050,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 @@ -1060,45 +1064,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); + 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); - } + 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; } @@ -1138,9 +1141,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) { @@ -1156,9 +1160,8 @@ } XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); - XRenderPictureAttributes pa; - Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0); Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); @@ -1177,12 +1180,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); @@ -1255,13 +1261,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); @@ -1306,7 +1310,7 @@ { if (bg_flags & BG_NEEDS_BLUR) { - if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) + if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth)) result &= ~BG_NEEDS_BLUR; } if (bg_flags & BG_NEEDS_TINT) @@ -1397,8 +1401,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 @@ -1511,9 +1513,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)