--- rxvt-unicode/src/xpm.C 2007/07/27 14:41:15 1.51 +++ rxvt-unicode/src/xpm.C 2007/08/03 23:32:14 1.57 @@ -26,202 +26,83 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#ifdef XPM_BACKGROUND - -#ifndef HAVE_AFTERIMAGE /* - * search for FILE in the current working directory, and within the - * colon-delimited PATHLIST, adding the file extension EXT if required. + * 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+X Adjust position horizontally X% and vertically X% + * from current position. * - * FILE is either semi-colon or zero terminated + * 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 */ -static char * -rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) -{ - int maxpath, len; - const char *p, *path; - char name[256]; - - if (!access (file, R_OK)) /* found (plain name) in current directory */ - return strdup (file); - - /* semi-colon delimited */ - if ((p = strchr (file, ';'))) - len = (p - file); - else - len = strlen (file); - - /* leave room for an extra '/' and trailing '\0' */ - maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2); - if (maxpath <= 0) - return NULL; - - /* check if we can find it now */ - strncpy (name, file, len); - name[len] = '\0'; - - if (!access (name, R_OK)) - return strdup (name); - if (ext) - { - strcat (name, ext); - if (!access (name, R_OK)) - return strdup (name); - } - for (path = pathlist; path != NULL && *path != '\0'; path = p) - { - int n; - - /* colon delimited */ - if ((p = strchr (path, ':')) == NULL) - p = strchr (path, '\0'); - - n = (p - path); - if (*p != '\0') - p++; - - if (n > 0 && n <= maxpath) - { - strncpy (name, path, n); - if (name[n - 1] != '/') - name[n++] = '/'; - name[n] = '\0'; - strncat (name, file, len); - - if (!access (name, R_OK)) - return strdup (name); - if (ext) - { - strcat (name, ext); - if (!access (name, R_OK)) - return strdup (name); - } - } - } - return NULL; -} -/* - * 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) +#ifdef HAVE_BG_PIXMAP +bool +bgPixmap_t::window_size_sensitive () { - 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; + return (flags&(bgPmap_Scale|bgPmap_Transparent)); } -#endif -/* - * 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) - * - * These GEOM strings adjust position relative to current position: - * @ `+X+Y' - * @ `+X' -> Y = X - * - * And this GEOM string is for querying current scale/position: - * @ `?' - */ -int -rxvt_term::scale_pixmap (const char *geom) +#ifdef XPM_BACKGROUND +bool +bgPixmap_t::handle_geometry (const char *geom) { - int flags, changed = 0; + int geom_flags, 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]") 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; } if ((p = strchr (geom, ';')) == NULL) @@ -230,99 +111,99 @@ n = (p - geom); if (n < MAXLEN_GEOM) { + 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 ; + w = h = 100; + geom_flags = WidthValue|HeightValue ; } else { - bgpixmap->auto_resize = False ; - flags = XParseGeometry (str, &x, &y, &w, &h); + geom_flags = XParseGeometry (str, &x, &y, &w, &h); } - - if (!flags) +/* code below is garbage and needs to be rewritten */ + if (!geom_flags) { - flags |= WidthValue; + geom_flags |= WidthValue; w = 0; } /* default is tile */ - if (flags & WidthValue) + if (geom_flags & WidthValue) { - if (!(flags & XValue)) + if (!(geom_flags & XValue)) x = 50; - if (!(flags & HeightValue)) + if (!(geom_flags & HeightValue)) h = w; if (w && !h) { - w = (bgpixmap->w * w) / 100; - h = bgpixmap->h; + w = (h_scale * w) / 100; + h = v_scale; } else if (h && !w) { - w = bgpixmap->w; - h = (bgpixmap->h * h) / 100; + w = h_scale; + h = (v_scale * h) / 100; } min_it (w, 32767); min_it (h, 32767); - if (bgpixmap->w != (short)w) + if (h_scale != w) { - bgpixmap->w = (short)w; + h_scale = w; changed++; } - if (bgpixmap->h != (short)h) + if (v_scale != h) { - bgpixmap->h = (short)h; + v_scale = h; changed++; } } - - if (!(flags & YValue)) + if (!(geom_flags & YValue)) { - if (flags & XNegative) - flags |= YNegative; + if (geom_flags & XNegative) + geom_flags |= YNegative; y = x; } - if (!(flags & WidthValue) && geom[0] != '=') - { - x += bgpixmap->x; - y += bgpixmap->y; - } - - if (xpmAttr.width && xpmAttr.height) + if (!(geom_flags & WidthValue) && geom[0] != '=') { - x = MOD(x, xpmAttr.width); - y = MOD(y, xpmAttr.height); + x += h_align; + y += v_align; } - if (bgpixmap->x != x) + if (h_align != x) { - bgpixmap->x = x; + h_align = x; changed++; } - if (bgpixmap->y != y) + if (v_align != y) { - bgpixmap->y = y; + v_align = y; changed++; } + + if (h_scale != 0) + new_flags |= bgPmap_hScale; + if (v_scale != 0) + new_flags |= bgPmap_vScale; } - return changed; + if (new_flags != flags) + { + flags = new_flags; + changed++; + } + return (changed > 0); } void @@ -330,130 +211,86 @@ { 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 ; } - - if (bgPixmap.pixmap == None) - { /* So be it: I'm not using pixmaps */ - pixmap = None; - #ifdef ENABLE_TRANSPARENCY - if (!option (Opt_transparent) || !am_transparent) + if (option(Opt_transparent) && am_transparent) + { + /* we need to re-generate transparency pixmap in that case ! */ + check_our_parents (); + return; + } #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 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); - } - } -#else /* HAVE_AFTERIMAGE */ - { - float incr, p; - Pixmap tmp; + if (w == 0) + w = im->width; + if (h == 0) + h = im->height; - 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 (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 ENABLE_TRANSPARENCY - am_transparent = 0; + if (im != bgPixmap.original_asim) + destroy_asimage (&im); #endif + if( bgPixmap.pixmap ) + XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap); + + XFreeGC (dpy, gc); } -Pixmap +void rxvt_term::set_bgPixmap (const char *file) { char *f; @@ -467,71 +304,33 @@ } 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 ; - } -#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 = rxvt_File_search_path (rs[Rs_path], file, ".xpm"); - 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 ENABLE_TRANSPARENCY -#if TINTING && !defined(HAVE_AFTERIMAGE) +#ifndef HAVE_AFTERIMAGE /* taken from aterm-0.4.2 */ typedef uint32_t RUINT32T; @@ -778,7 +577,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; @@ -787,12 +586,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; @@ -815,7 +626,6 @@ 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 ) @@ -836,230 +646,211 @@ 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 = NULL; XGCValues gcvalue; - unsigned int pmap_w = 0, pmap_h = 0; - -#ifdef HAVE_AFTERIMAGE - { - Pixmap tmp_pmap = None; - ShadingInfo shade; - ARGB32 tint; - - if (get_dpy_drawable_size (dpy, 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 (get_dpy_window_position (dpy, display->root, parent[0], NULL, NULL, &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 (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 (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 (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 (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 (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 - */ - Window wjunk; - int junk; - unsigned int ujunk; - /* root pixmap may be bad - allow a error */ - allowedxerror = -1; - if (XGetGeometry (dpy, rootpixmap, &wjunk, &junk, &junk, &pmap_w, &pmap_h, &ujunk, &ujunk)) - { - XImage *image = NULL; - int shade = 100; - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - Bool whole_tint = False; - - while (sx < 0) sx += (int)wrootattr.width; - while (sy < 0) sy += (int)wrootattr.height; - - if (pixmap != None) - XFreePixmap (dpy, pixmap); - pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth); - -#if TINTING - if (rs[Rs_shade]) - shade = atoi (rs[Rs_shade]); - if (ISSET_PIXCOLOR (Color_tint)) - pix_colors_focused [Color_tint].get (c); + 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)); + 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 - - /* If No tinting to be done - simply tile root pixmap on our pixmap - - * no need in XImage at all, thus following if() only for case with tinting */ - if (whole_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height) -#endif /* TINTING */ - { - 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, pixmap, gc, 0, 0, szHint.width, szHint.height); -#if TINTING - if (whole_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, pixmap, gc, 0, 0, szHint.width, szHint.height); - success = True; - } - else - image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); -#else - success = True; -#endif /* TINTING */ - } -#if TINTING - if (!success && image == NULL) - image = XGetImage (dpy, rootpixmap, sx, sy, szHint.width, szHint.height, AllPlanes, ZPixmap); - if (image != NULL) - { - 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, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); - XDestroyImage (image); - success = True; - } + /* 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 + */ + if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height) + { + } #endif - } - allowedxerror = 0; - } + 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); + + 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 */ + PRINT_BACKGROUND_OP_TIME; + if (gc != NULL) XFreeGC (dpy, gc); @@ -1068,10 +859,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; } } @@ -1079,7 +870,7 @@ } else { - XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); + XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap); XClearWindow (dpy, parent[0]); if (!am_transparent || !am_pixmap_trans) @@ -1087,7 +878,7 @@ am_transparent = am_pixmap_trans = 1; } - } + } /* rootpixmap != None */ if (am_pixmap_trans) XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);