--- rxvt-unicode/src/background.C 2010/10/22 18:03:10 1.97 +++ rxvt-unicode/src/background.C 2011/01/10 20:46:20 1.132 @@ -26,6 +26,14 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#if XRENDER +# include +#endif + +#ifndef FilterConvolution +#define FilterConvolution "convolution" +#endif + #define DO_TIMING_TEST 0 #if DO_TIMING_TEST @@ -60,24 +68,6 @@ * W and H are percentages of the terminal window size. * X and Y are also percentages; e.g., +50+50 centers * the image in the window. - * WxH+X Assumes Y == X - * WxH Assumes Y == X == 50 (centers the image) - * W+X+Y Assumes H == W - * W+X Assumes H == W and Y == X - * W Assumes H == W and Y == X == 50 - * - * Adjusting position only : - * =+X+Y Set position to X% by Y% (absolute). - * =+X Set position to X% by X%. - * +X+Y Adjust position horizontally X% and vertically Y% - * from current position (relative). - * +X Adjust position horizontally X% and vertically X% - * from current position. - * - * Adjusting scale only : - * Wx0 Multiply horizontal scaling factor by W% - * 0xH Multiply vertical scaling factor by H% - * 0x0 No scaling (show image at normal size). * * Pixmap Operations : (should be prepended by a colon) * tile Tile image. Scaling/position modifiers above will affect @@ -115,6 +105,7 @@ pixmap = None; valid_since = invalid_since = 0; target = 0; + target_x = target_y = 0; } void @@ -135,6 +126,20 @@ } bool +bgPixmap_t::set_position (int x, int y) +{ + + if (target_x != x + || target_y != y) + { + target_x = x; + target_y = y; + return true; + } + return false; +} + +bool bgPixmap_t::window_size_sensitive () { # ifdef ENABLE_TRANSPARENCY @@ -170,15 +175,6 @@ # endif return false; -}; - -bool bgPixmap_t::need_client_side_rendering () -{ -# ifdef HAVE_AFTERIMAGE - if (original_asim) - return true; -# endif - return false; } # ifdef BG_IMAGE_FROM_FILE @@ -250,14 +246,15 @@ } bool -bgPixmap_t::set_geometry (const char *geom) +bgPixmap_t::set_geometry (const char *geom, bool update) { - 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; unsigned long new_flags = (flags & (~geometryFlags)); - const char *p; + const char *ops; # define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ if (geom == NULL) @@ -265,172 +262,109 @@ char str[MAXLEN_GEOM]; - while (isspace(*geom)) ++geom; - if ((p = strchr (geom, ';')) == NULL) - p = strchr (geom, '\0'); - - n = (p - geom); - if (n < MAXLEN_GEOM) - { - char *ops; - new_flags |= geometrySet; - - memcpy (str, geom, n); - str[n] = '\0'; - if (str[0] == ':') - ops = &str[0]; - else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) - ops = &str[0]; - else - { - char *tmp; - ops = strchr (str, ':'); - if (ops != NULL) - { - for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp); - *(++tmp) = '\0'; - if (ops == tmp) ++ops; - } - } + ops = strchr (geom, ':'); + if (ops == NULL) + n = strlen (geom); + else + n = ops - geom; - if (ops > str || ops == NULL) - { - /* we have geometry string - let's handle it prior to applying ops */ - geom_flags = XParseGeometry (str, &x, &y, &w, &h); + if (n >= MAXLEN_GEOM) + return false; + + memcpy (str, geom, n); + str[n] = '\0'; + rxvt_strtrim (str); + + if (str[0]) + { + /* we have geometry string - let's handle it prior to applying ops */ + geom_flags = XParseGeometry (str, &x, &y, &w, &h); + } /* done parsing geometry string */ + + if (!update) + { + if (!(geom_flags & XValue)) + x = y = defaultAlign; + else if (!(geom_flags & YValue)) + y = x; - if ((geom_flags & XValue) && !(geom_flags & YValue)) + if (!(geom_flags & (WidthValue|HeightValue))) + w = h = defaultScale; + else if (!(geom_flags & HeightValue)) + h = w; + else if (!(geom_flags & WidthValue)) + w = h; + + geom_flags |= WidthValue|HeightValue|XValue|YValue; + } + + if (ops) + { + char **arr = rxvt_strsplit (':', ops + 1); + + for (int i = 0; arr[i]; i++) + { +# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0) + if (CHECK_GEOM_OPS ("tile")) { - y = x; - geom_flags |= YValue; + w = h = noScale; + geom_flags |= WidthValue|HeightValue; } - - if (flags & geometrySet) + else if (CHECK_GEOM_OPS ("propscale")) { - /* new geometry is an adjustment to the old one ! */ - if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) - { - if (w == 0 && h != 0) - { - w = h_scale; - h = (v_scale * h) / 100; - } - else if (h == 0 && w != 0) - { - w = (h_scale * w) / 100; - h = v_scale; - } - } - if (geom_flags & XValue) - { - if (str[0] != '=') - { - y += v_align; - x += h_align; - } - } + new_flags |= propScale; } - else /* setting up geometry from scratch */ + else if (CHECK_GEOM_OPS ("hscale")) { - if (!(geom_flags & XValue)) - { - /* use default geometry - centered */ - x = y = defaultAlign; - } - else if (!(geom_flags & YValue)) - y = x; + if (w == 0) w = windowScale; - if ((geom_flags & (WidthValue|HeightValue)) == 0) - { - /* use default geometry - scaled */ - w = h = defaultScale; - } - else if (geom_flags & WidthValue) - { - if (!(geom_flags & HeightValue)) - h = w; - } - else - w = h; + h = noScale; + geom_flags |= WidthValue|HeightValue; } - } /* done parsing geometry string */ - else if (!(flags & geometrySet)) - { - /* default geometry - scaled and centered */ - x = y = defaultAlign; - w = h = defaultScale; - } - - if (!(flags & geometrySet)) - geom_flags |= WidthValue|HeightValue|XValue|YValue; - - if (ops) - { - while (*ops) + else if (CHECK_GEOM_OPS ("vscale")) { - while (*ops == ':' || isspace(*ops)) ++ops; - -# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) - if (CHECK_GEOM_OPS ("tile")) - { - w = h = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("propscale")) - { - new_flags |= propScale; - } - else if (CHECK_GEOM_OPS ("hscale")) - { - if (w == 0) w = windowScale; - - h = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("vscale")) - { - if (h == 0) h = windowScale; + if (h == 0) h = windowScale; - w = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("scale")) - { - if (h == 0) h = windowScale; - if (w == 0) w = windowScale; + w = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (CHECK_GEOM_OPS ("scale")) + { + if (h == 0) h = windowScale; + if (w == 0) w = windowScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("auto")) - { - w = h = windowScale; - x = y = centerAlign; - geom_flags |= WidthValue|HeightValue|XValue|YValue; - } - else if (CHECK_GEOM_OPS ("root")) - { - new_flags |= rootAlign; - w = h = noScale; - geom_flags |= WidthValue|HeightValue; - } + geom_flags |= WidthValue|HeightValue; + } + else if (CHECK_GEOM_OPS ("auto")) + { + w = h = windowScale; + x = y = centerAlign; + geom_flags |= WidthValue|HeightValue|XValue|YValue; + } + else if (CHECK_GEOM_OPS ("root")) + { + new_flags |= rootAlign; + w = h = noScale; + geom_flags |= WidthValue|HeightValue; + } # undef CHECK_GEOM_OPS + } /* done parsing ops */ - while (*ops != ':' && *ops != '\0') ++ops; - } /* 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; + rxvt_free_strsplit (arr); } + 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 @@ -457,9 +391,8 @@ if (flags & rootAlign) { - target->get_window_origin (x, y); - x = -x; - y = -y; + x = -target_x; + y = -target_y; } else { @@ -663,20 +596,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; @@ -723,6 +650,91 @@ # ifdef HAVE_PIXBUF bool +bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, + int src_x, int src_y, int dst_x, int dst_y, + unsigned int width, unsigned int height) +{ + XImage *ximage; + char *data, *line; + int bytes_per_pixel; + int width_r, width_g, width_b; + int sh_r, sh_g, sh_b; + int rowstride; + int channels; + unsigned char *row; + Visual *visual = target->visual; + int depth = target->depth; + + if (visual->c_class != TrueColor) + return false; + + if (depth == 24 || depth == 32) + bytes_per_pixel = 4; + else if (depth == 15 || depth == 16) + bytes_per_pixel = 2; + else + return false; + + width_r = rxvt_popcount (visual->red_mask); + width_g = rxvt_popcount (visual->green_mask); + width_b = rxvt_popcount (visual->blue_mask); + + if (width_r > 8 || width_g > 8 || width_b > 8) + return false; + + sh_r = rxvt_ctz (visual->red_mask); + sh_g = rxvt_ctz (visual->green_mask); + sh_b = rxvt_ctz (visual->blue_mask); + + if (width > INT_MAX / height / bytes_per_pixel) + return false; + + data = (char *)malloc (width * height * bytes_per_pixel); + if (!data) + return false; + + ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data, + width, height, bytes_per_pixel * 8, 0); + if (!ximage) + { + free (data); + return false; + } + + ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; + + rowstride = gdk_pixbuf_get_rowstride (pixbuf); + channels = gdk_pixbuf_get_n_channels (pixbuf); + row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; + line = data; + + for (int y = 0; y < height; y++) + { + for (int x = 0; x < width; x++) + { + unsigned char *pixel = row + x * channels; + uint32_t value; + + value = ((pixel[0] >> (8 - width_r)) << sh_r) + | ((pixel[1] >> (8 - width_g)) << sh_g) + | ((pixel[2] >> (8 - width_b)) << sh_b); + + if (bytes_per_pixel == 4) + ((uint32_t *)line)[x] = value; + else + ((uint16_t *)line)[x] = value; + } + + row += rowstride; + line += ximage->bytes_per_line; + } + + XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height); + XDestroyImage (ximage); + return true; +} + +bool bgPixmap_t::render_image (unsigned long background_flags) { if (target == NULL) @@ -731,10 +743,9 @@ if (!pixbuf) return false; -#if !XFT - if (background_flags) + if (background_flags + && !(flags & HAS_RENDER)) return false; -#endif GdkPixbuf *result; @@ -795,19 +806,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; @@ -820,12 +825,10 @@ if (h_scale == 0 || v_scale == 0) { Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); - gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, - 0, 0, - 0, 0, - image_width, image_height, - XLIB_RGB_DITHER_NONE, - 0, 0); + pixbuf_to_pixmap (result, tile, gc, + 0, 0, + 0, 0, + image_width, image_height); gcv.tile = tile; gcv.fill_style = FillTiled; @@ -850,21 +853,19 @@ XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); if (dst_x < new_pmap_width && dst_y < new_pmap_height) - gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, - src_x, src_y, - dst_x, dst_y, - dst_width, dst_height, - XLIB_RGB_DITHER_NONE, - 0, 0); + pixbuf_to_pixmap (result, pixmap, gc, + src_x, src_y, + dst_x, dst_y, + dst_width, dst_height); } -#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 +912,44 @@ 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; + flags |= CLIENT_RENDER; + 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 +972,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 +987,13 @@ if (h_blurRadius != hr) { - ++changed; + changed = true; h_blurRadius = hr; } if (v_blurRadius != vr) { - ++changed; + changed = true; v_blurRadius = vr; } @@ -1002,19 +1002,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 @@ -1027,36 +1015,17 @@ if (tint) { tint->get (c); -# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) - if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) +# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00) + if (!has_shade + && IS_COMPONENT_WHOLESOME (c.r) && IS_COMPONENT_WHOLESOME (c.g) && IS_COMPONENT_WHOLESOME (c.b)) flags |= bgPixmap_t::tintWholesome; # undef IS_COMPONENT_WHOLESOME } - if (has_shade) + if (has_shade || tint) flags |= bgPixmap_t::tintNeeded; - else if (tint) - { - if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) - && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) - { - flags |= bgPixmap_t::tintNeeded; - } - } - - if (flags & bgPixmap_t::tintNeeded) - { - if (flags & bgPixmap_t::tintWholesome) - flags |= bgPixmap_t::tintServerSide; - else - { -#if XFT - flags |= bgPixmap_t::tintServerSide; -#endif - } - } return flags; } @@ -1076,20 +1045,6 @@ } bool -bgPixmap_t::unset_tint () -{ - unsigned long new_flags = compute_tint_shade_flags (NULL, shade); - - if (new_flags != (flags & tintFlags)) - { - flags = (flags & ~tintFlags) | new_flags; - return true; - } - - return false; -} - -bool bgPixmap_t::set_shade (const char *shade_str) { int new_shade = (shade_str) ? atoi (shade_str) : 100; @@ -1109,7 +1064,7 @@ return false; } -#if XFT +#if XRENDER static void get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) { @@ -1136,7 +1091,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 +1178,7 @@ } else { -# if XFT +# if XRENDER rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) @@ -1237,9 +1192,9 @@ } 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; + c.r = (c.r * (200 - shade)) / 100; + c.g = (c.g * (200 - shade)) / 100; + c.b = (c.b * (200 - shade)) / 100; } XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); @@ -1263,7 +1218,7 @@ { XRenderColor mask_c; - memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); + mask_c.red = mask_c.green = mask_c.blue = 0; mask_c.alpha = 0xffff; XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); @@ -1273,6 +1228,16 @@ 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; + 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); + } + ret = true; } @@ -1286,8 +1251,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 +1266,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; @@ -1313,65 +1278,97 @@ XGCValues gcv; GC gc; - target->get_window_origin (sx, sy); + sx = target_x; + sy = target_y; /* check if we are outside of the visible part of the virtual screen : */ if (sx + window_width <= 0 || sy + window_height <= 0 || 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.fill_style = FillTiled; - while (sx < 0) sx += (int)root_width; while (sy < 0) sy += (int)root_height; + gcv.tile = recoded_root_pmap; + gcv.fill_style = FillTiled; 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 & CLIENT_RENDER)) { - 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 +1379,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); + Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]); if (new_root_pixmap == None) - new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); + new_root_pixmap = target->get_pixmap_property (target->xa[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 shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c); # endif bool @@ -1425,9 +1421,8 @@ background_flags = make_transparency_pixmap (); if (background_flags == 0) return false; - else if ((background_flags & transpTransformations) == (flags & transpTransformations) - && pmap_depth == target->depth) - flags = flags & ~isInvalid; + else if ((background_flags & transpTransformations) == (flags & transpTransformations)) + flags &= ~isInvalid; } # endif @@ -1436,10 +1431,11 @@ || (background_flags & transpTransformations) != (flags & transpTransformations)) { if (render_image (background_flags)) - flags = flags & ~isInvalid; + flags &= ~isInvalid; } # endif +# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) XImage *result = NULL; if (background_flags && (flags & isInvalid)) @@ -1449,59 +1445,28 @@ 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); + shade_ximage (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; + flags &= ~isInvalid; } XDestroyImage (result); } +# endif if (flags & isInvalid) { @@ -1519,93 +1484,99 @@ 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) +shade_ximage (Visual *visual, XImage *ximage, 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; + int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; - if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; + if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; /* for convenience */ mask_r = visual->red_mask; @@ -1613,7 +1584,7 @@ mask_b = visual->blue_mask; /* boring lookup table pre-initialization */ - switch (srcImage->depth) + switch (ximage->depth) { case 15: if ((mask_r != 0x7c00) || @@ -1676,62 +1647,59 @@ { 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 = c.r * shade / 100; + high.g = c.g * shade / 100; + high.b = c.b * shade / 100; + + low.r = 65535 * (100 - shade) / 100; + low.g = 65535 * (100 - shade) / 100; + low.b = 65535 * (100 - shade) / 100; } 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)<bits_per_pixel == 32 - && (srcImage->depth == 24 || srcImage->depth == 32) - && srcImage->byte_order == host_byte_order) + if (ximage->bits_per_pixel == 32 + && (ximage->depth == 24 || ximage->depth == 32) + && ximage->byte_order == host_byte_order) { uint32_t *p1, *pf, *p, *pl; - p1 = (uint32_t *) srcImage->data; - pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + p1 = (uint32_t *) ximage->data; + pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line); while (p1 < pf) { p = p1; - pl = p1 + srcImage->width; + pl = p1 + ximage->width; for (; p < pl; p++) { *p = lookup_r[(*p & 0xff0000) >> 16] | @@ -1739,19 +1707,19 @@ lookup_b[(*p & 0x0000ff)] | (*p & 0xff000000); } - p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); + p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); } } else { - for (int y = 0; y < srcImage->height; y++) - for (int x = 0; x < srcImage->width; x++) + for (int y = 0; y < ximage->height; y++) + for (int x = 0; x < ximage->width; x++) { - unsigned long pixel = XGetPixel (srcImage, x, y); + unsigned long pixel = XGetPixel (ximage, x, y); pixel = lookup_r[(pixel & mask_r) >> sh_r] | lookup_g[(pixel & mask_g) >> sh_g] | lookup_b[(pixel & mask_b) >> sh_b]; - XPutPixel (srcImage, x, y, pixel); + XPutPixel (ximage, x, y, pixel); } }