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.51 by ayin, Fri Jul 27 14:41:15 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
30
31#ifndef HAVE_AFTERIMAGE 78#ifdef HAVE_AFTERIMAGE
32/* 79 if (original_asim != NULL)
33 * search for FILE in the current working directory, and within the 80#endif
34 * colon-delimited PATHLIST, adding the file extension EXT if required. 81 {
35 * 82 if (h_scale != 0 || v_scale != 0)
36 * FILE is either semi-colon or zero terminated 83 return true;
37 */ 84 }
38static char * 85#endif
39rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) 86#ifdef ENABLE_TRANSPARENCY
87 if (flags & bgPmap_Transparent)
88 return true;
89#endif
90 return false;
91}
92
93#ifdef XPM_BACKGROUND
94static inline bool
95check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
40{ 96{
41 int maxpath, len; 97 if (geom_flags & flag)
42 const char *p, *path;
43 char name[256];
44
45 if (!access (file, R_OK)) /* found (plain name) in current directory */
46 return strdup (file);
47
48 /* semi-colon delimited */
49 if ((p = strchr (file, ';')))
50 len = (p - file);
51 else
52 len = strlen (file);
53
54 /* leave room for an extra '/' and trailing '\0' */
55 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
56 if (maxpath <= 0)
57 return NULL;
58
59 /* check if we can find it now */
60 strncpy (name, file, len);
61 name[len] = '\0';
62
63 if (!access (name, R_OK))
64 return strdup (name);
65 if (ext)
66 {
67 strcat (name, ext);
68 if (!access (name, R_OK))
69 return strdup (name);
70 } 98 {
71 for (path = pathlist; path != NULL && *path != '\0'; path = p) 99 if (new_value > 1000)
72 { 100 new_value = 1000;
73 int n; 101 if (new_value != scale)
74
75 /* colon delimited */
76 if ((p = strchr (path, ':')) == NULL)
77 p = strchr (path, '\0');
78
79 n = (p - path);
80 if (*p != '\0')
81 p++;
82
83 if (n > 0 && n <= maxpath)
84 {
85 strncpy (name, path, n);
86 if (name[n - 1] != '/')
87 name[n++] = '/';
88 name[n] = '\0';
89 strncat (name, file, len);
90
91 if (!access (name, R_OK))
92 return strdup (name);
93 if (ext)
94 {
95 strcat (name, ext);
96 if (!access (name, R_OK))
97 return strdup (name);
98 }
99 } 102 {
103 scale = new_value;
104 return true;
105 }
100 } 106 }
101 return NULL; 107 return false;
102} 108}
103 109
104/* 110static inline bool
105 * Calculate tiling sizes and increments 111check_set_align_value (int geom_flags, int flag, int &align, int new_value)
106 * At start, p == 0, incr == xpmwidthheight
107 */
108static void
109rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
110{ 112{
111 unsigned int cwh, cxy; 113 if (geom_flags & flag)
112 float cincr, cp; 114 {
113 115 if (new_value < -100)
114 cp = 0; 116 new_value = -100;
115 cincr = (float)xpmwidthheight; 117 else if (new_value > 200)
116 cxy = *xy; 118 new_value = 200;
117 cwh = *wh; 119 if (new_value != align)
118 if (cwh == 1)
119 { /* display one image, no horizontal/vertical scaling */
120 cincr = (float)widthheight;
121 if (xpmwidthheight <= widthheight)
122 {
123 cwh = xpmwidthheight;
124 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
125 cwh += cxy;
126 } 120 {
127 else 121 align = new_value;
122 return true;
128 { 123 }
129 cxy = 0;
130 cwh = widthheight;
131 }
132 }
133 else if (cwh < 10)
134 { /* fit WH images across/down screen */
135 cincr *= cwh;
136 cxy = 0;
137 cwh = widthheight;
138 }
139 else
140 { 124 }
141 cincr *= 100.0 / cwh; 125 return false;
142 if (cwh < 100)
143 { /* contract */
144 float pos;
145
146 cwh = (cwh * widthheight) / 100;
147 pos = (float)cxy / 100 * widthheight - (cwh / 2);
148
149 cxy = (widthheight - cwh);
150 if (pos <= 0)
151 cxy = 0;
152 else if (pos < cxy)
153 cxy = (int) pos;
154 cwh += cxy;
155 }
156 else
157 { /* expand */
158 if (cxy > 0)
159 { /* position */
160 float pos;
161
162 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
163 cp = xpmwidthheight - cincr;
164 if (pos <= 0)
165 cp = 0;
166 else if (pos < cp)
167 cp = pos;
168 }
169 cxy = 0;
170 cwh = widthheight;
171 }
172 }
173 cincr /= widthheight;
174 *wh = cwh;
175 *xy = cxy;
176 *incr = cincr;
177 *p = cp;
178} 126}
179#endif
180 127
181/* 128bool
182 * These GEOM strings indicate absolute size/position: 129bgPixmap_t::handle_geometry (const char *geom)
183 * @ `WxH+X+Y'
184 * @ `WxH+X' -> Y = X
185 * @ `WxH' -> Y = X = 50
186 * @ `W+X+Y' -> H = W
187 * @ `W+X' -> H = W, Y = X
188 * @ `W' -> H = W, X = Y = 50
189 * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged)
190 * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged)
191 * @ `=+X+Y' -> (H, W unchanged)
192 * @ `=+X' -> Y = X (H, W unchanged)
193 *
194 * These GEOM strings adjust position relative to current position:
195 * @ `+X+Y'
196 * @ `+X' -> Y = X
197 *
198 * And this GEOM string is for querying current scale/position:
199 * @ `?'
200 */
201int
202rxvt_term::scale_pixmap (const char *geom)
203{ 130{
204 int flags, changed = 0; 131 int geom_flags = 0, changed = 0;
205 int x = 0, y = 0; 132 int x = 0, y = 0;
206 unsigned int w = 0, h = 0; 133 unsigned int w = 0, h = 0;
207 unsigned int n; 134 unsigned int n;
135 unsigned long new_flags = (flags&(~bgPmap_geometryFlags));
208 char *p; 136 char *p;
209 bgPixmap_t *bgpixmap = &bgPixmap; 137#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
210
211#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
212 138
213 if (geom == NULL) 139 if (geom == NULL)
214 return 0; 140 return false;
215 141
216 char str[MAXLEN_GEOM]; 142 char str[MAXLEN_GEOM];
217 143
218 if (!strcmp (geom, "?")) 144 if (!strcmp (geom, "?"))
219 { 145 {
146#if 0 /* TODO: */
220 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 147 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
221 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 148 min (h_scale, 32767), min (v_scale, 32767),
222 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 149 min (h_align, 32767), min (v_align, 32767));
223 process_xterm_seq (XTerm_title, str, CHAR_ST); 150 process_xterm_seq (XTerm_title, str, CHAR_ST);
151#endif
224 return 0; 152 return false;
225 } 153 }
226 154 while (isspace(*geom)) ++geom;
227 if ((p = strchr (geom, ';')) == NULL) 155 if ((p = strchr (geom, ';')) == NULL)
228 p = strchr (geom, '\0'); 156 p = strchr (geom, '\0');
229 157
230 n = (p - geom); 158 n = (p - geom);
231 if (n < MAXLEN_GEOM) 159 if (n < MAXLEN_GEOM)
232 { 160 {
161 char *ops;
162 new_flags |= bgPmap_geometrySet;
163
233 strncpy (str, geom, n); 164 strncpy (str, geom, n);
234 str[n] = '\0'; 165 str[n] = '\0';
235 166 if (str[0] == ':')
236 if (strcmp(str, "auto") == 0) 167 ops = &str[0];
237 { 168 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
238 if (!bgpixmap->auto_resize) 169 ops = &str[0];
239 changed++;
240 bgpixmap->auto_resize = True ;
241 w = szHint.width ;
242 h = szHint.height ;
243 flags = WidthValue|HeightValue ;
244 }
245 else 170 else
246 { 171 {
247 bgpixmap->auto_resize = False ; 172 char *tmp;
248 flags = XParseGeometry (str, &x, &y, &w, &h); 173 ops = strchr (str, ':');
249 } 174 if (ops != NULL)
250
251 if (!flags)
252 {
253 flags |= WidthValue;
254 w = 0;
255 } /* default is tile */
256
257 if (flags & WidthValue)
258 {
259 if (!(flags & XValue))
260 x = 50;
261
262 if (!(flags & HeightValue))
263 h = w;
264
265 if (w && !h)
266 { 175 {
267 w = (bgpixmap->w * w) / 100; 176 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
268 h = bgpixmap->h; 177 *(++tmp) = '\0';
178 if (ops == tmp) ++ops;
269 } 179 }
270 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))
271 { 188 {
272 w = bgpixmap->w; 189 y = x;
273 h = (bgpixmap->h * h) / 100; 190 geom_flags |= YValue;
274 } 191 }
275 192
276 min_it (w, 32767); 193 if (flags & bgPmap_geometrySet)
277 min_it (h, 32767); 194 {/* new geometry is an adjustment to the old one ! */
278 195 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
279 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 */
280 { 218 {
281 bgpixmap->w = (short)w; 219 if (!(geom_flags & XValue))
282 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;
283 } 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;
284 247
285 if (bgpixmap->h != (short)h) 248 if (ops)
249 {
250 while (*ops)
286 { 251 {
287 bgpixmap->h = (short)h; 252 while (*ops == ':' || isspace(*ops)) ++ops;
288 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;
289 } 258 }
290 } 259 else if (CHECK_GEOM_OPS("propscale"))
291 260 {
292 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 */
293 { 299 }
294 if (flags & XNegative)
295 flags |= YNegative;
296 300
297 y = x; 301 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
298 } 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 }
299 310
300 if (!(flags & WidthValue) && geom[0] != '=') 311 if (new_flags != flags)
301 { 312 {
302 x += bgpixmap->x; 313 flags = new_flags;
303 y += bgpixmap->y;
304 }
305
306 if (xpmAttr.width && xpmAttr.height)
307 {
308 x = MOD(x, xpmAttr.width);
309 y = MOD(y, xpmAttr.height);
310 }
311
312 if (bgpixmap->x != x)
313 {
314 bgpixmap->x = x;
315 changed++; 314 changed++;
316 }
317
318 if (bgpixmap->y != y)
319 {
320 bgpixmap->y = y;
321 changed++;
322 }
323 } 315 }
324 316//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
317// flags, h_scale, v_scale, h_align, v_align);
325 return changed; 318 return (changed > 0);
326} 319}
327 320
328void 321void
329rxvt_term::resize_pixmap () 322rxvt_term::resize_pixmap ()
330{ 323{
331 XGCValues gcvalue; 324 XGCValues gcvalue;
332 GC gc; 325 GC gc;
333 326 unsigned int w = bgPixmap.h_scale*szHint.width/100;
334 if (pixmap != None) 327 unsigned int h = bgPixmap.v_scale*szHint.height/100;
335 { 328 int x = bgPixmap.h_align*szHint.width/100;
336 XFreePixmap (dpy, pixmap); 329 int y = bgPixmap.v_align*szHint.height/100;
337 pixmap = None ; 330#ifdef HAVE_AFTERIMAGE
338 } 331 ASImage *im = bgPixmap.original_asim;
339 332#else
333 void *im = NULL;
334#endif
335/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
340 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)
341 { /* So be it: I'm not using pixmaps */ 351 { /* So be it: I'm not using pixmaps */
342 pixmap = None;
343
344#ifdef ENABLE_TRANSPARENCY
345 if (!option (Opt_transparent) || !am_transparent)
346#endif
347 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 352 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
348
349 return; 353 return;
350 } 354 }
351 355
352 gcvalue.foreground = pix_colors[Color_bg]; 356 gcvalue.foreground = pix_colors[Color_bg];
353 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 357 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
354 358
355 if (bgPixmap.pixmap != None)
356 { /* we have a specified pixmap */
357 unsigned int w = bgPixmap.w, h = bgPixmap.h,
358 x = bgPixmap.x, y = bgPixmap.y;
359 unsigned int xpmh = xpmAttr.height,
360 xpmw = xpmAttr.width;
361
362 if (bgPixmap.auto_resize)
363 {
364 w = szHint.width ;
365 h = szHint.height ;
366 }
367 /*
368 * don't zoom pixmap too much nor expand really small pixmaps 359 /* don't zoom pixmap too much nor expand really small pixmaps */
369 */ 360 if (w > 16000)
370 if (w > 32767 || h > 32767)
371 w = 1; 361 w = 1;
372 else if (width > (10 * xpmw) 362 if (h > 16000)
373 || height > (10 * xpmh)) 363 h = 1;
374 w = 0; /* tile */ 364
375
376 if (!w)
377 {
378 /* basic X tiling - let the X server do it */
379 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
380
381 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
382 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
383 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
384 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
385 }
386 else
387#ifdef HAVE_AFTERIMAGE 365#ifdef HAVE_AFTERIMAGE
388#ifdef ENABLE_TRANSPARENCY 366 if (w == 0)
389 if (!option(Opt_transparent) || !am_transparent) 367 w = im->width;
390 /* 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);
391#endif 398#endif
392 { 399 if( bgPixmap.pixmap )
393 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
394 if (scaled_im)
395 {
396 pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
397 destroy_asimage (&scaled_im);
398 }
399 }
400#else /* HAVE_AFTERIMAGE */
401 {
402 float incr, p;
403 Pixmap tmp;
404
405 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
406 /*
407 * horizontal scaling
408 */
409 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
410
411 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
412 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
413
414 for ( /*nil */ ; x < w; x++, p += incr)
415 {
416 if (p >= xpmw)
417 p = 0;
418
419 /* copy one column from the original pixmap to the tmp pixmap */
420 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
421 }
422
423 /*
424 * vertical scaling
425 */
426 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
427
428 if (y > 0)
429 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
430
431 if (h < height)
432 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
433
434 for ( /*nil */ ; y < h; y++, p += incr)
435 {
436 if (p >= xpmh)
437 p = 0;
438
439 /* copy one row from the tmp pixmap to the main pixmap */
440 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
441 }
442
443 XFreePixmap (dpy, tmp);
444 }
445#endif /* HAVE_AFTERIMAGE */
446 }
447
448 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 400 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
449 401
450 XFreeGC (dpy, gc); 402 XFreeGC (dpy, gc);
451#ifdef ENABLE_TRANSPARENCY
452 am_transparent = 0;
453#endif
454} 403}
455 404
456Pixmap 405void
457rxvt_term::set_bgPixmap (const char *file) 406rxvt_term::set_bgPixmap (const char *file)
458{ 407{
459 char *f; 408 char *f;
460 409
461 assert (file != NULL); 410 assert (file != NULL);
… …
465 XFreePixmap (dpy, bgPixmap.pixmap); 414 XFreePixmap (dpy, bgPixmap.pixmap);
466 bgPixmap.pixmap = None; 415 bgPixmap.pixmap = None;
467 } 416 }
468 417
469 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 418 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
470
471 if (*file != '\0') 419 if (*file != '\0')
472 { 420 {
473 /* XWindowAttributes attr; */
474
475 /*
476 * we already have the required attributes
477 */
478 /* XGetWindowAttributes (dpy, vt, &attr); */
479
480#ifdef HAVE_AFTERIMAGE 421#ifdef HAVE_AFTERIMAGE
481 if (asimman == NULL) 422 if (asimman == NULL)
482 asimman = create_generic_imageman(rs[Rs_path]); 423 asimman = create_generic_imageman(rs[Rs_path]);
483 if ((f = strchr (file, ';')) == NULL) 424 if ((f = strchr (file, ';')) == NULL)
484 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 425 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
485 else 426 else
486 { 427 {
487 size_t len = f - file; 428 size_t len = f - file;
488 f = (char *)malloc (len + 1); 429 f = (char *)malloc (len + 1);
489 strncpy (f, file, len); 430 strncpy (f, file, len);
490 f[len] = '\0'; 431 f[len] = '\0';
491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 432 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
492 free( f ); 433 free( f );
493 } 434 }
494 if (original_asim) 435#endif
495 {
496 bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
497 xpmAttr.width = original_asim->width ;
498 xpmAttr.height = original_asim->height ;
499 }
500#else /* HAVE_AFTERIMAGE */
501 xpmAttr.closeness = 30000;
502 xpmAttr.colormap = cmap;
503 xpmAttr.visual = visual;
504 xpmAttr.depth = depth;
505 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
506 | XpmDepth | XpmSize | XpmReturnPixels);
507
508 /* search environment variables here too */
509 f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
510 if (f == NULL
511 || XpmReadFileToPixmap (dpy, display->root, f,
512 &bgPixmap.pixmap, NULL,
513 &xpmAttr))
514 {
515 char *p;
516
517 /* semi-colon delimited */
518 if ((p = strchr (file, ';')) == NULL)
519 p = strchr (file, '\0');
520
521 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
522 }
523 free (f);
524#endif /* HAVE_AFTERIMAGE */
525 } 436 }
526 437
527 resize_pixmap (); 438 resize_pixmap ();
528 return bgPixmap.pixmap;
529} 439}
530 440
531#endif /* XPM_BACKGROUND */ 441#endif /* XPM_BACKGROUND */
442#endif /* HAVE_BG_PIXMAP */
532 443
533#ifdef ENABLE_TRANSPARENCY 444#ifdef ENABLE_TRANSPARENCY
534#if TINTING && !defined(HAVE_AFTERIMAGE) 445#ifndef HAVE_AFTERIMAGE
535/* taken from aterm-0.4.2 */ 446/* taken from aterm-0.4.2 */
536 447
537typedef uint32_t RUINT32T; 448typedef uint32_t RUINT32T;
538 449
539static void 450static void
… …
776} 687}
777 688
778void 689void
779rxvt_term::check_our_parents_cb (time_watcher &w) 690rxvt_term::check_our_parents_cb (time_watcher &w)
780{ 691{
781 int i, pchanged, aformat, have_pixmap, rootdepth; 692 int i, pchanged, aformat, rootdepth;
782 unsigned long nitems, bytes_after; 693 unsigned long nitems, bytes_after;
783 Atom atype; 694 Atom atype;
784 unsigned char *prop = NULL; 695 unsigned char *prop = NULL;
785 Window root, oldp, *list; 696 Window root, oldp, *list;
786 Pixmap rootpixmap = None; 697 Pixmap rootpixmap = None;
787 XWindowAttributes wattr, wrootattr; 698 XWindowAttributes wattr, wrootattr;
788 int sx, sy; 699 int sx, sy;
789 Window cr; 700 Window cr;
701 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
790 702
791 pchanged = 0; 703 pchanged = 0;
792 704
793 if (!option (Opt_transparent)) 705 if (!option (Opt_transparent))
794 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
795 718
796 XGetWindowAttributes (dpy, display->root, &wrootattr); 719 XGetWindowAttributes (dpy, display->root, &wrootattr);
797 rootdepth = wrootattr.depth; 720 rootdepth = wrootattr.depth;
798 721
799 XGetWindowAttributes (dpy, parent[0], &wattr); 722 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
813 /* 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. */
814 XSync (dpy, False); 737 XSync (dpy, False);
815 738
816 XTranslateCoordinates (dpy, parent[0], display->root, 739 XTranslateCoordinates (dpy, parent[0], display->root,
817 0, 0, &sx, &sy, &cr); 740 0, 0, &sx, &sy, &cr);
818
819 /* 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 : */
820 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 742 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
821 || sx >= wrootattr.width || sy >= wrootattr.height ) 743 || sx >= wrootattr.width || sy >= wrootattr.height )
822 return /* 0 */ ; 744 return /* 0 */ ;
823 /* 745 /*
… …
834 i = (xa[XA_ESETROOT_PMAP_ID] 756 i = (xa[XA_ESETROOT_PMAP_ID]
835 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 757 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
836 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 758 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
837 &nitems, &bytes_after, &prop) == Success); 759 &nitems, &bytes_after, &prop) == Success);
838 760
761 /* TODO: the below logic needs to be cleaned up */
839 if (!i || prop == NULL 762 if (!i || prop == NULL
840#if TINTING
841 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 763 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
842#ifdef HAVE_AFTERIMAGE 764#ifdef HAVE_AFTERIMAGE
843 && original_asim == NULL && rs[Rs_blurradius] == NULL 765 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
844#endif 766#endif
845 ) 767 )
846#endif
847 ) 768 )
848 have_pixmap = 0; 769 rootpixmap = None;
849 else 770 else
850 { 771 {
851 have_pixmap = 1; 772 int junk;
773 unsigned int ujunk;
774 /* root pixmap may be bad - allow a error */
775 allowedxerror = -1;
852 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)
853 XFree (prop); 783 XFree (prop);
854 }
855 784
856 if (have_pixmap) 785 if (rootpixmap != None)
857 { 786 {
858 Bool success = False; 787 Bool success = False;
859 GC gc = NULL; 788 GC gc = NULL;
860 XGCValues gcvalue; 789 XGCValues gcvalue;
861 unsigned int pmap_w = 0, pmap_h = 0; 790 int shade = 100;
791 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
792 Bool whole_tint = False, no_tint = True;
862 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;
863#ifdef HAVE_AFTERIMAGE 844#ifdef HAVE_AFTERIMAGE
845 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
864 { 846 {
865 Pixmap tmp_pmap = None; 847 ARGB32 tint = TINT_LEAVE_SAME;
866 ShadingInfo shade; 848 ASImage *back_im = NULL;
867 ARGB32 tint;
868 849
869 if (get_dpy_drawable_size (dpy, 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)
870 { 852 {
871 int root_x = 0, root_y = 0; 853 if (!whole_tint && (!no_tint || shade !=100))
872
873 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
874 if (ISSET_PIXCOLOR (Color_tint))
875 { 854 {
876 rgba c; 855 ShadingInfo as_shade;
877 pix_colors_focused [Color_tint].get (c); 856 as_shade.shading = shade;
878 shade.tintColor.red = c.r; 857 as_shade.tintColor.red = c.r;
879 shade.tintColor.green = c.g; 858 as_shade.tintColor.green = c.g;
880 shade.tintColor.blue = c.b; 859 as_shade.tintColor.blue = c.b;
860 tint = shading2tint32 (&as_shade);
881 } 861 }
882 else 862
883 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 863 if (rs[Rs_blurradius] && back_im)
884 tint = shading2tint32 (&shade);
885 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
886 if (get_dpy_window_position (dpy, display->root, parent[0], NULL, NULL, &root_x, &root_y))
887 { 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 {
888 ASImageLayer *layers = create_image_layers (2); 885 ASImageLayer *layers = create_image_layers (2);
889 ASImage *merged_im = NULL; 886 ASImage *merged_im = NULL;
890 int back_x, back_y, back_w, back_h; 887 int fore_w, fore_h;
891 /* merge_layers does good job at tiling background appropriately,
892 so all we need is to cut out smallest possible piece : */
893#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
894 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
895 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
896 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
897 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
898 else \
899 { /* small background - need the whole of it for successfull tiling :*/ \
900 back_##xy = 0; \
901 back_##wh = pmap_##wh; \
902 }}while(0)
903 888
904 MAKE_ROOTPMAP_GEOM(x,w,width); 889 layers[0].im = back_im;
905 MAKE_ROOTPMAP_GEOM(y,h,height);
906
907 layers[0].im = pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
908 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
909 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
910 layers[0].clip_width = szHint.width; 890 layers[0].clip_width = szHint.width;
911 layers[0].clip_height = szHint.height; 891 layers[0].clip_height = szHint.height;
912 layers[0].tint = tint; 892 layers[0].tint = tint;
913 if (rs[Rs_blurradius] && layers[0].im) 893 layers[1].im = bgPixmap.original_asim;
914 { 894
915 double r = atof(rs[Rs_blurradius]); 895 fore_w = (bgPixmap.h_scale == 0) ? bgPixmap.original_asim->width : bgPixmap.h_scale*szHint.width/100;
916 ASImage* tmp = blur_asimage_gauss (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;
917 if (tmp) 897
898 if (fore_w != bgPixmap.original_asim->width
899 || fore_h != bgPixmap.original_asim->height)
918 { 900 {
919 destroy_asimage (&layers[0].im);
920 layers[0].im = tmp;
921 }
922 }
923 if (original_asim != NULL)
924 {
925 int fore_w, fore_h;
926 layers[1].im = original_asim;
927 if (bgPixmap.auto_resize)
928 {
929 fore_w = szHint.width;
930 fore_h = szHint.height;
931 }
932 else
933 {
934 fore_w = bgPixmap.w;
935 fore_h = bgPixmap.h;
936 }
937 if (fore_w != original_asim->width
938 || fore_h != original_asim->height)
939 {
940 layers[1].im = scale_asimage (asv, 901 layers[1].im = scale_asimage (asv,
941 original_asim, 902 bgPixmap.original_asim,
942 fore_w, fore_h, 903 fore_w, fore_h,
943 ASA_ASImage, 100, 904 ASA_ASImage, 100,
944 ASIMAGE_QUALITY_DEFAULT); 905 ASIMAGE_QUALITY_DEFAULT);
945 } 906 }
946
947 layers[1].clip_width = szHint.width; 907 layers[1].clip_width = szHint.width;
948 layers[1].clip_height = szHint.height; 908 layers[1].clip_height = szHint.height;
949 909
950 if (rs[Rs_blendtype]) 910 if (rs[Rs_blendtype])
951 { 911 {
952 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]); 912 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
953 if (layers[1].merge_scanlines == NULL) 913 if (layers[1].merge_scanlines == NULL)
954 layers[1].merge_scanlines = alphablend_scanlines; 914 layers[1].merge_scanlines = alphablend_scanlines;
955 } 915 }
956 } 916 PRINT_BACKGROUND_OP_TIME;
957 merged_im = merge_layers (asv, layers, layers[1].im?2:1, 917 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
958 szHint.width, szHint.height,
959 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 918 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
960 if (layers[1].im != original_asim) 919 if (layers[1].im != bgPixmap.original_asim)
961 destroy_asimage (&(layers[1].im)); 920 destroy_asimage (&(layers[1].im));
962 destroy_asimage (&(layers[0].im)); 921 free (layers);
922
963 if (merged_im != NULL) 923 if (merged_im != NULL)
964 { 924 {
965 tmp_pmap = asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True);
966 destroy_asimage (&merged_im); 925 destroy_asimage (&back_im);
926 back_im = merged_im;
967 } 927 }
968 free (layers); 928 PRINT_BACKGROUND_OP_TIME;
969 } 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;
970 } 945 }
971 if (tmp_pmap != None)
972 {
973 success = True;
974 if (pixmap != None)
975 XFreePixmap (dpy, pixmap);
976 pixmap = tmp_pmap;
977 }
978 }
979#else /* HAVE_AFTERIMAGE */ 946#else /* HAVE_AFTERIMAGE */
980 { 947 if (!whole_tint && (!no_tint || shade !=100))
981 /*
982 * Copy display->root pixmap transparency
983 */
984 Window wjunk;
985 int junk;
986 unsigned int ujunk;
987 /* root pixmap may be bad - allow a error */
988 allowedxerror = -1;
989 if (XGetGeometry (dpy, rootpixmap, &wjunk, &junk, &junk, &pmap_w, &pmap_h, &ujunk, &ujunk))
990 { 948 {
991 XImage *image = NULL;
992 int shade = 100;
993 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
994 Bool whole_tint = False;
995
996 while (sx < 0) sx += (int)wrootattr.width;
997 while (sy < 0) sy += (int)wrootattr.height;
998
999 if (pixmap != None)
1000 XFreePixmap (dpy, pixmap);
1001 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
1002
1003#if TINTING
1004 if (rs[Rs_shade])
1005 shade = atoi (rs[Rs_shade]);
1006 if (ISSET_PIXCOLOR (Color_tint))
1007 pix_colors_focused [Color_tint].get (c);
1008#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
1009 if (shade >= 100)
1010 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
1011 && IS_COMPONENT_WHOLESOME(c.g)
1012 && IS_COMPONENT_WHOLESOME(c.b));
1013#undef IS_COMPONENT_WHOLESOME
1014
1015 /* If No tinting to be done - simply tile root pixmap on our pixmap -
1016 * no need in XImage at all, thus following if() only for case with tinting */
1017 if (whole_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
1018#endif /* TINTING */
1019 {
1020 gcvalue.tile = rootpixmap;
1021 gcvalue.fill_style = FillTiled;
1022 gcvalue.ts_x_origin = -sx;
1023 gcvalue.ts_y_origin = -sy;
1024 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
1025 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
1026#if TINTING
1027 if (whole_tint)
1028 {
1029 /* In this case we can tint image server-side getting significant
1030 * performance improvements, as we eliminate XImage transfer
1031 */
1032 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
1033 gcvalue.function = GXand;
1034 gcvalue.fill_style = FillSolid;
1035 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1036 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
1037 success = True;
1038 }
1039 else
1040 image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); 949 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1041#else
1042 success = True; 950 success = False;
1043#endif /* TINTING */
1044 }
1045#if TINTING
1046 if (!success && image == NULL)
1047 image = XGetImage (dpy, rootpixmap, sx, sy, szHint.width, szHint.height, AllPlanes, ZPixmap);
1048 if (image != NULL) 951 if (image != NULL)
1049 { 952 {
953 PRINT_BACKGROUND_OP_TIME;
1050 if (gc == NULL) 954 if (gc == NULL)
1051 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 955 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1052 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 956 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1053 ShadeXImage (this, image, shade, c.r, c.g, c.b); 957 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1054 XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); 958 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1055 XDestroyImage (image); 959 XDestroyImage (image);
1056 success = True; 960 success = True;
1057 } 961 }
1058#endif
1059 } 962 }
1060 allowedxerror = 0;
1061 }
1062#endif /* HAVE_AFTERIMAGE */ 963#endif /* HAVE_AFTERIMAGE */
964 PRINT_BACKGROUND_OP_TIME;
965
1063 if (gc != NULL) 966 if (gc != NULL)
1064 XFreeGC (dpy, gc); 967 XFreeGC (dpy, gc);
1065 968
1066 if (!success) 969 if (!success)
1067 { 970 {
1068 if (am_transparent && am_pixmap_trans) 971 if (am_transparent && am_pixmap_trans)
1069 { 972 {
1070 pchanged = 1; 973 pchanged = 1;
1071 if (pixmap != None) 974 if (bgPixmap.pixmap != None)
1072 { 975 {
1073 XFreePixmap (dpy, pixmap); 976 XFreePixmap (dpy, bgPixmap.pixmap);
1074 pixmap = None; 977 bgPixmap.pixmap = None;
1075 } 978 }
1076 } 979 }
1077 980
1078 am_pixmap_trans = 0; 981 am_pixmap_trans = 0;
1079 } 982 }
1080 else 983 else
1081 { 984 {
1082 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 985 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
1083 XClearWindow (dpy, parent[0]); 986 XClearWindow (dpy, parent[0]);
1084 987
1085 if (!am_transparent || !am_pixmap_trans) 988 if (!am_transparent || !am_pixmap_trans)
1086 pchanged = 1; 989 pchanged = 1;
1087 990
1088 am_transparent = am_pixmap_trans = 1; 991 am_transparent = am_pixmap_trans = 1;
1089 } 992 }
1090 } 993 } /* rootpixmap != None */
1091 994
1092 if (am_pixmap_trans) 995 if (am_pixmap_trans)
1093 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 996 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
1094 else 997 else
1095 { 998 {

Diff Legend

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