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.5 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.38 by sasha, Fri Jun 8 20:04:12 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xpm.c 2 * File: xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xpm.C,v 1.5 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
8 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
9 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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#include "xpm.intpro" /* PROTOS for internal routines */
29 28
30#ifdef XPM_BACKGROUND 29#ifdef XPM_BACKGROUND
30
31static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight);
31 32
32/* 33/*
33 * These GEOM strings indicate absolute size/position: 34 * These GEOM strings indicate absolute size/position:
34 * @ `WxH+X+Y' 35 * @ `WxH+X+Y'
35 * @ `WxH+X' -> Y = X 36 * @ `WxH+X' -> Y = X
… …
50 * @ `?' 51 * @ `?'
51 */ 52 */
52int 53int
53rxvt_term::scale_pixmap (const char *geom) 54rxvt_term::scale_pixmap (const char *geom)
54{ 55{
55 int flags, changed = 0; 56 int flags, changed = 0;
56 int x = 0, y = 0; 57 int x = 0, y = 0;
57 unsigned int w = 0, h = 0; 58 unsigned int w = 0, h = 0;
58 unsigned int n; 59 unsigned int n;
59 char *p, *str; 60 char *p;
60 bgPixmap_t *bgpixmap = &(bgPixmap); 61 bgPixmap_t *bgpixmap = &bgPixmap;
61 62
62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
63 64
64 if (geom == NULL) 65 if (geom == NULL)
65 return 0; 66 return 0;
66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 67
67 if (!STRCMP(geom, "?")) { 68 char str[MAXLEN_GEOM];
69
70 if (!strcmp (geom, "?"))
71 {
68 sprintf(str, "[%dx%d+%d+%d]", /* can't presume snprintf() ! */ 72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
69 min(bgpixmap->w, 9999), min(bgpixmap->h, 9999), 73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
70 min(bgpixmap->x, 9999), min(bgpixmap->y, 9999)); 74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
71 xterm_seq (XTerm_title, str, CHAR_ST); 75 process_xterm_seq (XTerm_title, str, CHAR_ST);
72 free(str); 76 return 0;
73 return 0;
74 } 77 }
75 78
76 if ((p = STRCHR(geom, ';')) == NULL) 79 if ((p = strchr (geom, ';')) == NULL)
77 p = STRCHR(geom, '\0'); 80 p = strchr (geom, '\0');
81
78 n = (p - geom); 82 n = (p - geom);
79 if (n <= MAXLEN_GEOM) { 83 if (n < MAXLEN_GEOM)
80 STRNCPY(str, geom, n); 84 {
85 strncpy (str, geom, n);
81 str[n] = '\0'; 86 str[n] = '\0';
82 87
88 if (strcmp(str, "auto") == 0)
89 {
90 if (!bgpixmap->auto_resize)
91 changed++;
92 bgpixmap->auto_resize = True ;
93 w = szHint.width ;
94 h = szHint.height ;
95 flags = WidthValue|HeightValue ;
96 }
97 else
98 {
99 bgpixmap->auto_resize = False ;
83 flags = XParseGeometry(str, &x, &y, &w, &h); 100 flags = XParseGeometry (str, &x, &y, &w, &h);
84 if (!flags) { 101 }
102
103 if (!flags)
104 {
85 flags |= WidthValue; 105 flags |= WidthValue;
86 w = 0; 106 w = 0;
87 } /* default is tile */ 107 } /* default is tile */
108
88 if (flags & WidthValue) { 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 {
119 w = (bgpixmap->w * w) / 100;
120 h = bgpixmap->h;
121 }
122 else if (h && !w)
123 {
124 w = bgpixmap->w;
125 h = (bgpixmap->h * h) / 100;
126 }
127
128 min_it (w, 32767);
129 min_it (h, 32767);
130
131 if (bgpixmap->w != (short)w)
132 {
133 bgpixmap->w = (short)w;
134 changed++;
135 }
136
137 if (bgpixmap->h != (short)h)
138 {
139 bgpixmap->h = (short)h;
140 changed++;
141 }
142 }
143
89 if (!(flags & XValue)) 144 if (!(flags & YValue))
90 x = 50; 145 {
91 if (!(flags & HeightValue)) 146 if (flags & XNegative)
92 h = w; 147 flags |= YNegative;
93 if (w && !h) { 148
94 w = (bgpixmap->w * w) / 100; 149 y = x;
95 h = bgpixmap->h; 150 }
96 } else if (h && !w) { 151
97 w = bgpixmap->w; 152 if (!(flags & WidthValue) && geom[0] != '=')
98 h = (bgpixmap->h * h) / 100; 153 {
154 x += bgpixmap->x;
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++;
168 }
169
170 if (bgpixmap->y != y)
171 {
172 bgpixmap->y = y;
173 changed++;
174 }
99 } 175 }
100 if (w > 1000)
101 w = 1000;
102 if (h > 1000)
103 h = 1000;
104 if (bgpixmap->w != (short)w) {
105 bgpixmap->w = (short)w;
106 changed++;
107 }
108 if (bgpixmap->h != (short)h) {
109 bgpixmap->h = (short)h;
110 changed++;
111 }
112 }
113 if (!(flags & YValue)) {
114 if (flags & XNegative)
115 flags |= YNegative;
116 y = x;
117 }
118 176
119 if (!(flags & WidthValue) && geom[0] != '=') {
120 x += bgpixmap->x;
121 y += bgpixmap->y;
122 } else {
123 if (flags & XNegative)
124 x += 100;
125 if (flags & YNegative)
126 y += 100;
127 }
128 MIN_IT(x, 100);
129 MIN_IT(y, 100);
130 MAX_IT(x, 0);
131 MAX_IT(y, 0);
132 if (bgpixmap->x != x) {
133 bgpixmap->x = x;
134 changed++;
135 }
136 if (bgpixmap->y != y) {
137 bgpixmap->y = y;
138 changed++;
139 }
140 }
141 free(str);
142 return changed; 177 return changed;
143} 178}
144 179
145void 180void
146rxvt_term::resize_pixmap () 181rxvt_term::resize_pixmap ()
147{ 182{
148 XGCValues gcvalue; 183 XGCValues gcvalue;
149 GC gc; 184 GC gc;
150 unsigned int width = TermWin_TotalWidth();
151 unsigned int height = TermWin_TotalHeight();
152 185
153 if (TermWin.pixmap != None) 186 if (pixmap != None)
154 XFreePixmap(Xdisplay, TermWin.pixmap); 187 {
188 XFreePixmap (dpy, pixmap);
189 pixmap = None ;
190 }
155 191
156 if (bgPixmap.pixmap == None) { /* So be it: I'm not using pixmaps */ 192 if (bgPixmap.pixmap == None)
157 TermWin.pixmap = None; 193 { /* So be it: I'm not using pixmaps */
194 pixmap = None;
195
196#ifdef TRANSPARENT
158 if (!(Options & Opt_transparent) || am_transparent == 0) 197 if (!option (Opt_transparent) || !am_transparent)
159 XSetWindowBackground(Xdisplay, TermWin.vt, 198#endif
160 PixColors[Color_bg]); 199 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
161 return;
162 }
163 200
201 return;
202 }
203
164 gcvalue.foreground = PixColors[Color_bg]; 204 gcvalue.foreground = pix_colors[Color_bg];
165 gc = XCreateGC(Xdisplay, TermWin.vt, GCForeground, &gcvalue); 205 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
166 206
167 if (bgPixmap.pixmap != None) { /* we have a specified pixmap */ 207 if (bgPixmap.pixmap != None)
208 { /* we have a specified pixmap */
168 unsigned int w = bgPixmap.w, h = bgPixmap.h, 209 unsigned int w = bgPixmap.w, h = bgPixmap.h,
169 x = bgPixmap.x, y = bgPixmap.y; 210 x = bgPixmap.x, y = bgPixmap.y;
170 unsigned int xpmh = xpmAttr.height, 211 unsigned int xpmh = xpmAttr.height,
171 xpmw = xpmAttr.width; 212 xpmw = xpmAttr.width;
172 213
173 /* 214 if (bgPixmap.auto_resize)
215 {
216 w = szHint.width ;
217 h = szHint.height ;
218 }
219 /*
174 * don't zoom pixmap too much nor expand really small pixmaps 220 * don't zoom pixmap too much nor expand really small pixmaps
175 */ 221 */
176 if (w > 1000 || h > 1000) 222 if (w > 32767 || h > 32767)
177 w = 1; 223 w = 1;
178 else if (width > (10 * xpmw) 224 else if (width > (10 * xpmw)
179 || height > (10 * xpmh)) 225 || height > (10 * xpmh))
180 w = 0; /* tile */ 226 w = 0; /* tile */
181 227
182 if (w == 0) { 228 if (!w)
229 {
183 /* basic X tiling - let the X server do it */ 230 /* basic X tiling - let the X server do it */
184 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 231 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
185 xpmw, xpmh,
186 (unsigned int)XDEPTH);
187 XCopyArea(Xdisplay, bgPixmap.pixmap, TermWin.pixmap, gc,
188 0, 0, xpmw, xpmh, 0, 0);
189 } else {
190 float incr, p;
191 Pixmap tmp;
192 232
193 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 233 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
194 width, height, 234 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
195 (unsigned int)XDEPTH); 235 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
196 /* 236 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
237 }
238 else
239#ifdef HAVE_AFTERIMAGE
240#ifdef TRANSPARENT
241 if (!option(Opt_transparent) || !am_transparent)
242 /* will do that in check_our_parents otherwise */
243#endif
244 {
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 /*
197 * horizontal scaling 259 * horizontal scaling
198 */ 260 */
199 rxvt_pixmap_incr(&w, &x, &incr, &p, width, xpmw); 261 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
200 262
201 tmp = XCreatePixmap(Xdisplay, TermWin.vt, 263 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
202 width, xpmh, (unsigned int)XDEPTH);
203 XFillRectangle(Xdisplay, tmp, gc, 0, 0, width, 264 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
204 xpmh);
205 265
206 for ( /*nil */ ; x < w; x++, p += incr) { 266 for ( /*nil */ ; x < w; x++, p += incr)
207 if (p >= xpmw) 267 {
208 p = 0; 268 if (p >= xpmw)
269 p = 0;
270
209 /* copy one column from the original pixmap to the tmp pixmap */ 271 /* copy one column from the original pixmap to the tmp pixmap */
210 XCopyArea(Xdisplay, bgPixmap.pixmap, tmp, gc, 272 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
211 (int)p, 0, 1, xpmh, (int)x, 0); 273 }
212 }
213 274
214 /* 275 /*
215 * vertical scaling 276 * vertical scaling
216 */ 277 */
217 rxvt_pixmap_incr(&h, &y, &incr, &p, height, xpmh); 278 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
218 279
219 if (y > 0) 280 if (y > 0)
220 XFillRectangle(Xdisplay, TermWin.pixmap, gc, 0, 0, width, 281 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
221 y); 282
222 if (h < height) 283 if (h < height)
223 XFillRectangle(Xdisplay, TermWin.pixmap, gc, 0, (int)h, 284 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
224 width, height - h + 1); 285
225 for ( /*nil */ ; y < h; y++, p += incr) { 286 for ( /*nil */ ; y < h; y++, p += incr)
226 if (p >= xpmh) 287 {
227 p = 0; 288 if (p >= xpmh)
289 p = 0;
290
228 /* copy one row from the tmp pixmap to the main pixmap */ 291 /* copy one row from the tmp pixmap to the main pixmap */
229 XCopyArea(Xdisplay, tmp, TermWin.pixmap, gc, 292 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
230 0, (int)p, width, 1, 0, (int)y); 293 }
294
295 XFreePixmap (dpy, tmp);
296 }
297#endif /* HAVE_AFTERIMAGE */
231 } 298 }
232 XFreePixmap(Xdisplay, tmp); 299
233 }
234 }
235 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, TermWin.pixmap); 300 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
301
236 XFreeGC(Xdisplay, gc); 302 XFreeGC (dpy, gc);
303#ifdef TRANSPARENT
237 am_transparent = 0; 304 am_transparent = 0;
238 305#endif
239 XClearWindow(Xdisplay, TermWin.vt);
240
241 XSync(Xdisplay, False);
242} 306}
243 307
244/* 308/*
245 * Calculate tiling sizes and increments 309 * Calculate tiling sizes and increments
246 * At start, p == 0, incr == xpmwidthheight 310 * At start, p == 0, incr == xpmwidthheight
247 */ 311 */
248void 312static void
249rxvt_pixmap_incr(unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 313rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
250{ 314{
251 unsigned int cwh, cxy; 315 unsigned int cwh, cxy;
252 float cincr, cp; 316 float cincr, cp;
253 317
254 cp = 0; 318 cp = 0;
255 cincr = (float)xpmwidthheight; 319 cincr = (float)xpmwidthheight;
256 cxy = *xy; 320 cxy = *xy;
257 cwh = *wh; 321 cwh = *wh;
322 if (cwh == 1)
258 if (cwh == 1) { /* display one image, no horizontal/vertical scaling */ 323 { /* display one image, no horizontal/vertical scaling */
259 cincr = (float)widthheight; 324 cincr = (float)widthheight;
260 if (xpmwidthheight <= widthheight) { 325 if (xpmwidthheight <= widthheight)
326 {
261 cwh = xpmwidthheight; 327 cwh = xpmwidthheight;
262 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ 328 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
263 cwh += cxy; 329 cwh += cxy;
264 } else { 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;
265 cxy = 0; 340 cxy = 0;
266 cwh = widthheight; 341 cwh = widthheight;
267 } 342 }
268 } else if (cwh < 10) { /* fit WH images across/down screen */ 343 else
269 cincr *= cwh; 344 {
270 cxy = 0;
271 cwh = widthheight;
272 } else {
273 cincr *= 100.0 / cwh; 345 cincr *= 100.0 / cwh;
274 if (cwh < 100) { /* contract */ 346 if (cwh < 100)
347 { /* contract */
275 float pos; 348 float pos;
276 349
277 cwh = (cwh * widthheight) / 100; 350 cwh = (cwh * widthheight) / 100;
278 pos = (float)cxy / 100 * widthheight - (cwh / 2); 351 pos = (float)cxy / 100 * widthheight - (cwh / 2);
279 352
280 cxy = (widthheight - cwh); 353 cxy = (widthheight - cwh);
281 if (pos <= 0) 354 if (pos <= 0)
282 cxy = 0; 355 cxy = 0;
283 else if (pos < cxy) 356 else if (pos < cxy)
284 cxy = (int) pos; 357 cxy = (int) pos;
285 cwh += cxy; 358 cwh += cxy;
286 } else { /* expand */ 359 }
287 if (cxy > 0) { /* position */ 360 else
288 float pos; 361 { /* expand */
362 if (cxy > 0)
363 { /* position */
364 float pos;
289 365
290 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2); 366 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
291 cp = xpmwidthheight - cincr; 367 cp = xpmwidthheight - cincr;
292 if (pos <= 0) 368 if (pos <= 0)
293 cp = 0; 369 cp = 0;
294 else if (pos < cp) 370 else if (pos < cp)
295 cp = pos; 371 cp = pos;
372 }
373 cxy = 0;
374 cwh = widthheight;
375 }
296 } 376 }
297 cxy = 0;
298 cwh = widthheight;
299 }
300 }
301 cincr /= widthheight; 377 cincr /= widthheight;
302 *wh = cwh; 378 *wh = cwh;
303 *xy = cxy; 379 *xy = cxy;
304 *incr = cincr; 380 *incr = cincr;
305 *p = cp; 381 *p = cp;
306} 382}
307 383
308Pixmap 384Pixmap
309rxvt_term::set_bgPixmap (const char *file) 385rxvt_term::set_bgPixmap (const char *file)
310{ 386{
311 char *f; 387 char *f;
312 388
313 assert(file != NULL); 389 assert (file != NULL);
314 390
315 if (bgPixmap.pixmap != None) { 391 if (bgPixmap.pixmap != None)
392 {
316 XFreePixmap(Xdisplay, bgPixmap.pixmap); 393 XFreePixmap (dpy, bgPixmap.pixmap);
317 bgPixmap.pixmap = None; 394 bgPixmap.pixmap = None;
318 } 395 }
396
319 XSetWindowBackground(Xdisplay, TermWin.vt, PixColors[Color_bg]); 397 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
320 398
321 if (*file != '\0') { 399 if (*file != '\0')
400 {
322/* XWindowAttributes attr; */ 401 /* XWindowAttributes attr; */
323 402
324 /* 403 /*
325 * we already have the required attributes 404 * we already have the required attributes
326 */ 405 */
327/* XGetWindowAttributes(Xdisplay, TermWin.vt, &attr); */ 406 /* XGetWindowAttributes (dpy, vt, &attr); */
328 407
408#ifdef HAVE_AFTERIMAGE
409 if (asimman == NULL)
410 asimman = create_generic_imageman(rs[Rs_path]);
411 if ((f = strchr (file, ';')) == NULL)
412 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
413 else
414 {
415 f = strndup( file, f - file );
416 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
417 free( f );
418 }
419 if (original_asim)
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 */
329 xpmAttr.closeness = 30000; 426 xpmAttr.closeness = 30000;
330 xpmAttr.colormap = XCMAP; 427 xpmAttr.colormap = cmap;
331 xpmAttr.visual = XVISUAL; 428 xpmAttr.visual = visual;
332 xpmAttr.depth = XDEPTH; 429 xpmAttr.depth = depth;
333 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 430 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
334 XpmDepth | XpmSize | XpmReturnPixels); 431 | XpmDepth | XpmSize | XpmReturnPixels);
335 432
336 /* search environment variables here too */ 433 /* search environment variables here too */
337 f = (char *)rxvt_File_find(file, ".xpm", rs[Rs_path]); 434 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
338 if (f == NULL 435 if (f == NULL
339 || XpmReadFileToPixmap(Xdisplay, Xroot, f, 436 || XpmReadFileToPixmap (dpy, display->root, f,
340 &bgPixmap.pixmap, NULL, 437 &bgPixmap.pixmap, NULL,
341 &xpmAttr)) { 438 &xpmAttr))
342 char *p; 439 {
440 char *p;
343 441
344 /* semi-colon delimited */ 442 /* semi-colon delimited */
345 if ((p = STRCHR(file, ';')) == NULL) 443 if ((p = strchr (file, ';')) == NULL)
346 p = STRCHR(file, '\0'); 444 p = strchr (file, '\0');
347 445
348 rxvt_print_error("couldn't load XPM file \"%.*s\"", (p - file), 446 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
349 file); 447 }
350 } 448 free (f);
351 free(f); 449#endif /* HAVE_AFTERIMAGE */
352 } 450 }
451
353 resize_pixmap (); 452 resize_pixmap ();
354 return bgPixmap.pixmap; 453 return bgPixmap.pixmap;
355} 454}
356 455
357#endif /* XPM_BACKGROUND */ 456#endif /* XPM_BACKGROUND */

Diff Legend

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