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.3 by pcg, Tue Nov 25 11:52:42 2003 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.3 2003/11/25 11:52:42 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
… …
47 * @ `+X' -> Y = X 48 * @ `+X' -> Y = X
48 * 49 *
49 * And this GEOM string is for querying current scale/position: 50 * And this GEOM string is for querying current scale/position:
50 * @ `?' 51 * @ `?'
51 */ 52 */
52/* EXTPROTO */
53int 53int
54rxvt_scale_pixmap(pR_ const char *geom) 54rxvt_term::scale_pixmap (const char *geom)
55{ 55{
56 int flags, changed = 0; 56 int flags, changed = 0;
57 int x = 0, y = 0; 57 int x = 0, y = 0;
58 unsigned int w = 0, h = 0; 58 unsigned int w = 0, h = 0;
59 unsigned int n; 59 unsigned int n;
60 char *p, *str; 60 char *p;
61 bgPixmap_t *bgpixmap = &(R->bgPixmap); 61 bgPixmap_t *bgpixmap = &bgPixmap;
62 62
63#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
64 64
65 if (geom == NULL) 65 if (geom == NULL)
66 return 0; 66 return 0;
67 str = rxvt_malloc(MAXLEN_GEOM + 1); 67
68 if (!STRCMP(geom, "?")) { 68 char str[MAXLEN_GEOM];
69
70 if (!strcmp (geom, "?"))
71 {
69 sprintf(str, "[%dx%d+%d+%d]", /* can't presume snprintf() ! */ 72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70 min(bgpixmap->w, 9999), min(bgpixmap->h, 9999), 73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
71 min(bgpixmap->x, 9999), min(bgpixmap->y, 9999)); 74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
72 rxvt_xterm_seq(aR_ XTerm_title, str, CHAR_ST); 75 process_xterm_seq (XTerm_title, str, CHAR_ST);
73 free(str); 76 return 0;
74 return 0;
75 } 77 }
76 78
77 if ((p = STRCHR(geom, ';')) == NULL) 79 if ((p = strchr (geom, ';')) == NULL)
78 p = STRCHR(geom, '\0'); 80 p = strchr (geom, '\0');
81
79 n = (p - geom); 82 n = (p - geom);
80 if (n <= MAXLEN_GEOM) { 83 if (n < MAXLEN_GEOM)
81 STRNCPY(str, geom, n); 84 {
85 strncpy (str, geom, n);
82 str[n] = '\0'; 86 str[n] = '\0';
83 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 ;
84 flags = XParseGeometry(str, &x, &y, &w, &h); 100 flags = XParseGeometry (str, &x, &y, &w, &h);
85 if (!flags) { 101 }
102
103 if (!flags)
104 {
86 flags |= WidthValue; 105 flags |= WidthValue;
87 w = 0; 106 w = 0;
88 } /* default is tile */ 107 } /* default is tile */
108
89 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
90 if (!(flags & XValue)) 144 if (!(flags & YValue))
91 x = 50; 145 {
92 if (!(flags & HeightValue)) 146 if (flags & XNegative)
93 h = w; 147 flags |= YNegative;
94 if (w && !h) { 148
95 w = (bgpixmap->w * w) / 100; 149 y = x;
96 h = bgpixmap->h; 150 }
97 } else if (h && !w) { 151
98 w = bgpixmap->w; 152 if (!(flags & WidthValue) && geom[0] != '=')
99 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 }
100 } 175 }
101 if (w > 1000)
102 w = 1000;
103 if (h > 1000)
104 h = 1000;
105 if (bgpixmap->w != (short)w) {
106 bgpixmap->w = (short)w;
107 changed++;
108 }
109 if (bgpixmap->h != (short)h) {
110 bgpixmap->h = (short)h;
111 changed++;
112 }
113 }
114 if (!(flags & YValue)) {
115 if (flags & XNegative)
116 flags |= YNegative;
117 y = x;
118 }
119 176
120 if (!(flags & WidthValue) && geom[0] != '=') {
121 x += bgpixmap->x;
122 y += bgpixmap->y;
123 } else {
124 if (flags & XNegative)
125 x += 100;
126 if (flags & YNegative)
127 y += 100;
128 }
129 MIN_IT(x, 100);
130 MIN_IT(y, 100);
131 MAX_IT(x, 0);
132 MAX_IT(y, 0);
133 if (bgpixmap->x != x) {
134 bgpixmap->x = x;
135 changed++;
136 }
137 if (bgpixmap->y != y) {
138 bgpixmap->y = y;
139 changed++;
140 }
141 }
142 free(str);
143 return changed; 177 return changed;
144} 178}
145 179
146/* EXTPROTO */
147void 180void
148rxvt_resize_pixmap(pR) 181rxvt_term::resize_pixmap ()
149{ 182{
150 XGCValues gcvalue; 183 XGCValues gcvalue;
151 GC gc; 184 GC gc;
152 unsigned int width = TermWin_TotalWidth();
153 unsigned int height = TermWin_TotalHeight();
154 185
155 if (R->TermWin.pixmap != None) 186 if (pixmap != None)
156 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
157
158 if (R->bgPixmap.pixmap == None) { /* So be it: I'm not using pixmaps */
159 R->TermWin.pixmap = None;
160 if (!(R->Options & Opt_transparent) || R->am_transparent == 0)
161 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
162 R->PixColors[Color_bg]);
163 return;
164 } 187 {
188 XFreePixmap (dpy, pixmap);
189 pixmap = None ;
190 }
165 191
192 if (bgPixmap.pixmap == None)
193 { /* 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]);
200
201 return;
202 }
203
166 gcvalue.foreground = R->PixColors[Color_bg]; 204 gcvalue.foreground = pix_colors[Color_bg];
167 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, GCForeground, &gcvalue); 205 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
168 206
169 if (R->bgPixmap.pixmap != None) { /* we have a specified pixmap */ 207 if (bgPixmap.pixmap != None)
208 { /* we have a specified pixmap */
170 unsigned int w = R->bgPixmap.w, h = R->bgPixmap.h, 209 unsigned int w = bgPixmap.w, h = bgPixmap.h,
171 x = R->bgPixmap.x, y = R->bgPixmap.y; 210 x = bgPixmap.x, y = bgPixmap.y;
172 unsigned int xpmh = R->xpmAttr.height, 211 unsigned int xpmh = xpmAttr.height,
173 xpmw = R->xpmAttr.width; 212 xpmw = xpmAttr.width;
174 213
175 /* 214 if (bgPixmap.auto_resize)
215 {
216 w = szHint.width ;
217 h = szHint.height ;
218 }
219 /*
176 * don't zoom pixmap too much nor expand really small pixmaps 220 * don't zoom pixmap too much nor expand really small pixmaps
177 */ 221 */
178 if (w > 1000 || h > 1000) 222 if (w > 32767 || h > 32767)
179 w = 1; 223 w = 1;
180 else if (width > (10 * xpmw) 224 else if (width > (10 * xpmw)
181 || height > (10 * xpmh)) 225 || height > (10 * xpmh))
182 w = 0; /* tile */ 226 w = 0; /* tile */
183 227
184 if (w == 0) { 228 if (!w)
229 {
185 /* basic X tiling - let the X server do it */ 230 /* basic X tiling - let the X server do it */
186 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 231 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
187 xpmw, xpmh,
188 (unsigned int)XDEPTH);
189 XCopyArea(R->Xdisplay, R->bgPixmap.pixmap, R->TermWin.pixmap, gc,
190 0, 0, xpmw, xpmh, 0, 0);
191 } else {
192 float incr, p;
193 Pixmap tmp;
194 232
195 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 233 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
196 width, height, 234 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
197 (unsigned int)XDEPTH); 235 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
198 /* 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 /*
199 * horizontal scaling 259 * horizontal scaling
200 */ 260 */
201 rxvt_pixmap_incr(&w, &x, &incr, &p, width, xpmw); 261 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
202 262
203 tmp = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 263 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
204 width, xpmh, (unsigned int)XDEPTH);
205 XFillRectangle(R->Xdisplay, tmp, gc, 0, 0, width, 264 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
206 xpmh);
207 265
208 for ( /*nil */ ; x < w; x++, p += incr) { 266 for ( /*nil */ ; x < w; x++, p += incr)
209 if (p >= xpmw) 267 {
210 p = 0; 268 if (p >= xpmw)
269 p = 0;
270
211 /* copy one column from the original pixmap to the tmp pixmap */ 271 /* copy one column from the original pixmap to the tmp pixmap */
212 XCopyArea(R->Xdisplay, R->bgPixmap.pixmap, tmp, gc, 272 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
213 (int)p, 0, 1, xpmh, (int)x, 0); 273 }
214 }
215 274
216 /* 275 /*
217 * vertical scaling 276 * vertical scaling
218 */ 277 */
219 rxvt_pixmap_incr(&h, &y, &incr, &p, height, xpmh); 278 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
220 279
221 if (y > 0) 280 if (y > 0)
222 XFillRectangle(R->Xdisplay, R->TermWin.pixmap, gc, 0, 0, width, 281 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
223 y); 282
224 if (h < height) 283 if (h < height)
225 XFillRectangle(R->Xdisplay, R->TermWin.pixmap, gc, 0, (int)h, 284 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
226 width, height - h + 1); 285
227 for ( /*nil */ ; y < h; y++, p += incr) { 286 for ( /*nil */ ; y < h; y++, p += incr)
228 if (p >= xpmh) 287 {
229 p = 0; 288 if (p >= xpmh)
289 p = 0;
290
230 /* copy one row from the tmp pixmap to the main pixmap */ 291 /* copy one row from the tmp pixmap to the main pixmap */
231 XCopyArea(R->Xdisplay, tmp, R->TermWin.pixmap, gc, 292 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
232 0, (int)p, width, 1, 0, (int)y); 293 }
294
295 XFreePixmap (dpy, tmp);
296 }
297#endif /* HAVE_AFTERIMAGE */
233 } 298 }
234 XFreePixmap(R->Xdisplay, tmp); 299
235 } 300 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
236 } 301
237 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, R->TermWin.pixmap);
238 XFreeGC(R->Xdisplay, gc); 302 XFreeGC (dpy, gc);
303#ifdef TRANSPARENT
239 R->am_transparent = 0; 304 am_transparent = 0;
240 305#endif
241 XClearWindow(R->Xdisplay, R->TermWin.vt);
242
243 XSync(R->Xdisplay, False);
244} 306}
245 307
246/* 308/*
247 * Calculate tiling sizes and increments 309 * Calculate tiling sizes and increments
248 * At start, p == 0, incr == xpmwidthheight 310 * At start, p == 0, incr == xpmwidthheight
249 */ 311 */
250/* INTPROTO */ 312static void
251void
252rxvt_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)
253{ 314{
254 unsigned int cwh, cxy; 315 unsigned int cwh, cxy;
255 float cincr, cp; 316 float cincr, cp;
256 317
257 cp = 0; 318 cp = 0;
258 cincr = (float)xpmwidthheight; 319 cincr = (float)xpmwidthheight;
259 cxy = *xy; 320 cxy = *xy;
260 cwh = *wh; 321 cwh = *wh;
322 if (cwh == 1)
261 if (cwh == 1) { /* display one image, no horizontal/vertical scaling */ 323 { /* display one image, no horizontal/vertical scaling */
262 cincr = (float)widthheight; 324 cincr = (float)widthheight;
263 if (xpmwidthheight <= widthheight) { 325 if (xpmwidthheight <= widthheight)
326 {
264 cwh = xpmwidthheight; 327 cwh = xpmwidthheight;
265 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ 328 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
266 cwh += cxy; 329 cwh += cxy;
267 } 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;
268 cxy = 0; 340 cxy = 0;
269 cwh = widthheight; 341 cwh = widthheight;
270 } 342 }
271 } else if (cwh < 10) { /* fit WH images across/down screen */ 343 else
272 cincr *= cwh; 344 {
273 cxy = 0;
274 cwh = widthheight;
275 } else {
276 cincr *= 100.0 / cwh; 345 cincr *= 100.0 / cwh;
277 if (cwh < 100) { /* contract */ 346 if (cwh < 100)
347 { /* contract */
278 float pos; 348 float pos;
279 349
280 cwh = (cwh * widthheight) / 100; 350 cwh = (cwh * widthheight) / 100;
281 pos = (float)cxy / 100 * widthheight - (cwh / 2); 351 pos = (float)cxy / 100 * widthheight - (cwh / 2);
282 352
283 cxy = (widthheight - cwh); 353 cxy = (widthheight - cwh);
284 if (pos <= 0) 354 if (pos <= 0)
285 cxy = 0; 355 cxy = 0;
286 else if (pos < cxy) 356 else if (pos < cxy)
287 cxy = pos; 357 cxy = (int) pos;
288 cwh += cxy; 358 cwh += cxy;
289 } else { /* expand */ 359 }
290 if (cxy > 0) { /* position */ 360 else
291 float pos; 361 { /* expand */
362 if (cxy > 0)
363 { /* position */
364 float pos;
292 365
293 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2); 366 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
294 cp = xpmwidthheight - cincr; 367 cp = xpmwidthheight - cincr;
295 if (pos <= 0) 368 if (pos <= 0)
296 cp = 0; 369 cp = 0;
297 else if (pos < cp) 370 else if (pos < cp)
298 cp = pos; 371 cp = pos;
372 }
373 cxy = 0;
374 cwh = widthheight;
375 }
299 } 376 }
300 cxy = 0;
301 cwh = widthheight;
302 }
303 }
304 cincr /= widthheight; 377 cincr /= widthheight;
305 *wh = cwh; 378 *wh = cwh;
306 *xy = cxy; 379 *xy = cxy;
307 *incr = cincr; 380 *incr = cincr;
308 *p = cp; 381 *p = cp;
309} 382}
310 383
311/* EXTPROTO */
312Pixmap 384Pixmap
313rxvt_set_bgPixmap(pR_ const char *file) 385rxvt_term::set_bgPixmap (const char *file)
314{ 386{
315 char *f; 387 char *f;
316 388
317 assert(file != NULL); 389 assert (file != NULL);
318 390
319 if (R->bgPixmap.pixmap != None) { 391 if (bgPixmap.pixmap != None)
392 {
320 XFreePixmap(R->Xdisplay, R->bgPixmap.pixmap); 393 XFreePixmap (dpy, bgPixmap.pixmap);
321 R->bgPixmap.pixmap = None; 394 bgPixmap.pixmap = None;
322 } 395 }
396
323 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, R->PixColors[Color_bg]); 397 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
324 398
325 if (*file != '\0') { 399 if (*file != '\0')
400 {
326/* XWindowAttributes attr; */ 401 /* XWindowAttributes attr; */
327 402
328 /* 403 /*
329 * we already have the required attributes 404 * we already have the required attributes
330 */ 405 */
331/* XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &attr); */ 406 /* XGetWindowAttributes (dpy, vt, &attr); */
332 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 */
333 R->xpmAttr.closeness = 30000; 426 xpmAttr.closeness = 30000;
334 R->xpmAttr.colormap = XCMAP; 427 xpmAttr.colormap = cmap;
335 R->xpmAttr.visual = XVISUAL; 428 xpmAttr.visual = visual;
336 R->xpmAttr.depth = XDEPTH; 429 xpmAttr.depth = depth;
337 R->xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 430 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
338 XpmDepth | XpmSize | XpmReturnPixels); 431 | XpmDepth | XpmSize | XpmReturnPixels);
339 432
340 /* search environment variables here too */ 433 /* search environment variables here too */
341 f = (char *)rxvt_File_find(file, ".xpm", R->rs[Rs_path]); 434 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
342 if (f == NULL 435 if (f == NULL
343 || XpmReadFileToPixmap(R->Xdisplay, Xroot, f, 436 || XpmReadFileToPixmap (dpy, display->root, f,
344 &R->bgPixmap.pixmap, NULL, 437 &bgPixmap.pixmap, NULL,
345 &R->xpmAttr)) { 438 &xpmAttr))
346 char *p; 439 {
440 char *p;
347 441
348 /* semi-colon delimited */ 442 /* semi-colon delimited */
349 if ((p = STRCHR(file, ';')) == NULL) 443 if ((p = strchr (file, ';')) == NULL)
350 p = STRCHR(file, '\0'); 444 p = strchr (file, '\0');
351 445
352 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);
353 file); 447 }
354 } 448 free (f);
355 free(f); 449#endif /* HAVE_AFTERIMAGE */
356 } 450 }
451
357 rxvt_resize_pixmap(aR); 452 resize_pixmap ();
358 return R->bgPixmap.pixmap; 453 return bgPixmap.pixmap;
359} 454}
360 455
361#endif /* XPM_BACKGROUND */ 456#endif /* XPM_BACKGROUND */

Diff Legend

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