--- rxvt-unicode/src/xpm.C 2007/06/26 00:40:19 1.41 +++ rxvt-unicode/src/xpm.C 2007/07/31 22:24:36 1.53 @@ -28,7 +28,155 @@ #ifdef XPM_BACKGROUND -static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight); +#ifndef HAVE_AFTERIMAGE +/* + * search for FILE in the current working directory, and within the + * colon-delimited PATHLIST, adding the file extension EXT if required. + * + * FILE is either semi-colon or zero terminated + */ +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) +{ + 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; +} +#endif /* * These GEOM strings indicate absolute size/position: @@ -85,18 +233,18 @@ strncpy (str, geom, n); str[n] = '\0'; - if (strcmp(str, "auto") == 0) + if (strcmp(str, "auto") == 0) { - if (!bgpixmap->auto_resize) + if (!bgpixmap->auto_resize) changed++; - bgpixmap->auto_resize = True ; - w = szHint.width ; + bgpixmap->auto_resize = True ; + w = szHint.width ; h = szHint.height ; flags = WidthValue|HeightValue ; } else { - bgpixmap->auto_resize = False ; + bgpixmap->auto_resize = False ; flags = XParseGeometry (str, &x, &y, &w, &h); } @@ -211,11 +359,11 @@ unsigned int xpmh = xpmAttr.height, xpmw = xpmAttr.width; - if (bgPixmap.auto_resize) + if (bgPixmap.auto_resize) { - w = szHint.width ; + w = szHint.width ; h = szHint.height ; - } + } /* * don't zoom pixmap too much nor expand really small pixmaps */ @@ -242,11 +390,11 @@ /* 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) + ASImage *scaled_im = scale_asimage (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 ); + pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True); + destroy_asimage (&scaled_im); } } #else /* HAVE_AFTERIMAGE */ @@ -305,82 +453,6 @@ #endif } -/* - * 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; -} - Pixmap rxvt_term::set_bgPixmap (const char *file) { @@ -406,21 +478,24 @@ /* 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 ); + 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'; + 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 ; + 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; @@ -431,7 +506,7 @@ | XpmDepth | XpmSize | XpmReturnPixels); /* search environment variables here too */ - f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); + f = rxvt_File_search_path (rs[Rs_path], file, ".xpm"); if (f == NULL || XpmReadFileToPixmap (dpy, display->root, f, &bgPixmap.pixmap, NULL, @@ -461,7 +536,8 @@ 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 +778,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 +787,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 +827,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,6 +847,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 @@ -769,199 +857,213 @@ ) #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 ; + 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 TINTING + 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 +#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 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 ( 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, pixmap, gc, 0, 0, szHint.width, szHint.height); #if TINTING - if (ISSET_PIXCOLOR (Color_tint)) - { - int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; + 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, 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))) + { + ARGB32 tint = TINT_LEAVE_SAME; + ASImage *back_im = NULL; + + back_im = pixmap2ximage (asv, 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); + } - rgba c; - pix_colors_focused [Color_tint].get (c); + 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, + (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 (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); + 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); + 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, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); + XDestroyImage (image); + success = True; + } + } #endif - - 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 ; - } - } #endif /* HAVE_AFTERIMAGE */ - if (gc != NULL) + PRINT_BACKGROUND_OP_TIME; + + if (gc != NULL) XFreeGC (dpy, gc); if (!success) @@ -988,7 +1090,7 @@ am_transparent = am_pixmap_trans = 1; } - } + } /* rootpixmap != None */ if (am_pixmap_trans) XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);