diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2005-11-16 05:49:18 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2005-11-16 05:49:18 +0000 |
| commit | 786a43d6cf102c185b05a31c10fba6b62b21511a (patch) | |
| tree | e86798e3e8e287214932fe2bd4171c2f79867a01 /src/xterm.c | |
| parent | 496f36c064a146b0d43a6ffc6ff1c7425cb5254b (diff) | |
| download | emacs-786a43d6cf102c185b05a31c10fba6b62b21511a.tar.gz | |
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
* xterm.c (x_bitmap_icon): Use the xpm if available.
* image.c (x_create_bitmap_from_xpm_data): New function.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 74fdd375364..8359cec0112 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7362,9 +7362,14 @@ x_bitmap_icon (f, file) /* Create the GNU bitmap and mask if necessary. */ if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0) { +#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) + FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id + = x_create_bitmap_from_xpm_data (f, gnu_bits); +#else FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id = x_create_bitmap_from_data (f, gnu_bits, gnu_width, gnu_height); +#endif /* (HAVE_XPM) && defined (HAVE_X_WINDOWS) */ x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id); } |