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

Diff Legend

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