Bug#220965: [PATCH] support for xpm backgrounds

[Bernhard R. Link]

Attached patch adds support for the special "None" colour in XPMs by
replacing them with the -background color.

Hochachtungsvoll,
        Bernhard R. Link

Index: xli-1.17.0/xpixmap.c
===================================================================
--- xli-1.17.0.orig/xpixmap.c   2000-02-09 10:23:35.000000000 +0100
+++ xli-1.17.0/xpixmap.c        2006-08-06 16:52:30.546035972 +0200
@@ -461,7 +461,16 @@
                        } else
                                p = buf;
 
-                       if (!xliParseXColor(&globals.dinfo, p, &xcolor)) {
+                       if( strcmp(p, "None") == 0 ) {
+                               if( image_ops->bg ) {
+                                       if (!xliParseXColor(&globals.dinfo, 
image_ops->bg, &xcolor)) {
+                                               fprintf(stderr, "xpixmapLoad: 
Bad background color name '%s'\n", image_ops->bg);
+                                               xcolor.red = xcolor.green = 
xcolor.blue = 0;
+                                       }
+                               } else {
+                                       xcolor.red = xcolor.green = xcolor.blue 
= 0;
+                               }
+                       } else if (!xliParseXColor(&globals.dinfo, p, &xcolor)) 
{
                                fprintf(stderr, "xpixmapLoad: %s - Bad color 
name '%s'\n", name, p);
                                xcolor.red = xcolor.green = xcolor.blue = 0;
                        }