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.59 by sasha, Sun Aug 5 06:19:01 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; 106 }
57 cwh = widthheight; 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)
58 } 120 {
121 align = new_value;
122 return true;
123 }
124 }
125 return false;
126}
127
128static inline int
129make_align_position (int align, int window_size, int image_size)
130{
131 int diff = window_size - image_size;
132 int smaller = MIN (image_size,window_size);
133
134 if (align >= 0 && align <= 50)
135 return diff * align / 100;
136 else if (align > 50 && align <= 100)
137 return window_size - image_size + diff * align / 100;
138 else if (align > 100 && align <= 200 )
139 return ((align - 100) * smaller / 100) + window_size - smaller;
140 else if (align > -100 && align < 0)
141 return ((align + 100) * smaller / 100) - image_size;
142 return 0;
143}
144
145static inline void
146make_clip_rectangle (int pos, int size, int target_size, short &clip_pos, unsigned short &clip_size)
147{
148 if (pos < 0)
59 } 149 {
60 else if (cwh < 10) 150 clip_pos = 0;
61 { /* fit WH images across/down screen */ 151 clip_size = MIN (target_size, size + pos);
62 cincr *= cwh;
63 cxy = 0;
64 cwh = widthheight;
65 } 152 }
66 else 153 else
67 { 154 {
68 cincr *= 100.0 / cwh; 155 clip_pos = pos;
69 if (cwh < 100) 156 clip_size = size;
70 { /* contract */ 157 if (pos < target_size && (int)clip_size > target_size - pos)
71 float pos; 158 clip_pos = target_size - 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 } 159 }
100 cincr /= widthheight;
101 *wh = cwh;
102 *xy = cxy;
103 *incr = cincr;
104 *p = cp;
105} 160}
106 161
107/* 162bool
108 * These GEOM strings indicate absolute size/position: 163bgPixmap_t::handle_geometry (const char *geom)
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{ 164{
130 int flags, changed = 0; 165 int geom_flags = 0, changed = 0;
131 int x = 0, y = 0; 166 int x = 0, y = 0;
132 unsigned int w = 0, h = 0; 167 unsigned int w = 0, h = 0;
133 unsigned int n; 168 unsigned int n;
169 unsigned long new_flags = (flags&(~bgPmap_geometryFlags));
134 char *p; 170 char *p;
135 bgPixmap_t *bgpixmap = &bgPixmap; 171#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
136
137#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
138 172
139 if (geom == NULL) 173 if (geom == NULL)
140 return 0; 174 return false;
141 175
142 char str[MAXLEN_GEOM]; 176 char str[MAXLEN_GEOM];
143 177
144 if (!strcmp (geom, "?")) 178 if (!strcmp (geom, "?"))
145 { 179 {
180#if 0 /* TODO: */
146 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 181 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
147 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 182 min (h_scale, 32767), min (v_scale, 32767),
148 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 183 min (h_align, 32767), min (v_align, 32767));
149 process_xterm_seq (XTerm_title, str, CHAR_ST); 184 process_xterm_seq (XTerm_title, str, CHAR_ST);
185#endif
150 return 0; 186 return false;
151 } 187 }
152 188 while (isspace(*geom)) ++geom;
153 if ((p = strchr (geom, ';')) == NULL) 189 if ((p = strchr (geom, ';')) == NULL)
154 p = strchr (geom, '\0'); 190 p = strchr (geom, '\0');
155 191
156 n = (p - geom); 192 n = (p - geom);
157 if (n < MAXLEN_GEOM) 193 if (n < MAXLEN_GEOM)
158 { 194 {
195 char *ops;
196 new_flags |= bgPmap_geometrySet;
197
159 strncpy (str, geom, n); 198 strncpy (str, geom, n);
160 str[n] = '\0'; 199 str[n] = '\0';
161 200 if (str[0] == ':')
162 if (strcmp(str, "auto") == 0) 201 ops = &str[0];
163 { 202 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
164 if (!bgpixmap->auto_resize) 203 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 204 else
172 { 205 {
173 bgpixmap->auto_resize = False ; 206 char *tmp;
174 flags = XParseGeometry (str, &x, &y, &w, &h); 207 ops = strchr (str, ':');
175 } 208 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 { 209 {
193 w = (bgpixmap->w * w) / 100; 210 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
194 h = bgpixmap->h; 211 *(++tmp) = '\0';
212 if (ops == tmp) ++ops;
195 } 213 }
196 else if (h && !w) 214 }
215
216 if (ops > str || ops == NULL)
217 {
218 /* we have geometry string - let's handle it prior to applying ops */
219 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
220
221 if ((geom_flags & XValue) && !(geom_flags & YValue))
197 { 222 {
198 w = bgpixmap->w; 223 y = x;
199 h = (bgpixmap->h * h) / 100; 224 geom_flags |= YValue;
200 } 225 }
201 226
202 min_it (w, 32767); 227 if (flags & bgPmap_geometrySet)
203 min_it (h, 32767); 228 {/* new geometry is an adjustment to the old one ! */
204 229 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
205 if (bgpixmap->w != (short)w) 230 {
231 if (w == 0 && h != 0)
232 {
233 w = h_scale;
234 h = (v_scale * h) / 100;
235 }
236 else if (h == 0 && w != 0)
237 {
238 w = (h_scale * w) / 100;
239 h = v_scale;
240 }
241 }
242 if (geom_flags & XValue)
243 {
244 if (str[0] != '=')
245 {
246 y += v_align;
247 x += h_align;
248 }
249 }
250 }
251 else /* setting up geometry from scratch */
206 { 252 {
207 bgpixmap->w = (short)w; 253 if (!(geom_flags & XValue))
208 changed++; 254 {/* use default geometry - centered */
255 x = y = bgPmap_defaultAlign;
256 }
257 else if (!(geom_flags & YValue))
258 y = x;
259
260 if ((geom_flags & (WidthValue|HeightValue)) == 0)
261 {/* use default geometry - scaled */
262 w = h = bgPmap_defaultScale;
263 }
264 else if (geom_flags & WidthValue)
265 {
266 if (!(geom_flags & HeightValue))
267 h = w;
268 }
269 else
270 w = h;
209 } 271 }
272 } /* done parsing geometry string */
273 else if (!(flags & bgPmap_geometrySet))
274 { /* default geometry - scaled and centered */
275 x = y = bgPmap_defaultAlign;
276 w = h = bgPmap_defaultScale;
277 }
278
279 if (!(flags & bgPmap_geometrySet))
280 geom_flags |= WidthValue|HeightValue|XValue|YValue;
210 281
211 if (bgpixmap->h != (short)h) 282 if (ops)
283 {
284 while (*ops)
212 { 285 {
213 bgpixmap->h = (short)h; 286 while (*ops == ':' || isspace(*ops)) ++ops;
214 changed++; 287#define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
288 if (CHECK_GEOM_OPS("tile"))
289 {
290 w = h = 0;
291 geom_flags |= WidthValue|HeightValue;
215 } 292 }
216 } 293 else if (CHECK_GEOM_OPS("propscale"))
217 294 {
218 if (!(flags & YValue)) 295 if (w == 0 && h == 0)
296 {
297 w = 100;
298 geom_flags |= WidthValue;
299 }
300 new_flags |= bgPmap_propScale;
301 }
302 else if (CHECK_GEOM_OPS("hscale"))
303 {
304 if (w == 0)
305 w = 100;
306 h = 0;
307 geom_flags |= WidthValue|HeightValue;
308 }
309 else if (CHECK_GEOM_OPS("vscale"))
310 {
311 if (h == 0)
312 h = 100;
313 w = 0;
314 geom_flags |= WidthValue|HeightValue;
315 }
316 else if (CHECK_GEOM_OPS("scale"))
317 {
318 if (h == 0)
319 h = 100;
320 if (w == 0)
321 w = 100;
322 geom_flags |= WidthValue|HeightValue;
323 }
324 else if (CHECK_GEOM_OPS("auto"))
325 {
326 w = h = 100;
327 x = y = 50;
328 geom_flags |= WidthValue|HeightValue|XValue|YValue;
329 }
330#undef CHECK_GEOM_OPS
331 while (*ops != ':' && *ops != '\0') ++ops;
332 } /* done parsing ops */
219 { 333 }
220 if (flags & XNegative)
221 flags |= YNegative;
222 334
223 y = x; 335 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
224 } 336 ++changed;
337 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))
338 ++changed;
339 if (check_set_align_value (geom_flags, XValue, h_align, x))
340 ++changed;
341 if (check_set_align_value (geom_flags, YValue, v_align, y))
342 ++changed;
343 }
225 344
226 if (!(flags & WidthValue) && geom[0] != '=') 345 if (new_flags != flags)
227 { 346 {
228 x += bgpixmap->x; 347 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++; 348 changed++;
242 }
243
244 if (bgpixmap->y != y)
245 {
246 bgpixmap->y = y;
247 changed++;
248 }
249 } 349 }
250 350//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
351// flags, h_scale, v_scale, h_align, v_align);
251 return changed; 352 return (changed > 0);
252} 353}
354
355#ifdef HAVE_AFTERIMAGE
356ASImage *
357bgPixmap_t::resize_asim (rxvt_term *target, ASImage *background, XRectangle &dst_rect)
358{
359 if (original_asim == NULL || target == NULL)
360 return NULL;
361
362 int target_width = (int)target->szHint.width;
363 int target_height = (int)target->szHint.height;
364 int w = h_scale * target_width / 100;
365 int h = v_scale * target_height / 100;
366 int x = make_align_position (h_align, target_width, w);
367 int y = make_align_position (v_align, target_height, h);
368
369 make_clip_rectangle (x, w, target_width, dst_rect.x, dst_rect.width);
370 make_clip_rectangle (y, h, target_height, dst_rect.y, dst_rect.height);
371
372 /* TODO : actuall scaling code :) */
373
374}
375#endif
253 376
254void 377void
255rxvt_term::resize_pixmap () 378rxvt_term::resize_pixmap ()
256{ 379{
257 XGCValues gcvalue; 380 XGCValues gcvalue;
258 GC gc; 381 GC gc;
259 382 unsigned int w = bgPixmap.h_scale*szHint.width/100;
260 if (pixmap != None) 383 unsigned int h = bgPixmap.v_scale*szHint.height/100;
261 { 384 int x = bgPixmap.h_align*szHint.width/100;
262 XFreePixmap (dpy, pixmap); 385 int y = bgPixmap.v_align*szHint.height/100;
263 pixmap = None ; 386#ifdef HAVE_AFTERIMAGE
264 } 387 ASImage *im = bgPixmap.original_asim;
265 388#else
389 void *im = NULL;
390#endif
391/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
266 if (bgPixmap.pixmap == None) 392 if (bgPixmap.pixmap != None)
393 {
394 XFreePixmap (dpy, bgPixmap.pixmap);
395 bgPixmap.pixmap = None ;
396 }
397#ifdef ENABLE_TRANSPARENCY
398 if (option(Opt_transparent) && am_transparent)
399 {
400 /* we need to re-generate transparency pixmap in that case ! */
401 check_our_parents ();
402 return;
403 }
404#endif
405
406 if (im == NULL)
267 { /* So be it: I'm not using pixmaps */ 407 { /* 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]); 408 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
274
275 return; 409 return;
276 } 410 }
277 411
278 gcvalue.foreground = pix_colors[Color_bg]; 412 gcvalue.foreground = pix_colors[Color_bg];
279 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 413 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
280 414
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 415 /* don't zoom pixmap too much nor expand really small pixmaps */
295 */ 416 if (w > 16000)
296 if (w > 32767 || h > 32767)
297 w = 1; 417 w = 1;
298 else if (width > (10 * xpmw) 418 if (h > 16000)
299 || height > (10 * xpmh)) 419 h = 1;
300 w = 0; /* tile */ 420
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 421#ifdef HAVE_AFTERIMAGE
314#ifdef ENABLE_TRANSPARENCY 422 if (w == 0)
315 if (!option(Opt_transparent) || !am_transparent) 423 w = im->width;
316 /* will do that in check_our_parents otherwise */ 424 if (h == 0)
425 h = im->height;
426
427 if (w != im->width || h != im->height)
428 {
429 ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT);
430 if (tmp != NULL)
431 im = tmp;
432 }
433 bgPixmap.pmap_width = MIN(w,szHint.width);
434 bgPixmap.pmap_height = MIN(h,szHint.height);
435#if 0 /* TODO: fix that! */
436 if (x != 0 || y != 0)
437 {
438 ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
439 if (tmp != NULL)
440 {
441 if (im != bgPixmap.original_asim)
442 destroy_asimage (&im);
443 im = tmp;
444 }
445 }
446#endif
447 bgPixmap.pixmap = XCreatePixmap (dpy, vt, bgPixmap.pmap_width, bgPixmap.pmap_height, depth);
448 bgPixmap.pmap_depth = depth;
449
450 asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, bgPixmap.pmap_width, bgPixmap.pmap_height, True);
451
452 if (im != bgPixmap.original_asim)
453 destroy_asimage (&im);
317#endif 454#endif
318 { 455 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); 456 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
375 457
376 XFreeGC (dpy, gc); 458 XFreeGC (dpy, gc);
377#ifdef ENABLE_TRANSPARENCY
378 am_transparent = 0;
379#endif
380} 459}
381 460
382Pixmap 461void
383rxvt_term::set_bgPixmap (const char *file) 462rxvt_term::set_bgPixmap (const char *file)
384{ 463{
385 char *f; 464 char *f;
386 465
387 assert (file != NULL); 466 assert (file != NULL);
… …
391 XFreePixmap (dpy, bgPixmap.pixmap); 470 XFreePixmap (dpy, bgPixmap.pixmap);
392 bgPixmap.pixmap = None; 471 bgPixmap.pixmap = None;
393 } 472 }
394 473
395 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 474 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
396
397 if (*file != '\0') 475 if (*file != '\0')
398 { 476 {
399 /* XWindowAttributes attr; */
400
401 /*
402 * we already have the required attributes
403 */
404 /* XGetWindowAttributes (dpy, vt, &attr); */
405
406#ifdef HAVE_AFTERIMAGE 477#ifdef HAVE_AFTERIMAGE
407 if (asimman == NULL) 478 if (asimman == NULL)
408 asimman = create_generic_imageman(rs[Rs_path]); 479 asimman = create_generic_imageman(rs[Rs_path]);
409 if ((f = strchr (file, ';')) == NULL) 480 if ((f = strchr (file, ';')) == NULL)
410 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 481 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
411 else 482 else
412 { 483 {
413 size_t len = f - file; 484 size_t len = f - file;
414 f = (char *)malloc (len + 1); 485 f = (char *)malloc (len + 1);
415 strncpy (f, file, len); 486 strncpy (f, file, len);
416 f[len] = '\0'; 487 f[len] = '\0';
417 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 488 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
418 free( f ); 489 free( f );
419 } 490 }
420 if (original_asim) 491#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 } 492 }
452 493
453 resize_pixmap (); 494 resize_pixmap ();
454 return bgPixmap.pixmap;
455} 495}
456 496
457#endif /* XPM_BACKGROUND */ 497#endif /* XPM_BACKGROUND */
498#endif /* HAVE_BG_PIXMAP */
458 499
459#ifdef ENABLE_TRANSPARENCY 500#ifdef ENABLE_TRANSPARENCY
460#if TINTING && !defined(HAVE_AFTERIMAGE) 501#ifndef HAVE_AFTERIMAGE
461/* taken from aterm-0.4.2 */ 502/* taken from aterm-0.4.2 */
462 503
463typedef uint32_t RUINT32T; 504typedef uint32_t RUINT32T;
464 505
465static void 506static void
… …
702} 743}
703 744
704void 745void
705rxvt_term::check_our_parents_cb (time_watcher &w) 746rxvt_term::check_our_parents_cb (time_watcher &w)
706{ 747{
707 int i, pchanged, aformat, have_pixmap, rootdepth; 748 int i, pchanged, aformat, rootdepth;
708 unsigned long nitems, bytes_after; 749 unsigned long nitems, bytes_after;
709 Atom atype; 750 Atom atype;
710 unsigned char *prop = NULL; 751 unsigned char *prop = NULL;
711 Window root, oldp, *list; 752 Window root, oldp, *list;
712 Pixmap rootpixmap = None; 753 Pixmap rootpixmap = None;
713 XWindowAttributes wattr, wrootattr; 754 XWindowAttributes wattr, wrootattr;
714 int sx, sy; 755 int sx, sy;
715 Window cr; 756 Window cr;
757 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
716 758
717 pchanged = 0; 759 pchanged = 0;
718 760
719 if (!option (Opt_transparent)) 761 if (!option (Opt_transparent))
720 return /*pchanged*/; /* Don't try any more */ 762 return /*pchanged*/; /* Don't try any more */
763
764#if 0
765 struct timeval stv;
766 gettimeofday (&stv,NULL);
767#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
768 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
769 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
770#else
771#define PRINT_BACKGROUND_OP_TIME do{}while(0)
772#endif
773
721 774
722 XGetWindowAttributes (dpy, display->root, &wrootattr); 775 XGetWindowAttributes (dpy, display->root, &wrootattr);
723 rootdepth = wrootattr.depth; 776 rootdepth = wrootattr.depth;
724 777
725 XGetWindowAttributes (dpy, parent[0], &wattr); 778 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
739 /* Get all X ops out of the queue so that our information is up-to-date. */ 792 /* Get all X ops out of the queue so that our information is up-to-date. */
740 XSync (dpy, False); 793 XSync (dpy, False);
741 794
742 XTranslateCoordinates (dpy, parent[0], display->root, 795 XTranslateCoordinates (dpy, parent[0], display->root,
743 0, 0, &sx, &sy, &cr); 796 0, 0, &sx, &sy, &cr);
744
745 /* check if we are outside of the visible part of the virtual screen : */ 797 /* 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 798 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
747 || sx >= wrootattr.width || sy >= wrootattr.height ) 799 || sx >= wrootattr.width || sy >= wrootattr.height )
748 return /* 0 */ ; 800 return /* 0 */ ;
749 /* 801 /*
750 * Make the frame window set by the window manager have 802 * Make the frame window set by the window manager have
751 * the root background. Some window managers put multiple nested frame 803 * the root background. Some window managers put multiple nested frame
752 * windows for each client, so we have to take care about that. 804 * windows for each client, so we have to take care about that.
… …
760 i = (xa[XA_ESETROOT_PMAP_ID] 812 i = (xa[XA_ESETROOT_PMAP_ID]
761 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 813 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
762 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 814 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
763 &nitems, &bytes_after, &prop) == Success); 815 &nitems, &bytes_after, &prop) == Success);
764 816
817 /* TODO: the below logic needs to be cleaned up */
765 if (!i || prop == NULL 818 if (!i || prop == NULL
766#if TINTING
767 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 819 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
768#ifdef HAVE_AFTERIMAGE 820#ifdef HAVE_AFTERIMAGE
769 && original_asim == NULL && rs[Rs_blurradius] == NULL 821 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
770#endif 822#endif
771 ) 823 )
772#endif
773 ) 824 )
774 have_pixmap = 0; 825 rootpixmap = None;
775 else 826 else
776 { 827 {
777 have_pixmap = 1; 828 int junk;
829 unsigned int ujunk;
830 /* root pixmap may be bad - allow a error */
831 allowedxerror = -1;
778 rootpixmap = *(Pixmap *)prop; 832 if ((rootpixmap = *(Pixmap *)prop) != None)
833 if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
834 rootpixmap = None;
835 allowedxerror = 0;
836 }
837
838 if (prop != NULL)
779 XFree (prop); 839 XFree (prop);
840
841 if (rootpixmap != None)
780 } 842 {
781
782 if (have_pixmap)
783 {
784 Bool success = False ; 843 Bool success = False;
785 GC gc = NULL; 844 GC gc = NULL;
786 XGCValues gcvalue; 845 XGCValues gcvalue;
846 int shade = 100;
847 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
848 Bool whole_tint = False, no_tint = True;
849
850 while (sx < 0) sx += (int)wrootattr.width;
851 while (sy < 0) sy += (int)wrootattr.height;
852
853 if (rs[Rs_shade])
854 shade = atoi (rs[Rs_shade]);
855 if (ISSET_PIXCOLOR (Color_tint))
856 pix_colors_focused [Color_tint].get (c);
857#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
858 if (shade >= 100)
859 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
860 && IS_COMPONENT_WHOLESOME(c.g)
861 && IS_COMPONENT_WHOLESOME(c.b));
862 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
863#undef IS_COMPONENT_WHOLESOME
864 /* theer are no performance advantages to reusing same pixmap */
865 if (bgPixmap.pixmap != None)
866 XFreePixmap (dpy, bgPixmap.pixmap);
867 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
868 bgPixmap.pmap_width = szHint.width;
869 bgPixmap.pmap_height = szHint.height;
870 bgPixmap.pmap_depth = rootdepth;
871
872#if 0 /* TODO : identify cases where this will be detrimental to performance : */
873 /* we want to tile root pixmap into our own pixmap in this cases :
874 * 1) rootpixmap does not cover our window entirely
875 * 2) whole_tint - we can use server-side tinting or tinting disabled
876 */
877 if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
878 {
879 }
880#endif
881 gcvalue.tile = rootpixmap;
882 gcvalue.fill_style = FillTiled;
883 gcvalue.ts_x_origin = -sx;
884 gcvalue.ts_y_origin = -sy;
885 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
886 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
887
888 if (whole_tint && !no_tint)
889 {
890 /* In this case we can tint image server-side getting significant
891 * performance improvements, as we eliminate XImage transfer
892 */
893 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
894 gcvalue.function = GXand;
895 gcvalue.fill_style = FillSolid;
896 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
897 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
898 }
899 success = True;
787#ifdef HAVE_AFTERIMAGE 900#ifdef HAVE_AFTERIMAGE
901 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
788 { 902 {
789 Pixmap tmp_pmap = None ; 903 ARGB32 tint = TINT_LEAVE_SAME;
790 ShadingInfo shade; 904 ASImage *back_im = NULL;
791 ARGB32 tint ;
792 unsigned int pmap_w = 0, pmap_h = 0;
793 905
794 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 906 back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
907 if (back_im != NULL)
795 { 908 {
796 int root_x = 0, root_y = 0; 909 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 { 910 {
801 rgba c; 911 ShadingInfo as_shade;
802 pix_colors_focused [Color_tint].get (c); 912 as_shade.shading = shade;
803 shade.tintColor.red = c.r; 913 as_shade.tintColor.red = c.r;
804 shade.tintColor.green = c.g; 914 as_shade.tintColor.green = c.g;
805 shade.tintColor.blue = c.b; 915 as_shade.tintColor.blue = c.b;
916 tint = shading2tint32 (&as_shade);
806 } 917 }
807 else 918
808 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 919 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 { 920 {
921 ASImage* tmp;
922 int junk;
923 unsigned int hr = 1, vr = 1;
924 int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr);
925 if (!(flags&WidthValue))
926 hr = 1;
927 if (!(flags&HeightValue))
928 vr = hr;
929 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
930 (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
931 100, ASIMAGE_QUALITY_DEFAULT);
932 if (tmp)
933 {
934 destroy_asimage (&back_im);
935 back_im = tmp;
936 }
937 }
938
939 if (bgPixmap.original_asim != NULL)
940 {
813 ASImageLayer *layers = create_image_layers( 2 ); 941 ASImageLayer *layers = create_image_layers (2);
814 ASImage *merged_im = NULL; 942 ASImage *merged_im = NULL;
815 int back_x, back_y, back_w, back_h; 943 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 944
832 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); 945 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; 946 layers[0].clip_width = szHint.width;
836 layers[0].clip_height = szHint.height; 947 layers[0].clip_height = szHint.height;
837 layers[0].tint = tint; 948 layers[0].tint = tint;
838 if (rs[Rs_blurradius] && layers[0].im) 949 layers[1].im = bgPixmap.original_asim;
839 { 950
840 double r = atof(rs[Rs_blurradius]); 951 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 ); 952 fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100;
842 if( tmp ) 953
954 if (fore_w != bgPixmap.original_asim->width
955 || fore_h != bgPixmap.original_asim->height)
843 { 956 {
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, 957 layers[1].im = scale_asimage (asv,
866 original_asim, 958 bgPixmap.original_asim,
867 fore_w, fore_h, 959 fore_w, fore_h,
868 ASA_ASImage, 100, 960 ASA_ASImage, 100,
869 ASIMAGE_QUALITY_DEFAULT ); 961 ASIMAGE_QUALITY_DEFAULT);
870 } 962 }
871
872 layers[1].clip_width = szHint.width; 963 layers[1].clip_width = szHint.width;
873 layers[1].clip_height = szHint.height; 964 layers[1].clip_height = szHint.height;
874 965
875 if (rs[Rs_blendtype]) 966 if (rs[Rs_blendtype])
876 { 967 {
877 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 968 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
878 if( layers[1].merge_scanlines == NULL ) 969 if (layers[1].merge_scanlines == NULL)
879 layers[1].merge_scanlines = alphablend_scanlines; 970 layers[1].merge_scanlines = alphablend_scanlines;
880 } 971 }
881 } 972 PRINT_BACKGROUND_OP_TIME;
882 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 973 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
883 szHint.width, szHint.height,
884 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 974 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
885 if (layers[1].im != original_asim) 975 if (layers[1].im != bgPixmap.original_asim)
886 destroy_asimage( &(layers[1].im) ); 976 destroy_asimage (&(layers[1].im));
887 destroy_asimage( &(layers[0].im) ); 977 free (layers);
978
888 if (merged_im != NULL) 979 if (merged_im != NULL)
889 { 980 {
890 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
891 destroy_asimage( &merged_im ); 981 destroy_asimage (&back_im);
982 back_im = merged_im;
892 } 983 }
893 free( layers ); 984 PRINT_BACKGROUND_OP_TIME;
894 } 985 }
986 else if (tint != TINT_LEAVE_SAME)
987 {
988 ASImage* tmp = tile_asimage (asv, back_im, 0, 0, szHint.width, szHint.height, tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
989 if (tmp)
990 {
991 destroy_asimage (&back_im);
992 back_im = tmp;
993 }
994 PRINT_BACKGROUND_OP_TIME;
995 }
996 asimage2drawable (asv, bgPixmap.pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
997 destroy_asimage (&back_im);
998 } /* back_im != NULL */
999 else
1000 success = False;
895 } 1001 }
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 */ 1002#else /* HAVE_AFTERIMAGE */
905 { 1003 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 { 1004 {
919 nw += sx; 1005 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
920 nx = -sx; 1006 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) 1007 if (image != NULL)
942 {
943 if (pixmap != None)
944 XFreePixmap (dpy, pixmap);
945
946#if TINTING
947 if (ISSET_PIXCOLOR (Color_tint))
948 { 1008 {
949 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 1009 PRINT_BACKGROUND_OP_TIME;
950 1010 if (gc == NULL)
951 rgba c; 1011 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
952 pix_colors_focused [Color_tint].get (c); 1012 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
953 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1013 ShadeXImage (this, image, shade, c.r, c.g, c.b);
954 } 1014 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); 1015 XDestroyImage (image);
962 success = True ; 1016 success = True;
963 } 1017 }
964 } 1018 }
965#endif /* HAVE_AFTERIMAGE */ 1019#endif /* HAVE_AFTERIMAGE */
1020 PRINT_BACKGROUND_OP_TIME;
1021
966 if (gc != NULL) 1022 if (gc != NULL)
967 XFreeGC (dpy, gc); 1023 XFreeGC (dpy, gc);
968 1024
969 if (!success) 1025 if (!success)
970 { 1026 {
971 if (am_transparent && am_pixmap_trans) 1027 if (am_transparent && am_pixmap_trans)
972 { 1028 {
973 pchanged = 1; 1029 pchanged = 1;
974 if (pixmap != None) 1030 if (bgPixmap.pixmap != None)
975 { 1031 {
976 XFreePixmap (dpy, pixmap); 1032 XFreePixmap (dpy, bgPixmap.pixmap);
977 pixmap = None; 1033 bgPixmap.pixmap = None;
978 } 1034 }
979 } 1035 }
980 1036
981 am_pixmap_trans = 0; 1037 am_pixmap_trans = 0;
982 } 1038 }
983 else 1039 else
984 { 1040 {
985 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 1041 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
986 XClearWindow (dpy, parent[0]); 1042 XClearWindow (dpy, parent[0]);
987 1043
988 if (!am_transparent || !am_pixmap_trans) 1044 if (!am_transparent || !am_pixmap_trans)
989 pchanged = 1; 1045 pchanged = 1;
990 1046
991 am_transparent = am_pixmap_trans = 1; 1047 am_transparent = am_pixmap_trans = 1;
992 } 1048 }
993 } 1049 } /* rootpixmap != None */
994 1050
995 if (am_pixmap_trans) 1051 if (am_pixmap_trans)
996 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 1052 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
997 else 1053 else
998 { 1054 {

Diff Legend

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