--- rxvt-unicode/src/xpm.C 2007/06/11 17:40:15 1.39 +++ rxvt-unicode/src/xpm.C 2007/08/06 22:42:05 1.60 @@ -26,362 +26,588 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#ifdef XPM_BACKGROUND - -static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight); - /* - * 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 * - * These GEOM strings adjust position relative to current position: - * @ `+X+Y' - * @ `+X' -> Y = X + * 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. * - * And this GEOM string is for querying current scale/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 + * 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 * 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 void +make_clip_rectangle (int pos, int size, int target_size, int &clip_pos, int &clip_size) +{ + if (size <= 0) + { /* special case - tiling */ + clip_pos = pos; + clip_size = target_size; + } + else if (pos < 0) + { + clip_pos = 0; + clip_size = MIN (target_size, size + pos); + } + else + { + clip_pos = pos; + clip_size = size; + if (pos < target_size && (int)clip_size > target_size - pos) + clip_pos = target_size - pos; + } +} + +bool +bgPixmap_t::handle_geometry (const char *geom) { - int flags, changed = 0; + 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 & WidthValue) + 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 (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 (!(flags & HeightValue)) - h = w; + 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 (w && !h) + 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); +} + +#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); + } + + int dst_x, dst_y; + int clip_width, clip_height; + + make_clip_rectangle (x, w, target_width, dst_x, clip_width); + make_clip_rectangle (y, h, target_height, dst_y, clip_height); + + /* TODO : actuall scaling code :) */ + if (dst_x >= target_width || dst_y >= target_height + || clip_width <= 0 || clip_height <= 0 || original_asim == NULL) + { + result = background; + dst_x = dst_y = 0; + if (background) + { + new_pmap_width = clip_width = background->width; + new_pmap_height = clip_height = background->height; + } + 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; + } + 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 */ + layers[1].dst_x = dst_x - (int)result->width; + layers[1].clip_width = result->width; + } + else + {/* clip horizontally */ + layers[1].dst_x = dst_x; + layers[1].clip_width = clip_width; + } + if (h <= 0) { - w = (bgpixmap->w * w) / 100; - h = bgpixmap->h; + layers[1].dst_y = dst_y - (int)result->height; + layers[1].clip_height = result->height; } - else if (h && !w) + else { - w = bgpixmap->w; - h = (bgpixmap->h * h) / 100; + layers[1].dst_y = dst_y; + layers[1].clip_height = clip_height; } - - min_it (w, 32767); - min_it (h, 32767); - - if (bgpixmap->w != (short)w) + if (target->rs[Rs_blendtype]) { - bgpixmap->w = (short)w; - changed++; + layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); + if (layers[1].merge_scanlines == NULL) + layers[1].merge_scanlines = alphablend_scanlines; } - - if (bgpixmap->h != (short)h) + 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; + dst_x = dst_y = 0; + clip_width = target_width; + clip_height = target_height; } + 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); - if (bgpixmap->x != x) + if (dst_x > 0 || dst_y > 0 + || dst_x + clip_width < new_pmap_width + || dst_y + clip_height < new_pmap_height) { - bgpixmap->x = x; - changed++; + XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); } + /* put result on pixmap */ + asimage2drawable (target->asv, pixmap, result, gc, 0, 0, dst_x, dst_y, clip_width, clip_height, True); - 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) + unsigned int w = bgPixmap.h_scale*szHint.width/100; + unsigned int h = bgPixmap.v_scale*szHint.height/100; + int x = bgPixmap.h_align*szHint.width/100; + int y = bgPixmap.v_align*szHint.height/100; +#ifdef HAVE_AFTERIMAGE + ASImage *im = bgPixmap.original_asim; +#else + void *im = NULL; +#endif +/* preliminary cleanup - this needs to be integrated with check_our_parents() code */ + if (bgPixmap.pixmap != None) { - XFreePixmap (dpy, pixmap); - pixmap = None ; + XFreePixmap (dpy, bgPixmap.pixmap); + bgPixmap.pixmap = None ; + } +#ifdef ENABLE_TRANSPARENCY + if (option(Opt_transparent) && am_transparent) + { + /* we need to re-generate transparency pixmap in that case ! */ + check_our_parents (); + return; } - - if (bgPixmap.pixmap == None) - { /* So be it: I'm not using pixmaps */ - pixmap = None; - -#ifdef TRANSPARENT - if (!option (Opt_transparent) || !am_transparent) #endif - XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); + if (im == NULL) + { /* So be it: I'm not using pixmaps */ + XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 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 + /* don't zoom pixmap too much nor expand really small pixmaps */ + if (w > 16000) + w = 1; + if (h > 16000) + h = 1; + #ifdef HAVE_AFTERIMAGE -#ifdef TRANSPARENT - if (!option(Opt_transparent) || !am_transparent) - /* will do that in check_our_parents otherwise */ -#endif - { - ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); - if (scaled_im) - { - pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True ); - destroy_asimage( &scaled_im ); - } - } -#else /* HAVE_AFTERIMAGE */ - { - float incr, p; - Pixmap tmp; - - pixmap = XCreatePixmap (dpy, vt, width, height, depth); - /* - * horizontal scaling - */ - rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); - - tmp = XCreatePixmap (dpy, vt, width, xpmh, depth); - XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh); - - for ( /*nil */ ; x < w; x++, p += incr) - { - if (p >= xpmw) - p = 0; - - /* copy one column from the original pixmap to the tmp pixmap */ - XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0); - } - - /* - * vertical scaling - */ - rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); + if (w == 0) + w = im->width; + if (h == 0) + h = im->height; - if (y > 0) - XFillRectangle (dpy, pixmap, gc, 0, 0, width, y); - - if (h < height) - XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1); - - for ( /*nil */ ; y < h; y++, p += incr) - { - if (p >= xpmh) - p = 0; - - /* copy one row from the tmp pixmap to the main pixmap */ - XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y); - } - - XFreePixmap (dpy, tmp); + if (w != im->width || h != im->height) + { + ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT); + if (tmp != NULL) + im = tmp; + } + bgPixmap.pmap_width = MIN(w,szHint.width); + bgPixmap.pmap_height = MIN(h,szHint.height); +#if 0 /* TODO: fix that! */ + if (x != 0 || y != 0) + { + ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); + if (tmp != NULL) + { + if (im != bgPixmap.original_asim) + destroy_asimage (&im); + im = tmp; } -#endif /* HAVE_AFTERIMAGE */ } +#endif + bgPixmap.pixmap = XCreatePixmap (dpy, vt, bgPixmap.pmap_width, bgPixmap.pmap_height, depth); + bgPixmap.pmap_depth = depth; - XSetWindowBackgroundPixmap (dpy, vt, pixmap); + asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, bgPixmap.pmap_width, bgPixmap.pmap_height, True); - XFreeGC (dpy, gc); -#ifdef TRANSPARENT - am_transparent = 0; + if (im != bgPixmap.original_asim) + destroy_asimage (&im); #endif -} + if( bgPixmap.pixmap ) + XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap); -/* - * Calculate tiling sizes and increments - * At start, p == 0, incr == xpmwidthheight - */ -static void -rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) -{ - unsigned int cwh, cxy; - float cincr, cp; - - cp = 0; - cincr = (float)xpmwidthheight; - cxy = *xy; - cwh = *wh; - if (cwh == 1) - { /* display one image, no horizontal/vertical scaling */ - cincr = (float)widthheight; - if (xpmwidthheight <= widthheight) - { - cwh = xpmwidthheight; - cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ - cwh += cxy; - } - else - { - cxy = 0; - cwh = widthheight; - } - } - else if (cwh < 10) - { /* fit WH images across/down screen */ - cincr *= cwh; - cxy = 0; - cwh = widthheight; - } - else - { - cincr *= 100.0 / cwh; - if (cwh < 100) - { /* contract */ - float pos; - - cwh = (cwh * widthheight) / 100; - pos = (float)cxy / 100 * widthheight - (cwh / 2); - - cxy = (widthheight - cwh); - if (pos <= 0) - cxy = 0; - else if (pos < cxy) - cxy = (int) pos; - cwh += cxy; - } - else - { /* expand */ - if (cxy > 0) - { /* position */ - float pos; - - pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2); - cp = xpmwidthheight - cincr; - if (pos <= 0) - cp = 0; - else if (pos < cp) - cp = pos; - } - cxy = 0; - cwh = widthheight; - } - } - cincr /= widthheight; - *wh = cwh; - *xy = cxy; - *incr = cincr; - *p = cp; + XFreeGC (dpy, gc); } -Pixmap +void rxvt_term::set_bgPixmap (const char *file) { char *f; @@ -395,73 +621,39 @@ } 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 (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 { - f = strndup( file, f - file ); - original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); + size_t len = f - file; + f = (char *)malloc (len + 1); + strncpy (f, file, len); + f[len] = '\0'; + bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); free( f ); } - if (original_asim) - { - bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True ); - xpmAttr.width = original_asim->width ; - xpmAttr.height = original_asim->height ; - } -#else /* HAVE_AFTERIMAGE */ - xpmAttr.closeness = 30000; - xpmAttr.colormap = cmap; - xpmAttr.visual = visual; - xpmAttr.depth = depth; - xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual - | XpmDepth | XpmSize | XpmReturnPixels); - - /* search environment variables here too */ - f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); - if (f == NULL - || XpmReadFileToPixmap (dpy, display->root, f, - &bgPixmap.pixmap, NULL, - &xpmAttr)) - { - char *p; - - /* semi-colon delimited */ - if ((p = strchr (file, ';')) == NULL) - p = strchr (file, '\0'); - - rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file); - } - free (f); -#endif /* HAVE_AFTERIMAGE */ +#endif } resize_pixmap (); - return bgPixmap.pixmap; } #endif /* XPM_BACKGROUND */ +#endif /* HAVE_BG_PIXMAP */ -#ifdef TRANSPARENT -#if TINTING && !defined(HAVE_AFTERIMAGE) +#ifdef ENABLE_TRANSPARENCY +#ifndef HAVE_AFTERIMAGE /* taken from aterm-0.4.2 */ typedef uint32_t RUINT32T; -void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) +static void +ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) { int sh_r, sh_g, sh_b; RUINT32T mask_r, mask_g, mask_b; @@ -702,7 +894,7 @@ void rxvt_term::check_our_parents_cb (time_watcher &w) { - int i, pchanged, aformat, have_pixmap, rootdepth; + int i, pchanged, aformat, rootdepth; unsigned long nitems, bytes_after; Atom atype; unsigned char *prop = NULL; @@ -711,12 +903,24 @@ XWindowAttributes wattr, wrootattr; int sx, sy; Window cr; + unsigned int rootpixmap_w = 0, rootpixmap_h = 0; pchanged = 0; if (!option (Opt_transparent)) return /*pchanged*/; /* Don't try any more */ +#if 0 + struct timeval stv; + gettimeofday (&stv,NULL); +#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\ + fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\ + tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0) +#else +#define PRINT_BACKGROUND_OP_TIME do{}while(0) +#endif + + XGetWindowAttributes (dpy, display->root, &wrootattr); rootdepth = wrootattr.depth; @@ -739,10 +943,9 @@ XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &sx, &sy, &cr); - /* check if we are outside of the visible part of the virtual screen : */ - if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 - || sx >= wrootattr.width || sy >= wrootattr.height ) + if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 + || sx >= wrootattr.width || sy >= wrootattr.height ) return /* 0 */ ; /* * Make the frame window set by the window manager have @@ -760,208 +963,212 @@ 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 + && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL #endif ) -#endif ) - have_pixmap = 0; + rootpixmap = None; else { - have_pixmap = 1; - rootpixmap = *(Pixmap *)prop; - XFree (prop); + int junk; + unsigned int ujunk; + /* root pixmap may be bad - allow a error */ + allowedxerror = -1; + if ((rootpixmap = *(Pixmap *)prop) != None) + if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk)) + rootpixmap = None; + allowedxerror = 0; } - if (have_pixmap) + if (prop != NULL) + XFree (prop); + + if (rootpixmap != None) { - Bool success = False ; - GC gc; + Bool success = False; + GC gc = NULL; XGCValues gcvalue; -#ifdef HAVE_AFTERIMAGE - { - Pixmap tmp_pmap = None ; - ShadingInfo shade; - ARGB32 tint ; - unsigned int pmap_w = 0, pmap_h = 0; - - if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) - { - int root_x = 0, root_y = 0; - - shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; - if (ISSET_PIXCOLOR (Color_tint)) - { - rgba c; - pix_colors_focused [Color_tint].get (c); - shade.tintColor.red = c.r; - shade.tintColor.green = c.g; - shade.tintColor.blue = c.b; - } - else - shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; - tint = shading2tint32( &shade ); - gc = XCreateGC (dpy, vt, 0UL, &gcvalue); - if (GetWinPosition (parent[0], &root_x, &root_y) ) - { - ASImageLayer *layers = create_image_layers( 2 ); - ASImage *merged_im = NULL; - int back_x, back_y, back_w, back_h; - /* merge_layers does good job at tiling background appropriately, - so all we need is to cut out smallest possible piece : */ -#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \ - do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \ - back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \ - if( pmap_##wh >= back_##xy + szHint.widthheight ) \ - back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \ - else \ - { /* small background - need the whole of it for successfull tiling :*/ \ - back_##xy = 0; \ - back_##wh = pmap_##wh; \ - }}while(0) - - MAKE_ROOTPMAP_GEOM(x,w,width); - MAKE_ROOTPMAP_GEOM(y,h,height); - - layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); - layers[0].clip_x = (back_w == pmap_w)?root_x:0; - layers[0].clip_y = (back_h == pmap_h)?root_y:0; - layers[0].clip_width = szHint.width; - layers[0].clip_height = szHint.height; - layers[0].tint = tint; - if (rs[Rs_blurradius] && layers[0].im) - { - double r = atof(rs[Rs_blurradius]); - ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT ); - if( tmp ) - { - destroy_asimage( &layers[0].im ); - layers[0].im = tmp; - } - } - if (original_asim != NULL) - { - int fore_w, fore_h; - 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( display->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; - } - } - merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, - szHint.width, szHint.height, - ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); - if (layers[1].im != original_asim) - destroy_asimage( &(layers[1].im) ); - destroy_asimage( &(layers[0].im) ); - if (merged_im != NULL) - { - tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True ); - destroy_asimage( &merged_im ); - } - free( layers ); - } - } - if (tmp_pmap != None) - { - success = True; - if (pixmap != None) - XFreePixmap (dpy, pixmap); - pixmap = tmp_pmap; - } - } -#else /* HAVE_AFTERIMAGE */ - { - /* - * Copy display->root pixmap transparency + int shade = 100; + rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + Bool whole_tint = False, no_tint = True; + + while (sx < 0) sx += (int)wrootattr.width; + while (sy < 0) sy += (int)wrootattr.height; + + if (rs[Rs_shade]) + shade = atoi (rs[Rs_shade]); + if (ISSET_PIXCOLOR (Color_tint)) + pix_colors_focused [Color_tint].get (c); +#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700) + if (shade >= 100) + whole_tint = (IS_COMPONENT_WHOLESOME(c.r) + && IS_COMPONENT_WHOLESOME(c.g) + && IS_COMPONENT_WHOLESOME(c.b)); + no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); +#undef IS_COMPONENT_WHOLESOME + /* theer are no performance advantages to reusing same pixmap */ + 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 : + * 1) rootpixmap does not cover our window entirely + * 2) whole_tint - we can use server-side tinting or tinting disabled */ - int nx, ny; - unsigned int nw, nh; - XImage *image; - - nw = (unsigned int)szHint.width; - nh = (unsigned int)szHint.height; - nx = ny = 0; - - if (sx < 0) - { - nw += sx; - nx = -sx; - sx = 0; - } - - if (sy < 0) - { - nh += sy; - ny = -sy; - sy = 0; - } - - min_it (nw, (unsigned int) (wrootattr.width - sx)); - min_it (nh, (unsigned int) (wrootattr.height - sy)); - - XSync (dpy, False); - allowedxerror = -1; - image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); - - /* XXX: handle BadMatch - usually because we're outside the pixmap */ - /* XXX: may need a delay here? */ - allowedxerror = 0; - if (image != NULL) - { - if (pixmap != None) - XFreePixmap (dpy, pixmap); - -#if TINTING - if (ISSET_PIXCOLOR (Color_tint)) - { - int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; - - rgba c; - pix_colors_focused [Color_tint].get (c); - ShadeXImage (this, image, shade, c.r, c.g, c.b); - } + if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height) + { + } #endif + gcvalue.tile = rootpixmap; + gcvalue.fill_style = FillTiled; + gcvalue.ts_x_origin = -sx; + gcvalue.ts_y_origin = -sy; + gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue); + XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height); - pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth); - gc = XCreateGC (dpy, vt, 0UL, &gcvalue); - XPutImage (dpy, pixmap, gc, image, 0, 0, - nx, ny, image->width, image->height); - XDestroyImage (image); - success = True ; - } - } + if (whole_tint && !no_tint) + { + /* In this case we can tint image server-side getting significant + * performance improvements, as we eliminate XImage transfer + */ + gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]); + gcvalue.function = GXand; + gcvalue.fill_style = FillSolid; + XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue); + XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height); + } + success = True; +#ifdef HAVE_AFTERIMAGE + 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, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100); + if (back_im != NULL) + { + if (!whole_tint && (!no_tint || shade !=100)) + { + ShadingInfo as_shade; + as_shade.shading = shade; + as_shade.tintColor.red = c.r; + as_shade.tintColor.green = c.g; + as_shade.tintColor.blue = c.b; + tint = shading2tint32 (&as_shade); + } + + if (rs[Rs_blurradius] && back_im) + { + ASImage* tmp; + int junk; + unsigned int hr = 1, vr = 1; + int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr); + if (!(flags&WidthValue)) + hr = 1; + if (!(flags&HeightValue)) + vr = hr; + tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF, + (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, + 100, ASIMAGE_QUALITY_DEFAULT); + if (tmp) + { + destroy_asimage (&back_im); + back_im = tmp; + } + } + + if (bgPixmap.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 = bgPixmap.original_asim; + + fore_w = (bgPixmap.h_scale == 0) ? bgPixmap.original_asim->width : bgPixmap.h_scale*szHint.width/100; + fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100; + + if (fore_w != bgPixmap.original_asim->width + || fore_h != bgPixmap.original_asim->height) + { + layers[1].im = scale_asimage (asv, + bgPixmap.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 != bgPixmap.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, bgPixmap.pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True); + destroy_asimage (&back_im); + } /* back_im != NULL */ + else + success = False; + } +#else /* HAVE_AFTERIMAGE */ + if (!whole_tint && (!no_tint || shade !=100)) + { + XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); + success = False; + if (image != NULL) + { + PRINT_BACKGROUND_OP_TIME; + if (gc == NULL) + 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, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); + XDestroyImage (image); + success = True; + } + } #endif /* HAVE_AFTERIMAGE */ - if (gc != NULL) + PRINT_BACKGROUND_OP_TIME; + + if (gc != NULL) XFreeGC (dpy, gc); if (!success) @@ -969,10 +1176,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; } } @@ -980,7 +1187,7 @@ } else { - XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); + XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap); XClearWindow (dpy, parent[0]); if (!am_transparent || !am_pixmap_trans) @@ -988,7 +1195,7 @@ am_transparent = am_pixmap_trans = 1; } - } + } /* rootpixmap != None */ if (am_pixmap_trans) XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);