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.52 by sasha, Fri Jul 27 22:52:08 2007 UTC vs.
Revision 1.56 by sasha, Fri Aug 3 22:40:10 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+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{
77 return (flags&(bgPmap_Scale|bgPmap_Transparent));
78}
79
29#ifdef XPM_BACKGROUND 80#ifdef XPM_BACKGROUND
30 81bool
31#ifndef HAVE_AFTERIMAGE 82bgPixmap_t::handle_geometry (const char *geom)
32/*
33 * search for FILE in the current working directory, and within the
34 * colon-delimited PATHLIST, adding the file extension EXT if required.
35 *
36 * FILE is either semi-colon or zero terminated
37 */
38static char *
39rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
40{ 83{
41 int maxpath, len;
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 }
71 for (path = pathlist; path != NULL && *path != '\0'; path = p)
72 {
73 int n;
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 }
100 }
101 return NULL;
102}
103
104/*
105 * Calculate tiling sizes and increments
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{
111 unsigned int cwh, cxy;
112 float cincr, cp;
113
114 cp = 0;
115 cincr = (float)xpmwidthheight;
116 cxy = *xy;
117 cwh = *wh;
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 }
127 else
128 {
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 {
141 cincr *= 100.0 / cwh;
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}
179#endif
180
181/*
182 * These GEOM strings indicate absolute size/position:
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{
204 int flags, changed = 0; 84 int geom_flags, changed = 0;
205 int x = 0, y = 0; 85 int x = 0, y = 0;
206 unsigned int w = 0, h = 0; 86 unsigned int w = 0, h = 0;
207 unsigned int n; 87 unsigned int n;
88 unsigned long new_flags = (flags&(~bgPmap_geometryFlags)) ;
208 char *p; 89 char *p;
209 bgPixmap_t *bgpixmap = &bgPixmap;
210
211#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]") 90#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
212 91
213 if (geom == NULL) 92 if (geom == NULL)
214 return 0; 93 return false;
215 94
216 char str[MAXLEN_GEOM]; 95 char str[MAXLEN_GEOM];
217 96
218 if (!strcmp (geom, "?")) 97 if (!strcmp (geom, "?"))
219 { 98 {
99#if 0 /* TODO: */
220 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 100 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
221 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 101 min (h_scale, 32767), min (v_scale, 32767),
222 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 102 min (h_align, 32767), min (v_align, 32767));
223 process_xterm_seq (XTerm_title, str, CHAR_ST); 103 process_xterm_seq (XTerm_title, str, CHAR_ST);
104#endif
224 return 0; 105 return false;
225 } 106 }
226 107
227 if ((p = strchr (geom, ';')) == NULL) 108 if ((p = strchr (geom, ';')) == NULL)
228 p = strchr (geom, '\0'); 109 p = strchr (geom, '\0');
229 110
230 n = (p - geom); 111 n = (p - geom);
231 if (n < MAXLEN_GEOM) 112 if (n < MAXLEN_GEOM)
232 { 113 {
114 new_flags |= bgPmap_geometrySet;
115
233 strncpy (str, geom, n); 116 strncpy (str, geom, n);
234 str[n] = '\0'; 117 str[n] = '\0';
235 118
236 if (strcmp(str, "auto") == 0) 119 if (strcmp(str, "auto") == 0)
237 { 120 {
238 if (!bgpixmap->auto_resize) 121 w = h = 100;
239 changed++;
240 bgpixmap->auto_resize = True ;
241 w = szHint.width ;
242 h = szHint.height ;
243 flags = WidthValue|HeightValue ; 122 geom_flags = WidthValue|HeightValue ;
244 } 123 }
245 else 124 else
246 { 125 {
247 bgpixmap->auto_resize = False ;
248 flags = XParseGeometry (str, &x, &y, &w, &h); 126 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
249 }
250
251 if (!flags)
252 { 127 }
128/* code below is garbage and needs to be rewritten */
129 if (!geom_flags)
130 {
253 flags |= WidthValue; 131 geom_flags |= WidthValue;
254 w = 0; 132 w = 0;
255 } /* default is tile */ 133 } /* default is tile */
256 134
257 if (flags & WidthValue) 135 if (geom_flags & WidthValue)
258 { 136 {
259 if (!(flags & XValue)) 137 if (!(geom_flags & XValue))
260 x = 50; 138 x = 50;
261 139
262 if (!(flags & HeightValue)) 140 if (!(geom_flags & HeightValue))
263 h = w; 141 h = w;
264 142
265 if (w && !h) 143 if (w && !h)
266 { 144 {
267 w = (bgpixmap->w * w) / 100; 145 w = (h_scale * w) / 100;
268 h = bgpixmap->h; 146 h = v_scale;
269 } 147 }
270 else if (h && !w) 148 else if (h && !w)
271 { 149 {
272 w = bgpixmap->w; 150 w = h_scale;
273 h = (bgpixmap->h * h) / 100; 151 h = (v_scale * h) / 100;
274 } 152 }
275 153
276 min_it (w, 32767); 154 min_it (w, 32767);
277 min_it (h, 32767); 155 min_it (h, 32767);
278 156
279 if (bgpixmap->w != (short)w) 157 if (h_scale != w)
280 { 158 {
281 bgpixmap->w = (short)w; 159 h_scale = w;
282 changed++; 160 changed++;
283 } 161 }
284 162
285 if (bgpixmap->h != (short)h) 163 if (v_scale != h)
286 { 164 {
287 bgpixmap->h = (short)h; 165 v_scale = h;
288 changed++; 166 changed++;
289 } 167 }
290 } 168 }
291
292 if (!(flags & YValue)) 169 if (!(geom_flags & YValue))
293 { 170 {
294 if (flags & XNegative) 171 if (geom_flags & XNegative)
295 flags |= YNegative; 172 geom_flags |= YNegative;
296 173
297 y = x; 174 y = x;
298 } 175 }
299 176
300 if (!(flags & WidthValue) && geom[0] != '=') 177 if (!(geom_flags & WidthValue) && geom[0] != '=')
301 {
302 x += bgpixmap->x;
303 y += bgpixmap->y;
304 } 178 {
305 179 x += h_align;
306 if (xpmAttr.width && xpmAttr.height) 180 y += v_align;
307 { 181 }
308 x = MOD(x, xpmAttr.width); 182
309 y = MOD(y, xpmAttr.height); 183 if (h_align != x)
310 } 184 {
311 185 h_align = x;
312 if (bgpixmap->x != x)
313 {
314 bgpixmap->x = x;
315 changed++; 186 changed++;
316 } 187 }
317 188
318 if (bgpixmap->y != y) 189 if (v_align != y)
319 { 190 {
320 bgpixmap->y = y; 191 v_align = y;
321 changed++; 192 changed++;
322 } 193 }
194
195 if (h_scale != 0)
196 new_flags |= bgPmap_hScale;
197 if (v_scale != 0)
198 new_flags |= bgPmap_vScale;
199 }
200
201 if (new_flags != flags)
323 } 202 {
324 203 flags = new_flags;
204 changed++;
205 }
325 return changed; 206 return (changed > 0);
326} 207}
327 208
328void 209void
329rxvt_term::resize_pixmap () 210rxvt_term::resize_pixmap ()
330{ 211{
331 XGCValues gcvalue; 212 XGCValues gcvalue;
332 GC gc; 213 GC gc;
333 214 unsigned int w = bgPixmap.h_scale*szHint.width/100;
334 if (pixmap != None) 215 unsigned int h = bgPixmap.v_scale*szHint.height/100;
335 { 216 int x = bgPixmap.h_align*szHint.width/100;
336 XFreePixmap (dpy, pixmap); 217 int y = bgPixmap.v_align*szHint.height/100;
337 pixmap = None ; 218#ifdef HAVE_AFTERIMAGE
338 } 219 ASImage *im = bgPixmap.original_asim;
339 220#else
221 void *im = NULL;
222#endif
223/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
340 if (bgPixmap.pixmap == None) 224 if (bgPixmap.pixmap != None)
225 {
226 XFreePixmap (dpy, bgPixmap.pixmap);
227 bgPixmap.pixmap = None ;
228 }
229#ifdef ENABLE_TRANSPARENCY
230 if (option(Opt_transparent) && am_transparent)
231 {
232 /* we need to re-generate transparency pixmap in that case ! */
233 check_our_parents ();
234 return;
235 }
236#endif
237
238 if (im == NULL)
341 { /* So be it: I'm not using pixmaps */ 239 { /* 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]); 240 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
348
349 return; 241 return;
350 } 242 }
351 243
352 gcvalue.foreground = pix_colors[Color_bg]; 244 gcvalue.foreground = pix_colors[Color_bg];
353 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 245 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
354 246
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 247 /* don't zoom pixmap too much nor expand really small pixmaps */
369 */ 248 if (w > 16000)
370 if (w > 32767 || h > 32767)
371 w = 1; 249 w = 1;
372 else if (width > (10 * xpmw) 250 if (h > 16000)
373 || height > (10 * xpmh)) 251 h = 1;
374 w = 0; /* tile */ 252
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 253#ifdef HAVE_AFTERIMAGE
388#ifdef ENABLE_TRANSPARENCY 254 if (w == 0)
389 if (!option(Opt_transparent) || !am_transparent) 255 w = im->width;
390 /* will do that in check_our_parents otherwise */ 256 if (h == 0)
391#endif 257 h = im->height;
392 { 258
259 if (w != im->width || h != im->height)
260 {
393 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 261 ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT);
394 if (scaled_im) 262 if (tmp != NULL)
395 { 263 im = tmp;
396 pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True); 264 }
397 destroy_asimage (&scaled_im); 265 bgPixmap.pmap_width = MIN(w,szHint.width);
398 } 266 bgPixmap.pmap_height = MIN(h,szHint.height);
267#if 0 /* TODO: fix that! */
268 if (x != 0 || y != 0)
269 {
270 ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
271 if (tmp != NULL)
399 } 272 {
400#else /* HAVE_AFTERIMAGE */ 273 if (im != bgPixmap.original_asim)
274 destroy_asimage (&im);
275 im = tmp;
401 { 276 }
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 } 277 }
278#endif
279 bgPixmap.pixmap = XCreatePixmap (dpy, vt, bgPixmap.pmap_width, bgPixmap.pmap_height, depth);
280 bgPixmap.pmap_depth = depth;
447 281
282 asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, bgPixmap.pmap_width, bgPixmap.pmap_height, True);
283
284 if (im != bgPixmap.original_asim)
285 destroy_asimage (&im);
286#endif
287 if( bgPixmap.pixmap )
448 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 288 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
449 289
450 XFreeGC (dpy, gc); 290 XFreeGC (dpy, gc);
451#ifdef ENABLE_TRANSPARENCY
452 am_transparent = 0;
453#endif
454} 291}
455 292
456Pixmap 293void
457rxvt_term::set_bgPixmap (const char *file) 294rxvt_term::set_bgPixmap (const char *file)
458{ 295{
459 char *f; 296 char *f;
460 297
461 assert (file != NULL); 298 assert (file != NULL);
… …
465 XFreePixmap (dpy, bgPixmap.pixmap); 302 XFreePixmap (dpy, bgPixmap.pixmap);
466 bgPixmap.pixmap = None; 303 bgPixmap.pixmap = None;
467 } 304 }
468 305
469 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 306 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
470
471 if (*file != '\0') 307 if (*file != '\0')
472 { 308 {
473 /* XWindowAttributes attr; */
474
475 /*
476 * we already have the required attributes
477 */
478 /* XGetWindowAttributes (dpy, vt, &attr); */
479
480#ifdef HAVE_AFTERIMAGE 309#ifdef HAVE_AFTERIMAGE
481 if (asimman == NULL) 310 if (asimman == NULL)
482 asimman = create_generic_imageman(rs[Rs_path]); 311 asimman = create_generic_imageman(rs[Rs_path]);
483 if ((f = strchr (file, ';')) == NULL) 312 if ((f = strchr (file, ';')) == NULL)
484 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 313 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
485 else 314 else
486 { 315 {
487 size_t len = f - file; 316 size_t len = f - file;
488 f = (char *)malloc (len + 1); 317 f = (char *)malloc (len + 1);
489 strncpy (f, file, len); 318 strncpy (f, file, len);
490 f[len] = '\0'; 319 f[len] = '\0';
491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 320 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
492 free( f ); 321 free( f );
493 } 322 }
494 if (original_asim) 323#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 } 324 }
526 325
527 resize_pixmap (); 326 resize_pixmap ();
528 return bgPixmap.pixmap;
529} 327}
530 328
531#endif /* XPM_BACKGROUND */ 329#endif /* XPM_BACKGROUND */
330#endif /* HAVE_BG_PIXMAP */
532 331
533#ifdef ENABLE_TRANSPARENCY 332#ifdef ENABLE_TRANSPARENCY
534#if TINTING && !defined(HAVE_AFTERIMAGE) 333#if TINTING && !defined(HAVE_AFTERIMAGE)
535/* taken from aterm-0.4.2 */ 334/* taken from aterm-0.4.2 */
536 335
… …
850 /* TODO: the below logic needs to be cleaned up */ 649 /* TODO: the below logic needs to be cleaned up */
851 if (!i || prop == NULL 650 if (!i || prop == NULL
852#if TINTING 651#if TINTING
853 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 652 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
854#ifdef HAVE_AFTERIMAGE 653#ifdef HAVE_AFTERIMAGE
855 && original_asim == NULL && rs[Rs_blurradius] == NULL 654 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
856#endif 655#endif
857 ) 656 )
858#endif 657#endif
859 ) 658 )
860 rootpixmap = None; 659 rootpixmap = None;
… …
897 && IS_COMPONENT_WHOLESOME(c.b)); 696 && IS_COMPONENT_WHOLESOME(c.b));
898 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); 697 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
899#undef IS_COMPONENT_WHOLESOME 698#undef IS_COMPONENT_WHOLESOME
900#endif /* TINTING */ 699#endif /* TINTING */
901 /* theer are no performance advantages to reusing same pixmap */ 700 /* theer are no performance advantages to reusing same pixmap */
902 if (pixmap != None) 701 if (bgPixmap.pixmap != None)
903 XFreePixmap (dpy, pixmap); 702 XFreePixmap (dpy, bgPixmap.pixmap);
904 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth); 703 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
704 bgPixmap.pmap_width = szHint.width;
705 bgPixmap.pmap_height = szHint.height;
706 bgPixmap.pmap_depth = rootdepth;
905 707
906#if 0 /* TODO : identify cases where this will be detrimental to performance : */ 708#if 0 /* TODO : identify cases where this will be detrimental to performance : */
907 /* we want to tile root pixmap into our own pixmap in this cases : 709 /* we want to tile root pixmap into our own pixmap in this cases :
908 * 1) rootpixmap does not cover our window entirely 710 * 1) rootpixmap does not cover our window entirely
909 * 2) whole_tint - we can use server-side tinting or tinting disabled 711 * 2) whole_tint - we can use server-side tinting or tinting disabled
… …
915 gcvalue.tile = rootpixmap; 717 gcvalue.tile = rootpixmap;
916 gcvalue.fill_style = FillTiled; 718 gcvalue.fill_style = FillTiled;
917 gcvalue.ts_x_origin = -sx; 719 gcvalue.ts_x_origin = -sx;
918 gcvalue.ts_y_origin = -sy; 720 gcvalue.ts_y_origin = -sy;
919 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue); 721 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
920 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height); 722 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
921 723
922#if TINTING 724#if TINTING
923 if (whole_tint && !no_tint) 725 if (whole_tint && !no_tint)
924 { 726 {
925 /* In this case we can tint image server-side getting significant 727 /* In this case we can tint image server-side getting significant
… …
927 */ 729 */
928 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]); 730 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
929 gcvalue.function = GXand; 731 gcvalue.function = GXand;
930 gcvalue.fill_style = FillSolid; 732 gcvalue.fill_style = FillSolid;
931 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue); 733 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
932 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height); 734 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
933 } 735 }
934#endif 736#endif
935 success = True; 737 success = True;
936#ifdef HAVE_AFTERIMAGE 738#ifdef HAVE_AFTERIMAGE
937 if (rs[Rs_blurradius] || original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) 739 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
938 { 740 {
939 ARGB32 tint = TINT_LEAVE_SAME; 741 ARGB32 tint = TINT_LEAVE_SAME;
940 ASImage *back_im = NULL; 742 ASImage *back_im = NULL;
941 743
942 back_im = pixmap2ximage (asv, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100); 744 back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
943 if (back_im != NULL) 745 if (back_im != NULL)
944 { 746 {
945 if (!whole_tint && (!no_tint || shade !=100)) 747 if (!whole_tint && (!no_tint || shade !=100))
946 { 748 {
947 ShadingInfo as_shade; 749 ShadingInfo as_shade;
… …
952 tint = shading2tint32 (&as_shade); 754 tint = shading2tint32 (&as_shade);
953 } 755 }
954 756
955 if (rs[Rs_blurradius] && back_im) 757 if (rs[Rs_blurradius] && back_im)
956 { 758 {
957 double r = atof(rs[Rs_blurradius]); 759 ASImage* tmp;
760 int junk;
761 unsigned int hr = 1, vr = 1;
762 int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr);
763 if (!(flags&WidthValue))
764 hr = 1;
765 if (!(flags&HeightValue))
766 vr = hr;
958 ASImage* tmp = blur_asimage_gauss (asv, back_im, r, r, 0xFFFFFFFF, 767 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
959 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 768 (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
960 100, ASIMAGE_QUALITY_DEFAULT); 769 100, ASIMAGE_QUALITY_DEFAULT);
961 if (tmp) 770 if (tmp)
962 { 771 {
963 destroy_asimage (&back_im); 772 destroy_asimage (&back_im);
964 back_im = tmp; 773 back_im = tmp;
965 } 774 }
966 } 775 }
967 776
968 if (original_asim != NULL) 777 if (bgPixmap.original_asim != NULL)
969 { 778 {
970 ASImageLayer *layers = create_image_layers (2); 779 ASImageLayer *layers = create_image_layers (2);
971 ASImage *merged_im = NULL; 780 ASImage *merged_im = NULL;
972 int fore_w, fore_h; 781 int fore_w, fore_h;
973 782
974 layers[0].im = back_im; 783 layers[0].im = back_im;
975 layers[0].clip_width = szHint.width; 784 layers[0].clip_width = szHint.width;
976 layers[0].clip_height = szHint.height; 785 layers[0].clip_height = szHint.height;
977 layers[0].tint = tint; 786 layers[0].tint = tint;
978 layers[1].im = original_asim; 787 layers[1].im = bgPixmap.original_asim;
979 if (bgPixmap.auto_resize) 788
980 { 789 fore_w = (bgPixmap.h_scale == 0) ? bgPixmap.original_asim->width : bgPixmap.h_scale*szHint.width/100;
981 fore_w = szHint.width; 790 fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100;
982 fore_h = szHint.height; 791
983 }
984 else
985 {
986 fore_w = bgPixmap.w;
987 fore_h = bgPixmap.h;
988 }
989 if (fore_w != original_asim->width 792 if (fore_w != bgPixmap.original_asim->width
990 || fore_h != original_asim->height) 793 || fore_h != bgPixmap.original_asim->height)
991 { 794 {
992 layers[1].im = scale_asimage (asv, 795 layers[1].im = scale_asimage (asv,
993 original_asim, 796 bgPixmap.original_asim,
994 fore_w, fore_h, 797 fore_w, fore_h,
995 ASA_ASImage, 100, 798 ASA_ASImage, 100,
996 ASIMAGE_QUALITY_DEFAULT); 799 ASIMAGE_QUALITY_DEFAULT);
997 } 800 }
998 layers[1].clip_width = szHint.width; 801 layers[1].clip_width = szHint.width;
… …
1005 layers[1].merge_scanlines = alphablend_scanlines; 808 layers[1].merge_scanlines = alphablend_scanlines;
1006 } 809 }
1007 PRINT_BACKGROUND_OP_TIME; 810 PRINT_BACKGROUND_OP_TIME;
1008 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height, 811 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
1009 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 812 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
1010 if (layers[1].im != original_asim) 813 if (layers[1].im != bgPixmap.original_asim)
1011 destroy_asimage (&(layers[1].im)); 814 destroy_asimage (&(layers[1].im));
1012 free (layers); 815 free (layers);
1013 816
1014 if (merged_im != NULL) 817 if (merged_im != NULL)
1015 { 818 {
… …
1026 destroy_asimage (&back_im); 829 destroy_asimage (&back_im);
1027 back_im = tmp; 830 back_im = tmp;
1028 } 831 }
1029 PRINT_BACKGROUND_OP_TIME; 832 PRINT_BACKGROUND_OP_TIME;
1030 } 833 }
1031 asimage2drawable (asv, pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True); 834 asimage2drawable (asv, bgPixmap.pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
1032 destroy_asimage (&back_im); 835 destroy_asimage (&back_im);
1033 } /* back_im != NULL */ 836 } /* back_im != NULL */
1034 else 837 else
1035 success = False; 838 success = False;
1036 } 839 }
1037#else /* HAVE_AFTERIMAGE */ 840#else /* HAVE_AFTERIMAGE */
1038#if TINTING 841#if TINTING
1039 if (!whole_tint && (!no_tint || shade !=100)) 842 if (!whole_tint && (!no_tint || shade !=100))
1040 { 843 {
1041 XImage *image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); 844 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1042 success = False; 845 success = False;
1043 if (image != NULL) 846 if (image != NULL)
1044 { 847 {
1045 PRINT_BACKGROUND_OP_TIME; 848 PRINT_BACKGROUND_OP_TIME;
1046 if (gc == NULL) 849 if (gc == NULL)
1047 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 850 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1048 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 851 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1049 ShadeXImage (this, image, shade, c.r, c.g, c.b); 852 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1050 XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); 853 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1051 XDestroyImage (image); 854 XDestroyImage (image);
1052 success = True; 855 success = True;
1053 } 856 }
1054 } 857 }
1055#endif 858#endif
… …
1062 if (!success) 865 if (!success)
1063 { 866 {
1064 if (am_transparent && am_pixmap_trans) 867 if (am_transparent && am_pixmap_trans)
1065 { 868 {
1066 pchanged = 1; 869 pchanged = 1;
1067 if (pixmap != None) 870 if (bgPixmap.pixmap != None)
1068 { 871 {
1069 XFreePixmap (dpy, pixmap); 872 XFreePixmap (dpy, bgPixmap.pixmap);
1070 pixmap = None; 873 bgPixmap.pixmap = None;
1071 } 874 }
1072 } 875 }
1073 876
1074 am_pixmap_trans = 0; 877 am_pixmap_trans = 0;
1075 } 878 }
1076 else 879 else
1077 { 880 {
1078 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 881 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
1079 XClearWindow (dpy, parent[0]); 882 XClearWindow (dpy, parent[0]);
1080 883
1081 if (!am_transparent || !am_pixmap_trans) 884 if (!am_transparent || !am_pixmap_trans)
1082 pchanged = 1; 885 pchanged = 1;
1083 886

Diff Legend

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