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.41 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.58 by sasha, Sat Aug 4 07:05:31 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 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{
29#ifdef XPM_BACKGROUND 77#ifdef XPM_BACKGROUND
78#ifdef HAVE_AFTERIMAGE
79 if (original_asim != NULL)
80#endif
81 {
82 if (h_scale != 0 || v_scale != 0)
83 return true;
84 }
85#endif
86#ifdef ENABLE_TRANSPARENCY
87 if (flags & bgPmap_Transparent)
88 return true;
89#endif
90 return false;
91}
30 92
31static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight); 93#ifdef XPM_BACKGROUND
32 94static inline bool
33/* 95check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
34 * These GEOM strings indicate absolute size/position:
35 * @ `WxH+X+Y'
36 * @ `WxH+X' -> Y = X
37 * @ `WxH' -> Y = X = 50
38 * @ `W+X+Y' -> H = W
39 * @ `W+X' -> H = W, Y = X
40 * @ `W' -> H = W, X = Y = 50
41 * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged)
42 * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged)
43 * @ `=+X+Y' -> (H, W unchanged)
44 * @ `=+X' -> Y = X (H, W unchanged)
45 *
46 * These GEOM strings adjust position relative to current position:
47 * @ `+X+Y'
48 * @ `+X' -> Y = X
49 *
50 * And this GEOM string is for querying current scale/position:
51 * @ `?'
52 */
53int
54rxvt_term::scale_pixmap (const char *geom)
55{ 96{
97 if (geom_flags & flag)
98 {
99 if (new_value > 1000)
100 new_value = 1000;
101 if (new_value != scale)
102 {
103 scale = new_value;
104 return true;
105 }
106 }
107 return false;
108}
109
110static inline bool
111check_set_align_value (int geom_flags, int flag, int &align, int new_value)
112{
113 if (geom_flags & flag)
114 {
115 if (new_value < -100)
116 new_value = -100;
117 else if (new_value > 200)
118 new_value = 200;
119 if (new_value != align)
120 {
121 align = new_value;
122 return true;
123 }
124 }
125 return false;
126}
127
128bool
129bgPixmap_t::handle_geometry (const char *geom)
130{
56 int flags, changed = 0; 131 int geom_flags = 0, changed = 0;
57 int x = 0, y = 0; 132 int x = 0, y = 0;
58 unsigned int w = 0, h = 0; 133 unsigned int w = 0, h = 0;
59 unsigned int n; 134 unsigned int n;
135 unsigned long new_flags = (flags&(~bgPmap_geometryFlags));
60 char *p; 136 char *p;
61 bgPixmap_t *bgpixmap = &bgPixmap; 137#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
62
63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
64 138
65 if (geom == NULL) 139 if (geom == NULL)
66 return 0; 140 return false;
67 141
68 char str[MAXLEN_GEOM]; 142 char str[MAXLEN_GEOM];
69 143
70 if (!strcmp (geom, "?")) 144 if (!strcmp (geom, "?"))
71 { 145 {
146#if 0 /* TODO: */
72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 147 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 148 min (h_scale, 32767), min (v_scale, 32767),
74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 149 min (h_align, 32767), min (v_align, 32767));
75 process_xterm_seq (XTerm_title, str, CHAR_ST); 150 process_xterm_seq (XTerm_title, str, CHAR_ST);
151#endif
76 return 0; 152 return false;
77 } 153 }
78 154 while (isspace(*geom)) ++geom;
79 if ((p = strchr (geom, ';')) == NULL) 155 if ((p = strchr (geom, ';')) == NULL)
80 p = strchr (geom, '\0'); 156 p = strchr (geom, '\0');
81 157
82 n = (p - geom); 158 n = (p - geom);
83 if (n < MAXLEN_GEOM) 159 if (n < MAXLEN_GEOM)
84 { 160 {
161 char *ops;
162 new_flags |= bgPmap_geometrySet;
163
85 strncpy (str, geom, n); 164 strncpy (str, geom, n);
86 str[n] = '\0'; 165 str[n] = '\0';
87 166 if (str[0] == ':')
88 if (strcmp(str, "auto") == 0) 167 ops = &str[0];
89 { 168 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
90 if (!bgpixmap->auto_resize) 169 ops = &str[0];
91 changed++;
92 bgpixmap->auto_resize = True ;
93 w = szHint.width ;
94 h = szHint.height ;
95 flags = WidthValue|HeightValue ;
96 }
97 else 170 else
98 { 171 {
99 bgpixmap->auto_resize = False ; 172 char *tmp;
100 flags = XParseGeometry (str, &x, &y, &w, &h); 173 ops = strchr (str, ':');
101 } 174 if (ops != NULL)
102
103 if (!flags)
104 {
105 flags |= WidthValue;
106 w = 0;
107 } /* default is tile */
108
109 if (flags & WidthValue)
110 {
111 if (!(flags & XValue))
112 x = 50;
113
114 if (!(flags & HeightValue))
115 h = w;
116
117 if (w && !h)
118 { 175 {
119 w = (bgpixmap->w * w) / 100; 176 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
120 h = bgpixmap->h; 177 *(++tmp) = '\0';
178 if (ops == tmp) ++ops;
121 } 179 }
122 else if (h && !w) 180 }
181
182 if (ops > str || ops == NULL)
183 {
184 /* we have geometry string - let's handle it prior to applying ops */
185 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
186
187 if ((geom_flags & XValue) && !(geom_flags & YValue))
123 { 188 {
124 w = bgpixmap->w; 189 y = x;
125 h = (bgpixmap->h * h) / 100; 190 geom_flags |= YValue;
126 } 191 }
127 192
128 min_it (w, 32767); 193 if (flags & bgPmap_geometrySet)
129 min_it (h, 32767); 194 {/* new geometry is an adjustment to the old one ! */
130 195 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
131 if (bgpixmap->w != (short)w) 196 {
197 if (w == 0 && h != 0)
198 {
199 w = h_scale;
200 h = (v_scale * h) / 100;
201 }
202 else if (h == 0 && w != 0)
203 {
204 w = (h_scale * w) / 100;
205 h = v_scale;
206 }
207 }
208 if (geom_flags & XValue)
209 {
210 if (str[0] != '=')
211 {
212 y += v_align;
213 x += h_align;
214 }
215 }
216 }
217 else /* setting up geometry from scratch */
132 { 218 {
133 bgpixmap->w = (short)w; 219 if (!(geom_flags & XValue))
134 changed++; 220 {/* use default geometry - centered */
221 x = y = bgPmap_defaultAlign;
222 }
223 else if (!(geom_flags & YValue))
224 y = x;
225
226 if ((geom_flags & (WidthValue|HeightValue)) == 0)
227 {/* use default geometry - scaled */
228 w = h = bgPmap_defaultScale;
229 }
230 else if (geom_flags & WidthValue)
231 {
232 if (!(geom_flags & HeightValue))
233 h = w;
234 }
235 else
236 w = h;
135 } 237 }
238 } /* done parsing geometry string */
239 else if (!(flags & bgPmap_geometrySet))
240 { /* default geometry - scaled and centered */
241 x = y = bgPmap_defaultAlign;
242 w = h = bgPmap_defaultScale;
243 }
244
245 if (!(flags & bgPmap_geometrySet))
246 geom_flags |= WidthValue|HeightValue|XValue|YValue;
136 247
137 if (bgpixmap->h != (short)h) 248 if (ops)
249 {
250 while (*ops)
138 { 251 {
139 bgpixmap->h = (short)h; 252 while (*ops == ':' || isspace(*ops)) ++ops;
140 changed++; 253#define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
254 if (CHECK_GEOM_OPS("tile"))
255 {
256 w = h = 0;
257 geom_flags |= WidthValue|HeightValue;
141 } 258 }
142 } 259 else if (CHECK_GEOM_OPS("propscale"))
143 260 {
144 if (!(flags & YValue)) 261 if (w == 0 && h == 0)
262 {
263 w = 100;
264 geom_flags |= WidthValue;
265 }
266 new_flags |= bgPmap_propScale;
267 }
268 else if (CHECK_GEOM_OPS("hscale"))
269 {
270 if (w == 0)
271 w = 100;
272 h = 0;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (CHECK_GEOM_OPS("vscale"))
276 {
277 if (h == 0)
278 h = 100;
279 w = 0;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (CHECK_GEOM_OPS("scale"))
283 {
284 if (h == 0)
285 h = 100;
286 if (w == 0)
287 w = 100;
288 geom_flags |= WidthValue|HeightValue;
289 }
290 else if (CHECK_GEOM_OPS("auto"))
291 {
292 w = h = 100;
293 x = y = 50;
294 geom_flags |= WidthValue|HeightValue|XValue|YValue;
295 }
296#undef CHECK_GEOM_OPS
297 while (*ops != ':' && *ops != '\0') ++ops;
298 } /* done parsing ops */
145 { 299 }
146 if (flags & XNegative)
147 flags |= YNegative;
148 300
149 y = x; 301 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
150 } 302 ++changed;
303 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))
304 ++changed;
305 if (check_set_align_value (geom_flags, XValue, h_align, x))
306 ++changed;
307 if (check_set_align_value (geom_flags, YValue, v_align, y))
308 ++changed;
309 }
151 310
152 if (!(flags & WidthValue) && geom[0] != '=') 311 if (new_flags != flags)
153 { 312 {
154 x += bgpixmap->x; 313 flags = new_flags;
155 y += bgpixmap->y;
156 }
157
158 if (xpmAttr.width && xpmAttr.height)
159 {
160 x = MOD(x, xpmAttr.width);
161 y = MOD(y, xpmAttr.height);
162 }
163
164 if (bgpixmap->x != x)
165 {
166 bgpixmap->x = x;
167 changed++; 314 changed++;
168 }
169
170 if (bgpixmap->y != y)
171 {
172 bgpixmap->y = y;
173 changed++;
174 }
175 } 315 }
176 316//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
317// flags, h_scale, v_scale, h_align, v_align);
177 return changed; 318 return (changed > 0);
178} 319}
179 320
180void 321void
181rxvt_term::resize_pixmap () 322rxvt_term::resize_pixmap ()
182{ 323{
183 XGCValues gcvalue; 324 XGCValues gcvalue;
184 GC gc; 325 GC gc;
185 326 unsigned int w = bgPixmap.h_scale*szHint.width/100;
186 if (pixmap != None) 327 unsigned int h = bgPixmap.v_scale*szHint.height/100;
187 { 328 int x = bgPixmap.h_align*szHint.width/100;
188 XFreePixmap (dpy, pixmap); 329 int y = bgPixmap.v_align*szHint.height/100;
189 pixmap = None ; 330#ifdef HAVE_AFTERIMAGE
190 } 331 ASImage *im = bgPixmap.original_asim;
191 332#else
333 void *im = NULL;
334#endif
335/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
192 if (bgPixmap.pixmap == None) 336 if (bgPixmap.pixmap != None)
337 {
338 XFreePixmap (dpy, bgPixmap.pixmap);
339 bgPixmap.pixmap = None ;
340 }
341#ifdef ENABLE_TRANSPARENCY
342 if (option(Opt_transparent) && am_transparent)
343 {
344 /* we need to re-generate transparency pixmap in that case ! */
345 check_our_parents ();
346 return;
347 }
348#endif
349
350 if (im == NULL)
193 { /* So be it: I'm not using pixmaps */ 351 { /* So be it: I'm not using pixmaps */
194 pixmap = None;
195
196#ifdef ENABLE_TRANSPARENCY
197 if (!option (Opt_transparent) || !am_transparent)
198#endif
199 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 352 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
200
201 return; 353 return;
202 } 354 }
203 355
204 gcvalue.foreground = pix_colors[Color_bg]; 356 gcvalue.foreground = pix_colors[Color_bg];
205 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 357 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
206 358
207 if (bgPixmap.pixmap != None)
208 { /* we have a specified pixmap */
209 unsigned int w = bgPixmap.w, h = bgPixmap.h,
210 x = bgPixmap.x, y = bgPixmap.y;
211 unsigned int xpmh = xpmAttr.height,
212 xpmw = xpmAttr.width;
213
214 if (bgPixmap.auto_resize)
215 {
216 w = szHint.width ;
217 h = szHint.height ;
218 }
219 /*
220 * don't zoom pixmap too much nor expand really small pixmaps 359 /* don't zoom pixmap too much nor expand really small pixmaps */
221 */ 360 if (w > 16000)
222 if (w > 32767 || h > 32767)
223 w = 1; 361 w = 1;
224 else if (width > (10 * xpmw) 362 if (h > 16000)
225 || height > (10 * xpmh)) 363 h = 1;
226 w = 0; /* tile */ 364
227
228 if (!w)
229 {
230 /* basic X tiling - let the X server do it */
231 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
232
233 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
234 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
235 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
236 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
237 }
238 else
239#ifdef HAVE_AFTERIMAGE 365#ifdef HAVE_AFTERIMAGE
240#ifdef ENABLE_TRANSPARENCY 366 if (w == 0)
241 if (!option(Opt_transparent) || !am_transparent) 367 w = im->width;
242 /* will do that in check_our_parents otherwise */ 368 if (h == 0)
369 h = im->height;
370
371 if (w != im->width || h != im->height)
372 {
373 ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT);
374 if (tmp != NULL)
375 im = tmp;
376 }
377 bgPixmap.pmap_width = MIN(w,szHint.width);
378 bgPixmap.pmap_height = MIN(h,szHint.height);
379#if 0 /* TODO: fix that! */
380 if (x != 0 || y != 0)
381 {
382 ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
383 if (tmp != NULL)
384 {
385 if (im != bgPixmap.original_asim)
386 destroy_asimage (&im);
387 im = tmp;
388 }
389 }
390#endif
391 bgPixmap.pixmap = XCreatePixmap (dpy, vt, bgPixmap.pmap_width, bgPixmap.pmap_height, depth);
392 bgPixmap.pmap_depth = depth;
393
394 asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, bgPixmap.pmap_width, bgPixmap.pmap_height, True);
395
396 if (im != bgPixmap.original_asim)
397 destroy_asimage (&im);
243#endif 398#endif
244 { 399 if( bgPixmap.pixmap )
245 ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
246 if (scaled_im)
247 {
248 pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True );
249 destroy_asimage( &scaled_im );
250 }
251 }
252#else /* HAVE_AFTERIMAGE */
253 {
254 float incr, p;
255 Pixmap tmp;
256
257 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
258 /*
259 * horizontal scaling
260 */
261 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
262
263 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
264 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
265
266 for ( /*nil */ ; x < w; x++, p += incr)
267 {
268 if (p >= xpmw)
269 p = 0;
270
271 /* copy one column from the original pixmap to the tmp pixmap */
272 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
273 }
274
275 /*
276 * vertical scaling
277 */
278 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
279
280 if (y > 0)
281 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
282
283 if (h < height)
284 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
285
286 for ( /*nil */ ; y < h; y++, p += incr)
287 {
288 if (p >= xpmh)
289 p = 0;
290
291 /* copy one row from the tmp pixmap to the main pixmap */
292 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
293 }
294
295 XFreePixmap (dpy, tmp);
296 }
297#endif /* HAVE_AFTERIMAGE */
298 }
299
300 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 400 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
301 401
302 XFreeGC (dpy, gc); 402 XFreeGC (dpy, gc);
303#ifdef ENABLE_TRANSPARENCY
304 am_transparent = 0;
305#endif
306} 403}
307 404
308/* 405void
309 * Calculate tiling sizes and increments
310 * At start, p == 0, incr == xpmwidthheight
311 */
312static void
313rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
314{
315 unsigned int cwh, cxy;
316 float cincr, cp;
317
318 cp = 0;
319 cincr = (float)xpmwidthheight;
320 cxy = *xy;
321 cwh = *wh;
322 if (cwh == 1)
323 { /* display one image, no horizontal/vertical scaling */
324 cincr = (float)widthheight;
325 if (xpmwidthheight <= widthheight)
326 {
327 cwh = xpmwidthheight;
328 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
329 cwh += cxy;
330 }
331 else
332 {
333 cxy = 0;
334 cwh = widthheight;
335 }
336 }
337 else if (cwh < 10)
338 { /* fit WH images across/down screen */
339 cincr *= cwh;
340 cxy = 0;
341 cwh = widthheight;
342 }
343 else
344 {
345 cincr *= 100.0 / cwh;
346 if (cwh < 100)
347 { /* contract */
348 float pos;
349
350 cwh = (cwh * widthheight) / 100;
351 pos = (float)cxy / 100 * widthheight - (cwh / 2);
352
353 cxy = (widthheight - cwh);
354 if (pos <= 0)
355 cxy = 0;
356 else if (pos < cxy)
357 cxy = (int) pos;
358 cwh += cxy;
359 }
360 else
361 { /* expand */
362 if (cxy > 0)
363 { /* position */
364 float pos;
365
366 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
367 cp = xpmwidthheight - cincr;
368 if (pos <= 0)
369 cp = 0;
370 else if (pos < cp)
371 cp = pos;
372 }
373 cxy = 0;
374 cwh = widthheight;
375 }
376 }
377 cincr /= widthheight;
378 *wh = cwh;
379 *xy = cxy;
380 *incr = cincr;
381 *p = cp;
382}
383
384Pixmap
385rxvt_term::set_bgPixmap (const char *file) 406rxvt_term::set_bgPixmap (const char *file)
386{ 407{
387 char *f; 408 char *f;
388 409
389 assert (file != NULL); 410 assert (file != NULL);
… …
393 XFreePixmap (dpy, bgPixmap.pixmap); 414 XFreePixmap (dpy, bgPixmap.pixmap);
394 bgPixmap.pixmap = None; 415 bgPixmap.pixmap = None;
395 } 416 }
396 417
397 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 418 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
398
399 if (*file != '\0') 419 if (*file != '\0')
400 { 420 {
401 /* XWindowAttributes attr; */
402
403 /*
404 * we already have the required attributes
405 */
406 /* XGetWindowAttributes (dpy, vt, &attr); */
407
408#ifdef HAVE_AFTERIMAGE 421#ifdef HAVE_AFTERIMAGE
409 if (asimman == NULL) 422 if (asimman == NULL)
410 asimman = create_generic_imageman(rs[Rs_path]); 423 asimman = create_generic_imageman(rs[Rs_path]);
411 if ((f = strchr (file, ';')) == NULL) 424 if ((f = strchr (file, ';')) == NULL)
412 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 425 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
413 else 426 else
414 { 427 {
415 f = strndup( file, f - file ); 428 size_t len = f - file;
429 f = (char *)malloc (len + 1);
430 strncpy (f, file, len);
431 f[len] = '\0';
416 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 432 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
417 free( f ); 433 free( f );
418 } 434 }
419 if (original_asim) 435#endif
420 {
421 bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True );
422 xpmAttr.width = original_asim->width ;
423 xpmAttr.height = original_asim->height ;
424 }
425#else /* HAVE_AFTERIMAGE */
426 xpmAttr.closeness = 30000;
427 xpmAttr.colormap = cmap;
428 xpmAttr.visual = visual;
429 xpmAttr.depth = depth;
430 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
431 | XpmDepth | XpmSize | XpmReturnPixels);
432
433 /* search environment variables here too */
434 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
435 if (f == NULL
436 || XpmReadFileToPixmap (dpy, display->root, f,
437 &bgPixmap.pixmap, NULL,
438 &xpmAttr))
439 {
440 char *p;
441
442 /* semi-colon delimited */
443 if ((p = strchr (file, ';')) == NULL)
444 p = strchr (file, '\0');
445
446 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
447 }
448 free (f);
449#endif /* HAVE_AFTERIMAGE */
450 } 436 }
451 437
452 resize_pixmap (); 438 resize_pixmap ();
453 return bgPixmap.pixmap;
454} 439}
455 440
456#endif /* XPM_BACKGROUND */ 441#endif /* XPM_BACKGROUND */
442#endif /* HAVE_BG_PIXMAP */
457 443
458#ifdef ENABLE_TRANSPARENCY 444#ifdef ENABLE_TRANSPARENCY
459#if TINTING && !defined(HAVE_AFTERIMAGE) 445#ifndef HAVE_AFTERIMAGE
460/* taken from aterm-0.4.2 */ 446/* taken from aterm-0.4.2 */
461 447
462typedef uint32_t RUINT32T; 448typedef uint32_t RUINT32T;
463 449
450static void
464void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 451ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
465{ 452{
466 int sh_r, sh_g, sh_b; 453 int sh_r, sh_g, sh_b;
467 RUINT32T mask_r, mask_g, mask_b; 454 RUINT32T mask_r, mask_g, mask_b;
468 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 455 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
469 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 456 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
… …
700} 687}
701 688
702void 689void
703rxvt_term::check_our_parents_cb (time_watcher &w) 690rxvt_term::check_our_parents_cb (time_watcher &w)
704{ 691{
705 int i, pchanged, aformat, have_pixmap, rootdepth; 692 int i, pchanged, aformat, rootdepth;
706 unsigned long nitems, bytes_after; 693 unsigned long nitems, bytes_after;
707 Atom atype; 694 Atom atype;
708 unsigned char *prop = NULL; 695 unsigned char *prop = NULL;
709 Window root, oldp, *list; 696 Window root, oldp, *list;
710 Pixmap rootpixmap = None; 697 Pixmap rootpixmap = None;
711 XWindowAttributes wattr, wrootattr; 698 XWindowAttributes wattr, wrootattr;
712 int sx, sy; 699 int sx, sy;
713 Window cr; 700 Window cr;
701 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
714 702
715 pchanged = 0; 703 pchanged = 0;
716 704
717 if (!option (Opt_transparent)) 705 if (!option (Opt_transparent))
718 return /*pchanged*/; /* Don't try any more */ 706 return /*pchanged*/; /* Don't try any more */
707
708#if 0
709 struct timeval stv;
710 gettimeofday (&stv,NULL);
711#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
712 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
713 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
714#else
715#define PRINT_BACKGROUND_OP_TIME do{}while(0)
716#endif
717
719 718
720 XGetWindowAttributes (dpy, display->root, &wrootattr); 719 XGetWindowAttributes (dpy, display->root, &wrootattr);
721 rootdepth = wrootattr.depth; 720 rootdepth = wrootattr.depth;
722 721
723 XGetWindowAttributes (dpy, parent[0], &wattr); 722 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
737 /* Get all X ops out of the queue so that our information is up-to-date. */ 736 /* Get all X ops out of the queue so that our information is up-to-date. */
738 XSync (dpy, False); 737 XSync (dpy, False);
739 738
740 XTranslateCoordinates (dpy, parent[0], display->root, 739 XTranslateCoordinates (dpy, parent[0], display->root,
741 0, 0, &sx, &sy, &cr); 740 0, 0, &sx, &sy, &cr);
742
743 /* check if we are outside of the visible part of the virtual screen : */ 741 /* check if we are outside of the visible part of the virtual screen : */
744 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 742 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
745 || sx >= wrootattr.width || sy >= wrootattr.height ) 743 || sx >= wrootattr.width || sy >= wrootattr.height )
746 return /* 0 */ ; 744 return /* 0 */ ;
747 /* 745 /*
748 * Make the frame window set by the window manager have 746 * Make the frame window set by the window manager have
749 * the root background. Some window managers put multiple nested frame 747 * the root background. Some window managers put multiple nested frame
750 * windows for each client, so we have to take care about that. 748 * windows for each client, so we have to take care about that.
… …
758 i = (xa[XA_ESETROOT_PMAP_ID] 756 i = (xa[XA_ESETROOT_PMAP_ID]
759 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 757 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
760 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 758 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
761 &nitems, &bytes_after, &prop) == Success); 759 &nitems, &bytes_after, &prop) == Success);
762 760
761 /* TODO: the below logic needs to be cleaned up */
763 if (!i || prop == NULL 762 if (!i || prop == NULL
764#if TINTING
765 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 763 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
766#ifdef HAVE_AFTERIMAGE 764#ifdef HAVE_AFTERIMAGE
767 && original_asim == NULL && rs[Rs_blurradius] == NULL 765 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
768#endif 766#endif
769 ) 767 )
770#endif
771 ) 768 )
772 have_pixmap = 0; 769 rootpixmap = None;
773 else 770 else
774 { 771 {
775 have_pixmap = 1; 772 int junk;
773 unsigned int ujunk;
774 /* root pixmap may be bad - allow a error */
775 allowedxerror = -1;
776 rootpixmap = *(Pixmap *)prop; 776 if ((rootpixmap = *(Pixmap *)prop) != None)
777 if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
778 rootpixmap = None;
779 allowedxerror = 0;
780 }
781
782 if (prop != NULL)
777 XFree (prop); 783 XFree (prop);
784
785 if (rootpixmap != None)
778 } 786 {
779
780 if (have_pixmap)
781 {
782 Bool success = False ; 787 Bool success = False;
783 GC gc = NULL; 788 GC gc = NULL;
784 XGCValues gcvalue; 789 XGCValues gcvalue;
790 int shade = 100;
791 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
792 Bool whole_tint = False, no_tint = True;
793
794 while (sx < 0) sx += (int)wrootattr.width;
795 while (sy < 0) sy += (int)wrootattr.height;
796
797 if (rs[Rs_shade])
798 shade = atoi (rs[Rs_shade]);
799 if (ISSET_PIXCOLOR (Color_tint))
800 pix_colors_focused [Color_tint].get (c);
801#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
802 if (shade >= 100)
803 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
804 && IS_COMPONENT_WHOLESOME(c.g)
805 && IS_COMPONENT_WHOLESOME(c.b));
806 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
807#undef IS_COMPONENT_WHOLESOME
808 /* theer are no performance advantages to reusing same pixmap */
809 if (bgPixmap.pixmap != None)
810 XFreePixmap (dpy, bgPixmap.pixmap);
811 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
812 bgPixmap.pmap_width = szHint.width;
813 bgPixmap.pmap_height = szHint.height;
814 bgPixmap.pmap_depth = rootdepth;
815
816#if 0 /* TODO : identify cases where this will be detrimental to performance : */
817 /* we want to tile root pixmap into our own pixmap in this cases :
818 * 1) rootpixmap does not cover our window entirely
819 * 2) whole_tint - we can use server-side tinting or tinting disabled
820 */
821 if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
822 {
823 }
824#endif
825 gcvalue.tile = rootpixmap;
826 gcvalue.fill_style = FillTiled;
827 gcvalue.ts_x_origin = -sx;
828 gcvalue.ts_y_origin = -sy;
829 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
830 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
831
832 if (whole_tint && !no_tint)
833 {
834 /* In this case we can tint image server-side getting significant
835 * performance improvements, as we eliminate XImage transfer
836 */
837 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
838 gcvalue.function = GXand;
839 gcvalue.fill_style = FillSolid;
840 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
841 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
842 }
843 success = True;
785#ifdef HAVE_AFTERIMAGE 844#ifdef HAVE_AFTERIMAGE
845 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
786 { 846 {
787 Pixmap tmp_pmap = None ; 847 ARGB32 tint = TINT_LEAVE_SAME;
788 ShadingInfo shade; 848 ASImage *back_im = NULL;
789 ARGB32 tint ;
790 unsigned int pmap_w = 0, pmap_h = 0;
791 849
792 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 850 back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
851 if (back_im != NULL)
793 { 852 {
794 int root_x = 0, root_y = 0; 853 if (!whole_tint && (!no_tint || shade !=100))
795
796 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
797 if (ISSET_PIXCOLOR (Color_tint))
798 { 854 {
799 rgba c; 855 ShadingInfo as_shade;
800 pix_colors_focused [Color_tint].get (c); 856 as_shade.shading = shade;
801 shade.tintColor.red = c.r; 857 as_shade.tintColor.red = c.r;
802 shade.tintColor.green = c.g; 858 as_shade.tintColor.green = c.g;
803 shade.tintColor.blue = c.b; 859 as_shade.tintColor.blue = c.b;
860 tint = shading2tint32 (&as_shade);
804 } 861 }
805 else 862
806 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 863 if (rs[Rs_blurradius] && back_im)
807 tint = shading2tint32( &shade );
808 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
809 if (GetWinPosition (parent[0], &root_x, &root_y) )
810 { 864 {
865 ASImage* tmp;
866 int junk;
867 unsigned int hr = 1, vr = 1;
868 int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr);
869 if (!(flags&WidthValue))
870 hr = 1;
871 if (!(flags&HeightValue))
872 vr = hr;
873 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
874 (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
875 100, ASIMAGE_QUALITY_DEFAULT);
876 if (tmp)
877 {
878 destroy_asimage (&back_im);
879 back_im = tmp;
880 }
881 }
882
883 if (bgPixmap.original_asim != NULL)
884 {
811 ASImageLayer *layers = create_image_layers( 2 ); 885 ASImageLayer *layers = create_image_layers (2);
812 ASImage *merged_im = NULL; 886 ASImage *merged_im = NULL;
813 int back_x, back_y, back_w, back_h; 887 int fore_w, fore_h;
814 /* merge_layers does good job at tiling background appropriately,
815 so all we need is to cut out smallest possible piece : */
816#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
817 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
818 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
819 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
820 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
821 else \
822 { /* small background - need the whole of it for successfull tiling :*/ \
823 back_##xy = 0; \
824 back_##wh = pmap_##wh; \
825 }}while(0)
826
827 MAKE_ROOTPMAP_GEOM(x,w,width);
828 MAKE_ROOTPMAP_GEOM(y,h,height);
829 888
830 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); 889 layers[0].im = back_im;
831 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
832 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
833 layers[0].clip_width = szHint.width; 890 layers[0].clip_width = szHint.width;
834 layers[0].clip_height = szHint.height; 891 layers[0].clip_height = szHint.height;
835 layers[0].tint = tint; 892 layers[0].tint = tint;
836 if (rs[Rs_blurradius] && layers[0].im) 893 layers[1].im = bgPixmap.original_asim;
837 { 894
838 double r = atof(rs[Rs_blurradius]); 895 fore_w = (bgPixmap.h_scale == 0) ? bgPixmap.original_asim->width : bgPixmap.h_scale*szHint.width/100;
839 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT ); 896 fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100;
840 if( tmp ) 897
898 if (fore_w != bgPixmap.original_asim->width
899 || fore_h != bgPixmap.original_asim->height)
841 { 900 {
842 destroy_asimage( &layers[0].im );
843 layers[0].im = tmp;
844 }
845 }
846 if (original_asim != NULL)
847 {
848 int fore_w, fore_h;
849 layers[1].im = original_asim;
850 if( bgPixmap.auto_resize )
851 {
852 fore_w = szHint.width;
853 fore_h = szHint.height;
854 }
855 else
856 {
857 fore_w = bgPixmap.w;
858 fore_h = bgPixmap.h;
859 }
860 if (fore_w != original_asim->width
861 || fore_h != original_asim->height)
862 {
863 layers[1].im = scale_asimage( display->asv, 901 layers[1].im = scale_asimage (asv,
864 original_asim, 902 bgPixmap.original_asim,
865 fore_w, fore_h, 903 fore_w, fore_h,
866 ASA_ASImage, 100, 904 ASA_ASImage, 100,
867 ASIMAGE_QUALITY_DEFAULT ); 905 ASIMAGE_QUALITY_DEFAULT);
868 } 906 }
869
870 layers[1].clip_width = szHint.width; 907 layers[1].clip_width = szHint.width;
871 layers[1].clip_height = szHint.height; 908 layers[1].clip_height = szHint.height;
872 909
873 if (rs[Rs_blendtype]) 910 if (rs[Rs_blendtype])
874 { 911 {
875 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 912 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
876 if( layers[1].merge_scanlines == NULL ) 913 if (layers[1].merge_scanlines == NULL)
877 layers[1].merge_scanlines = alphablend_scanlines; 914 layers[1].merge_scanlines = alphablend_scanlines;
878 } 915 }
879 } 916 PRINT_BACKGROUND_OP_TIME;
880 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 917 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
881 szHint.width, szHint.height,
882 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 918 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
883 if (layers[1].im != original_asim) 919 if (layers[1].im != bgPixmap.original_asim)
884 destroy_asimage( &(layers[1].im) ); 920 destroy_asimage (&(layers[1].im));
885 destroy_asimage( &(layers[0].im) ); 921 free (layers);
922
886 if (merged_im != NULL) 923 if (merged_im != NULL)
887 { 924 {
888 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
889 destroy_asimage( &merged_im ); 925 destroy_asimage (&back_im);
926 back_im = merged_im;
890 } 927 }
891 free( layers ); 928 PRINT_BACKGROUND_OP_TIME;
892 } 929 }
930 else if (tint != TINT_LEAVE_SAME)
931 {
932 ASImage* tmp = tile_asimage (asv, back_im, 0, 0, szHint.width, szHint.height, tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
933 if (tmp)
934 {
935 destroy_asimage (&back_im);
936 back_im = tmp;
937 }
938 PRINT_BACKGROUND_OP_TIME;
939 }
940 asimage2drawable (asv, bgPixmap.pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
941 destroy_asimage (&back_im);
942 } /* back_im != NULL */
943 else
944 success = False;
893 } 945 }
894 if (tmp_pmap != None)
895 {
896 success = True;
897 if (pixmap != None)
898 XFreePixmap (dpy, pixmap);
899 pixmap = tmp_pmap;
900 }
901 }
902#else /* HAVE_AFTERIMAGE */ 946#else /* HAVE_AFTERIMAGE */
903 { 947 if (!whole_tint && (!no_tint || shade !=100))
904 /*
905 * Copy display->root pixmap transparency
906 */
907 int nx, ny;
908 unsigned int nw, nh;
909 XImage *image;
910
911 nw = (unsigned int)szHint.width;
912 nh = (unsigned int)szHint.height;
913 nx = ny = 0;
914
915 if (sx < 0)
916 { 948 {
917 nw += sx; 949 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
918 nx = -sx; 950 success = False;
919 sx = 0;
920 }
921
922 if (sy < 0)
923 {
924 nh += sy;
925 ny = -sy;
926 sy = 0;
927 }
928
929 min_it (nw, (unsigned int) (wrootattr.width - sx));
930 min_it (nh, (unsigned int) (wrootattr.height - sy));
931
932 XSync (dpy, False);
933 allowedxerror = -1;
934 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
935
936 /* XXX: handle BadMatch - usually because we're outside the pixmap */
937 /* XXX: may need a delay here? */
938 allowedxerror = 0;
939 if (image != NULL) 951 if (image != NULL)
940 {
941 if (pixmap != None)
942 XFreePixmap (dpy, pixmap);
943
944#if TINTING
945 if (ISSET_PIXCOLOR (Color_tint))
946 { 952 {
947 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 953 PRINT_BACKGROUND_OP_TIME;
948 954 if (gc == NULL)
949 rgba c; 955 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
950 pix_colors_focused [Color_tint].get (c); 956 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
951 ShadeXImage (this, image, shade, c.r, c.g, c.b); 957 ShadeXImage (this, image, shade, c.r, c.g, c.b);
952 } 958 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
953#endif
954
955 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
956 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
957 XPutImage (dpy, pixmap, gc, image, 0, 0,
958 nx, ny, image->width, image->height);
959 XDestroyImage (image); 959 XDestroyImage (image);
960 success = True ; 960 success = True;
961 } 961 }
962 } 962 }
963#endif /* HAVE_AFTERIMAGE */ 963#endif /* HAVE_AFTERIMAGE */
964 PRINT_BACKGROUND_OP_TIME;
965
964 if (gc != NULL) 966 if (gc != NULL)
965 XFreeGC (dpy, gc); 967 XFreeGC (dpy, gc);
966 968
967 if (!success) 969 if (!success)
968 { 970 {
969 if (am_transparent && am_pixmap_trans) 971 if (am_transparent && am_pixmap_trans)
970 { 972 {
971 pchanged = 1; 973 pchanged = 1;
972 if (pixmap != None) 974 if (bgPixmap.pixmap != None)
973 { 975 {
974 XFreePixmap (dpy, pixmap); 976 XFreePixmap (dpy, bgPixmap.pixmap);
975 pixmap = None; 977 bgPixmap.pixmap = None;
976 } 978 }
977 } 979 }
978 980
979 am_pixmap_trans = 0; 981 am_pixmap_trans = 0;
980 } 982 }
981 else 983 else
982 { 984 {
983 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 985 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
984 XClearWindow (dpy, parent[0]); 986 XClearWindow (dpy, parent[0]);
985 987
986 if (!am_transparent || !am_pixmap_trans) 988 if (!am_transparent || !am_pixmap_trans)
987 pchanged = 1; 989 pchanged = 1;
988 990
989 am_transparent = am_pixmap_trans = 1; 991 am_transparent = am_pixmap_trans = 1;
990 } 992 }
991 } 993 } /* rootpixmap != None */
992 994
993 if (am_pixmap_trans) 995 if (am_pixmap_trans)
994 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 996 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
995 else 997 else
996 { 998 {

Diff Legend

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