--- rxvt-unicode/src/background.C 2010/10/22 18:03:10 1.97 +++ rxvt-unicode/src/background.C 2010/11/11 11:58:10 1.116 @@ -26,6 +26,10 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#if XRENDER +# include +#endif + #define DO_TIMING_TEST 0 #if DO_TIMING_TEST @@ -252,7 +256,8 @@ bool bgPixmap_t::set_geometry (const char *geom) { - int geom_flags = 0, changed = 0; + bool changed = false; + int geom_flags = 0; int x = 0, y = 0; unsigned int w = 0, h = 0; unsigned int n; @@ -418,19 +423,19 @@ } /* done parsing ops */ } - if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; - if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; - if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; - if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; + 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 != flags) { flags = new_flags; - changed++; + changed = true; } - return (changed > 0); + return changed; } void @@ -663,20 +668,14 @@ XGCValues gcv; GC gc; - if (pixmap) - { - if (pmap_width != new_pmap_width - || pmap_height != new_pmap_height - || pmap_depth != target->depth) - { - XFreePixmap (target->dpy, pixmap); - pixmap = None; - } - } - /* create Pixmap */ - if (pixmap == None) + if (pixmap == None + || pmap_width != new_pmap_width + || pmap_height != new_pmap_height + || pmap_depth != target->depth) { + if (pixmap) + XFreePixmap (target->dpy, pixmap); pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); pmap_width = new_pmap_width; pmap_height = new_pmap_height; @@ -731,10 +730,9 @@ if (!pixbuf) return false; -#if !XFT - if (background_flags) + if (background_flags + && !(flags & HAS_RENDER)) return false; -#endif GdkPixbuf *result; @@ -795,19 +793,13 @@ } } - if (pixmap) - { - if (pmap_width != new_pmap_width - || pmap_height != new_pmap_height - || pmap_depth != target->depth) - { - XFreePixmap (target->dpy, pixmap); - pixmap = None; - } - } - - if (pixmap == None) + if (pixmap == None + || pmap_width != new_pmap_width + || pmap_height != new_pmap_height + || pmap_depth != target->depth) { + if (pixmap) + XFreePixmap (target->dpy, pixmap); pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); pmap_width = new_pmap_width; pmap_height = new_pmap_height; @@ -858,13 +850,13 @@ 0, 0); } -#if XFT +#if XRENDER if (background_flags) { Display *dpy = target->dpy; XRenderPictureAttributes pa; - XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual); Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); @@ -911,45 +903,43 @@ bool bgPixmap_t::set_file (const char *file) { - assert (file); + if (!file || !*file) + return false; - if (*file) + if (const char *p = strchr (file, ';')) { - if (const char *p = strchr (file, ';')) - { - size_t len = p - file; - char *f = rxvt_temp_buf (len + 1); - memcpy (f, file, len); - f[len] = '\0'; - file = f; - } + size_t len = p - file; + char *f = rxvt_temp_buf (len + 1); + memcpy (f, file, len); + f[len] = '\0'; + file = f; + } # ifdef HAVE_AFTERIMAGE - if (!target->asimman) - target->asimman = create_generic_imageman (target->rs[Rs_path]); - 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; - } + if (!target->asimman) + target->asimman = create_generic_imageman (target->rs[Rs_path]); + 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 - 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 + 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 return false; } @@ -972,7 +962,7 @@ bool bgPixmap_t::set_blur_radius (const char *geom) { - int changed = 0; + bool changed = false; unsigned int hr, vr; int junk; int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); @@ -987,13 +977,13 @@ if (h_blurRadius != hr) { - ++changed; + changed = true; h_blurRadius = hr; } if (v_blurRadius != vr) { - ++changed; + changed = true; v_blurRadius = vr; } @@ -1002,19 +992,7 @@ 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); + return changed; } static inline unsigned long @@ -1046,18 +1024,6 @@ } } - if (flags & bgPixmap_t::tintNeeded) - { - if (flags & bgPixmap_t::tintWholesome) - flags |= bgPixmap_t::tintServerSide; - else - { -#if XFT - flags |= bgPixmap_t::tintServerSide; -#endif - } - } - return flags; } @@ -1109,7 +1075,7 @@ return false; } -#if XFT +#if XRENDER static void get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) { @@ -1136,7 +1102,7 @@ bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) { bool ret = false; -#if XFT +#if XRENDER int size = max (h_blurRadius, v_blurRadius) * 2 + 1; double *kernel = (double *)malloc (size * sizeof (double)); XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); @@ -1223,7 +1189,7 @@ } else { -# if XFT +# if XRENDER rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) @@ -1263,7 +1229,7 @@ { XRenderColor mask_c; - memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); + mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; mask_c.alpha = 0xffff; XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); @@ -1286,8 +1252,8 @@ } /* 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 + * Builds a pixmap of the same size as the terminal window that contains + * the tiled portion of the root pixmap that is supposed to be covered by * our window. */ unsigned long @@ -1301,9 +1267,9 @@ /* root dimensions may change from call to call - but Display structure should * be always up-to-date, so let's use it : */ - Window root = target->display->root; int screen = target->display->screen; Display *dpy = target->dpy; + int root_depth = DefaultDepth (dpy, screen); int root_width = DisplayWidth (dpy, screen); int root_height = DisplayHeight (dpy, screen); unsigned int root_pmap_width, root_pmap_height; @@ -1320,30 +1286,63 @@ || sx >= root_width || sy >= root_height) return 0; + // validate root pixmap and get its size if (root_pixmap != None) { - /* 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 */ + Window wdummy; + int idummy; + unsigned int udummy; + target->allowedxerror = -1; - if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) + if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) root_pixmap = None; target->allowedxerror = 0; } + Pixmap recoded_root_pmap = root_pixmap; + + if (root_pixmap != None && root_depth != target->depth) + { +#if XRENDER + if (flags & HAS_RENDER) + { + XRenderPictureAttributes pa; + + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); + Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); + + recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); + XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); + Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); + + if (src && dst) + XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); + else + { + XFreePixmap (dpy, recoded_root_pmap); + root_pixmap = None; + } + + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); + } + else +#endif + root_pixmap = None; + } + if (root_pixmap == None) return 0; - Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); + Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); if (tiled_root_pmap == None) /* something really bad happened - abort */ return 0; /* straightforward pixmap copy */ - gcv.tile = root_pixmap; + gcv.tile = recoded_root_pmap; gcv.fill_style = FillTiled; while (sx < 0) sx += (int)root_width; @@ -1351,27 +1350,26 @@ gcv.ts_x_origin = -sx; gcv.ts_y_origin = -sy; - gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); if (gc) { XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); result |= transpPmapTiled; XFreeGC (dpy, gc); - } - if (tiled_root_pmap != None) - { if (!need_client_side_rendering ()) { - if (flags & (blurNeeded | blurServerSide)) + if ((flags & blurNeeded) + && (flags & HAS_RENDER_CONV)) { - if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) + if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) result |= transpPmapBlurred; } - if (flags & (tintNeeded | tintServerSide)) + if ((flags & tintNeeded) + && (flags & (tintWholesome | HAS_RENDER))) { - if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) + if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) result |= transpPmapTinted; } } /* server side rendering completed */ @@ -1382,31 +1380,30 @@ pixmap = tiled_root_pmap; pmap_width = window_width; pmap_height = window_height; - pmap_depth = root_depth; + pmap_depth = target->depth; } + else + XFreePixmap (dpy, tiled_root_pmap); + + if (recoded_root_pmap != root_pixmap) + XFreePixmap (dpy, recoded_root_pmap); return result; } -bool +void bgPixmap_t::set_root_pixmap () { Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); if (new_root_pixmap == None) new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); - if (new_root_pixmap != root_pixmap) - { - root_pixmap = new_root_pixmap; - return true; - } - - return false; + root_pixmap = new_root_pixmap; } # endif /* ENABLE_TRANSPARENCY */ -# ifndef HAVE_AFTERIMAGE -static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); +#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) +static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); # endif bool @@ -1425,8 +1422,7 @@ background_flags = make_transparency_pixmap (); if (background_flags == 0) return false; - else if ((background_flags & transpTransformations) == (flags & transpTransformations) - && pmap_depth == target->depth) + else if ((background_flags & transpTransformations) == (flags & transpTransformations)) flags = flags & ~isInvalid; } # endif @@ -1440,6 +1436,7 @@ } # endif +# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) XImage *result = NULL; if (background_flags && (flags & isInvalid)) @@ -1449,52 +1446,20 @@ if (result) { -# if !defined(HAVE_AFTERIMAGE) && !XFT /* our own client-side tinting */ - /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. - This may need to be changed in need_client_side_rendering() logic is altered !!! */ if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) { rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) tint.get (c); - ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); + ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); } -# endif GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); if (gc) { - if (/*pmap_depth != target->depth &&*/ pixmap != None) - { - XFreePixmap (target->dpy, pixmap); - pixmap = None; - } - - if (pixmap == None) - { - pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); - pmap_width = result->width; - pmap_height = result->height; - pmap_depth = target->depth; - } - - if (pmap_depth != result->depth) - { - /* Bad Match error will ensue ! stupid X !!!! */ - if (result->depth == 24 && pmap_depth == 32) - result->depth = 32; - else if (result->depth == 32 && pmap_depth == 24) - result->depth = 24; - else - { - /* TODO: implement image recoding */ - } - } - - if (pmap_depth == result->depth) - XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); + XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); XFreeGC (target->dpy, gc); flags = flags & ~isInvalid; @@ -1502,6 +1467,7 @@ XDestroyImage (result); } +# endif if (flags & isInvalid) { @@ -1519,89 +1485,95 @@ return true; } -bool +void bgPixmap_t::set_target (rxvt_term *new_target) { - if (new_target) - if (target != new_target) - { - target = new_target; -# ifdef ENABLE_TRANSPARENCY - root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); -# endif - return true; - } + target = new_target; - return false; + flags &= ~(HAS_RENDER | HAS_RENDER_CONV); +#if XRENDER + int major, minor; + if (XRenderQueryVersion (target->dpy, &major, &minor)) + flags |= HAS_RENDER; + XFilters *filters = XRenderQueryFilters (target->dpy, target->vt); + if (filters) + { + for (int i = 0; i < filters->nfilter; i++) + if (!strcmp (filters->filter[i], FilterConvolution)) + flags |= HAS_RENDER_CONV; + + XFree (filters); + } +#endif } void bgPixmap_t::apply () { - if (target) + if (target == NULL) + return; + + if (pixmap != None) { - if (pixmap != None) - { - /* set target's background to pixmap */ + /* set target's background to pixmap */ # ifdef ENABLE_TRANSPARENCY - if (flags & isTransparent) - { - XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); - XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); - - if (target->scrollBar.win) - XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); - } - else -# endif - { - /* force old pixmap dereference in case it was transparent before :*/ - XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); - XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); - /* do we also need to set scrollbar's background here ? */ + if (flags & isTransparent) + { + XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); + XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); - if (target->scrollBar.win) - XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); - } + if (target->scrollBar.win) + XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); } else +# endif { - /* set target background to a pixel */ + /* force old pixmap dereference in case it was transparent before :*/ XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); - XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); + XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); /* do we also need to set scrollbar's background here ? */ + if (target->scrollBar.win) XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); } + } + else + { + /* set target background to a pixel */ + XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); + XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); + /* do we also need to set scrollbar's background here ? */ + if (target->scrollBar.win) + XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); + } - /* don't want Expose on the parent or vt. It is better to use - scr_touch or we get a great deal of flicker otherwise: */ - XClearWindow (target->dpy, target->parent[0]); - - if (target->scrollBar.state && target->scrollBar.win) - { - target->scrollBar.state = STATE_IDLE; - target->scrollBar.show (0); - } + /* don't want Expose on the parent or vt. It is better to use + scr_touch or we get a great deal of flicker otherwise: */ + XClearWindow (target->dpy, target->parent[0]); - target->want_refresh = 1; - flags |= hasChanged; + if (target->scrollBar.state && target->scrollBar.win) + { + target->scrollBar.state = STATE_IDLE; + target->scrollBar.show (0); } + + target->want_refresh = 1; + flags |= hasChanged; } #endif /* HAVE_BG_PIXMAP */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT +#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) /* taken from aterm-0.4.2 */ static void -ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) +ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) { int sh_r, sh_g, sh_b; uint32_t mask_r, mask_g, mask_b; uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; - unsigned int lower_lim_r, lower_lim_g, lower_lim_b; - unsigned int upper_lim_r, upper_lim_g, upper_lim_b; + rgba low; + rgba high; int i; int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; @@ -1676,46 +1648,43 @@ { shade = 200 - shade; - lower_lim_r = 65535-rm; - lower_lim_g = 65535-gm; - lower_lim_b = 65535-bm; - - lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); - lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); - lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); - - upper_lim_r = upper_lim_g = upper_lim_b = 65535; + high.r = (65535 - c.r) * shade / 100; + high.g = (65535 - c.g) * shade / 100; + high.b = (65535 - c.b) * shade / 100; + + low.r = 65535 - high.r; + low.g = 65535 - high.g; + low.b = 65535 - high.b; } else { + high.r = c.r * shade / 100; + high.g = c.g * shade / 100; + high.b = c.b * shade / 100; - lower_lim_r = lower_lim_g = lower_lim_b = 0; - - upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100); - upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100); - upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100); + low.r = low.g = low.b = 0; } /* fill our lookup tables */ for (i = 0; i <= mask_r>>sh_r; i++) { uint32_t tmp; - tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); - tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); + tmp = i * high.r; + tmp += (mask_r>>sh_r) * low.r; lookup_r[i] = (tmp/65535)<>sh_g; i++) { uint32_t tmp; - tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); - tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); + tmp = i * high.g; + tmp += (mask_g>>sh_g) * low.g; lookup_g[i] = (tmp/65535)<>sh_b; i++) { uint32_t tmp; - tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); - tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); + tmp = i * high.b; + tmp += (mask_b>>sh_b) * low.b; lookup_b[i] = (tmp/65535)<