--- rxvt-unicode/src/background.C 2011/08/11 12:27:26 1.162 +++ rxvt-unicode/src/background.C 2011/12/28 11:11:25 1.186 @@ -34,22 +34,6 @@ #define FilterConvolution "convolution" #endif -/* - * Pixmap geometry string interpretation : - * Each geometry string contains zero or one scale/position - * adjustment and may optionally be followed by a colon and one or more - * colon-delimited pixmap operations. - * The following table shows the valid geometry strings and their - * effects on the background image : - * - * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. - * W and H are percentages of the terminal window size. - * X and Y are also percentages; e.g., +50+50 centers - * the image in the window. - * - * Pixmap Operations : (should be prepended by a colon) - */ - #ifdef HAVE_BG_PIXMAP void rxvt_term::bg_destroy () @@ -168,9 +152,9 @@ if (align >= 0 && align <= 100) return diff * align / 100; else if (align > 100 && align <= 200) - return ((align - 100) * smaller / 100) + window_size - smaller; + return (align - 100) * smaller / 100 + window_size - smaller; else if (align >= -100 && align < 0) - return ((align + 100) * smaller / 100) - image_size; + return (align + 100) * smaller / 100 - image_size; return 0; } @@ -199,56 +183,16 @@ int geom_flags = 0; int x = 0, y = 0; unsigned int w = 0, h = 0; - unsigned int n; - unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); - const char *ops; + unsigned long new_flags = 0; if (geom == NULL) return false; - char str[256]; - - ops = strchr (geom, ':'); - if (ops == NULL) - n = strlen (geom); - else - n = ops - geom; - - 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 (ops) + if (geom[0]) { - char **arr = rxvt_strsplit (':', ops + 1); + char **arr = rxvt_strsplit (':', geom); - for (int i = 0; arr[i]; i++) + for (int i = 0; arr[i]; i++) { if (!strcasecmp (arr[i], "style=tiled")) { @@ -259,9 +203,10 @@ } else if (!strcasecmp (arr[i], "style=aspect-stretched")) { - new_flags = BG_PROP_SCALE; + new_flags = BG_KEEP_ASPECT; + w = h = windowScale; x = y = centerAlign; - geom_flags = XValue|YValue; + geom_flags = WidthValue|HeightValue|XValue|YValue; } else if (!strcasecmp (arr[i], "style=stretched")) { @@ -284,9 +229,9 @@ } else if (!strcasecmp (arr[i], "op=tile")) new_flags |= BG_TILE; - else if (!strcasecmp (arr[i], "op=pscale")) - new_flags |= BG_PROP_SCALE; - else if (!strcasecmp (arr[i], "op=root")) + else if (!strcasecmp (arr[i], "op=keep-aspect")) + new_flags |= BG_KEEP_ASPECT; + else if (!strcasecmp (arr[i], "op=root-align")) new_flags |= BG_ROOT_ALIGN; // deprecated @@ -298,7 +243,9 @@ } else if (!strcasecmp (arr[i], "propscale")) { - new_flags |= BG_PROP_SCALE; + new_flags |= BG_KEEP_ASPECT; + w = h = windowScale; + geom_flags |= WidthValue|HeightValue; } else if (!strcasecmp (arr[i], "hscale")) { @@ -331,11 +278,33 @@ w = h = noScale; geom_flags |= WidthValue|HeightValue; } + + else + geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); } /* done parsing ops */ rxvt_free_strsplit (arr); } + new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; + + 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 (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; @@ -356,18 +325,16 @@ int target_width = szHint.width; int target_height = szHint.height; - if (bg_flags & BG_PROP_SCALE) + w = h_scale * target_width / 100; + h = v_scale * target_height / 100; + + if (bg_flags & BG_KEEP_ASPECT) { - float scale = (float)target_width / image_width; - min_it (scale, (float)target_height / image_height); + float scale = (float)w / image_width; + min_it (scale, (float)h / image_height); w = image_width * scale + 0.5; h = image_height * scale + 0.5; } - else - { - w = h_scale * target_width / 100; - h = v_scale * target_height / 100; - } if (!w) w = image_width; if (!h) h = image_height; @@ -385,7 +352,7 @@ bg_flags &= ~BG_IS_SIZE_SENSITIVE; if (!(bg_flags & BG_TILE) - || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale + || h_scale || v_scale || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) || w > target_width || h > target_height) bg_flags |= BG_IS_SIZE_SENSITIVE; @@ -422,7 +389,7 @@ if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) { ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, - (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, + ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); if (tmp) { @@ -451,8 +418,8 @@ || (!(bg_flags & BG_ROOT_ALIGN) && (x >= target_width || y >= target_height - || (x + w <= 0) - || (y + h <= 0)))) + || x + w <= 0 + || y + h <= 0))) { if (background) { @@ -476,12 +443,12 @@ { result = original_asim; - if ((w != original_asim->width) - || (h != original_asim->height)) + if (w != original_asim->width + || h != original_asim->height) { result = scale_asimage (asv, original_asim, w, h, - background ? ASA_ASImage : ASA_XImage, + ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); } @@ -741,14 +708,14 @@ if (!(bg_flags & BG_ROOT_ALIGN) && (x >= target_width || y >= target_height - || (x + w <= 0) - || (y + h <= 0))) + || x + w <= 0 + || y + h <= 0)) return false; result = pixbuf; - if ((w != image_width) - || (h != image_height)) + if (w != image_width + || h != image_height) { result = gdk_pixbuf_scale_simple (pixbuf, w, h, @@ -887,7 +854,10 @@ if (!file || !*file) return false; - if (const char *p = strchr (file, ';')) + bool ret = false; + const char *p = strchr (file, ';'); + + if (p) { size_t len = p - file; char *f = rxvt_temp_buf (len + 1); @@ -906,7 +876,7 @@ safe_asimage_destroy (original_asim); original_asim = image; bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; - return true; + ret = true; } # endif @@ -918,11 +888,19 @@ g_object_unref (pixbuf); pixbuf = image; bg_flags |= BG_IS_FROM_FILE; - return true; + ret = true; } # endif - return false; + if (ret) + { + if (p) + bg_set_geometry (p + 1); + else + bg_set_default_geometry (); + } + + return ret; } # endif /* BG_IMAGE_FROM_FILE */ @@ -979,7 +957,7 @@ void rxvt_term::set_tint_shade_flags () { - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + rgba c; bool has_shade = shade != 100; bg_flags &= ~BG_TINT_FLAGS; @@ -1015,7 +993,7 @@ bool rxvt_term::bg_set_shade (const char *shade_str) { - int new_shade = (shade_str) ? atoi (shade_str) : 100; + int new_shade = atoi (shade_str); clamp_it (new_shade, -100, 200); if (new_shade < 0) @@ -1059,6 +1037,9 @@ { bool ret = false; #if XRENDER + if (!(bg_flags & BG_HAS_RENDER_CONV)) + return false; + int size = max (h_blurRadius, v_blurRadius) * 2 + 1; double *kernel = (double *)malloc (size * sizeof (double)); XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); @@ -1141,9 +1122,9 @@ XFreeGC (dpy, gc); } } - else - { # if XRENDER + else if (bg_flags & BG_HAS_RENDER) + { rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); if (bg_flags & BG_TINT_SET) @@ -1208,8 +1189,8 @@ XRenderFreePicture (dpy, mask_pic); XRenderFreePicture (dpy, overlay_pic); XRenderFreePicture (dpy, back_pic); -# endif } +# endif return ret; } @@ -1303,8 +1284,8 @@ } /* straightforward pixmap copy */ - while (sx < 0) sx += root_width; - while (sy < 0) sy += root_height; + while (sx < 0) sx += root_pmap_width; + while (sy < 0) sy += root_pmap_height; gcv.tile = recoded_root_pmap; gcv.fill_style = FillTiled; @@ -1320,14 +1301,12 @@ if (!(bg_flags & BG_CLIENT_RENDER)) { - if ((bg_flags & BG_NEEDS_BLUR) - && (bg_flags & BG_HAS_RENDER_CONV)) + if (bg_flags & BG_NEEDS_BLUR) { if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) result &= ~BG_NEEDS_BLUR; } - if ((bg_flags & BG_NEEDS_TINT) - && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER))) + if (bg_flags & BG_NEEDS_TINT) { if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) result &= ~BG_NEEDS_TINT; @@ -1352,10 +1331,6 @@ } # endif /* ENABLE_TRANSPARENCY */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) -static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c); -# endif - bool rxvt_term::bg_render () { @@ -1369,8 +1344,7 @@ tr_flags = make_transparency_pixmap (); if (tr_flags == 0) return false; - else if (!(tr_flags & BG_EFFECTS_FLAGS)) - bg_flags |= BG_IS_VALID; + bg_flags |= BG_IS_VALID; } # endif @@ -1386,7 +1360,7 @@ # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) XImage *result = NULL; - if (tr_flags && !(bg_flags & BG_IS_VALID)) + if (tr_flags & BG_NEEDS_TINT) { result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); } @@ -1394,13 +1368,9 @@ if (result) { /* our own client-side tinting */ - if (tr_flags & BG_NEEDS_TINT) - { - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (bg_flags & BG_TINT_SET) - tint.get (c); - shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); - } + //if (tr_flags & BG_NEEDS_TINT) + if (1) + tint_ximage (DefaultVisual (dpy, display->screen), result); GC gc = XCreateGC (dpy, vt, 0UL, NULL); @@ -1409,7 +1379,6 @@ XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); XFreeGC (dpy, gc); - bg_flags |= BG_IS_VALID; } XDestroyImage (result); @@ -1460,17 +1429,27 @@ #endif /* HAVE_BG_PIXMAP */ #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) -/* taken from aterm-0.4.2 */ +/* based on code from aterm-0.4.2 */ -static void -shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) +static inline void +fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) +{ + for (int i = 0; i <= mask >> sh; i++) + { + uint32_t tmp; + tmp = i * high; + tmp += (mask >> sh) * low; + lookup[i] = (tmp / 0xffff) << sh; + } +} + +void +rxvt_term::tint_ximage (Visual *visual, XImage *ximage) { int sh_r, sh_g, sh_b; uint32_t mask_r, mask_g, mask_b; uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; - rgba low; - rgba high; - int i; + unsigned short low; int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; @@ -1539,50 +1518,33 @@ return; /* we do not support this color depth */ } + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); + + if (bg_flags & BG_TINT_SET) + tint.get (c); + /* prepare limits for color transformation (each channel is handled separately) */ if (shade > 100) { - shade = 200 - shade; + c.r = c.r * (200 - shade) / 100; + c.g = c.g * (200 - shade) / 100; + c.b = c.b * (200 - shade) / 100; - 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; + low = 0xffff * (shade - 100) / 100; } else { - high.r = c.r * shade / 100; - high.g = c.g * shade / 100; - high.b = c.b * shade / 100; + c.r = c.r * shade / 100; + c.g = c.g * shade / 100; + c.b = c.b * shade / 100; - low.r = low.g = low.b = 0; + low = 0; } /* fill our lookup tables */ - for (i = 0; i <= mask_r>>sh_r; i++) - { - uint32_t tmp; - tmp = i * high.r; - tmp += (mask_r>>sh_r) * low.r; - lookup_r[i] = (tmp/65535)<>sh_g; i++) - { - uint32_t tmp; - tmp = i * high.g; - tmp += (mask_g>>sh_g) * low.g; - lookup_g[i] = (tmp/65535)<>sh_b; i++) - { - uint32_t tmp; - tmp = i * high.b; - tmp += (mask_b>>sh_b) * low.b; - lookup_b[i] = (tmp/65535)<bits_per_pixel == 32