--- rxvt-unicode/src/background.C 2010/09/01 09:40:08 1.51 +++ rxvt-unicode/src/background.C 2012/05/13 15:28:44 1.211 @@ -3,8 +3,9 @@ *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2005-2008 Marc Lehmann + * Copyright (c) 2005-2008 Marc Lehmann * Copyright (c) 2007 Sasha Vasko + * Copyright (c) 2010-2012 Emanuele Giaquinta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,1349 +22,1156 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ +#include #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#define DO_TIMING_TEST 0 +#if XRENDER +# include +#endif -#if DO_TIMING_TEST -# include -#define TIMING_TEST_START(id) \ - struct timeval timing_test_##id##_stv; \ - gettimeofday (&timing_test_##id##_stv, NULL); - -#define TIMING_TEST_PRINT_RESULT(id) \ - do { \ - struct timeval tv; \ - gettimeofday (&tv, NULL); \ - tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \ - fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \ - tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \ - } while (0) - -#else -#define TIMING_TEST_START(id) do {} while (0) -#define TIMING_TEST_PRINT_RESULT(id) do {} while (0) +#ifndef FilterConvolution +#define FilterConvolution "convolution" #endif -/* - * Pixmap geometry string interpretation : - * Each geometry string contains zero or one scale/position - * adjustment and may optionally be followed by a colon and one or more - * colon-delimited pixmap operations. - * The following table shows the valid geometry strings and their - * effects on the background image : - * - * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. - * 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 - * the tile size and origin. - * propscale When scaling, scale proportionally. That is, maintain the - * proper aspect ratio for the image. Any portion of the - * background not covered by the image is filled with the - * current background color. - * hscale Scale horizontally, tile vertically ? - * vscale Tile horizontally, scale vertically ? - * scale Scale both up and down - * auto Same as 100x100+50+50 - */ +#ifndef RepeatPad +#define RepeatPad True +#endif #ifdef HAVE_BG_PIXMAP -bgPixmap_t::bgPixmap_t () +# if XRENDER +static Picture +create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) { - // this is basically redundant as bgPixmap_t is only used in - // zero_initialised-derived structs -#ifdef HAVE_AFTERIMAGE - original_asim = NULL; -#endif -#ifdef BG_IMAGE_FROM_FILE - have_image = false; - h_scale = v_scale = 0; - h_align = v_align = 0; -#endif - flags = 0; - pixmap = None; - valid_since = invalid_since = 0; - target = 0; + 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 -bgPixmap_t::destroy () +rxvt_term::bg_destroy () { -#ifdef HAVE_AFTERIMAGE - if (original_asim) - safe_asimage_destroy (original_asim); +#ifdef HAVE_PIXBUF + if (pixbuf) + g_object_unref (pixbuf); #endif - if (pixmap && target) - XFreePixmap (target->dpy, pixmap); + if (bg_pixmap) + XFreePixmap (dpy, bg_pixmap); } bool -bgPixmap_t::window_size_sensitive () +rxvt_term::bg_set_position (int x, int y) { -# ifdef ENABLE_TRANSPARENCY - if (flags & isTransparent) - return true; -# endif -# ifdef BG_IMAGE_FROM_FILE - if (have_image) + if (target_x != x + || target_y != y) { - if (h_scale != 0 || v_scale != 0 - || h_align != 0 || v_align != 0) - return true; + target_x = x; + target_y = y; + return true; } -# endif - return false; } bool -bgPixmap_t::window_position_sensitive () +rxvt_term::bg_window_size_sensitive () { # ifdef ENABLE_TRANSPARENCY - if (flags & isTransparent) + if (bg_flags & BG_IS_TRANSPARENT) return true; # endif # ifdef BG_IMAGE_FROM_FILE - if (have_image) + if (bg_flags & BG_IS_FROM_FILE) { - if (h_align == rootAlign || v_align == rootAlign) + if (bg_flags & BG_IS_SIZE_SENSITIVE) return true; } # endif return false; -}; +} -bool bgPixmap_t::need_client_side_rendering () +bool +rxvt_term::bg_window_position_sensitive () { -# ifdef HAVE_AFTERIMAGE - if (original_asim) - return true; -# endif # ifdef ENABLE_TRANSPARENCY - if (flags & isTransparent) - { -# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways - if ((flags & blurNeeded) && !(flags & blurServerSide)) - return true; -# endif - if ((flags & tintNeeded) && !(flags & tintServerSide)) - return true; - } + if (bg_flags & BG_IS_TRANSPARENT) + return true; # endif - return false; -} # 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 (bg_flags & BG_IS_FROM_FILE) { - if (new_value > 1000) - new_value = 1000; - if (new_value != scale) - { - scale = new_value; - return true; - } + if (bg_flags & BG_ROOT_ALIGN) + return true; } - return false; -} +# endif -static inline bool -check_set_align_value (int geom_flags, int flag, int &align, int new_value) -{ - if (geom_flags & flag) - { - if (new_value != bgPixmap_t::rootAlign) - { - 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; } +# ifdef BG_IMAGE_FROM_FILE static inline int make_align_position (int align, int window_size, int image_size) { - int diff = window_size - image_size; - int smaller = MIN (image_size,window_size); - - if (align >= 0 && align <= 50) - return diff * align / 100; - else if (align > 50 && align <= 100) - return window_size - image_size - diff * (100 - align) / 100; - else if (align > 100 && align <= 200 ) - return ((align - 100) * smaller / 100) + window_size - smaller; - else if (align > -100 && align < 0) - return ((align + 100) * smaller / 100) - image_size; - return 0; + if (align >= 0 && align <= 100) + return lerp (0, window_size - image_size, align); + else if (align > 100) + return lerp (window_size - image_size, window_size, align - 100); + else + return lerp (-image_size, 0, align + 100); } static inline int make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) { int src_pos = 0; - dst_pos = 0; + dst_pos = pos; dst_size = size; - if (pos < 0 && size > target_size) + if (pos < 0) { src_pos = -pos; + dst_pos = 0; dst_size += pos; } - else if (pos > 0) - dst_pos = 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; } bool -bgPixmap_t::set_geometry (const char *geom) +rxvt_term::bg_set_geometry (const char *geom, bool update) { - int geom_flags = 0, changed = 0; - int x = 0, y = 0; - unsigned int w = 0, h = 0; - unsigned int n; - unsigned long new_flags = (flags & (~geometryFlags)); - const char *p; -# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ + bool changed = false; + int geom_flags = 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) return false; - char str[MAXLEN_GEOM]; + if (geom[0]) + { + char **arr = rxvt_strsplit (':', 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 + for (int i = 0; arr[i]; i++) { - char *tmp; - ops = strchr (str, ':'); - if (ops != NULL) + if (!strcasecmp (arr[i], "style=tiled")) { - for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp); - *(++tmp) = '\0'; - if (ops == tmp) ++ops; + new_flags = BG_TILE; + w = h = noScale; + x = y = 0; + geom_flags = WidthValue|HeightValue|XValue|YValue; } - } - - 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 ((geom_flags & XValue) && !(geom_flags & YValue)) + else if (!strcasecmp (arr[i], "style=aspect-stretched")) { - y = x; - geom_flags |= YValue; + new_flags = BG_KEEP_ASPECT; + w = h = windowScale; + x = y = centerAlign; + geom_flags = WidthValue|HeightValue|XValue|YValue; } - - if (flags & geometrySet) + else if (!strcasecmp (arr[i], "style=stretched")) { - /* 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 = 0; + w = h = windowScale; + geom_flags = WidthValue|HeightValue; } - else /* setting up geometry from scratch */ + else if (!strcasecmp (arr[i], "style=centered")) { - if (!(geom_flags & XValue)) - { - /* use default geometry - centered */ - x = y = defaultAlign; - } - else if (!(geom_flags & YValue)) - y = x; - - 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; + new_flags = 0; + w = h = noScale; + x = y = centerAlign; + geom_flags = WidthValue|HeightValue|XValue|YValue; + } + else if (!strcasecmp (arr[i], "style=root-tiled")) + { + new_flags = BG_TILE|BG_ROOT_ALIGN; + w = h = noScale; + geom_flags = WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "op=tile")) + new_flags |= BG_TILE; + else if (!strcasecmp (arr[i], "op=keep-aspect")) + new_flags |= BG_KEEP_ASPECT; + else if (!strcasecmp (arr[i], "op=root-align")) + new_flags |= BG_ROOT_ALIGN; + + // deprecated + else if (!strcasecmp (arr[i], "tile")) + { + new_flags |= BG_TILE; + w = h = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "propscale")) + { + new_flags |= BG_KEEP_ASPECT; + w = h = windowScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "hscale")) + { + new_flags |= BG_TILE; + w = windowScale; + h = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "vscale")) + { + new_flags |= BG_TILE; + h = windowScale; + w = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "scale")) + { + w = h = windowScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "auto")) + { + w = h = windowScale; + x = y = centerAlign; + geom_flags |= WidthValue|HeightValue|XValue|YValue; + } + else if (!strcasecmp (arr[i], "root")) + { + new_flags |= BG_TILE|BG_ROOT_ALIGN; + w = 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; + else + geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); + } /* done parsing ops */ - if (ops) - { - while (*ops) - { - while (*ops == ':' || isspace(*ops)) ++ops; + rxvt_free_strsplit (arr); + } -# 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")) - { - if (w == 0 && h == 0) - { - w = windowScale; - geom_flags |= WidthValue; - } - new_flags |= propScale; - } - else if (CHECK_GEOM_OPS ("hscale")) - { - if (w == 0) w = windowScale; + new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; - h = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("vscale")) - { - if (h == 0) h = windowScale; + if (!update) + { + if (!(geom_flags & XValue)) + x = y = defaultAlign; + else if (!(geom_flags & YValue)) + y = x; - w = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("scale")) - { - if (h == 0) h = windowScale; - if (w == 0) w = windowScale; + 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; - } - else if (CHECK_GEOM_OPS ("auto")) - { - w = h = windowScale; - x = y = centerAlign; - geom_flags |= WidthValue|HeightValue|XValue|YValue; - } - else if (CHECK_GEOM_OPS ("root")) - { - w = h = noScale; - x = y = rootAlign; - geom_flags |= WidthValue|HeightValue|XValue|YValue; - } -# undef CHECK_GEOM_OPS + min_it (w, 1000); + min_it (h, 1000); + clamp_it (x, -100, 200); + clamp_it (y, -100, 200); - while (*ops != ':' && *ops != '\0') ++ops; - } /* done parsing ops */ - } + 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; + } + + return changed; +} - 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; +void +rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) +{ + int target_width = szHint.width; + int target_height = szHint.height; + + w = h_scale * target_width / 100; + h = v_scale * target_height / 100; + + if (bg_flags & BG_KEEP_ASPECT) + { + float scale = (float)w / image_width; + min_it (scale, (float)h / image_height); + w = image_width * scale + 0.5; + h = image_height * scale + 0.5; } - if (new_flags != flags) + if (!w) w = image_width; + if (!h) h = image_height; + + if (bg_flags & BG_ROOT_ALIGN) { - flags = new_flags; - changed++; + x = -target_x; + y = -target_y; + } + else + { + x = make_align_position (h_align, target_width, w); + y = make_align_position (v_align, target_height, h); } - //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", - // flags, h_scale, v_scale, h_align, v_align); - return (changed > 0); + if (!(bg_flags & BG_TILE) + || h_scale || v_scale + || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) + || image_width > target_width || image_height > target_height) + bg_flags |= BG_IS_SIZE_SENSITIVE; + else + bg_flags &= ~BG_IS_SIZE_SENSITIVE; } -# ifdef HAVE_AFTERIMAGE +# ifdef HAVE_PIXBUF bool -bgPixmap_t::render_image (unsigned long background_flags) -{ - if (target == NULL) +rxvt_term::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 *line; + int width_r, width_g, width_b, width_a; + int sh_r, sh_g, sh_b, sh_a; + uint32_t alpha_mask; + int rowstride; + int channels; + unsigned char *row; + + if (visual->c_class != TrueColor) return false; - target->init_asv (); +#if XRENDER + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); + if (format) + alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha; + else +#endif + alpha_mask = 0; - ASImage *background = NULL; - ARGB32 background_tint = TINT_LEAVE_SAME; + width_r = ecb_popcount32 (visual->red_mask); + width_g = ecb_popcount32 (visual->green_mask); + width_b = ecb_popcount32 (visual->blue_mask); + width_a = ecb_popcount32 (alpha_mask); -# ifdef ENABLE_TRANSPARENCY - if (background_flags) - background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); + if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8) + return false; - if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) - { - ShadingInfo as_shade; - as_shade.shading = (shade == 0) ? 100 : shade; + sh_r = ecb_ctz32 (visual->red_mask); + sh_g = ecb_ctz32 (visual->green_mask); + sh_b = ecb_ctz32 (visual->blue_mask); + sh_a = ecb_ctz32 (alpha_mask); - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (flags & tintSet) - tint.get (c); - as_shade.tintColor.red = c.r; - as_shade.tintColor.green = c.g; - as_shade.tintColor.blue = c.b; + if (width > 32767 || height > 32767) + return false; - background_tint = shading2tint32 (&as_shade); - } + ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, 0, + width, height, 32, 0); + if (!ximage) + return false; - if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) + if (height > INT_MAX / ximage->bytes_per_line + || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line))) { - ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, - (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, - 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - { - destroy_asimage (&background); - background = tmp; - } + XDestroyImage (ximage); + return false; } -# endif - ASImage *result = 0; + ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; - int target_width = target->szHint.width; - int target_height = target->szHint.height; - int new_pmap_width = target_width; - int new_pmap_height = target_height; - - int x = 0; - int y = 0; - int w = h_scale * target_width / 100; - int h = v_scale * target_height / 100; + 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 = ximage->data; - TIMING_TEST_START (asim); + rgba c (0, 0, 0); - if (original_asim) + if (channels == 4 && alpha_mask == 0) { - if (h_align == rootAlign || v_align == rootAlign) - { - target->get_window_origin (x, y); - x = -x; - y = -y; - } - - if (h_align != rootAlign) - x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); - - if (v_align != rootAlign) - y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); + pix_colors[Color_bg].get (c); + c.r >>= 8; + c.g >>= 8; + c.b >>= 8; } - if (!original_asim - || x >= target_width - || y >= target_height - || (w > 0 && x + w <= 0) - || (h > 0 && y + h <= 0)) + for (int y = 0; y < height; y++) { - if (background) + for (int x = 0; x < width; x++) { - new_pmap_width = background->width; - new_pmap_height = background->height; - result = background; + unsigned char *pixel = row + x * channels; + uint32_t value; + unsigned char r, g, b, a; - if (background_tint != TINT_LEAVE_SAME) + if (channels == 4) + { + a = pixel[3]; + r = (pixel[0] * a + c.r * (0xff - a)) / 0xff; + g = (pixel[1] * a + c.g * (0xff - a)) / 0xff; + b = (pixel[2] * a + c.b * (0xff - a)) / 0xff; + } + else { - ASImage *tmp = tile_asimage (target->asv, background, 0, 0, - target_width, target_height, background_tint, - ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - result = tmp; + a = 0xff; + r = pixel[0]; + g = pixel[1]; + b = pixel[2]; } + + value = ((r >> (8 - width_r)) << sh_r) + | ((g >> (8 - width_g)) << sh_g) + | ((b >> (8 - width_b)) << sh_b) + | ((a >> (8 - width_a)) << sh_a); + + if (ximage->bits_per_pixel == 32) + ((uint32_t *)line)[x] = value; + else + XPutPixel (ximage, x, y, value); } - else - new_pmap_width = new_pmap_height = 0; + + row += rowstride; + line += ximage->bytes_per_line; } - else - { - result = original_asim; - if ((w > 0 && w != original_asim->width) - || (h > 0 && h != original_asim->height)) - { - result = scale_asimage (target->asv, original_asim, - w > 0 ? w : original_asim->width, - h > 0 ? h : original_asim->height, - background ? ASA_ASImage : ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); - } + XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height); + XDestroyImage (ximage); + return true; +} - if (background == NULL) - { - /* if tiling - pixmap has to be sized exactly as the image, - but there is no need to make it bigger than the window! */ - if (h_scale == 0) - new_pmap_width = min (result->width, target_width); - if (v_scale == 0) - new_pmap_height = min (result->height, target_height); - /* we also need to tile our image in one or both directions */ - if (h_scale == 0 || v_scale == 0) - { - ASImage *tmp = tile_asimage (target->asv, result, - (h_scale > 0) ? 0 : (int)result->width - x, - (v_scale > 0) ? 0 : (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); +bool +rxvt_term::render_image (bool transparent) +{ + if (!pixbuf) + return false; - result = tmp; - } - } - } - else - { - /* if blending background and image - pixmap has to be sized same as target window */ - ASImageLayer *layers = create_image_layers (2); + if (transparent + && !(bg_flags & BG_HAS_RENDER)) + return false; - 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; + GdkPixbuf *result; - if (w <= 0) - { - /* 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; - } + int image_width = gdk_pixbuf_get_width (pixbuf); + int image_height = gdk_pixbuf_get_height (pixbuf); - if (h <= 0) - { - 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; - } + int target_width = szHint.width; + int target_height = szHint.height; + int new_pmap_width = target_width; + int new_pmap_height = target_height; - if (target->rs[Rs_blendtype]) - { - layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); - if (layers[1].merge_scanlines == NULL) - layers[1].merge_scanlines = alphablend_scanlines; - } + int x = 0; + int y = 0; + int w = 0; + int h = 0; - ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, - ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); + get_image_geometry (image_width, image_height, w, h, x, y); - if (tmp) - { - if (result != original_asim) - destroy_asimage (&result); + if (!(bg_flags & BG_ROOT_ALIGN) + && (x >= target_width + || y >= target_height + || x + w <= 0 + || y + h <= 0)) + return false; - result = tmp; - } + result = pixbuf; - free (layers); - } + if (w != image_width + || h != image_height) + { + result = gdk_pixbuf_scale_simple (pixbuf, + w, h, + GDK_INTERP_BILINEAR); } - TIMING_TEST_PRINT_RESULT (asim); + + if (!result) + return false; bool ret = false; - if (result) - { - XGCValues gcv; - GC gc; + XGCValues gcv; + GC gc; + Pixmap root_pmap; + + image_width = gdk_pixbuf_get_width (result); + image_height = gdk_pixbuf_get_height (result); - if (pixmap) + if (transparent) + { + root_pmap = bg_pixmap; + bg_pixmap = None; + } + else + { + if (bg_flags & BG_TILE) { - if (pmap_width != new_pmap_width - || pmap_height != new_pmap_height - || pmap_depth != target->depth) - { - XFreePixmap (target->dpy, pixmap); - pixmap = None; - } + new_pmap_width = min (image_width, target_width); + new_pmap_height = min (image_height, target_height); } + } + + 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; + } - /* create Pixmap */ - if (pixmap == None) + gcv.foreground = pix_colors[Color_bg]; + gc = XCreateGC (dpy, vt, GCForeground, &gcv); + + if (gc) + { + if (bg_flags & BG_TILE) { - pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); - pmap_width = new_pmap_width; - pmap_height = new_pmap_height; - pmap_depth = target->depth; + Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); + pixbuf_to_pixmap (result, tile, gc, + 0, 0, + 0, 0, + image_width, image_height); + + gcv.tile = tile; + gcv.fill_style = FillTiled; + gcv.ts_x_origin = x; + gcv.ts_y_origin = y; + XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + + XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); + XFreePixmap (dpy, tile); } - /* fill with background color (if result's not completely overlapping it) */ - gcv.foreground = target->pix_colors[Color_bg]; - gc = XCreateGC (target->dpy, target->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) + else { - if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); - if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); + int src_x, src_y, dst_x, dst_y; + int dst_width, dst_height; + + src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width ); + src_y = make_clip_rectangle (y, image_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 (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); + XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); + + if (dst_x < new_pmap_width && dst_y < new_pmap_height) + pixbuf_to_pixmap (result, bg_pixmap, gc, + src_x, src_y, + dst_x, dst_y, + dst_width, dst_height); } - /* put result on pixmap */ - if (dst_x < new_pmap_width && dst_y < new_pmap_height) - asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); +#if XRENDER + if (transparent) + { + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); - if (result != background && result != original_asim) - destroy_asimage (&result); + Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); - XFreeGC (target->dpy, gc); - TIMING_TEST_PRINT_RESULT (asim); + 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 = + 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); + XRenderFreePicture (dpy, dst); + XRenderFreePicture (dpy, mask); + } +#endif + + XFreeGC (dpy, gc); ret = true; } - if (background) - destroy_asimage (&background); + if (result != pixbuf) + g_object_unref (result); + + if (transparent) + XFreePixmap (dpy, root_pmap); return ret; } -# endif /* HAVE_AFTERIMAGE */ +# endif /* HAVE_PIXBUF */ bool -bgPixmap_t::set_file (const char *file) +rxvt_term::bg_set_file (const char *file) { - assert (file); + if (!file || !*file) + return false; - if (*file) + bool ret = false; + const char *p = strchr (file, ';'); + + if (p) { - 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]); - original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); - if (original_asim) - have_image = true; - return have_image; +# ifdef HAVE_PIXBUF + GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); + if (image) + { + if (pixbuf) + g_object_unref (pixbuf); + pixbuf = image; + bg_flags |= BG_IS_FROM_FILE; + ret = true; + } # endif + + if (ret) + { + if (p) + bg_set_geometry (p + 1); + else + bg_set_default_geometry (); } - return false; + return ret; } # endif /* BG_IMAGE_FROM_FILE */ # ifdef ENABLE_TRANSPARENCY bool -bgPixmap_t::set_transparent () +rxvt_term::bg_set_blur (const char *geom) { - if (!(flags & isTransparent)) - { - flags |= isTransparent; - return true; - } - - return false; -} - -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); - if (!(geom_flags&WidthValue)) + if (!(geom_flags & WidthValue)) hr = 1; - if (!(geom_flags&HeightValue)) + if (!(geom_flags & HeightValue)) vr = hr; + min_it (hr, 128); + min_it (vr, 128); + if (h_blurRadius != hr) { - ++changed; + changed = true; h_blurRadius = hr; } if (v_blurRadius != vr) { - ++changed; + changed = true; v_blurRadius = vr; } - if (v_blurRadius == 0 && h_blurRadius == 0) - flags &= ~blurNeeded; + if (h_blurRadius && v_blurRadius) + bg_flags |= BG_NEEDS_BLUR; else - flags |= blurNeeded; + bg_flags &= ~BG_NEEDS_BLUR; - return (changed>0); + return changed; } -static inline unsigned long -compute_tint_shade_flags (rxvt_color *tint, int shade) +void +rxvt_term::set_tint_shade_flags () { - unsigned long flags = 0; - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); - - if (tint) - { - tint->get (c); -# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) - 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 (shade != 100 || (bg_flags & BG_TINT_SET)) + bg_flags |= BG_NEEDS_TINT; + else + bg_flags &= ~BG_NEEDS_TINT; +} - if (has_shade) - flags |= bgPixmap_t::tintNeeded; - else if (tint) +bool +rxvt_term::bg_set_tint (rxvt_color &new_tint) +{ + if (!(bg_flags & BG_TINT_SET) || tint != new_tint) { - if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) - && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) - { - flags |= bgPixmap_t::tintNeeded; - } - } + tint = new_tint; + bg_flags |= BG_TINT_SET; - if (flags & bgPixmap_t::tintNeeded) - { - if (flags & bgPixmap_t::tintWholesome) - flags |= bgPixmap_t::tintServerSide; + 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 - { -#if XFT - flags |= bgPixmap_t::tintServerSide; -#endif - } + bg_flags &= ~BG_TINT_BITAND; + + set_tint_shade_flags (); + return true; } - return flags; + return false; } bool -bgPixmap_t::set_tint (rxvt_color &new_tint) +rxvt_term::bg_set_shade (const char *shade_str) { - if (tint != new_tint) + int new_shade = atoi (shade_str); + + clamp_it (new_shade, -100, 200); + if (new_shade < 0) + new_shade = 200 - (100 + new_shade); + + if (new_shade != shade) { - unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); - tint = new_tint; - flags = (flags & ~tintFlags) | new_flags | tintSet; + shade = new_shade; + set_tint_shade_flags (); return true; } return false; } -bool -bgPixmap_t::unset_tint () +#if XRENDER +static void +get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) { - unsigned long new_flags = compute_tint_shade_flags (NULL, shade); + double sigma = radius / 2.0; + double scale = sqrt (2.0 * M_PI) * sigma; + double sum = 0.0; - if (new_flags != (flags & tintFlags)) + for (int i = 0; i < width; i++) { - flags = (flags&~tintFlags)|new_flags; - return true; + double x = i - width / 2; + kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; + sum += kernel[i]; } - return false; + params[0] = XDoubleToFixed (width); + params[1] = XDoubleToFixed (1); + + for (int i = 0; i < width; i++) + params[i+2] = XDoubleToFixed (kernel[i] / sum); } +#endif bool -bgPixmap_t::set_shade (const char *shade_str) +rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) { - int new_shade = (shade_str) ? atoi (shade_str) : 0; + bool ret = false; +#if XRENDER + if (!(bg_flags & BG_HAS_RENDER_CONV)) + return false; - if (new_shade < 0 && new_shade > -100) - new_shade = 200 - (100 + new_shade); - else if (new_shade == 100) - new_shade = 0; + int size = max (h_blurRadius, v_blurRadius) * 2 + 1; + double *kernel = (double *)malloc (size * sizeof (double)); + XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); + + XRenderPictureAttributes pa; + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); + + 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) + { + 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); + + ::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); - if (new_shade != shade) + ret = true; + } + + free (kernel); + free (params); + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); +#endif + return ret; +} + +bool +rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) +{ + bool ret = false; + + if (shade == 100 && (bg_flags & BG_TINT_BITAND)) { - unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); - shade = new_shade; - flags = (flags & (~tintFlags | tintSet)) | new_flags; - return true; + XGCValues gcv; + GC gc; + + /* In this case we can tint image server-side getting significant + * performance improvements, as we eliminate XImage transfer + */ + gcv.foreground = Pixel (tint); + gcv.function = GXand; + gcv.fill_style = FillSolid; + gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv); + if (gc) + { + XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); + ret = true; + XFreeGC (dpy, gc); + } } +# if XRENDER + else if (bg_flags & BG_HAS_RENDER) + { + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - return false; + if (bg_flags & BG_TINT_SET) + tint.get (c); + + if (shade <= 100) + { + c.r = c.r * shade / 100; + c.g = c.g * shade / 100; + c.b = c.b * shade / 100; + } + else + { + c.r = c.r * (200 - shade) / 100; + c.g = c.g * (200 - shade) / 100; + c.b = c.b * (200 - shade) / 100; + } + + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); + + Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0); + + Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); + + Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True); + + XRenderColor mask_c; + + mask_c.alpha = 0xffff; + mask_c.red = + mask_c.green = + mask_c.blue = 0; + XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); + + mask_c.alpha = 0; + mask_c.red = 0xffff - c.r; + 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.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); + } + + ret = true; + + XRenderFreePicture (dpy, mask_pic); + XRenderFreePicture (dpy, overlay_pic); + XRenderFreePicture (dpy, back_pic); + } +# endif + + return ret; } -/* 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 -bgPixmap_t::make_transparency_pixmap () +bool +rxvt_term::make_transparency_pixmap () { - unsigned long result = 0; - - if (target == NULL) - return 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 : */ - Window root = target->display->root; - int screen = target->display->screen; - Display *dpy = target->dpy; + int screen = display->screen; + 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; - int window_width = target->szHint.width; - int window_height = target->szHint.height; + int window_width = szHint.width; + int window_height = szHint.height; int sx, sy; XGCValues gcv; + GC gc; - TIMING_TEST_START (tp); - 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 it's size at the same time : */ - int junk; - unsigned int ujunk; - /* root pixmap may be bad - allow a error */ - target->allowedxerror = -1; + Window wdummy; + int idummy; + unsigned int udummy; - if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) + allowedxerror = -1; + + if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) root_pixmap = None; - target->allowedxerror = 0; + allowedxerror = 0; } - Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); - GC gc = NULL; + Pixmap recoded_root_pmap = root_pixmap; - if (tiled_root_pmap == None) /* something really bad happened - abort */ - return 0; - - if (root_pixmap == None) + if (root_pixmap != None && root_depth != depth) { - /* use tricks to obtain the root background image :*/ - /* we want to create Overrideredirect window overlapping out window - with background type of Parent Relative and then grab it */ - XSetWindowAttributes attr; - Window src; - bool success = false; - - attr.background_pixmap = ParentRelative; - attr.backing_store = Always; - attr.event_mask = ExposureMask; - attr.override_redirect = True; - src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, - CopyFromParent, CopyFromParent, CopyFromParent, - CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, - &attr); - - if (src != None) +#if XRENDER + if (bg_flags & BG_HAS_RENDER) { - XEvent event; - int ev_count = 0; - XGrabServer (dpy); - XMapRaised (dpy, src); - XSync (dpy, False); - - /* XSync should get window where it's properly exposed, - * but to be on the safe side - let's check for the actual event to arrive : */ - while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) - ++ev_count; + recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); - if (ev_count > 0); - { - /* hooray! - we can grab the image! */ - gc = XCreateGC (dpy, root, 0, NULL); - if (gc) - { - XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); - success = true; - } - } + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); + Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0); - XDestroyWindow (dpy, src); - XUngrabServer (dpy); - //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); - } + XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); + Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0); - if (!success) - { - XFreePixmap (dpy, tiled_root_pmap); - tiled_root_pmap = None; + XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); + + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); } else - result |= transpPmapTiled; +#endif + recoded_root_pmap = None; } - else - { - /* 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.ts_x_origin = -sx; - gcv.ts_y_origin = -sy; - gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); - if (gc) - { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); - result |= transpPmapTiled; - } - } - TIMING_TEST_PRINT_RESULT (tp); + if (recoded_root_pmap == None) + return 0; - if (tiled_root_pmap != None) + if (bg_pixmap == None + || bg_pmap_width != window_width + || bg_pmap_height != window_height) + { + if (bg_pixmap) + XFreePixmap (dpy, bg_pixmap); + bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); + bg_pmap_width = window_width; + bg_pmap_height = window_height; + } + + /* straightforward pixmap copy */ + while (sx < 0) sx += root_pmap_width; + while (sy < 0) sy += root_pmap_height; + + gcv.tile = recoded_root_pmap; + gcv.fill_style = FillTiled; + gcv.ts_x_origin = -sx; + gcv.ts_y_origin = -sy; + gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + + if (gc) { - if (!need_client_side_rendering ()) + XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); + ret = true; + unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS; + + if (!(bg_flags & BG_CLIENT_RENDER)) { - if ((flags & tintNeeded)) + if (bg_flags & BG_NEEDS_BLUR) { - if (flags & tintWholesome) - { - /* In this case we can tint image server-side getting significant - * performance improvements, as we eliminate XImage transfer - */ - gcv.foreground = Pixel (tint); - gcv.function = GXand; - gcv.fill_style = FillSolid; - if (gc) - XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv); - else - gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); - if (gc) - { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); - result |= transpPmapTinted; - } - } - else + 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)) + 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) { -# if XFT - Picture back_pic = 0; - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - - if (flags & tintSet) - tint.get (c); - - if (shade > 0 && shade < 100) - { - c.r = (c.r * shade) / 100; - c.g = (c.g * shade) / 100; - c.b = (c.b * shade) / 100; - } - else if (shade > 100 && shade < 200) - { - c.r = (c.r * (200 - shade)) / 100; - c.g = (c.g * (200 - shade)) / 100; - c.b = (c.b * (200 - shade)) / 100; - } - - XRenderPictFormat pf; - pf.type = PictTypeDirect; - pf.depth = 32; - pf.direct.redMask = 0xff; - pf.direct.greenMask = 0xff; - pf.direct.blueMask = 0xff; - pf.direct.alphaMask = 0xff; - - XRenderPictFormat *solid_format = XRenderFindFormat (dpy, - (PictFormatType| - PictFormatDepth| - PictFormatRedMask| - PictFormatGreenMask| - PictFormatBlueMask| - PictFormatAlphaMask), - &pf, - 0); - XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); - XRenderPictureAttributes pa ; - - back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); - - pa.repeat = True; - - Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); - Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); - XFreePixmap (dpy, overlay_pmap); - - pa.component_alpha = True; - Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); - Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); - XFreePixmap (dpy, mask_pmap); - - if (mask_pic && overlay_pic && back_pic) - { - XRenderColor mask_c; - - memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); - mask_c.alpha = 0xffff; - XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); - - mask_c.alpha = 0; - mask_c.red = 0xffff - c.r; - 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, window_width, window_height); - result |= transpPmapTinted; - } - - XRenderFreePicture (dpy, mask_pic); - XRenderFreePicture (dpy, overlay_pic); - XRenderFreePicture (dpy, back_pic); -# if DO_TIMING_TEST - XSync (dpy, False); -# endif -# endif + /* 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 */ - if (pixmap) - XFreePixmap (dpy, pixmap); - - pixmap = tiled_root_pmap; - pmap_width = window_width; - pmap_height = window_height; - pmap_depth = root_depth; + XFreeGC (dpy, gc); } - if (gc) - XFreeGC (dpy, gc); - - TIMING_TEST_PRINT_RESULT (tp); + if (recoded_root_pmap != root_pixmap) + XFreePixmap (dpy, recoded_root_pmap); - return result; + return ret; } -bool -bgPixmap_t::set_root_pixmap () +void +rxvt_term::bg_set_root_pixmap () { - Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); + Pixmap new_root_pixmap = get_pixmap_property (xa[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; - } + new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); - return false; + root_pixmap = new_root_pixmap; } # endif /* ENABLE_TRANSPARENCY */ -# ifndef HAVE_AFTERIMAGE -static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); -# endif - bool -bgPixmap_t::render () +rxvt_term::bg_render () { - unsigned long background_flags = 0; - - if (target == NULL) - return false; + bool transparent = false; - TIMING_TEST_START (tp); - - invalidate (); + bg_invalidate (); # ifdef ENABLE_TRANSPARENCY - if (flags & isTransparent) + if (bg_flags & BG_IS_TRANSPARENT) { /* we need to re-generate transparency pixmap in that case ! */ - 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; + transparent = make_transparency_pixmap (); + if (transparent) + bg_flags |= BG_IS_VALID; } # endif # ifdef BG_IMAGE_FROM_FILE - if (have_image - || (background_flags & transpTransformations) != (flags & transpTransformations)) + if (bg_flags & BG_IS_FROM_FILE) { - if (render_image (background_flags)) - flags = flags & ~isInvalid; + if (render_image (transparent)) + bg_flags |= BG_IS_VALID; } # endif - XImage *result = NULL; - - if (background_flags && (flags & isInvalid)) + if (!(bg_flags & BG_IS_VALID)) { - result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); - -# 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 (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) + if (bg_pixmap != None) { - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (flags & tintSet) - tint.get (c); - ShadeXImage (target, result, shade, c.r, c.g, c.b); + XFreePixmap (dpy, bg_pixmap); + bg_pixmap = None; } -# endif } - if (result) - { - 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 */ - } - } + scr_recolour (false); + bg_flags |= BG_NEEDS_REFRESH; - if (pmap_depth == result->depth) - XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); - - XFreeGC (target->dpy, gc); - flags = flags & ~isInvalid; - } - - XDestroyImage (result); - } - - if (flags & isInvalid) - { - if (pixmap != None) - { - XFreePixmap (target->dpy, pixmap); - pixmap = None; - } - } - - apply (); - - XSync (target->dpy, False); - valid_since = ev::now (); - - TIMING_TEST_PRINT_RESULT (tp); + bg_valid_since = ev::now (); return true; } -bool -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; - } - - return false; -} - void -bgPixmap_t::apply () +rxvt_term::bg_init () { - if (target) - { - flags &= ~isVtOrigin; - - if (pixmap != None) - { - /* 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 - { - flags |= isVtOrigin; - /* 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 (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]); - } +#ifdef ENABLE_TRANSPARENCY + shade = 100; +#endif - /* 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]); + bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); +#if XRENDER + int major, minor; + if (XRenderQueryVersion (dpy, &major, &minor)) + bg_flags |= BG_HAS_RENDER; + XFilters *filters = XRenderQueryFilters (dpy, vt); + if (filters) + { + for (int i = 0; i < filters->nfilter; i++) + if (!strcmp (filters->filter[i], FilterConvolution)) + bg_flags |= BG_HAS_RENDER_CONV; - if (target->scrollBar.state && target->scrollBar.win) - { - target->scrollBar.state = STATE_IDLE; - target->scrollBar.show (0); - } - - target->want_refresh = 1; - flags |= hasChanged; + XFree (filters); } +#endif } #endif /* HAVE_BG_PIXMAP */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT -/* taken from aterm-0.4.2 */ +#ifdef ENABLE_TRANSPARENCY +/* based on code from aterm-0.4.2 */ -typedef uint32_t RUINT32T; +static inline void +fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) +{ + for (int i = 0; i <= mask >> sh; i++) + { + uint32_t tmp; + tmp = i * high; + tmp += (mask >> sh) * low; + lookup[i] = (tmp / 0xffff) << sh; + } +} -static void -ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) +void +rxvt_term::tint_ximage (Visual *visual, XImage *ximage) { + unsigned int size_r, size_g, size_b; int sh_r, sh_g, sh_b; - RUINT32T mask_r, mask_g, mask_b; - RUINT32T *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; - int i; - - Visual *visual = term->visual; + uint32_t mask_r, mask_g, mask_b; + uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; + unsigned short low; + int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; - if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; - - if (shade == 0) - shade = 100; + if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; /* for convenience */ mask_r = visual->red_mask; @@ -1371,209 +1179,82 @@ mask_b = visual->blue_mask; /* boring lookup table pre-initialization */ - switch (srcImage->bits_per_pixel) { - case 15: - if ((mask_r != 0x7c00) || - (mask_g != 0x03e0) || - (mask_b != 0x001f)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); - lookup_r = lookup; - lookup_g = lookup+32; - lookup_b = lookup+32+32; - sh_r = 10; - sh_g = 5; - sh_b = 0; - break; - case 16: - if ((mask_r != 0xf800) || - (mask_g != 0x07e0) || - (mask_b != 0x001f)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); - lookup_r = lookup; - lookup_g = lookup+32; - lookup_b = lookup+32+64; - sh_r = 11; - sh_g = 5; - sh_b = 0; - break; - case 24: - if ((mask_r != 0xff0000) || - (mask_g != 0x00ff00) || - (mask_b != 0x0000ff)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); - lookup_r = lookup; - lookup_g = lookup+256; - lookup_b = lookup+256+256; - sh_r = 16; - sh_g = 8; - sh_b = 0; - break; - case 32: - if ((mask_r != 0xff0000) || - (mask_g != 0x00ff00) || - (mask_b != 0x0000ff)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); - lookup_r = lookup; - lookup_g = lookup+256; - lookup_b = lookup+256+256; - sh_r = 16; - sh_g = 8; - sh_b = 0; - break; - default: - return; /* we do not support this color depth */ - } + sh_r = ecb_ctz32 (mask_r); + sh_g = ecb_ctz32 (mask_g); + sh_b = ecb_ctz32 (mask_b); + + size_r = mask_r >> sh_r; + size_g = mask_g >> sh_g; + size_b = mask_b >> sh_b; + + if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255) + return; + + lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b)); + lookup_r = lookup; + lookup_g = lookup + size_r; + lookup_b = lookup + size_r + size_g; + + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); + + if (bg_flags & BG_TINT_SET) + tint.get (c); /* prepare limits for color transformation (each channel is handled separately) */ - if (shade < 0) { - shade = -shade; - if (shade < 0) shade = 0; - if (shade > 100) shade = 100; - - lower_lim_r = 65535-rm; - lower_lim_g = 65535-gm; - lower_lim_b = 65535-bm; - - lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); - lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); - lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); - - upper_lim_r = upper_lim_g = upper_lim_b = 65535; - } else { - if (shade < 0) shade = 0; - if (shade > 100) shade = 100; - - lower_lim_r = lower_lim_g = lower_lim_b = 0; - - upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); - upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); - upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); - } - - /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ - if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) - { - unsigned int tmp; - - tmp = lower_lim_r; - lower_lim_r = lower_lim_b; - lower_lim_b = tmp; - - tmp = upper_lim_r; - upper_lim_r = upper_lim_b; - upper_lim_b = tmp; - } + if (shade > 100) + { + c.r = c.r * (200 - shade) / 100; + c.g = c.g * (200 - shade) / 100; + c.b = c.b * (200 - shade) / 100; + + low = 0xffff * (shade - 100) / 100; + } + else + { + c.r = c.r * shade / 100; + c.g = c.g * shade / 100; + c.b = c.b * shade / 100; + + low = 0; + } /* fill our lookup tables */ - for (i = 0; i <= mask_r>>sh_r; i++) - { - RUINT32T tmp; - tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); - tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); - lookup_r[i] = (tmp/65535)<>sh_g; i++) - { - RUINT32T tmp; - tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); - tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); - lookup_g[i] = (tmp/65535)<>sh_b; i++) - { - RUINT32T tmp; - tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); - tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); - lookup_b[i] = (tmp/65535)<bits_per_pixel) - { - case 15: - { - unsigned short *p1, *pf, *p, *pl; - p1 = (unsigned short *) srcImage->data; - pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) - { - *p = lookup_r[(*p & 0x7c00)>>10] | - lookup_g[(*p & 0x03e0)>> 5] | - lookup_b[(*p & 0x001f)]; - } - p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); - } - break; - } - case 16: - { - unsigned short *p1, *pf, *p, *pl; - p1 = (unsigned short *) srcImage->data; - pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) - { - *p = lookup_r[(*p & 0xf800)>>11] | - lookup_g[(*p & 0x07e0)>> 5] | - lookup_b[(*p & 0x001f)]; - } - p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); - } - break; - } - case 24: - { - unsigned char *p1, *pf, *p, *pl; - p1 = (unsigned char *) srcImage->data; - pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width * 3; - for (; p < pl; p += 3) - { - p[0] = lookup_r[(p[0] & 0xff0000)>>16]; - p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; - p[2] = lookup_r[(p[2] & 0x0000ff)]; - } - p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); - } - break; - } - case 32: - { - RUINT32T *p1, *pf, *p, *pl; - p1 = (RUINT32T *) srcImage->data; - pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) + if (ximage->bits_per_pixel == 32 + && ximage->byte_order == host_byte_order) + { + char *line = ximage->data; + + for (int y = 0; y < ximage->height; y++) { - *p = lookup_r[(*p & 0xff0000)>>16] | - lookup_g[(*p & 0x00ff00)>> 8] | - lookup_b[(*p & 0x0000ff)] | - (*p & ~0xffffff); + uint32_t *p = (uint32_t *)line; + for (int x = 0; x < ximage->width; x++) + { + *p = lookup_r[(*p & mask_r) >> sh_r] | + lookup_g[(*p & mask_g) >> sh_g] | + lookup_b[(*p & mask_b) >> sh_b]; + p++; + } + line += ximage->bytes_per_line; } - p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); - } - break; } - } + else + { + for (int y = 0; y < ximage->height; y++) + for (int x = 0; x < ximage->width; x++) + { + 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 (ximage, x, y, pixel); + } + } free (lookup); } -#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ +#endif /* ENABLE_TRANSPARENCY */