--- rxvt-unicode/src/background.C 2010/11/18 17:29:25 1.120 +++ rxvt-unicode/src/background.C 2011/01/14 17:06:04 1.136 @@ -34,28 +34,6 @@ #define FilterConvolution "convolution" #endif -#define DO_TIMING_TEST 0 - -#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) -#endif - /* * Pixmap geometry string interpretation : * Each geometry string contains zero or one scale/position @@ -105,6 +83,7 @@ pixmap = None; valid_since = invalid_since = 0; target = 0; + target_x = target_y = 0; } void @@ -125,6 +104,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 @@ -162,15 +155,6 @@ 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 static inline bool check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) @@ -249,12 +233,11 @@ unsigned int n; unsigned long new_flags = (flags & (~geometryFlags)); const char *ops; -# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ if (geom == NULL) return false; - char str[MAXLEN_GEOM]; + char str[256]; ops = strchr (geom, ':'); if (ops == NULL) @@ -262,96 +245,94 @@ else n = ops - geom; - if (n < MAXLEN_GEOM) + if (n >= sizeof (str)) + return false; + + memcpy (str, geom, n); + str[n] = '\0'; + rxvt_strtrim (str); + + if (str[0]) { - memcpy (str, geom, n); - str[n] = '\0'; - rxvt_strtrim (str); + /* 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 (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 (!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; - 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; + } - geom_flags |= WidthValue|HeightValue|XValue|YValue; - } + if (ops) + { + char **arr = rxvt_strsplit (':', ops + 1); - if (ops) + for (int i = 0; arr[i]; i++) { - while (*ops) + if (!strcasecmp (arr[i], "tile")) { - 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 = h = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "propscale")) + { + new_flags |= propScale; + } + else if (!strcasecmp (arr[i], "hscale")) + { + 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; + h = noScale; + geom_flags |= WidthValue|HeightValue; + } + else if (!strcasecmp (arr[i], "vscale")) + { + 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 |= rootAlign; + w = h = noScale; + geom_flags |= WidthValue|HeightValue; + } + } /* 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; + rxvt_free_strsplit (arr); } + if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; + if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; + if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; + if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; + if (new_flags != flags) { flags = new_flags; @@ -385,9 +366,8 @@ if (flags & rootAlign) { - target->get_window_origin (x, y); - x = -x; - y = -y; + x = -target_x; + y = -target_y; } else { @@ -594,15 +574,13 @@ /* create Pixmap */ if (pixmap == None || pmap_width != new_pmap_width - || pmap_height != new_pmap_height - || pmap_depth != target->depth) + || pmap_height != new_pmap_height) { 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; - pmap_depth = target->depth; } /* fill with background color (if result's not completely overlapping it) */ gcv.foreground = target->pix_colors[Color_bg]; @@ -645,6 +623,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) @@ -718,15 +781,13 @@ if (pixmap == None || pmap_width != new_pmap_width - || pmap_height != new_pmap_height - || pmap_depth != target->depth) + || pmap_height != new_pmap_height) { 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; - pmap_depth = target->depth; } gcv.foreground = target->pix_colors[Color_bg]; @@ -735,12 +796,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; @@ -765,12 +824,10 @@ 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 XRENDER @@ -847,6 +904,7 @@ if (original_asim) safe_asimage_destroy (original_asim); original_asim = image; + flags |= CLIENT_RENDER; have_image = true; return true; } @@ -928,24 +986,15 @@ 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)) + if (!has_shade + && (c.r <= 0x00ff || c.r >= 0xff00) + && (c.g <= 0x00ff || c.g >= 0xff00) + && (c.b <= 0x00ff || c.b >= 0xff00)) 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; - } - } return flags; } @@ -965,20 +1014,6 @@ } bool -bgPixmap_t::unset_tint () -{ - unsigned long new_flags = compute_tint_shade_flags (NULL, shade); - - if (new_flags != (flags & tintFlags)) - { - flags = (flags & ~tintFlags) | new_flags; - return true; - } - - return false; -} - -bool bgPixmap_t::set_shade (const char *shade_str) { int new_shade = (shade_str) ? atoi (shade_str) : 100; @@ -1126,9 +1161,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); @@ -1152,7 +1187,7 @@ { XRenderColor mask_c; - mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; + 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); @@ -1162,6 +1197,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; } @@ -1202,7 +1247,8 @@ 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 @@ -1259,54 +1305,52 @@ if (root_pixmap == None) return 0; - Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); + if (pixmap == None + || pmap_width != window_width + || pmap_height != window_height) + { + if (pixmap) + XFreePixmap (target->dpy, pixmap); + pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth); + pmap_width = window_width; + pmap_height = window_height; + } - if (tiled_root_pmap == None) /* something really bad happened - abort */ + if (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); if (gc) { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); + XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); result |= transpPmapTiled; XFreeGC (dpy, gc); - if (!need_client_side_rendering ()) + if (!(flags & CLIENT_RENDER)) { if ((flags & blurNeeded) && (flags & HAS_RENDER_CONV)) { - if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) + if (blur_pixmap (pixmap, 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)) + if (tint_pixmap (pixmap, target->visual, window_width, window_height)) result |= transpPmapTinted; } } /* 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; } - else - XFreePixmap (dpy, tiled_root_pmap); if (recoded_root_pmap != root_pixmap) XFreePixmap (dpy, recoded_root_pmap); @@ -1317,16 +1361,16 @@ void bgPixmap_t::set_root_pixmap () { - Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); + Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]); if (new_root_pixmap == None) - new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); + new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]); root_pixmap = new_root_pixmap; } # endif /* ENABLE_TRANSPARENCY */ #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) -static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); +static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c); # endif bool @@ -1346,7 +1390,7 @@ if (background_flags == 0) return false; else if ((background_flags & transpTransformations) == (flags & transpTransformations)) - flags = flags & ~isInvalid; + flags &= ~isInvalid; } # endif @@ -1355,7 +1399,7 @@ || (background_flags & transpTransformations) != (flags & transpTransformations)) { if (render_image (background_flags)) - flags = flags & ~isInvalid; + flags &= ~isInvalid; } # endif @@ -1375,7 +1419,7 @@ rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) tint.get (c); - ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); + shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); } GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); @@ -1385,7 +1429,7 @@ 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); @@ -1490,7 +1534,7 @@ /* taken from aterm-0.4.2 */ static void -ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) +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; @@ -1498,9 +1542,9 @@ 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; @@ -1508,7 +1552,7 @@ mask_b = visual->blue_mask; /* boring lookup table pre-initialization */ - switch (srcImage->depth) + switch (ximage->depth) { case 15: if ((mask_r != 0x7c00) || @@ -1571,13 +1615,13 @@ { shade = 200 - shade; - high.r = (65535 - c.r) * shade / 100; - high.g = (65535 - c.g) * shade / 100; - high.b = (65535 - c.b) * shade / 100; - - low.r = 65535 - high.r; - low.g = 65535 - high.g; - low.b = 65535 - high.b; + 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 { @@ -1612,18 +1656,18 @@ } /* apply table to input image (replacing colors by newly calculated ones) */ - if (srcImage->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] | @@ -1631,19 +1675,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); } }