aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2003-04-01 10:04:38 +0000
committerDave Love2003-04-01 10:04:38 +0000
commit9b8a0941bbb55a479fb4bca5b24e2e0a6566f1a1 (patch)
tree57791fa98d4832b1b91ae62dda7ee46a94bd57ac /src
parent3e6a560b5b57c14c471d63d6eb1b12d29346d21e (diff)
downloademacs-9b8a0941bbb55a479fb4bca5b24e2e0a6566f1a1.tar.gz
emacs-9b8a0941bbb55a479fb4bca5b24e2e0a6566f1a1.zip
(xpm_lookup_color): Grok "opaque".
Diffstat (limited to 'src')
-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 @@
1/* Functions for the X window system. 1/* Functions for the X window system.
2 Copyright (C) 1989, 92, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001 2 Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -6246,6 +6246,14 @@ xpm_lookup_color (f, color_name, color)
6246 color->blue); 6246 color->blue);
6247 p = xpm_cache_color (f, color_name, color, h); 6247 p = xpm_cache_color (f, color_name, color, h);
6248 } 6248 }
6249 /* You get `opaque' at least from ImageMagick converting pbm to xpm
6250 with transparency, and it's useful. */
6251 else if (strcmp ("opaque", color_name) == 0)
6252 {
6253 bzero (color, sizeof (XColor)); /* Is this necessary/correct? */
6254 color->pixel = FRAME_FOREGROUND_PIXEL (f);
6255 p = xpm_cache_color (f, color_name, color, h);
6256 }
6249 6257
6250 return p != NULL; 6258 return p != NULL;
6251} 6259}