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.40 by ayin, Wed Jun 20 13:46:25 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
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
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)
149 {
150 clip_pos = 0;
151 clip_size = MIN (target_size, size + pos);
152 }
153 else
154 {
155 clip_pos = pos;
156 clip_size = size;
157 if (pos < target_size && (int)clip_size > target_size - pos)
158 clip_pos = target_size - pos;
159 }
160}
161
162bool
163bgPixmap_t::handle_geometry (const char *geom)
164{
56 int flags, changed = 0; 165 int geom_flags = 0, changed = 0;
57 int x = 0, y = 0; 166 int x = 0, y = 0;
58 unsigned int w = 0, h = 0; 167 unsigned int w = 0, h = 0;
59 unsigned int n; 168 unsigned int n;
169 unsigned long new_flags = (flags&(~bgPmap_geometryFlags));
60 char *p; 170 char *p;
61 bgPixmap_t *bgpixmap = &bgPixmap; 171#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
62
63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
64 172
65 if (geom == NULL) 173 if (geom == NULL)
66 return 0; 174 return false;
67 175
68 char str[MAXLEN_GEOM]; 176 char str[MAXLEN_GEOM];
69 177
70 if (!strcmp (geom, "?")) 178 if (!strcmp (geom, "?"))
71 { 179 {
180#if 0 /* TODO: */
72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 181 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 182 min (h_scale, 32767), min (v_scale, 32767),
74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 183 min (h_align, 32767), min (v_align, 32767));
75 process_xterm_seq (XTerm_title, str, CHAR_ST); 184 process_xterm_seq (XTerm_title, str, CHAR_ST);
185#endif
76 return 0; 186 return false;
77 } 187 }
78 188 while (isspace(*geom)) ++geom;
79 if ((p = strchr (geom, ';')) == NULL) 189 if ((p = strchr (geom, ';')) == NULL)
80 p = strchr (geom, '\0'); 190 p = strchr (geom, '\0');
81 191
82 n = (p - geom); 192 n = (p - geom);
83 if (n < MAXLEN_GEOM) 193 if (n < MAXLEN_GEOM)
84 { 194 {
195 char *ops;
196 new_flags |= bgPmap_geometrySet;
197
85 strncpy (str, geom, n); 198 strncpy (str, geom, n);
86 str[n] = '\0'; 199 str[n] = '\0';
87 200 if (str[0] == ':')
88 if (strcmp(str, "auto") == 0) 201 ops = &str[0];
89 { 202 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
90 if (!bgpixmap->auto_resize) 203 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 204 else
98 { 205 {
99 bgpixmap->auto_resize = False ; 206 char *tmp;
100 flags = XParseGeometry (str, &x, &y, &w, &h); 207 ops = strchr (str, ':');
101 } 208 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 { 209 {
119 w = (bgpixmap->w * w) / 100; 210 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
120 h = bgpixmap->h; 211 *(++tmp) = '\0';
212 if (ops == tmp) ++ops;
121 } 213 }
122 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))
123 { 222 {
124 w = bgpixmap->w; 223 y = x;
125 h = (bgpixmap->h * h) / 100; 224 geom_flags |= YValue;
126 } 225 }
127 226
128 min_it (w, 32767); 227 if (flags & bgPmap_geometrySet)
129 min_it (h, 32767); 228 {/* new geometry is an adjustment to the old one ! */
130 229 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
131 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 */
132 { 252 {
133 bgpixmap->w = (short)w; 253 if (!(geom_flags & XValue))
134 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;
135 } 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;
136 281
137 if (bgpixmap->h != (short)h) 282 if (ops)
283 {
284 while (*ops)
138 { 285 {
139 bgpixmap->h = (short)h; 286 while (*ops == ':' || isspace(*ops)) ++ops;
140 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;
141 } 292 }
142 } 293 else if (CHECK_GEOM_OPS("propscale"))
143 294 {
144 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 */
145 { 333 }
146 if (flags & XNegative)
147 flags |= YNegative;
148 334
149 y = x; 335 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
150 } 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 }
151 344
152 if (!(flags & WidthValue) && geom[0] != '=') 345 if (new_flags != flags)
153 { 346 {
154 x += bgpixmap->x; 347 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++; 348 changed++;
168 }
169
170 if (bgpixmap->y != y)
171 {
172 bgpixmap->y = y;
173 changed++;
174 }
175 } 349 }
176 350//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
351// flags, h_scale, v_scale, h_align, v_align);
177 return changed; 352 return (changed > 0);
178} 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
179 376
180void 377void
181rxvt_term::resize_pixmap () 378rxvt_term::resize_pixmap ()
182{ 379{
183 XGCValues gcvalue; 380 XGCValues gcvalue;
184 GC gc; 381 GC gc;
185 382 unsigned int w = bgPixmap.h_scale*szHint.width/100;
186 if (pixmap != None) 383 unsigned int h = bgPixmap.v_scale*szHint.height/100;
187 { 384 int x = bgPixmap.h_align*szHint.width/100;
188 XFreePixmap (dpy, pixmap); 385 int y = bgPixmap.v_align*szHint.height/100;
189 pixmap = None ; 386#ifdef HAVE_AFTERIMAGE
190 } 387 ASImage *im = bgPixmap.original_asim;
191 388#else
389 void *im = NULL;
390#endif
391/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
192 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)
193 { /* So be it: I'm not using pixmaps */ 407 { /* So be it: I'm not using pixmaps */
194 pixmap = None;
195
196#ifdef TRANSPARENT
197 if (!option (Opt_transparent) || !am_transparent)
198#endif
199 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 408 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
200
201 return; 409 return;
202 } 410 }
203 411
204 gcvalue.foreground = pix_colors[Color_bg]; 412 gcvalue.foreground = pix_colors[Color_bg];
205 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 413 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
206 414
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 415 /* don't zoom pixmap too much nor expand really small pixmaps */
221 */ 416 if (w > 16000)
222 if (w > 32767 || h > 32767)
223 w = 1; 417 w = 1;
224 else if (width > (10 * xpmw) 418 if (h > 16000)
225 || height > (10 * xpmh)) 419 h = 1;
226 w = 0; /* tile */ 420
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 421#ifdef HAVE_AFTERIMAGE
240#ifdef TRANSPARENT 422 if (w == 0)
241 if (!option(Opt_transparent) || !am_transparent) 423 w = im->width;
242 /* 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);
243#endif 454#endif
244 { 455 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); 456 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
301 457
302 XFreeGC (dpy, gc); 458 XFreeGC (dpy, gc);
303#ifdef TRANSPARENT
304 am_transparent = 0;
305#endif
306} 459}
307 460
308/* 461void
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) 462rxvt_term::set_bgPixmap (const char *file)
386{ 463{
387 char *f; 464 char *f;
388 465
389 assert (file != NULL); 466 assert (file != NULL);
… …
393 XFreePixmap (dpy, bgPixmap.pixmap); 470 XFreePixmap (dpy, bgPixmap.pixmap);
394 bgPixmap.pixmap = None; 471 bgPixmap.pixmap = None;
395 } 472 }
396 473
397 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 474 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
398
399 if (*file != '\0') 475 if (*file != '\0')
400 { 476 {
401 /* XWindowAttributes attr; */
402
403 /*
404 * we already have the required attributes
405 */
406 /* XGetWindowAttributes (dpy, vt, &attr); */
407
408#ifdef HAVE_AFTERIMAGE 477#ifdef HAVE_AFTERIMAGE
409 if (asimman == NULL) 478 if (asimman == NULL)
410 asimman = create_generic_imageman(rs[Rs_path]); 479 asimman = create_generic_imageman(rs[Rs_path]);
411 if ((f = strchr (file, ';')) == NULL) 480 if ((f = strchr (file, ';')) == NULL)
412 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 481 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
413 else 482 else
414 { 483 {
415 f = strndup( file, f - file ); 484 size_t len = f - file;
485 f = (char *)malloc (len + 1);
486 strncpy (f, file, len);
487 f[len] = '\0';
416 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 488 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
417 free( f ); 489 free( f );
418 } 490 }
419 if (original_asim) 491#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 } 492 }
451 493
452 resize_pixmap (); 494 resize_pixmap ();
453 return bgPixmap.pixmap;
454} 495}
455 496
456#endif /* XPM_BACKGROUND */ 497#endif /* XPM_BACKGROUND */
498#endif /* HAVE_BG_PIXMAP */
457 499
458#ifdef TRANSPARENT 500#ifdef ENABLE_TRANSPARENCY
459#if TINTING && !defined(HAVE_AFTERIMAGE) 501#ifndef HAVE_AFTERIMAGE
460/* taken from aterm-0.4.2 */ 502/* taken from aterm-0.4.2 */
461 503
462typedef uint32_t RUINT32T; 504typedef uint32_t RUINT32T;
463 505
506static void
464void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 507ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
465{ 508{
466 int sh_r, sh_g, sh_b; 509 int sh_r, sh_g, sh_b;
467 RUINT32T mask_r, mask_g, mask_b; 510 RUINT32T mask_r, mask_g, mask_b;
468 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 511 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
469 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 512 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
… …
700} 743}
701 744
702void 745void
703rxvt_term::check_our_parents_cb (time_watcher &w) 746rxvt_term::check_our_parents_cb (time_watcher &w)
704{ 747{
705 int i, pchanged, aformat, have_pixmap, rootdepth; 748 int i, pchanged, aformat, rootdepth;
706 unsigned long nitems, bytes_after; 749 unsigned long nitems, bytes_after;
707 Atom atype; 750 Atom atype;
708 unsigned char *prop = NULL; 751 unsigned char *prop = NULL;
709 Window root, oldp, *list; 752 Window root, oldp, *list;
710 Pixmap rootpixmap = None; 753 Pixmap rootpixmap = None;
711 XWindowAttributes wattr, wrootattr; 754 XWindowAttributes wattr, wrootattr;
712 int sx, sy; 755 int sx, sy;
713 Window cr; 756 Window cr;
757 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
714 758
715 pchanged = 0; 759 pchanged = 0;
716 760
717 if (!option (Opt_transparent)) 761 if (!option (Opt_transparent))
718 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
719 774
720 XGetWindowAttributes (dpy, display->root, &wrootattr); 775 XGetWindowAttributes (dpy, display->root, &wrootattr);
721 rootdepth = wrootattr.depth; 776 rootdepth = wrootattr.depth;
722 777
723 XGetWindowAttributes (dpy, parent[0], &wattr); 778 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
737 /* 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. */
738 XSync (dpy, False); 793 XSync (dpy, False);
739 794
740 XTranslateCoordinates (dpy, parent[0], display->root, 795 XTranslateCoordinates (dpy, parent[0], display->root,
741 0, 0, &sx, &sy, &cr); 796 0, 0, &sx, &sy, &cr);
742
743 /* 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 : */
744 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 798 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
745 || sx >= wrootattr.width || sy >= wrootattr.height ) 799 || sx >= wrootattr.width || sy >= wrootattr.height )
746 return /* 0 */ ; 800 return /* 0 */ ;
747 /* 801 /*
748 * Make the frame window set by the window manager have 802 * Make the frame window set by the window manager have
749 * the root background. Some window managers put multiple nested frame 803 * the root background. Some window managers put multiple nested frame
750 * 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.
… …
758 i = (xa[XA_ESETROOT_PMAP_ID] 812 i = (xa[XA_ESETROOT_PMAP_ID]
759 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 813 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
760 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 814 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
761 &nitems, &bytes_after, &prop) == Success); 815 &nitems, &bytes_after, &prop) == Success);
762 816
817 /* TODO: the below logic needs to be cleaned up */
763 if (!i || prop == NULL 818 if (!i || prop == NULL
764#if TINTING
765 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 819 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
766#ifdef HAVE_AFTERIMAGE 820#ifdef HAVE_AFTERIMAGE
767 && original_asim == NULL && rs[Rs_blurradius] == NULL 821 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
768#endif 822#endif
769 ) 823 )
770#endif
771 ) 824 )
772 have_pixmap = 0; 825 rootpixmap = None;
773 else 826 else
774 { 827 {
775 have_pixmap = 1; 828 int junk;
829 unsigned int ujunk;
830 /* root pixmap may be bad - allow a error */
831 allowedxerror = -1;
776 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)
777 XFree (prop); 839 XFree (prop);
840
841 if (rootpixmap != None)
778 } 842 {
779
780 if (have_pixmap)
781 {
782 Bool success = False ; 843 Bool success = False;
783 GC gc = NULL; 844 GC gc = NULL;
784 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;
785#ifdef HAVE_AFTERIMAGE 900#ifdef HAVE_AFTERIMAGE
901 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
786 { 902 {
787 Pixmap tmp_pmap = None ; 903 ARGB32 tint = TINT_LEAVE_SAME;
788 ShadingInfo shade; 904 ASImage *back_im = NULL;
789 ARGB32 tint ;
790 unsigned int pmap_w = 0, pmap_h = 0;
791 905
792 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)
793 { 908 {
794 int root_x = 0, root_y = 0; 909 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 { 910 {
799 rgba c; 911 ShadingInfo as_shade;
800 pix_colors_focused [Color_tint].get (c); 912 as_shade.shading = shade;
801 shade.tintColor.red = c.r; 913 as_shade.tintColor.red = c.r;
802 shade.tintColor.green = c.g; 914 as_shade.tintColor.green = c.g;
803 shade.tintColor.blue = c.b; 915 as_shade.tintColor.blue = c.b;
916 tint = shading2tint32 (&as_shade);
804 } 917 }
805 else 918
806 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 919 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 { 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 {
811 ASImageLayer *layers = create_image_layers( 2 ); 941 ASImageLayer *layers = create_image_layers (2);
812 ASImage *merged_im = NULL; 942 ASImage *merged_im = NULL;
813 int back_x, back_y, back_w, back_h; 943 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 944
830 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;
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; 946 layers[0].clip_width = szHint.width;
834 layers[0].clip_height = szHint.height; 947 layers[0].clip_height = szHint.height;
835 layers[0].tint = tint; 948 layers[0].tint = tint;
836 if (rs[Rs_blurradius] && layers[0].im) 949 layers[1].im = bgPixmap.original_asim;
837 { 950
838 double r = atof(rs[Rs_blurradius]); 951 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 ); 952 fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100;
840 if( tmp ) 953
954 if (fore_w != bgPixmap.original_asim->width
955 || fore_h != bgPixmap.original_asim->height)
841 { 956 {
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, 957 layers[1].im = scale_asimage (asv,
864 original_asim, 958 bgPixmap.original_asim,
865 fore_w, fore_h, 959 fore_w, fore_h,
866 ASA_ASImage, 100, 960 ASA_ASImage, 100,
867 ASIMAGE_QUALITY_DEFAULT ); 961 ASIMAGE_QUALITY_DEFAULT);
868 } 962 }
869
870 layers[1].clip_width = szHint.width; 963 layers[1].clip_width = szHint.width;
871 layers[1].clip_height = szHint.height; 964 layers[1].clip_height = szHint.height;
872 965
873 if (rs[Rs_blendtype]) 966 if (rs[Rs_blendtype])
874 { 967 {
875 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 968 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
876 if( layers[1].merge_scanlines == NULL ) 969 if (layers[1].merge_scanlines == NULL)
877 layers[1].merge_scanlines = alphablend_scanlines; 970 layers[1].merge_scanlines = alphablend_scanlines;
878 } 971 }
879 } 972 PRINT_BACKGROUND_OP_TIME;
880 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 973 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
881 szHint.width, szHint.height,
882 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 974 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
883 if (layers[1].im != original_asim) 975 if (layers[1].im != bgPixmap.original_asim)
884 destroy_asimage( &(layers[1].im) ); 976 destroy_asimage (&(layers[1].im));
885 destroy_asimage( &(layers[0].im) ); 977 free (layers);
978
886 if (merged_im != NULL) 979 if (merged_im != NULL)
887 { 980 {
888 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
889 destroy_asimage( &merged_im ); 981 destroy_asimage (&back_im);
982 back_im = merged_im;
890 } 983 }
891 free( layers ); 984 PRINT_BACKGROUND_OP_TIME;
892 } 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;
893 } 1001 }
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 */ 1002#else /* HAVE_AFTERIMAGE */
903 { 1003 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 { 1004 {
917 nw += sx; 1005 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
918 nx = -sx; 1006 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) 1007 if (image != NULL)
940 {
941 if (pixmap != None)
942 XFreePixmap (dpy, pixmap);
943
944#if TINTING
945 if (ISSET_PIXCOLOR (Color_tint))
946 { 1008 {
947 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 1009 PRINT_BACKGROUND_OP_TIME;
948 1010 if (gc == NULL)
949 rgba c; 1011 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
950 pix_colors_focused [Color_tint].get (c); 1012 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
951 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1013 ShadeXImage (this, image, shade, c.r, c.g, c.b);
952 } 1014 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); 1015 XDestroyImage (image);
960 success = True ; 1016 success = True;
961 } 1017 }
962 } 1018 }
963#endif /* HAVE_AFTERIMAGE */ 1019#endif /* HAVE_AFTERIMAGE */
1020 PRINT_BACKGROUND_OP_TIME;
1021
964 if (gc != NULL) 1022 if (gc != NULL)
965 XFreeGC (dpy, gc); 1023 XFreeGC (dpy, gc);
966 1024
967 if (!success) 1025 if (!success)
968 { 1026 {
969 if (am_transparent && am_pixmap_trans) 1027 if (am_transparent && am_pixmap_trans)
970 { 1028 {
971 pchanged = 1; 1029 pchanged = 1;
972 if (pixmap != None) 1030 if (bgPixmap.pixmap != None)
973 { 1031 {
974 XFreePixmap (dpy, pixmap); 1032 XFreePixmap (dpy, bgPixmap.pixmap);
975 pixmap = None; 1033 bgPixmap.pixmap = None;
976 } 1034 }
977 } 1035 }
978 1036
979 am_pixmap_trans = 0; 1037 am_pixmap_trans = 0;
980 } 1038 }
981 else 1039 else
982 { 1040 {
983 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 1041 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
984 XClearWindow (dpy, parent[0]); 1042 XClearWindow (dpy, parent[0]);
985 1043
986 if (!am_transparent || !am_pixmap_trans) 1044 if (!am_transparent || !am_pixmap_trans)
987 pchanged = 1; 1045 pchanged = 1;
988 1046
989 am_transparent = am_pixmap_trans = 1; 1047 am_transparent = am_pixmap_trans = 1;
990 } 1048 }
991 } 1049 } /* rootpixmap != None */
992 1050
993 if (am_pixmap_trans) 1051 if (am_pixmap_trans)
994 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 1052 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
995 else 1053 else
996 { 1054 {

Diff Legend

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