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.9 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.10 by pcg, Wed Mar 17 03:47:14 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xpm.c 2 * File: xpm.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xpm.C,v 1.9 2004/02/13 12:16:21 pcg Exp $ 4 * $Id: xpm.C,v 1.10 2004/03/17 03:47:14 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 7 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
8 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 8 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
9 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 9 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
375 if (f == NULL 375 if (f == NULL
376 || XpmReadFileToPixmap (display->display, display->root, f, 376 || XpmReadFileToPixmap (display->display, display->root, f,
377 &bgPixmap.pixmap, NULL, 377 &bgPixmap.pixmap, NULL,
378 &xpmAttr)) 378 &xpmAttr))
379 { 379 {
380 char *p; 380 char *p;
381 381
382 /* semi-colon delimited */ 382 /* semi-colon delimited */
383 if ((p = STRCHR (file, ';')) == NULL) 383 if ((p = STRCHR (file, ';')) == NULL)
384 p = STRCHR (file, '\0'); 384 p = STRCHR (file, '\0');
385 385
386 rxvt_print_error ("couldn't load XPM file \"%.*s\"", (p - file), 386 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.", (p - file), file);
387 file);
388 } 387 }
388
389 free (f); 389 free (f);
390 } 390 }
391
391 resize_pixmap (); 392 resize_pixmap ();
392 return bgPixmap.pixmap; 393 return bgPixmap.pixmap;
393} 394}
394 395
395#endif /* XPM_BACKGROUND */ 396#endif /* XPM_BACKGROUND */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines