--- rxvt-unicode/src/background.C 2010/10/13 23:01:40 1.79 +++ rxvt-unicode/src/background.C 2010/12/02 11:02:16 1.127 @@ -5,6 +5,7 @@ * All portions of code are copyright by their respective author/s. * Copyright (c) 2005-2008 Marc Lehmann * Copyright (c) 2007 Sasha Vasko + * Copyright (c) 2010 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,9 +22,18 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ +#include #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 @@ -58,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 @@ -113,6 +105,7 @@ pixmap = None; valid_since = invalid_since = 0; target = 0; + target_x = target_y = 0; } void @@ -133,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 @@ -168,7 +175,7 @@ # endif return false; -}; +} bool bgPixmap_t::need_client_side_rendering () { @@ -176,17 +183,6 @@ 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; - } -# endif return false; } @@ -233,7 +229,7 @@ if (align >= 0 && align <= 100) return diff * align / 100; - else if (align > 100 && align <= 200 ) + 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; @@ -259,14 +255,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) @@ -274,174 +271,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 (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 & (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 > str || ops == NULL) + if (ops) + { + while (*ops) { - /* we have geometry string - let's handle it prior to applying ops */ - geom_flags = XParseGeometry (str, &x, &y, &w, &h); + while (*ops == ':' || isspace(*ops)) ++ops; - if ((geom_flags & XValue) && !(geom_flags & YValue)) +# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 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; + if (h == 0) h = windowScale; -# 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; - - 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 - 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; + while (*ops != ':' && *ops != '\0') ++ops; + } /* done parsing ops */ } + 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; } - //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", - // flags, h_scale, v_scale, h_align, v_align); - return (changed > 0); + return changed; } void @@ -468,9 +400,8 @@ if (flags & rootAlign) { - target->get_window_origin (x, y); - x = -x; - y = -y; + x = -target_x; + y = -target_y; } else { @@ -479,8 +410,8 @@ } flags &= ~sizeSensitive; - if (h_scale != 0 || v_scale != 0 - || h_align != 0 || v_align != 0 + if ((flags & propScale) || h_scale || v_scale + || (!(flags & rootAlign) && (h_align || v_align)) || w > target_width || h > target_height) flags |= sizeSensitive; } @@ -541,8 +472,6 @@ int w = 0; int h = 0; - TIMING_TEST_START (asim); - if (original_asim) get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); @@ -668,7 +597,6 @@ free (layers); } } - TIMING_TEST_PRINT_RESULT (asim); bool ret = false; @@ -677,20 +605,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; @@ -724,7 +646,6 @@ destroy_asimage (&result); XFreeGC (target->dpy, gc); - TIMING_TEST_PRINT_RESULT (asim); ret = true; } @@ -738,6 +659,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) @@ -746,10 +752,9 @@ if (!pixbuf) return false; -#if !XFT - if (background_flags) + if (background_flags + && !(flags & HAS_RENDER)) return false; -#endif GdkPixbuf *result; @@ -810,19 +815,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; @@ -835,12 +834,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; @@ -865,21 +862,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); @@ -926,35 +921,43 @@ bool bgPixmap_t::set_file (const char *file) { - assert (file); + if (!file || !*file) + return false; - if (*file) + if (const char *p = strchr (file, ';')) { - if (const char *p = strchr (file, ';')) - { - size_t len = p - file; - char *f = rxvt_temp_buf (len + 1); - memcpy (f, file, len); - f[len] = '\0'; - file = f; - } + size_t len = p - file; + char *f = rxvt_temp_buf (len + 1); + memcpy (f, file, len); + f[len] = '\0'; + file = f; + } # ifdef HAVE_AFTERIMAGE - if (!target->asimman) - target->asimman = create_generic_imageman (target->rs[Rs_path]); - original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); + 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) - have_image = true; - return have_image; + safe_asimage_destroy (original_asim); + original_asim = image; + have_image = true; + return true; + } # endif # ifdef HAVE_PIXBUF - pixbuf = gdk_pixbuf_new_from_file (file, NULL); + GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); + if (image) + { if (pixbuf) - have_image = true; - return have_image; -# endif + g_object_unref (pixbuf); + pixbuf = image; + have_image = true; + return true; } +# endif return false; } @@ -977,7 +980,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,15 +990,18 @@ 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; } @@ -1004,7 +1010,7 @@ else flags |= blurNeeded; - return (changed > 0); + return changed; } static inline unsigned long @@ -1017,36 +1023,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; } @@ -1099,6 +1086,93 @@ return false; } +#if XRENDER +static void +get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) +{ + double sigma = radius / 2.0; + double scale = sqrt (2.0 * M_PI) * sigma; + double sum = 0.0; + + for (int i = 0; i < width; i++) + { + double x = i - width / 2; + kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; + sum += kernel[i]; + } + + 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::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) +{ + bool ret = false; +#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)); + + Display *dpy = target->dpy; + XRenderPictureAttributes pa; + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); + + Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); + + if (kernel && params && src && dst) + { + if (h_blurRadius) + { + size = h_blurRadius * 2 + 1; + get_gaussian_kernel (h_blurRadius, size, kernel, params); + + XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); + XRenderComposite (dpy, + PictOpSrc, + src, + None, + dst, + 0, 0, + 0, 0, + 0, 0, + width, height); + } + + if (v_blurRadius) + { + size = v_blurRadius * 2 + 1; + get_gaussian_kernel (v_blurRadius, size, kernel, params); + swap (params[0], params[1]); + + XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); + XRenderComposite (dpy, + PictOpSrc, + src, + None, + dst, + 0, 0, + 0, 0, + 0, 0, + width, height); + } + + ret = true; + } + + free (kernel); + free (params); + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); +#endif + return ret; +} + bool bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) { @@ -1126,7 +1200,7 @@ } else { -# if XFT +# if XRENDER rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) @@ -1140,9 +1214,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); @@ -1166,7 +1240,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); @@ -1176,15 +1250,22 @@ 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; } XRenderFreePicture (dpy, mask_pic); XRenderFreePicture (dpy, overlay_pic); XRenderFreePicture (dpy, back_pic); -# if DO_TIMING_TEST - XSync (dpy, False); -# endif # endif } @@ -1192,8 +1273,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 @@ -1207,9 +1288,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; @@ -1217,118 +1298,99 @@ int window_height = target->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 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 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 != target->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) - { - 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; - - 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; - } - } +#if XRENDER + if (flags & HAS_RENDER) + { + XRenderPictureAttributes pa; - XDestroyWindow (dpy, src); - XUngrabServer (dpy); - //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); - } + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); + Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); - if (!success) - { - XFreePixmap (dpy, tiled_root_pmap); - tiled_root_pmap = None; + 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 - result |= transpPmapTiled; +#endif + root_pixmap = 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 (root_pixmap == None) + return 0; + + 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 */ + 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, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); - if (tiled_root_pmap != None) + if (gc) { + XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); + result |= transpPmapTiled; + XFreeGC (dpy, gc); + if (!need_client_side_rendering ()) { - if ((flags & tintNeeded)) + if ((flags & blurNeeded) + && (flags & HAS_RENDER_CONV)) { - if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) + if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) + result |= transpPmapBlurred; + } + if ((flags & tintNeeded) + && (flags & (tintWholesome | HAS_RENDER))) + { + if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) result |= transpPmapTinted; } } /* server side rendering completed */ @@ -1339,36 +1401,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 (gc) - XFreeGC (dpy, gc); - - TIMING_TEST_PRINT_RESULT (tp); + if (recoded_root_pmap != root_pixmap) + XFreePixmap (dpy, recoded_root_pmap); return result; } -bool +void bgPixmap_t::set_root_pixmap () { Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); if (new_root_pixmap == None) new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); - if (new_root_pixmap != root_pixmap) - { - root_pixmap = new_root_pixmap; - return true; - } - - return false; + root_pixmap = new_root_pixmap; } # endif /* ENABLE_TRANSPARENCY */ -# ifndef HAVE_AFTERIMAGE -static void ShadeXImage(rxvt_term *term, 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 @@ -1379,8 +1435,6 @@ if (target == NULL) return false; - TIMING_TEST_START (tp); - invalidate (); # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) @@ -1389,9 +1443,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 @@ -1400,10 +1453,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)) @@ -1413,59 +1467,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 (target, 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) { @@ -1478,107 +1501,104 @@ apply (); - XSync (target->dpy, False); valid_since = ev::now (); - TIMING_TEST_PRINT_RESULT (tp); - 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) - { - flags &= ~isVtOrigin; + if (target == NULL) + return; - if (pixmap != None) - { - /* set target's background to pixmap */ + 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 (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 */ -typedef uint32_t RUINT32T; - static void -ShadeXImage(rxvt_term *term, 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; - 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; + uint32_t mask_r, mask_g, mask_b; + uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; + rgba low; + rgba high; int i; + int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; - Visual *visual = term->visual; - - 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; @@ -1586,204 +1606,144 @@ 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)); + switch (ximage->depth) + { + case 15: + if ((mask_r != 0x7c00) || + (mask_g != 0x03e0) || + (mask_b != 0x001f)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(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)); + break; + case 16: + if ((mask_r != 0xf800) || + (mask_g != 0x07e0) || + (mask_b != 0x001f)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(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)); + break; + case 24: + if ((mask_r != 0xff0000) || + (mask_g != 0x00ff00) || + (mask_b != 0x0000ff)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(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)); + break; + case 32: + if ((mask_r != 0xff0000) || + (mask_g != 0x00ff00) || + (mask_b != 0x0000ff)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(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 */ - } + break; + default: + return; /* we do not support this color depth */ + } /* prepare limits for color transformation (each channel is handled separately) */ - if (shade > 100) { - shade = 200 - shade; + if (shade > 100) + { + shade = 200 - shade; - 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 { - - 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; - } + 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; + + low.r = low.g = low.b = 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_r) * low.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_g) * low.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)<>sh_b) * low.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); + 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 *) ximage->data; + pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line); while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) - { - *p = lookup_r[(*p & 0xff0000)>>16] | - lookup_g[(*p & 0x00ff00)>> 8] | - lookup_b[(*p & 0x0000ff)] | - (*p & ~0xffffff); - } - p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); - } - break; + { + p = p1; + pl = p1 + ximage->width; + for (; p < pl; p++) + { + *p = lookup_r[(*p & 0xff0000) >> 16] | + lookup_g[(*p & 0x00ff00) >> 8] | + lookup_b[(*p & 0x0000ff)] | + (*p & 0xff000000); + } + p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); + } + } + 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); }