summaryrefslogtreecommitdiff
path: root/src/xfns.c
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2003-04-01 10:04:38 +0000
committerDave Love <fx@gnu.org>2003-04-01 10:04:38 +0000
commit9b8a0941bbb55a479fb4bca5b24e2e0a6566f1a1 (patch)
tree57791fa98d4832b1b91ae62dda7ee46a94bd57ac /src/xfns.c
parent3e6a560b5b57c14c471d63d6eb1b12d29346d21e (diff)
downloademacs-9b8a0941bbb55a479fb4bca5b24e2e0a6566f1a1.tar.gz
(xpm_lookup_color): Grok "opaque".
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 3a4ac07a1d6..774eff9d3da 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,5 +1,5 @@
/* Functions for the X window system.
- Copyright (C) 1989, 92, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001
+ Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
Free Software Foundation.
This file is part of GNU Emacs.
@@ -6246,6 +6246,14 @@ xpm_lookup_color (f, color_name, color)
color->blue);
p = xpm_cache_color (f, color_name, color, h);
}
+ /* You get `opaque' at least from ImageMagick converting pbm to xpm
+ with transparency, and it's useful. */
+ else if (strcmp ("opaque", color_name) == 0)
+ {
+ bzero (color, sizeof (XColor)); /* Is this necessary/correct? */
+ color->pixel = FRAME_FOREGROUND_PIXEL (f);
+ p = xpm_cache_color (f, color_name, color, h);
+ }
return p != NULL;
}