Mercurial > emacs
diff src/xterm.c @ 66919:a9d1837b115c
* 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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 16 Nov 2005 05:49:18 +0000 |
| parents | afc5a296f79d |
| children | 1a573209abf9 |
line wrap: on
line diff
--- a/src/xterm.c Wed Nov 16 05:02:40 2005 +0000 +++ b/src/xterm.c Wed Nov 16 05:49:18 2005 +0000 @@ -7362,9 +7362,14 @@ /* 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); }