--- rxvt-unicode/src/xpm.C 2007/08/02 00:09:54 1.54 +++ rxvt-unicode/src/xpm.C 2007/08/07 22:43:33 1.62 @@ -26,237 +26,551 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#ifdef XPM_BACKGROUND - /* - * These GEOM strings indicate absolute size/position: - * @ `WxH+X+Y' - * @ `WxH+X' -> Y = X - * @ `WxH' -> Y = X = 50 - * @ `W+X+Y' -> H = W - * @ `W+X' -> H = W, Y = X - * @ `W' -> H = W, X = Y = 50 - * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged) - * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged) - * @ `=+X+Y' -> (H, W unchanged) - * @ `=+X' -> Y = X (H, W unchanged) + * 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 + * affects on the background image : + * + * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. + * W and H are percentages of the terminal window size. + * X and Y are also percentages; e.g., +50+50 centers + * the image in the window. + * WxH+X Assumes Y == X + * WxH Assumes Y == X == 50 (centers the image) + * W+X+Y Assumes H == W + * W+X Assumes H == W and Y == X + * W Assumes H == W and Y == X == 50 + * + * Adjusting position only : + * =+X+Y Set position to X% by Y% (absolute). + * =+X Set position to X% by X%. + * +X+Y Adjust position horizontally X% and vertically Y% + * from current position (relative). + * +X Adjust position horizontally X% and vertically X% + * from current position. * - * These GEOM strings adjust position relative to current position: - * @ `+X+Y' - * @ `+X' -> Y = X + * 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). * - * And this GEOM string is for querying current scale/position: - * @ `?' + * Pixmap Operations : (should be prepended by a colon) + * tile Tile image. Scaling/position modifiers above will affect + * the tile size and origin. + * propscale When scaling, scale proportionally. That is, maintain the + * proper aspect ratio for the image. Any portion of the + * background not covered by the image is filled with the + * current background color. + * hscale Scale horizontally, tile vertically ? + * vscale Tile horizontally, scale vertically ? + * scale Scale both up and down + * auto Same as 100x100+50+50 */ -int -rxvt_term::scale_pixmap (const char *geom) + +#ifdef HAVE_BG_PIXMAP +bool +bgPixmap_t::window_size_sensitive () +{ +#ifdef XPM_BACKGROUND +#ifdef HAVE_AFTERIMAGE + if (original_asim != NULL) +#endif + { + if (h_scale != 0 || v_scale != 0) + return true; + } +#endif +#ifdef ENABLE_TRANSPARENCY + if (flags & bgPmap_Transparent) + return true; +#endif + return false; +} + +#ifdef XPM_BACKGROUND +static inline bool +check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) +{ + if (geom_flags & flag) + { + if (new_value > 1000) + new_value = 1000; + if (new_value != scale) + { + scale = new_value; + return true; + } + } + return false; +} + +static inline bool +check_set_align_value (int geom_flags, int flag, int &align, int new_value) +{ + if (geom_flags & flag) + { + if (new_value < -100) + new_value = -100; + else if (new_value > 200) + new_value = 200; + if (new_value != align) + { + align = new_value; + return true; + } + } + return false; +} + +static inline int +make_align_position (int align, int window_size, int image_size) +{ + int diff = window_size - image_size; + int smaller = MIN (image_size,window_size); + + if (align >= 0 && align <= 50) + return diff * align / 100; + else if (align > 50 && align <= 100) + return window_size - image_size - diff * (100 - align) / 100; + else if (align > 100 && align <= 200 ) + return ((align - 100) * smaller / 100) + window_size - smaller; + else if (align > -100 && align < 0) + return ((align + 100) * smaller / 100) - image_size; + return 0; +} + +static inline int +make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) { - int flags, changed = 0; + int src_pos = 0; + dst_pos = 0; + dst_size = size; + if (pos < 0 && size > target_size) + { + src_pos = -pos; + dst_size += pos; + } + else if (pos > 0) + dst_pos = pos; + + if (dst_pos + dst_size > target_size) + dst_size = target_size - dst_pos; + return src_pos; +} + +bool +bgPixmap_t::handle_geometry (const char *geom) +{ + int geom_flags = 0, changed = 0; int x = 0, y = 0; unsigned int w = 0, h = 0; unsigned int n; + unsigned long new_flags = (flags&(~bgPmap_geometryFlags)); char *p; - bgPixmap_t *bgpixmap = &bgPixmap; - -#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]") +#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ if (geom == NULL) - return 0; + return false; char str[MAXLEN_GEOM]; if (!strcmp (geom, "?")) { +#if 0 /* TODO: */ sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ - min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), - min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); + min (h_scale, 32767), min (v_scale, 32767), + min (h_align, 32767), min (v_align, 32767)); process_xterm_seq (XTerm_title, str, CHAR_ST); - return 0; +#endif + return false; } - + while (isspace(*geom)) ++geom; if ((p = strchr (geom, ';')) == NULL) p = strchr (geom, '\0'); n = (p - geom); if (n < MAXLEN_GEOM) { + char *ops; + new_flags |= bgPmap_geometrySet; + strncpy (str, geom, n); str[n] = '\0'; - - if (strcmp(str, "auto") == 0) - { - if (!bgpixmap->auto_resize) - changed++; - bgpixmap->auto_resize = True ; - w = szHint.width ; - h = szHint.height ; - flags = WidthValue|HeightValue ; - } + if (str[0] == ':') + ops = &str[0]; + else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) + ops = &str[0]; else { - bgpixmap->auto_resize = False ; - flags = XParseGeometry (str, &x, &y, &w, &h); + char *tmp; + ops = strchr (str, ':'); + if (ops != NULL) + { + for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp); + *(++tmp) = '\0'; + if (ops == tmp) ++ops; + } } - if (!flags) + if (ops > str || ops == NULL) { - flags |= WidthValue; - w = 0; - } /* default is tile */ + /* we have geometry string - let's handle it prior to applying ops */ + geom_flags = XParseGeometry (str, &x, &y, &w, &h); + + if ((geom_flags & XValue) && !(geom_flags & YValue)) + { + y = x; + geom_flags |= YValue; + } + + if (flags & bgPmap_geometrySet) + {/* 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; + } + } + } + else /* setting up geometry from scratch */ + { + if (!(geom_flags & XValue)) + {/* use default geometry - centered */ + x = y = bgPmap_defaultAlign; + } + else if (!(geom_flags & YValue)) + y = x; + + if ((geom_flags & (WidthValue|HeightValue)) == 0) + {/* use default geometry - scaled */ + w = h = bgPmap_defaultScale; + } + else if (geom_flags & WidthValue) + { + if (!(geom_flags & HeightValue)) + h = w; + } + else + w = h; + } + } /* done parsing geometry string */ + else if (!(flags & bgPmap_geometrySet)) + { /* default geometry - scaled and centered */ + x = y = bgPmap_defaultAlign; + w = h = bgPmap_defaultScale; + } + + if (!(flags & bgPmap_geometrySet)) + geom_flags |= WidthValue|HeightValue|XValue|YValue; - if (flags & WidthValue) + if (ops) { - if (!(flags & XValue)) - x = 50; + while (*ops) + { + 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 = 0; + geom_flags |= WidthValue|HeightValue; + } + else if (CHECK_GEOM_OPS("propscale")) + { + if (w == 0 && h == 0) + { + w = 100; + geom_flags |= WidthValue; + } + new_flags |= bgPmap_propScale; + } + else if (CHECK_GEOM_OPS("hscale")) + { + if (w == 0) + w = 100; + h = 0; + geom_flags |= WidthValue|HeightValue; + } + else if (CHECK_GEOM_OPS("vscale")) + { + if (h == 0) + h = 100; + w = 0; + geom_flags |= WidthValue|HeightValue; + } + else if (CHECK_GEOM_OPS("scale")) + { + if (h == 0) + h = 100; + if (w == 0) + w = 100; + geom_flags |= WidthValue|HeightValue; + } + else if (CHECK_GEOM_OPS("auto")) + { + w = h = 100; + x = y = 50; + geom_flags |= WidthValue|HeightValue|XValue|YValue; + } +#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; + } - if (!(flags & HeightValue)) - h = w; + if (new_flags != flags) + { + flags = new_flags; + changed++; + } +//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", +// flags, h_scale, v_scale, h_align, v_align); + return (changed > 0); +} - if (w && !h) +#ifdef HAVE_AFTERIMAGE +bool +bgPixmap_t::render_asim (rxvt_term *target, ASImage *background, ARGB32 background_tint) +{ + if (target == NULL) + return false; + + int target_width = (int)target->szHint.width; + int target_height = (int)target->szHint.height; + int new_pmap_width = target_width, new_pmap_height = target_height; + ASImage *result = NULL; + + int x = 0; + int y = 0; + int w = h_scale * target_width / 100; + int h = v_scale * target_height / 100; + + if (original_asim) + { + x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); + y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); + } + + if (original_asim == NULL + || x >= target_width + || y >= target_height + || (w > 0 && x + w <= 0) + || (h > 0 && y + h <= 0)) + { + if (background) + { + new_pmap_width = background->width; + new_pmap_height = background->height; + result = background; + if (background_tint != TINT_LEAVE_SAME) { - w = (bgpixmap->w * w) / 100; - h = bgpixmap->h; + ASImage* tmp = tile_asimage (target->asv, background, 0, 0, + target_width, target_height, background_tint, + ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); + if (tmp) + result = tmp; } - else if (h && !w) + } + else + new_pmap_width = new_pmap_height = 0; + } + else + { + result = original_asim; + if ((w > 0 && w != original_asim->width) + || (h > 0 && h != original_asim->height)) + { + result = scale_asimage (target->asv, original_asim, + w > 0 ? w : original_asim->width, + h > 0 ? h : original_asim->height, + background ? ASA_ASImage : ASA_XImage, + 100, ASIMAGE_QUALITY_DEFAULT); + } + if (background == NULL) + {/* if tiling - pixmap has to be sized exactly as the image */ + if (h_scale == 0) + new_pmap_width = result->width; + if (v_scale == 0) + new_pmap_height = result->height; + /* we also need to tile our image in one or both directions */ + if (h_scale == 0 || v_scale == 0) { - w = bgpixmap->w; - h = (bgpixmap->h * h) / 100; + ASImage *tmp = tile_asimage (target->asv, result, + (h_scale > 0) ? 0 : (int)result->width - x, + (v_scale > 0) ? 0 : (int)result->height - y, + result->width, result->height, + TINT_LEAVE_SAME, ASA_XImage, + 100, ASIMAGE_QUALITY_DEFAULT); + if (tmp) + { + if (result != original_asim) + destroy_asimage (&result); + result = tmp; + } } - - min_it (w, 32767); - min_it (h, 32767); - - if (bgpixmap->w != (short)w) + } + else + {/* if blending background and image - pixmap has to be sized same as target window */ + ASImageLayer *layers = create_image_layers (2); + ASImage *merged_im = NULL; + + layers[0].im = background; + layers[0].clip_width = target_width; + layers[0].clip_height = target_height; + layers[0].tint = background_tint; + layers[1].im = result; + if (w <= 0) + {/* tile horizontally */ + while (x > 0) x -= (int)result->width; + layers[1].dst_x = x; + layers[1].clip_width = result->width+target_width; + } + else + {/* clip horizontally */ + layers[1].dst_x = x; + layers[1].clip_width = result->width; + } + if (h <= 0) { - bgpixmap->w = (short)w; - changed++; + while (y > 0) y -= (int)result->height; + layers[1].dst_y = y; + layers[1].clip_height = result->height + target_height; } - - if (bgpixmap->h != (short)h) + else + { + layers[1].dst_y = y; + layers[1].clip_height = result->height; + } + if (target->rs[Rs_blendtype]) + { + layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); + if (layers[1].merge_scanlines == NULL) + layers[1].merge_scanlines = alphablend_scanlines; + } + ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, + ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); + if (tmp) { - bgpixmap->h = (short)h; - changed++; + if (result != original_asim) + destroy_asimage (&result); + result = tmp; } + free (layers); } + } - if (!(flags & YValue)) + if (pixmap) + { + if (result == NULL + || pmap_width != new_pmap_width + || pmap_height != new_pmap_height + || pmap_depth != target->depth) { - if (flags & XNegative) - flags |= YNegative; - - y = x; + XFreePixmap (target->dpy, pixmap); + pixmap = None; } + } - if (!(flags & WidthValue) && geom[0] != '=') - { - x += bgpixmap->x; - y += bgpixmap->y; - } + if (result) + { + XGCValues gcv; + GC gc; - if (xpmAttr.width && xpmAttr.height) + /* create Pixmap */ + if (pixmap == None) { - x = MOD(x, xpmAttr.width); - y = MOD(y, xpmAttr.height); + 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]; + gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); + + int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; + int dst_width = result->width, dst_height = result->height; + if (background == NULL) + { + if (h_scale > 0) + src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); + if (v_scale > 0) + src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); + + 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); + } } - if (bgpixmap->x != x) - { - bgpixmap->x = x; - changed++; - } + /* put result on pixmap */ + if (dst_x < new_pmap_width && dst_y < new_pmap_height) + asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); + + if (result != background && result != original_asim) + destroy_asimage (&result); - if (bgpixmap->y != y) - { - bgpixmap->y = y; - changed++; - } + /* set target's background to pixmap */ + XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); + + XFreeGC (target->dpy, gc); + } + else + { + /* set target background to a pixel */ + XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); } - return changed; + return true; } +#endif void rxvt_term::resize_pixmap () { - XGCValues gcvalue; - GC gc; - - if (pixmap != None) - { - XFreePixmap (dpy, pixmap); - pixmap = None ; - } - - if (bgPixmap.pixmap == None) - { /* So be it: I'm not using pixmaps */ - pixmap = None; #ifdef ENABLE_TRANSPARENCY - if (!option (Opt_transparent) || !am_transparent) -#endif - XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); - - return; + if (option(Opt_transparent) && am_transparent) + { + /* we need to re-generate transparency pixmap in that case ! */ + check_our_parents (); + return; } - - gcvalue.foreground = pix_colors[Color_bg]; - gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); - - if (bgPixmap.pixmap != None) - { /* we have a specified pixmap */ - unsigned int w = bgPixmap.w, h = bgPixmap.h, - x = bgPixmap.x, y = bgPixmap.y; - unsigned int xpmh = xpmAttr.height, - xpmw = xpmAttr.width; - - if (bgPixmap.auto_resize) - { - w = szHint.width ; - h = szHint.height ; - } - /* - * don't zoom pixmap too much nor expand really small pixmaps - */ - if (w > 32767 || h > 32767) - w = 1; - else if (width > (10 * xpmw) - || height > (10 * xpmh)) - w = 0; /* tile */ - - if (!w) - { - /* basic X tiling - let the X server do it */ - pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth); - - XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0); - XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y); - XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0); - XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y); - } - else -#ifdef ENABLE_TRANSPARENCY - if (!option(Opt_transparent) || !am_transparent) - /* will do that in check_our_parents otherwise */ #endif - { - ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); - if (scaled_im) - { - pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True); - destroy_asimage (&scaled_im); - } - } - } - - XSetWindowBackgroundPixmap (dpy, vt, pixmap); - - XFreeGC (dpy, gc); -#ifdef ENABLE_TRANSPARENCY - am_transparent = 0; +#ifdef HAVE_AFTERIMAGE + bgPixmap.render_asim(this, NULL, TINT_LEAVE_SAME); #endif } -Pixmap +void rxvt_term::set_bgPixmap (const char *file) { char *f; @@ -270,45 +584,32 @@ } XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); - if (*file != '\0') { - /* XWindowAttributes attr; */ - - /* - * we already have the required attributes - */ - /* XGetWindowAttributes (dpy, vt, &attr); */ - +#ifdef HAVE_AFTERIMAGE if (asimman == NULL) asimman = create_generic_imageman(rs[Rs_path]); if ((f = strchr (file, ';')) == NULL) - original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); + bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); else { size_t len = f - file; f = (char *)malloc (len + 1); strncpy (f, file, len); f[len] = '\0'; - original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); + bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); free( f ); } - if (original_asim) - { - bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True); - xpmAttr.width = original_asim->width ; - xpmAttr.height = original_asim->height ; - } +#endif } - - resize_pixmap (); - return bgPixmap.pixmap; + resize_pixmap (); /* TODO: temporary fix - should be done by the caller! */ } #endif /* XPM_BACKGROUND */ +#endif /* HAVE_BG_PIXMAP */ #ifdef ENABLE_TRANSPARENCY -#if TINTING && !defined(HAVE_AFTERIMAGE) +#ifndef HAVE_AFTERIMAGE /* taken from aterm-0.4.2 */ typedef uint32_t RUINT32T; @@ -624,16 +925,7 @@ 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop) == Success); - /* TODO: the below logic needs to be cleaned up */ - if (!i || prop == NULL -#if TINTING - || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL -#ifdef HAVE_AFTERIMAGE - && original_asim == NULL && rs[Rs_blurradius] == NULL -#endif - ) -#endif - ) + if (!i || prop == NULL) rootpixmap = None; else { @@ -662,7 +954,6 @@ while (sx < 0) sx += (int)wrootattr.width; while (sy < 0) sy += (int)wrootattr.height; -#if TINTING if (rs[Rs_shade]) shade = atoi (rs[Rs_shade]); if (ISSET_PIXCOLOR (Color_tint)) @@ -674,11 +965,13 @@ && IS_COMPONENT_WHOLESOME(c.b)); no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); #undef IS_COMPONENT_WHOLESOME -#endif /* TINTING */ /* theer are no performance advantages to reusing same pixmap */ - if (pixmap != None) - XFreePixmap (dpy, pixmap); - pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth); + if (bgPixmap.pixmap != None) + XFreePixmap (dpy, bgPixmap.pixmap); + bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth); + bgPixmap.pmap_width = szHint.width; + bgPixmap.pmap_height = szHint.height; + bgPixmap.pmap_depth = rootdepth; #if 0 /* TODO : identify cases where this will be detrimental to performance : */ /* we want to tile root pixmap into our own pixmap in this cases : @@ -694,9 +987,8 @@ gcvalue.ts_x_origin = -sx; gcvalue.ts_y_origin = -sy; gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue); - XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height); + XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height); -#if TINTING if (whole_tint && !no_tint) { /* In this case we can tint image server-side getting significant @@ -706,17 +998,16 @@ gcvalue.function = GXand; gcvalue.fill_style = FillSolid; XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue); - XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height); + XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height); } -#endif success = True; #ifdef HAVE_AFTERIMAGE - if (rs[Rs_blurradius] || original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) + if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) { ARGB32 tint = TINT_LEAVE_SAME; ASImage *back_im = NULL; - back_im = pixmap2ximage (asv, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100); + back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100); if (back_im != NULL) { if (!whole_tint && (!no_tint || shade !=100)) @@ -740,7 +1031,7 @@ if (!(flags&HeightValue)) vr = hr; tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF, - (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, + (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT); if (tmp) { @@ -748,81 +1039,19 @@ back_im = tmp; } } - - if (original_asim != NULL) - { - ASImageLayer *layers = create_image_layers (2); - ASImage *merged_im = NULL; - int fore_w, fore_h; - - layers[0].im = back_im; - layers[0].clip_width = szHint.width; - layers[0].clip_height = szHint.height; - layers[0].tint = tint; - layers[1].im = original_asim; - if (bgPixmap.auto_resize) - { - fore_w = szHint.width; - fore_h = szHint.height; - } - else - { - fore_w = bgPixmap.w; - fore_h = bgPixmap.h; - } - if (fore_w != original_asim->width - || fore_h != original_asim->height) - { - layers[1].im = scale_asimage (asv, - original_asim, - fore_w, fore_h, - ASA_ASImage, 100, - ASIMAGE_QUALITY_DEFAULT); - } - layers[1].clip_width = szHint.width; - layers[1].clip_height = szHint.height; - - if (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; - } - PRINT_BACKGROUND_OP_TIME; - merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height, - ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); - if (layers[1].im != original_asim) - destroy_asimage (&(layers[1].im)); - free (layers); - - if (merged_im != NULL) - { - destroy_asimage (&back_im); - back_im = merged_im; - } - PRINT_BACKGROUND_OP_TIME; - } - else if (tint != TINT_LEAVE_SAME) - { - ASImage* tmp = tile_asimage (asv, back_im, 0, 0, szHint.width, szHint.height, tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - { - destroy_asimage (&back_im); - back_im = tmp; - } - PRINT_BACKGROUND_OP_TIME; - } - asimage2drawable (asv, pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True); + /* TODO: temporary fix - redo the logic, so that same function can do both + transparency and non-transparency */ + bgPixmap.render_asim (this, back_im, tint); destroy_asimage (&back_im); + } /* back_im != NULL */ else success = False; } #else /* HAVE_AFTERIMAGE */ -#if TINTING if (!whole_tint && (!no_tint || shade !=100)) { - XImage *image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); + XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); success = False; if (image != NULL) { @@ -831,12 +1060,11 @@ gc = XCreateGC (dpy, vt, 0UL, &gcvalue); if (ISSET_PIXCOLOR (Color_tint) || shade != 100) ShadeXImage (this, image, shade, c.r, c.g, c.b); - XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); + XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); XDestroyImage (image); success = True; } } -#endif #endif /* HAVE_AFTERIMAGE */ PRINT_BACKGROUND_OP_TIME; @@ -848,10 +1076,10 @@ if (am_transparent && am_pixmap_trans) { pchanged = 1; - if (pixmap != None) + if (bgPixmap.pixmap != None) { - XFreePixmap (dpy, pixmap); - pixmap = None; + XFreePixmap (dpy, bgPixmap.pixmap); + bgPixmap.pixmap = None; } } @@ -859,7 +1087,7 @@ } else { - XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); + XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap); XClearWindow (dpy, parent[0]); if (!am_transparent || !am_pixmap_trans) @@ -872,65 +1100,7 @@ if (am_pixmap_trans) XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); else - { - unsigned int n; - /* - * InheritPixmap transparency - */ - for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) - { - oldp = parent[i]; - XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n); - XFree (list); - - if (parent[i] == display->root) - { - if (oldp != None) - pchanged = 1; - - break; - } - - if (oldp != parent[i]) - pchanged = 1; - } - - n = 0; - - if (pchanged) - for (; n < (unsigned int)i; n++) - { - XGetWindowAttributes (dpy, parent[n], &wattr); - - if (wattr.depth != rootdepth || wattr.c_class == InputOnly) - { - n = (int) (sizeof (parent) / sizeof (Window)) + 1; - break; - } - } - - if (n > (sizeof (parent) / sizeof (parent[0]))) - { - XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]); - XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); - am_transparent = 0; - /* XXX: also turn off Opt_transparent? */ - } - else - { - for (n = 0; n < (unsigned int)i; n++) - { - XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative); - XClearWindow (dpy, parent[n]); - } - - XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); - am_transparent = 1; - } - - for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) - parent[i] = None; - } + return; if (scrollBar.win) {