ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.54 by ayin, Thu Aug 2 00:09:54 2007 UTC vs.
Revision 1.57 by ayin, Fri Aug 3 23:32:14 2007 UTC

… …
24 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29/*
30 * Pixmap geometry string interpretation :
31 * Each geometry string contains zero or one scale/position
32 * adjustment and may optionally be followed by a colon and one or more
33 * colon-delimited pixmap operations.
34 * The following table shows the valid geometry strings and their
35 * affects on the background image :
36 *
37 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
38 * W and H are percentages of the terminal window size.
39 * X and Y are also percentages; e.g., +50+50 centers
40 * the image in the window.
41 * WxH+X Assumes Y == X
42 * WxH Assumes Y == X == 50 (centers the image)
43 * W+X+Y Assumes H == W
44 * W+X Assumes H == W and Y == X
45 * W Assumes H == W and Y == X == 50
46 *
47 * Adjusting position only :
48 * =+X+Y Set position to X% by Y% (absolute).
49 * =+X Set position to X% by X%.
50 * +X+Y Adjust position horizontally X% and vertically Y%
51 * from current position (relative).
52 * +X+X Adjust position horizontally X% and vertically X%
53 * from current position.
54 *
55 * Adjusting scale only :
56 * Wx0 Multiply horizontal scaling factor by W%
57 * 0xH Multiply vertical scaling factor by H%
58 * 0x0 No scaling (show image at normal size).
59 *
60 * Pixmap Operations : (should be prepended by a colon)
61 * tile Tile image. Scaling/position modifiers above will affect
62 * the tile size and origin.
63 * propscale When scaling, scale proportionally. That is, maintain the
64 * proper aspect ratio for the image. Any portion of the
65 * background not covered by the image is filled with the
66 * current background color.
67 * hscale Scale horizontally, tile vertically ?
68 * vscale Tile horizontally, scale vertically ?
69 * scale Scale both up and down
70 * auto Same as 100x100+50+50
71 */
72
73#ifdef HAVE_BG_PIXMAP
74bool
75bgPixmap_t::window_size_sensitive ()
76{
77 return (flags&(bgPmap_Scale|bgPmap_Transparent));
78}
79
29#ifdef XPM_BACKGROUND 80#ifdef XPM_BACKGROUND
30 81bool
31/* 82bgPixmap_t::handle_geometry (const char *geom)
32 * These GEOM strings indicate absolute size/position:
33 * @ `WxH+X+Y'
34 * @ `WxH+X' -> Y = X
35 * @ `WxH' -> Y = X = 50
36 * @ `W+X+Y' -> H = W
37 * @ `W+X' -> H = W, Y = X
38 * @ `W' -> H = W, X = Y = 50
39 * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged)
40 * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged)
41 * @ `=+X+Y' -> (H, W unchanged)
42 * @ `=+X' -> Y = X (H, W unchanged)
43 *
44 * These GEOM strings adjust position relative to current position:
45 * @ `+X+Y'
46 * @ `+X' -> Y = X
47 *
48 * And this GEOM string is for querying current scale/position:
49 * @ `?'
50 */
51int
52rxvt_term::scale_pixmap (const char *geom)
53{ 83{
54 int flags, changed = 0; 84 int geom_flags, changed = 0;
55 int x = 0, y = 0; 85 int x = 0, y = 0;
56 unsigned int w = 0, h = 0; 86 unsigned int w = 0, h = 0;
57 unsigned int n; 87 unsigned int n;
88 unsigned long new_flags = (flags&(~bgPmap_geometryFlags)) ;
58 char *p; 89 char *p;
59 bgPixmap_t *bgpixmap = &bgPixmap;
60
61#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]") 90#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
62 91
63 if (geom == NULL) 92 if (geom == NULL)
64 return 0; 93 return false;
65 94
66 char str[MAXLEN_GEOM]; 95 char str[MAXLEN_GEOM];
67 96
68 if (!strcmp (geom, "?")) 97 if (!strcmp (geom, "?"))
69 { 98 {
99#if 0 /* TODO: */
70 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 100 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
71 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 101 min (h_scale, 32767), min (v_scale, 32767),
72 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 102 min (h_align, 32767), min (v_align, 32767));
73 process_xterm_seq (XTerm_title, str, CHAR_ST); 103 process_xterm_seq (XTerm_title, str, CHAR_ST);
104#endif
74 return 0; 105 return false;
75 } 106 }
76 107
77 if ((p = strchr (geom, ';')) == NULL) 108 if ((p = strchr (geom, ';')) == NULL)
78 p = strchr (geom, '\0'); 109 p = strchr (geom, '\0');
79 110
80 n = (p - geom); 111 n = (p - geom);
81 if (n < MAXLEN_GEOM) 112 if (n < MAXLEN_GEOM)
82 { 113 {
114 new_flags |= bgPmap_geometrySet;
115
83 strncpy (str, geom, n); 116 strncpy (str, geom, n);
84 str[n] = '\0'; 117 str[n] = '\0';
85 118
86 if (strcmp(str, "auto") == 0) 119 if (strcmp(str, "auto") == 0)
87 { 120 {
88 if (!bgpixmap->auto_resize) 121 w = h = 100;
89 changed++;
90 bgpixmap->auto_resize = True ;
91 w = szHint.width ;
92 h = szHint.height ;
93 flags = WidthValue|HeightValue ; 122 geom_flags = WidthValue|HeightValue ;
94 } 123 }
95 else 124 else
96 { 125 {
97 bgpixmap->auto_resize = False ;
98 flags = XParseGeometry (str, &x, &y, &w, &h); 126 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
99 }
100
101 if (!flags)
102 { 127 }
128/* code below is garbage and needs to be rewritten */
129 if (!geom_flags)
130 {
103 flags |= WidthValue; 131 geom_flags |= WidthValue;
104 w = 0; 132 w = 0;
105 } /* default is tile */ 133 } /* default is tile */
106 134
107 if (flags & WidthValue) 135 if (geom_flags & WidthValue)
108 { 136 {
109 if (!(flags & XValue)) 137 if (!(geom_flags & XValue))
110 x = 50; 138 x = 50;
111 139
112 if (!(flags & HeightValue)) 140 if (!(geom_flags & HeightValue))
113 h = w; 141 h = w;
114 142
115 if (w && !h) 143 if (w && !h)
116 { 144 {
117 w = (bgpixmap->w * w) / 100; 145 w = (h_scale * w) / 100;
118 h = bgpixmap->h; 146 h = v_scale;
119 } 147 }
120 else if (h && !w) 148 else if (h && !w)
121 { 149 {
122 w = bgpixmap->w; 150 w = h_scale;
123 h = (bgpixmap->h * h) / 100; 151 h = (v_scale * h) / 100;
124 } 152 }
125 153
126 min_it (w, 32767); 154 min_it (w, 32767);
127 min_it (h, 32767); 155 min_it (h, 32767);
128 156
129 if (bgpixmap->w != (short)w) 157 if (h_scale != w)
130 { 158 {
131 bgpixmap->w = (short)w; 159 h_scale = w;
132 changed++; 160 changed++;
133 } 161 }
134 162
135 if (bgpixmap->h != (short)h) 163 if (v_scale != h)
136 { 164 {
137 bgpixmap->h = (short)h; 165 v_scale = h;
138 changed++; 166 changed++;
139 } 167 }
140 } 168 }
141
142 if (!(flags & YValue)) 169 if (!(geom_flags & YValue))
143 { 170 {
144 if (flags & XNegative) 171 if (geom_flags & XNegative)
145 flags |= YNegative; 172 geom_flags |= YNegative;
146 173
147 y = x; 174 y = x;
148 } 175 }
149 176
150 if (!(flags & WidthValue) && geom[0] != '=') 177 if (!(geom_flags & WidthValue) && geom[0] != '=')
151 {
152 x += bgpixmap->x;
153 y += bgpixmap->y;
154 } 178 {
155 179 x += h_align;
156 if (xpmAttr.width && xpmAttr.height) 180 y += v_align;
157 { 181 }
158 x = MOD(x, xpmAttr.width); 182
159 y = MOD(y, xpmAttr.height); 183 if (h_align != x)
160 } 184 {
161 185 h_align = x;
162 if (bgpixmap->x != x)
163 {
164 bgpixmap->x = x;
165 changed++; 186 changed++;
166 } 187 }
167 188
168 if (bgpixmap->y != y) 189 if (v_align != y)
169 { 190 {
170 bgpixmap->y = y; 191 v_align = y;
171 changed++; 192 changed++;
172 } 193 }
194
195 if (h_scale != 0)
196 new_flags |= bgPmap_hScale;
197 if (v_scale != 0)
198 new_flags |= bgPmap_vScale;
199 }
200
201 if (new_flags != flags)
173 } 202 {
174 203 flags = new_flags;
204 changed++;
205 }
175 return changed; 206 return (changed > 0);
176} 207}
177 208
178void 209void
179rxvt_term::resize_pixmap () 210rxvt_term::resize_pixmap ()
180{ 211{
181 XGCValues gcvalue; 212 XGCValues gcvalue;
182 GC gc; 213 GC gc;
183 214 unsigned int w = bgPixmap.h_scale*szHint.width/100;
184 if (pixmap != None) 215 unsigned int h = bgPixmap.v_scale*szHint.height/100;
185 { 216 int x = bgPixmap.h_align*szHint.width/100;
186 XFreePixmap (dpy, pixmap); 217 int y = bgPixmap.v_align*szHint.height/100;
187 pixmap = None ; 218#ifdef HAVE_AFTERIMAGE
188 } 219 ASImage *im = bgPixmap.original_asim;
189 220#else
221 void *im = NULL;
222#endif
223/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
190 if (bgPixmap.pixmap == None) 224 if (bgPixmap.pixmap != None)
225 {
226 XFreePixmap (dpy, bgPixmap.pixmap);
227 bgPixmap.pixmap = None ;
228 }
229#ifdef ENABLE_TRANSPARENCY
230 if (option(Opt_transparent) && am_transparent)
231 {
232 /* we need to re-generate transparency pixmap in that case ! */
233 check_our_parents ();
234 return;
235 }
236#endif
237
238 if (im == NULL)
191 { /* So be it: I'm not using pixmaps */ 239 { /* So be it: I'm not using pixmaps */
192 pixmap = None;
193
194#ifdef ENABLE_TRANSPARENCY
195 if (!option (Opt_transparent) || !am_transparent)
196#endif
197 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 240 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
198
199 return; 241 return;
200 } 242 }
201 243
202 gcvalue.foreground = pix_colors[Color_bg]; 244 gcvalue.foreground = pix_colors[Color_bg];
203 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 245 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
204 246
205 if (bgPixmap.pixmap != None)
206 { /* we have a specified pixmap */
207 unsigned int w = bgPixmap.w, h = bgPixmap.h,
208 x = bgPixmap.x, y = bgPixmap.y;
209 unsigned int xpmh = xpmAttr.height,
210 xpmw = xpmAttr.width;
211
212 if (bgPixmap.auto_resize)
213 {
214 w = szHint.width ;
215 h = szHint.height ;
216 }
217 /*
218 * don't zoom pixmap too much nor expand really small pixmaps 247 /* don't zoom pixmap too much nor expand really small pixmaps */
219 */ 248 if (w > 16000)
220 if (w > 32767 || h > 32767)
221 w = 1; 249 w = 1;
222 else if (width > (10 * xpmw) 250 if (h > 16000)
223 || height > (10 * xpmh)) 251 h = 1;
224 w = 0; /* tile */ 252
253#ifdef HAVE_AFTERIMAGE
254 if (w == 0)
255 w = im->width;
256 if (h == 0)
257 h = im->height;
225 258
226 if (!w) 259 if (w != im->width || h != im->height)
227 { 260 {
228 /* basic X tiling - let the X server do it */ 261 ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT);
229 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth); 262 if (tmp != NULL)
230 263 im = tmp;
231 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0); 264 }
232 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y); 265 bgPixmap.pmap_width = MIN(w,szHint.width);
233 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0); 266 bgPixmap.pmap_height = MIN(h,szHint.height);
234 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y); 267#if 0 /* TODO: fix that! */
268 if (x != 0 || y != 0)
269 {
270 ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
271 if (tmp != NULL)
235 } 272 {
236 else 273 if (im != bgPixmap.original_asim)
237#ifdef ENABLE_TRANSPARENCY 274 destroy_asimage (&im);
238 if (!option(Opt_transparent) || !am_transparent) 275 im = tmp;
239 /* will do that in check_our_parents otherwise */ 276 }
277 }
278#endif
279 bgPixmap.pixmap = XCreatePixmap (dpy, vt, bgPixmap.pmap_width, bgPixmap.pmap_height, depth);
280 bgPixmap.pmap_depth = depth;
281
282 asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, bgPixmap.pmap_width, bgPixmap.pmap_height, True);
283
284 if (im != bgPixmap.original_asim)
285 destroy_asimage (&im);
240#endif 286#endif
241 { 287 if( bgPixmap.pixmap )
242 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
243 if (scaled_im)
244 {
245 pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
246 destroy_asimage (&scaled_im);
247 }
248 }
249 }
250
251 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 288 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
252 289
253 XFreeGC (dpy, gc); 290 XFreeGC (dpy, gc);
254#ifdef ENABLE_TRANSPARENCY
255 am_transparent = 0;
256#endif
257} 291}
258 292
259Pixmap 293void
260rxvt_term::set_bgPixmap (const char *file) 294rxvt_term::set_bgPixmap (const char *file)
261{ 295{
262 char *f; 296 char *f;
263 297
264 assert (file != NULL); 298 assert (file != NULL);
… …
268 XFreePixmap (dpy, bgPixmap.pixmap); 302 XFreePixmap (dpy, bgPixmap.pixmap);
269 bgPixmap.pixmap = None; 303 bgPixmap.pixmap = None;
270 } 304 }
271 305
272 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 306 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
273
274 if (*file != '\0') 307 if (*file != '\0')
275 { 308 {
276 /* XWindowAttributes attr; */ 309#ifdef HAVE_AFTERIMAGE
277
278 /*
279 * we already have the required attributes
280 */
281 /* XGetWindowAttributes (dpy, vt, &attr); */
282
283 if (asimman == NULL) 310 if (asimman == NULL)
284 asimman = create_generic_imageman(rs[Rs_path]); 311 asimman = create_generic_imageman(rs[Rs_path]);
285 if ((f = strchr (file, ';')) == NULL) 312 if ((f = strchr (file, ';')) == NULL)
286 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 313 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
287 else 314 else
288 { 315 {
289 size_t len = f - file; 316 size_t len = f - file;
290 f = (char *)malloc (len + 1); 317 f = (char *)malloc (len + 1);
291 strncpy (f, file, len); 318 strncpy (f, file, len);
292 f[len] = '\0'; 319 f[len] = '\0';
293 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 320 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
294 free( f ); 321 free( f );
295 } 322 }
296 if (original_asim) 323#endif
297 {
298 bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
299 xpmAttr.width = original_asim->width ;
300 xpmAttr.height = original_asim->height ;
301 }
302 } 324 }
303 325
304 resize_pixmap (); 326 resize_pixmap ();
305 return bgPixmap.pixmap;
306} 327}
307 328
308#endif /* XPM_BACKGROUND */ 329#endif /* XPM_BACKGROUND */
330#endif /* HAVE_BG_PIXMAP */
309 331
310#ifdef ENABLE_TRANSPARENCY 332#ifdef ENABLE_TRANSPARENCY
311#if TINTING && !defined(HAVE_AFTERIMAGE) 333#ifndef HAVE_AFTERIMAGE
312/* taken from aterm-0.4.2 */ 334/* taken from aterm-0.4.2 */
313 335
314typedef uint32_t RUINT32T; 336typedef uint32_t RUINT32T;
315 337
316static void 338static void
… …
624 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 646 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
625 &nitems, &bytes_after, &prop) == Success); 647 &nitems, &bytes_after, &prop) == Success);
626 648
627 /* TODO: the below logic needs to be cleaned up */ 649 /* TODO: the below logic needs to be cleaned up */
628 if (!i || prop == NULL 650 if (!i || prop == NULL
629#if TINTING
630 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 651 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
631#ifdef HAVE_AFTERIMAGE 652#ifdef HAVE_AFTERIMAGE
632 && original_asim == NULL && rs[Rs_blurradius] == NULL 653 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
633#endif 654#endif
634 ) 655 )
635#endif
636 ) 656 )
637 rootpixmap = None; 657 rootpixmap = None;
638 else 658 else
639 { 659 {
640 int junk; 660 int junk;
… …
660 Bool whole_tint = False, no_tint = True; 680 Bool whole_tint = False, no_tint = True;
661 681
662 while (sx < 0) sx += (int)wrootattr.width; 682 while (sx < 0) sx += (int)wrootattr.width;
663 while (sy < 0) sy += (int)wrootattr.height; 683 while (sy < 0) sy += (int)wrootattr.height;
664 684
665#if TINTING
666 if (rs[Rs_shade]) 685 if (rs[Rs_shade])
667 shade = atoi (rs[Rs_shade]); 686 shade = atoi (rs[Rs_shade]);
668 if (ISSET_PIXCOLOR (Color_tint)) 687 if (ISSET_PIXCOLOR (Color_tint))
669 pix_colors_focused [Color_tint].get (c); 688 pix_colors_focused [Color_tint].get (c);
670#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700) 689#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
… …
672 whole_tint = (IS_COMPONENT_WHOLESOME(c.r) 691 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
673 && IS_COMPONENT_WHOLESOME(c.g) 692 && IS_COMPONENT_WHOLESOME(c.g)
674 && IS_COMPONENT_WHOLESOME(c.b)); 693 && IS_COMPONENT_WHOLESOME(c.b));
675 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); 694 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
676#undef IS_COMPONENT_WHOLESOME 695#undef IS_COMPONENT_WHOLESOME
677#endif /* TINTING */
678 /* theer are no performance advantages to reusing same pixmap */ 696 /* theer are no performance advantages to reusing same pixmap */
679 if (pixmap != None) 697 if (bgPixmap.pixmap != None)
680 XFreePixmap (dpy, pixmap); 698 XFreePixmap (dpy, bgPixmap.pixmap);
681 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth); 699 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
700 bgPixmap.pmap_width = szHint.width;
701 bgPixmap.pmap_height = szHint.height;
702 bgPixmap.pmap_depth = rootdepth;
682 703
683#if 0 /* TODO : identify cases where this will be detrimental to performance : */ 704#if 0 /* TODO : identify cases where this will be detrimental to performance : */
684 /* we want to tile root pixmap into our own pixmap in this cases : 705 /* we want to tile root pixmap into our own pixmap in this cases :
685 * 1) rootpixmap does not cover our window entirely 706 * 1) rootpixmap does not cover our window entirely
686 * 2) whole_tint - we can use server-side tinting or tinting disabled 707 * 2) whole_tint - we can use server-side tinting or tinting disabled
… …
692 gcvalue.tile = rootpixmap; 713 gcvalue.tile = rootpixmap;
693 gcvalue.fill_style = FillTiled; 714 gcvalue.fill_style = FillTiled;
694 gcvalue.ts_x_origin = -sx; 715 gcvalue.ts_x_origin = -sx;
695 gcvalue.ts_y_origin = -sy; 716 gcvalue.ts_y_origin = -sy;
696 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue); 717 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
697 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height); 718 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
698 719
699#if TINTING
700 if (whole_tint && !no_tint) 720 if (whole_tint && !no_tint)
701 { 721 {
702 /* In this case we can tint image server-side getting significant 722 /* In this case we can tint image server-side getting significant
703 * performance improvements, as we eliminate XImage transfer 723 * performance improvements, as we eliminate XImage transfer
704 */ 724 */
705 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]); 725 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
706 gcvalue.function = GXand; 726 gcvalue.function = GXand;
707 gcvalue.fill_style = FillSolid; 727 gcvalue.fill_style = FillSolid;
708 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue); 728 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
709 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height); 729 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
710 } 730 }
711#endif
712 success = True; 731 success = True;
713#ifdef HAVE_AFTERIMAGE 732#ifdef HAVE_AFTERIMAGE
714 if (rs[Rs_blurradius] || original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) 733 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
715 { 734 {
716 ARGB32 tint = TINT_LEAVE_SAME; 735 ARGB32 tint = TINT_LEAVE_SAME;
717 ASImage *back_im = NULL; 736 ASImage *back_im = NULL;
718 737
719 back_im = pixmap2ximage (asv, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100); 738 back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
720 if (back_im != NULL) 739 if (back_im != NULL)
721 { 740 {
722 if (!whole_tint && (!no_tint || shade !=100)) 741 if (!whole_tint && (!no_tint || shade !=100))
723 { 742 {
724 ShadingInfo as_shade; 743 ShadingInfo as_shade;
… …
738 if (!(flags&WidthValue)) 757 if (!(flags&WidthValue))
739 hr = 1; 758 hr = 1;
740 if (!(flags&HeightValue)) 759 if (!(flags&HeightValue))
741 vr = hr; 760 vr = hr;
742 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF, 761 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
743 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 762 (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
744 100, ASIMAGE_QUALITY_DEFAULT); 763 100, ASIMAGE_QUALITY_DEFAULT);
745 if (tmp) 764 if (tmp)
746 { 765 {
747 destroy_asimage (&back_im); 766 destroy_asimage (&back_im);
748 back_im = tmp; 767 back_im = tmp;
749 } 768 }
750 } 769 }
751 770
752 if (original_asim != NULL) 771 if (bgPixmap.original_asim != NULL)
753 { 772 {
754 ASImageLayer *layers = create_image_layers (2); 773 ASImageLayer *layers = create_image_layers (2);
755 ASImage *merged_im = NULL; 774 ASImage *merged_im = NULL;
756 int fore_w, fore_h; 775 int fore_w, fore_h;
757 776
758 layers[0].im = back_im; 777 layers[0].im = back_im;
759 layers[0].clip_width = szHint.width; 778 layers[0].clip_width = szHint.width;
760 layers[0].clip_height = szHint.height; 779 layers[0].clip_height = szHint.height;
761 layers[0].tint = tint; 780 layers[0].tint = tint;
762 layers[1].im = original_asim; 781 layers[1].im = bgPixmap.original_asim;
763 if (bgPixmap.auto_resize) 782
764 { 783 fore_w = (bgPixmap.h_scale == 0) ? bgPixmap.original_asim->width : bgPixmap.h_scale*szHint.width/100;
765 fore_w = szHint.width; 784 fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100;
766 fore_h = szHint.height; 785
767 }
768 else
769 {
770 fore_w = bgPixmap.w;
771 fore_h = bgPixmap.h;
772 }
773 if (fore_w != original_asim->width 786 if (fore_w != bgPixmap.original_asim->width
774 || fore_h != original_asim->height) 787 || fore_h != bgPixmap.original_asim->height)
775 { 788 {
776 layers[1].im = scale_asimage (asv, 789 layers[1].im = scale_asimage (asv,
777 original_asim, 790 bgPixmap.original_asim,
778 fore_w, fore_h, 791 fore_w, fore_h,
779 ASA_ASImage, 100, 792 ASA_ASImage, 100,
780 ASIMAGE_QUALITY_DEFAULT); 793 ASIMAGE_QUALITY_DEFAULT);
781 } 794 }
782 layers[1].clip_width = szHint.width; 795 layers[1].clip_width = szHint.width;
… …
789 layers[1].merge_scanlines = alphablend_scanlines; 802 layers[1].merge_scanlines = alphablend_scanlines;
790 } 803 }
791 PRINT_BACKGROUND_OP_TIME; 804 PRINT_BACKGROUND_OP_TIME;
792 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height, 805 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
793 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 806 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
794 if (layers[1].im != original_asim) 807 if (layers[1].im != bgPixmap.original_asim)
795 destroy_asimage (&(layers[1].im)); 808 destroy_asimage (&(layers[1].im));
796 free (layers); 809 free (layers);
797 810
798 if (merged_im != NULL) 811 if (merged_im != NULL)
799 { 812 {
… …
810 destroy_asimage (&back_im); 823 destroy_asimage (&back_im);
811 back_im = tmp; 824 back_im = tmp;
812 } 825 }
813 PRINT_BACKGROUND_OP_TIME; 826 PRINT_BACKGROUND_OP_TIME;
814 } 827 }
815 asimage2drawable (asv, pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True); 828 asimage2drawable (asv, bgPixmap.pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
816 destroy_asimage (&back_im); 829 destroy_asimage (&back_im);
817 } /* back_im != NULL */ 830 } /* back_im != NULL */
818 else 831 else
819 success = False; 832 success = False;
820 } 833 }
821#else /* HAVE_AFTERIMAGE */ 834#else /* HAVE_AFTERIMAGE */
822#if TINTING
823 if (!whole_tint && (!no_tint || shade !=100)) 835 if (!whole_tint && (!no_tint || shade !=100))
824 { 836 {
825 XImage *image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); 837 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
826 success = False; 838 success = False;
827 if (image != NULL) 839 if (image != NULL)
828 { 840 {
829 PRINT_BACKGROUND_OP_TIME; 841 PRINT_BACKGROUND_OP_TIME;
830 if (gc == NULL) 842 if (gc == NULL)
831 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 843 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
832 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 844 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
833 ShadeXImage (this, image, shade, c.r, c.g, c.b); 845 ShadeXImage (this, image, shade, c.r, c.g, c.b);
834 XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); 846 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
835 XDestroyImage (image); 847 XDestroyImage (image);
836 success = True; 848 success = True;
837 } 849 }
838 } 850 }
839#endif
840#endif /* HAVE_AFTERIMAGE */ 851#endif /* HAVE_AFTERIMAGE */
841 PRINT_BACKGROUND_OP_TIME; 852 PRINT_BACKGROUND_OP_TIME;
842 853
843 if (gc != NULL) 854 if (gc != NULL)
844 XFreeGC (dpy, gc); 855 XFreeGC (dpy, gc);
… …
846 if (!success) 857 if (!success)
847 { 858 {
848 if (am_transparent && am_pixmap_trans) 859 if (am_transparent && am_pixmap_trans)
849 { 860 {
850 pchanged = 1; 861 pchanged = 1;
851 if (pixmap != None) 862 if (bgPixmap.pixmap != None)
852 { 863 {
853 XFreePixmap (dpy, pixmap); 864 XFreePixmap (dpy, bgPixmap.pixmap);
854 pixmap = None; 865 bgPixmap.pixmap = None;
855 } 866 }
856 } 867 }
857 868
858 am_pixmap_trans = 0; 869 am_pixmap_trans = 0;
859 } 870 }
860 else 871 else
861 { 872 {
862 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 873 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
863 XClearWindow (dpy, parent[0]); 874 XClearWindow (dpy, parent[0]);
864 875
865 if (!am_transparent || !am_pixmap_trans) 876 if (!am_transparent || !am_pixmap_trans)
866 pchanged = 1; 877 pchanged = 1;
867 878

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines