--- rxvt-unicode/src/background.C 2010/11/01 14:29:33 1.107 +++ rxvt-unicode/src/background.C 2011/01/28 00:21:10 1.145 @@ -26,26 +26,12 @@ #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 /* @@ -60,24 +46,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 @@ -93,36 +61,16 @@ */ #ifdef HAVE_BG_PIXMAP -bgPixmap_t::bgPixmap_t () -{ - // this is basically redundant as bgPixmap_t is only used in - // zero_initialised-derived structs -#ifdef HAVE_AFTERIMAGE - original_asim = NULL; -#endif -#ifdef HAVE_PIXBUF - pixbuf = NULL; -#endif -#ifdef BG_IMAGE_FROM_FILE - have_image = false; - h_scale = v_scale = 0; - h_align = v_align = 0; -#endif -#ifdef ENABLE_TRANSPARENCY - shade = 100; -#endif - flags = 0; - pixmap = None; - valid_since = invalid_since = 0; - target = 0; -} - void -bgPixmap_t::destroy () +rxvt_term::bg_destroy () { #ifdef HAVE_AFTERIMAGE if (original_asim) safe_asimage_destroy (original_asim); + if (asv) + destroy_asvisual (asv, 0); + if (asimman) + destroy_image_manager (asimman, 0); #endif #ifdef HAVE_PIXBUF @@ -130,22 +78,36 @@ 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) +{ + + if (target_x != x + || target_y != y) + { + target_x = x; + target_y = y; + return true; + } + return false; +} + +bool +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 (flags & sizeSensitive) + if (bg_flags & BG_IS_SIZE_SENSITIVE) return true; } # endif @@ -154,31 +116,22 @@ } bool -bgPixmap_t::window_position_sensitive () +rxvt_term::bg_window_position_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 (flags & rootAlign) + if (bg_flags & BG_ROOT_ALIGN) return true; } # endif return false; -}; - -bool bgPixmap_t::need_client_side_rendering () -{ -# ifdef HAVE_AFTERIMAGE - if (original_asim) - return true; -# endif - return false; } # ifdef BG_IMAGE_FROM_FILE @@ -250,196 +203,131 @@ } bool -bgPixmap_t::set_geometry (const char *geom) +rxvt_term::bg_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; -# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ + unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); + const char *ops; if (geom == NULL) return false; - char str[MAXLEN_GEOM]; + char str[256]; - while (isspace(*geom)) ++geom; - if ((p = strchr (geom, ';')) == NULL) - p = strchr (geom, '\0'); - - n = (p - geom); - if (n < MAXLEN_GEOM) - { - char *ops; - new_flags |= geometrySet; - - memcpy (str, geom, n); - str[n] = '\0'; - if (str[0] == ':') - ops = &str[0]; - else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) - ops = &str[0]; - else - { - char *tmp; - ops = strchr (str, ':'); - if (ops != NULL) - { - for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp); - *(++tmp) = '\0'; - if (ops == tmp) ++ops; - } - } + ops = strchr (geom, ':'); + if (ops == NULL) + n = strlen (geom); + else + n = ops - geom; - if (ops > str || ops == NULL) - { - /* we have geometry string - let's handle it prior to applying ops */ - geom_flags = XParseGeometry (str, &x, &y, &w, &h); + if (n >= sizeof (str)) + 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 ((geom_flags & XValue) && !(geom_flags & YValue)) + if (ops) + { + char **arr = rxvt_strsplit (':', ops + 1); + + for (int i = 0; arr[i]; i++) + { + if (!strcasecmp (arr[i], "tile")) { - y = x; - geom_flags |= YValue; + w = h = noScale; + geom_flags |= WidthValue|HeightValue; } - - if (flags & geometrySet) + else if (!strcasecmp (arr[i], "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 |= BG_PROP_SCALE; } - else /* setting up geometry from scratch */ + else if (!strcasecmp (arr[i], "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 (!strcasecmp (arr[i], "vscale")) { - while (*ops == ':' || isspace(*ops)) ++ops; - -# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) - if (CHECK_GEOM_OPS ("tile")) - { - w = h = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("propscale")) - { - new_flags |= propScale; - } - else if (CHECK_GEOM_OPS ("hscale")) - { - if (w == 0) w = windowScale; - - h = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("vscale")) - { - if (h == 0) h = windowScale; - - w = noScale; - geom_flags |= WidthValue|HeightValue; - } - else if (CHECK_GEOM_OPS ("scale")) - { - if (h == 0) h = windowScale; - if (w == 0) w = windowScale; + if (h == 0) h = 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; - } -# undef CHECK_GEOM_OPS + w = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "scale")) + { + if (h == 0) h = windowScale; + if (w == 0) w = windowScale; - while (*ops != ':' && *ops != '\0') ++ops; - } /* done parsing ops */ - } + 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_ROOT_ALIGN; + w = h = noScale; + geom_flags |= WidthValue|HeightValue; + } + } /* done parsing ops */ - if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; - if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; - if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; - if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; + rxvt_free_strsplit (arr); } - if (new_flags != flags) + 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 != bg_flags) { - flags = new_flags; - changed++; + bg_flags = new_flags; + changed = true; } - return (changed > 0); + return changed; } void -bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) +rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) { - int target_width = target->szHint.width; - int target_height = target->szHint.height; + int target_width = szHint.width; + int target_height = szHint.height; - if (flags & propScale) + if (bg_flags & BG_PROP_SCALE) { float scale = (float)target_width / image_width; min_it (scale, (float)target_height / image_height); @@ -455,11 +343,10 @@ if (!w) w = image_width; if (!h) h = image_height; - if (flags & rootAlign) + if (bg_flags & BG_ROOT_ALIGN) { - target->get_window_origin (x, y); - x = -x; - y = -y; + x = -target_x; + y = -target_y; } else { @@ -467,36 +354,33 @@ y = make_align_position (v_align, target_height, h); } - flags &= ~sizeSensitive; - if ((flags & propScale) || h_scale || v_scale - || (!(flags & rootAlign) && (h_align || v_align)) + bg_flags &= ~BG_IS_SIZE_SENSITIVE; + if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale + || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) || w > target_width || h > target_height) - flags |= sizeSensitive; + bg_flags |= BG_IS_SIZE_SENSITIVE; } # ifdef HAVE_AFTERIMAGE bool -bgPixmap_t::render_image (unsigned long background_flags) +rxvt_term::render_image (unsigned long tr_flags) { - if (target == NULL) - return false; - - target->init_asv (); + init_asv (); ASImage *background = NULL; ARGB32 background_tint = TINT_LEAVE_SAME; # ifdef ENABLE_TRANSPARENCY - if (background_flags) - background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); + if (tr_flags) + background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100); - if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) + if (tr_flags & BG_NEEDS_TINT) { ShadingInfo as_shade; as_shade.shading = shade; rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (flags & tintSet) + if (bg_flags & BG_TINT_SET) tint.get (c); as_shade.tintColor.red = c.r; as_shade.tintColor.green = c.g; @@ -505,9 +389,9 @@ background_tint = shading2tint32 (&as_shade); } - if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) + if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) { - ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, + ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT); if (tmp) @@ -520,8 +404,8 @@ ASImage *result = 0; - int target_width = target->szHint.width; - int target_height = target->szHint.height; + int target_width = szHint.width; + int target_height = szHint.height; int new_pmap_width = target_width; int new_pmap_height = target_height; @@ -534,7 +418,7 @@ get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); if (!original_asim - || (!(flags & rootAlign) + || (!(bg_flags & BG_ROOT_ALIGN) && (x >= target_width || y >= target_height || (x + w <= 0) @@ -548,7 +432,7 @@ if (background_tint != TINT_LEAVE_SAME) { - ASImage *tmp = tile_asimage (target->asv, background, 0, 0, + ASImage *tmp = tile_asimage (asv, background, 0, 0, target_width, target_height, background_tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); if (tmp) @@ -565,7 +449,7 @@ if ((w != original_asim->width) || (h != original_asim->height)) { - result = scale_asimage (target->asv, original_asim, + result = scale_asimage (asv, original_asim, w, h, background ? ASA_ASImage : ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); @@ -581,7 +465,7 @@ new_pmap_height = min (result->height, target_height); /* we also need to tile our image in both directions */ - ASImage *tmp = tile_asimage (target->asv, result, + ASImage *tmp = tile_asimage (asv, result, (int)result->width - x, (int)result->height - y, new_pmap_width, @@ -634,14 +518,14 @@ layers[1].clip_height = result->height; } - if (target->rs[Rs_blendtype]) + if (rs[Rs_blendtype]) { - layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); + layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]); if (layers[1].merge_scanlines == NULL) layers[1].merge_scanlines = alphablend_scanlines; } - ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, + ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); if (tmp) @@ -663,28 +547,20 @@ 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) - { - 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; + 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; } /* 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); + gcv.foreground = pix_colors[Color_bg]; + gc = XCreateGC (dpy, 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; @@ -699,17 +575,17 @@ 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); } /* 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); + asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); if (result != background && result != original_asim) destroy_asimage (&result); - XFreeGC (target->dpy, gc); + XFreeGC (dpy, gc); ret = true; } @@ -723,26 +599,105 @@ # 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 *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; + + 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 (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 (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height); + XDestroyImage (ximage); + return true; +} + +bool +rxvt_term::render_image (unsigned long tr_flags) +{ if (!pixbuf) return false; -#if !XRENDER - if (background_flags) + if (tr_flags + && !(bg_flags & BG_HAS_RENDER)) return false; -#endif GdkPixbuf *result; int image_width = gdk_pixbuf_get_width (pixbuf); int image_height = gdk_pixbuf_get_height (pixbuf); - int target_width = target->szHint.width; - int target_height = target->szHint.height; + int target_width = szHint.width; + int target_height = szHint.height; int new_pmap_width = target_width; int new_pmap_height = target_height; @@ -753,7 +708,7 @@ get_image_geometry (image_width, image_height, w, h, x, y); - if (!(flags & rootAlign) + if (!(bg_flags & BG_ROOT_ALIGN) && (x >= target_width || y >= target_height || (x + w <= 0) @@ -781,10 +736,10 @@ image_width = gdk_pixbuf_get_width (result); image_height = gdk_pixbuf_get_height (result); - if (background_flags) + if (tr_flags) { - root_pmap = pixmap; - pixmap = None; + root_pmap = bg_pixmap; + bg_pixmap = None; } else { @@ -795,46 +750,36 @@ } } - if (pixmap) - { - if (pmap_width != new_pmap_width - || pmap_height != new_pmap_height - || pmap_depth != target->depth) - { - XFreePixmap (target->dpy, pixmap); - pixmap = None; - } + 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; } - if (pixmap == None) - { - 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; - } - - gcv.foreground = target->pix_colors[Color_bg]; - gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); + gcv.foreground = pix_colors[Color_bg]; + gc = XCreateGC (dpy, vt, GCForeground, &gcv); 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); + 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 (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); - XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); - XFreePixmap (target->dpy, tile); + XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); + XFreePixmap (dpy, tile); } else { @@ -847,31 +792,28 @@ 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) - 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, bg_pixmap, gc, + src_x, src_y, + dst_x, dst_y, + dst_width, dst_height); } #if XRENDER - if (background_flags) + if (tr_flags) { - Display *dpy = target->dpy; XRenderPictureAttributes pa; - XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual); + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); - XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); - Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); + XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); + Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); pa.repeat = True; - Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); + Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); XFreePixmap (dpy, mask_pmap); @@ -899,7 +841,7 @@ if (result != pixbuf) g_object_unref (result); - XFreeGC (target->dpy, gc); + XFreeGC (dpy, gc); ret = true; } @@ -909,7 +851,7 @@ # endif /* HAVE_PIXBUF */ bool -bgPixmap_t::set_file (const char *file) +rxvt_term::bg_set_file (const char *file) { if (!file || !*file) return false; @@ -924,15 +866,15 @@ } # ifdef HAVE_AFTERIMAGE - if (!target->asimman) - target->asimman = create_generic_imageman (target->rs[Rs_path]); - ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); + if (!asimman) + asimman = create_generic_imageman (rs[Rs_path]); + ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100); if (image) { if (original_asim) safe_asimage_destroy (original_asim); original_asim = image; - have_image = true; + bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; return true; } # endif @@ -944,7 +886,7 @@ if (pixbuf) g_object_unref (pixbuf); pixbuf = image; - have_image = true; + bg_flags |= BG_IS_FROM_FILE; return true; } # endif @@ -956,11 +898,11 @@ # ifdef ENABLE_TRANSPARENCY bool -bgPixmap_t::set_transparent () +rxvt_term::bg_set_transparent () { - if (!(flags & isTransparent)) + if (!(bg_flags & BG_IS_TRANSPARENT)) { - flags |= isTransparent; + bg_flags |= BG_IS_TRANSPARENT; return true; } @@ -968,9 +910,9 @@ } bool -bgPixmap_t::set_blur_radius (const char *geom) +rxvt_term::bg_set_blur (const char *geom) { - int changed = 0; + bool changed = false; unsigned int hr, vr; int junk; int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); @@ -985,34 +927,22 @@ 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; + bg_flags &= ~BG_NEEDS_BLUR; else - flags |= blurNeeded; - -#if XRENDER - XFilters *filters = XRenderQueryFilters (target->dpy, target->vt); - if (filters) - { - for (int i = 0; i < filters->nfilter; i++) - if (!strcmp (filters->filter[i], FilterConvolution)) - flags |= bgPixmap_t::blurServerSide; - - XFree (filters); - } -#endif + bg_flags |= BG_NEEDS_BLUR; - return (changed > 0); + return changed; } static inline unsigned long @@ -1025,62 +955,27 @@ 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 (!has_shade + && (c.r <= 0x00ff || c.r >= 0xff00) + && (c.g <= 0x00ff || c.g >= 0xff00) + && (c.b <= 0x00ff || c.b >= 0xff00)) + flags |= rxvt_term::BG_TINT_BITAND; } - if (has_shade) - 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 XRENDER - flags |= bgPixmap_t::tintServerSide; -#endif - } - } + if (has_shade || tint) + flags |= rxvt_term::BG_NEEDS_TINT; return flags; } bool -bgPixmap_t::set_tint (rxvt_color &new_tint) +rxvt_term::bg_set_tint (rxvt_color &new_tint) { - if (!(flags & tintSet) || tint != new_tint) + if (!(bg_flags & BG_TINT_SET) || tint != new_tint) { unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); tint = new_tint; - flags = (flags & ~tintFlags) | new_flags | tintSet; - return true; - } - - return false; -} - -bool -bgPixmap_t::unset_tint () -{ - unsigned long new_flags = compute_tint_shade_flags (NULL, shade); - - if (new_flags != (flags & tintFlags)) - { - flags = (flags & ~tintFlags) | new_flags; + bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags | BG_TINT_SET; return true; } @@ -1088,7 +983,7 @@ } bool -bgPixmap_t::set_shade (const char *shade_str) +rxvt_term::bg_set_shade (const char *shade_str) { int new_shade = (shade_str) ? atoi (shade_str) : 100; @@ -1098,9 +993,9 @@ if (new_shade != shade) { - unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); + unsigned long new_flags = compute_tint_shade_flags ((bg_flags & BG_TINT_SET) ? &tint : NULL, new_shade); shade = new_shade; - flags = (flags & (~tintFlags | tintSet)) | new_flags; + bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags; return true; } @@ -1131,7 +1026,7 @@ #endif bool -bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) +rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) { bool ret = false; #if XRENDER @@ -1139,7 +1034,6 @@ 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); @@ -1169,7 +1063,7 @@ { size = v_blurRadius * 2 + 1; get_gaussian_kernel (v_blurRadius, size, kernel, params); - swap (params[0], params[1]); + ::swap (params[0], params[1]); XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); XRenderComposite (dpy, @@ -1195,12 +1089,11 @@ } bool -bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) +rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) { - Display *dpy = target->dpy; bool ret = false; - if (flags & tintWholesome) + if (bg_flags & BG_TINT_BITAND) { XGCValues gcv; GC gc; @@ -1224,7 +1117,7 @@ # if XRENDER rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (flags & tintSet) + if (bg_flags & BG_TINT_SET) tint.get (c); if (shade <= 100) @@ -1235,9 +1128,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); @@ -1261,7 +1154,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); @@ -1271,6 +1164,16 @@ mask_c.blue = 0xffff - c.b; XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); + + if (shade > 100) + { + mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100; + mask_c.alpha = 0; + XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); + + XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); + } + ret = true; } @@ -1289,29 +1192,26 @@ * our window. */ unsigned long -bgPixmap_t::make_transparency_pixmap () +rxvt_term::make_transparency_pixmap () { unsigned long result = 0; - if (target == NULL) - return 0; - /* root dimensions may change from call to call - but Display structure should * be always up-to-date, so let's use it : */ - 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; - 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 @@ -1325,94 +1225,94 @@ int idummy; unsigned int udummy; - target->allowedxerror = -1; + 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 recoded_root_pmap = root_pixmap; - if (root_pixmap != None && root_depth != target->depth) + if (root_pixmap != None && root_depth != depth) { #if XRENDER - XRenderPictureAttributes pa; + if (bg_flags & BG_HAS_RENDER) + { + XRenderPictureAttributes pa; - XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); - Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); + XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); + Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); - recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); - XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); - Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); + recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); + XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, 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; - } + 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 - root_pixmap = None; + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); + } + else #endif + root_pixmap = None; } if (root_pixmap == None) return 0; - Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); + 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; + } - if (tiled_root_pmap == None) /* something really bad happened - abort */ + if (bg_pixmap == None) return 0; /* straightforward pixmap copy */ - gcv.tile = recoded_root_pmap; - gcv.fill_style = FillTiled; - while (sx < 0) sx += (int)root_width; while (sy < 0) sy += (int)root_height; + gcv.tile = recoded_root_pmap; + gcv.fill_style = FillTiled; gcv.ts_x_origin = -sx; gcv.ts_y_origin = -sy; - gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); if (gc) { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); - result |= transpPmapTiled; + XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); + result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); XFreeGC (dpy, gc); - } - if (tiled_root_pmap != None) - { - if (!need_client_side_rendering ()) + if (!(bg_flags & BG_CLIENT_RENDER)) { - if ((flags & blurNeeded) - && (flags & blurServerSide)) + if ((bg_flags & BG_NEEDS_BLUR) + && (bg_flags & BG_HAS_RENDER_CONV)) { - if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) - result |= transpPmapBlurred; + if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) + result &= ~BG_NEEDS_BLUR; } - if ((flags & tintNeeded) - && (flags & tintServerSide)) + if ((bg_flags & BG_NEEDS_TINT) + && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER))) { - if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) - result |= transpPmapTinted; + if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) + result &= ~BG_NEEDS_TINT; } } /* server side rendering completed */ - - if (pixmap) - XFreePixmap (dpy, pixmap); - - pixmap = tiled_root_pmap; - pmap_width = window_width; - pmap_height = window_height; - pmap_depth = target->depth; } if (recoded_root_pmap != root_pixmap) @@ -1422,176 +1322,138 @@ } void -bgPixmap_t::set_root_pixmap () +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); + new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); root_pixmap = new_root_pixmap; } # endif /* ENABLE_TRANSPARENCY */ -# ifndef HAVE_AFTERIMAGE -static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); +#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) +static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c); # endif bool -bgPixmap_t::render () +rxvt_term::bg_render () { - unsigned long background_flags = 0; - - if (target == NULL) - return false; + unsigned long tr_flags = 0; - 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) + tr_flags = make_transparency_pixmap (); + if (tr_flags == 0) return false; - else if ((background_flags & transpTransformations) == (flags & transpTransformations)) - flags = flags & ~isInvalid; + else if (!(tr_flags & BG_EFFECTS_FLAGS)) + 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) + || (tr_flags & BG_EFFECTS_FLAGS)) { - if (render_image (background_flags)) - flags = flags & ~isInvalid; + if (render_image (tr_flags)) + bg_flags |= BG_IS_VALID; } # endif +# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) XImage *result = NULL; - if (background_flags && (flags & isInvalid)) + if (tr_flags && !(bg_flags & BG_IS_VALID)) { - result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); + result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); } if (result) { -# if !defined(HAVE_AFTERIMAGE) && !XRENDER /* our own client-side tinting */ - if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) + if (tr_flags & BG_NEEDS_TINT) { rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (flags & tintSet) + if (bg_flags & BG_TINT_SET) tint.get (c); - ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); + shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); } -# endif - GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); + GC gc = XCreateGC (dpy, vt, 0UL, NULL); if (gc) { - XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); + XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); - XFreeGC (target->dpy, gc); - flags = flags & ~isInvalid; + XFreeGC (dpy, gc); + bg_flags |= BG_IS_VALID; } XDestroyImage (result); } +# endif - if (flags & isInvalid) + if (!(bg_flags & BG_IS_VALID)) { - if (pixmap != None) + if (bg_pixmap != None) { - XFreePixmap (target->dpy, pixmap); - pixmap = None; + XFreePixmap (dpy, bg_pixmap); + bg_pixmap = None; } } - apply (); + scr_recolour (false); + bg_flags |= BG_NEEDS_REFRESH; - valid_since = ev::now (); + bg_valid_since = ev::now (); return true; } void -bgPixmap_t::set_target (rxvt_term *new_target) -{ - target = new_target; -} - -void -bgPixmap_t::apply () +rxvt_term::bg_init () { - if (target == NULL) - return; - - 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 - { - /* 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 ? */ +#ifdef ENABLE_TRANSPARENCY + shade = 100; +#endif - if (target->scrollBar.win) - XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); - } - } - else + 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) { - /* 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]); + 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); + XFree (filters); } - - target->want_refresh = 1; - flags |= hasChanged; +#endif } #endif /* HAVE_BG_PIXMAP */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER +#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) /* taken from aterm-0.4.2 */ static void -ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) +shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) { int sh_r, sh_g, sh_b; uint32_t mask_r, mask_g, mask_b; uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; - unsigned int lower_lim_r, lower_lim_g, lower_lim_b; - unsigned int upper_lim_r, upper_lim_g, upper_lim_b; + rgba low; + rgba high; int i; - int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; + int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; - if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; + if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; /* for convenience */ mask_r = visual->red_mask; @@ -1599,7 +1461,7 @@ mask_b = visual->blue_mask; /* boring lookup table pre-initialization */ - switch (srcImage->depth) + switch (ximage->depth) { case 15: if ((mask_r != 0x7c00) || @@ -1662,62 +1524,59 @@ { shade = 200 - shade; - lower_lim_r = 65535-rm; - lower_lim_g = 65535-gm; - lower_lim_b = 65535-bm; - - lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); - lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); - lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); - - upper_lim_r = upper_lim_g = upper_lim_b = 65535; + high.r = c.r * shade / 100; + high.g = c.g * shade / 100; + high.b = c.b * shade / 100; + + low.r = 65535 * (100 - shade) / 100; + low.g = 65535 * (100 - shade) / 100; + low.b = 65535 * (100 - shade) / 100; } else { + high.r = c.r * shade / 100; + high.g = c.g * shade / 100; + high.b = c.b * shade / 100; - lower_lim_r = lower_lim_g = lower_lim_b = 0; - - upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100); - upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100); - upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100); + low.r = low.g = low.b = 0; } /* fill our lookup tables */ for (i = 0; i <= mask_r>>sh_r; i++) { uint32_t tmp; - tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); - tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); + tmp = i * high.r; + tmp += (mask_r>>sh_r) * low.r; lookup_r[i] = (tmp/65535)<>sh_g; i++) { uint32_t tmp; - tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); - tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); + tmp = i * high.g; + tmp += (mask_g>>sh_g) * low.g; lookup_g[i] = (tmp/65535)<>sh_b; i++) { uint32_t tmp; - tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); - tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); + tmp = i * high.b; + tmp += (mask_b>>sh_b) * low.b; lookup_b[i] = (tmp/65535)<bits_per_pixel == 32 - && (srcImage->depth == 24 || srcImage->depth == 32) - && srcImage->byte_order == host_byte_order) + if (ximage->bits_per_pixel == 32 + && (ximage->depth == 24 || ximage->depth == 32) + && ximage->byte_order == host_byte_order) { uint32_t *p1, *pf, *p, *pl; - p1 = (uint32_t *) srcImage->data; - pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + p1 = (uint32_t *) ximage->data; + pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line); while (p1 < pf) { p = p1; - pl = p1 + srcImage->width; + pl = p1 + ximage->width; for (; p < pl; p++) { *p = lookup_r[(*p & 0xff0000) >> 16] | @@ -1725,19 +1584,19 @@ lookup_b[(*p & 0x0000ff)] | (*p & 0xff000000); } - p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); + p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); } } else { - for (int y = 0; y < srcImage->height; y++) - for (int x = 0; x < srcImage->width; x++) + for (int y = 0; y < ximage->height; y++) + for (int x = 0; x < ximage->width; x++) { - unsigned long pixel = XGetPixel (srcImage, x, y); + unsigned long pixel = XGetPixel (ximage, x, y); pixel = lookup_r[(pixel & mask_r) >> sh_r] | lookup_g[(pixel & mask_g) >> sh_g] | lookup_b[(pixel & mask_b) >> sh_b]; - XPutPixel (srcImage, x, y, pixel); + XPutPixel (ximage, x, y, pixel); } }