Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 66918:a4fc9278ae05 | 66919:a9d1837b115c |
|---|---|
| 7360 else | 7360 else |
| 7361 { | 7361 { |
| 7362 /* Create the GNU bitmap and mask if necessary. */ | 7362 /* Create the GNU bitmap and mask if necessary. */ |
| 7363 if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0) | 7363 if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0) |
| 7364 { | 7364 { |
| 7365 #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) | |
| 7366 FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id | |
| 7367 = x_create_bitmap_from_xpm_data (f, gnu_bits); | |
| 7368 #else | |
| 7365 FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id | 7369 FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id |
| 7366 = x_create_bitmap_from_data (f, gnu_bits, | 7370 = x_create_bitmap_from_data (f, gnu_bits, |
| 7367 gnu_width, gnu_height); | 7371 gnu_width, gnu_height); |
| 7372 #endif /* (HAVE_XPM) && defined (HAVE_X_WINDOWS) */ | |
| 7368 x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id); | 7373 x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id); |
| 7369 } | 7374 } |
| 7370 | 7375 |
| 7371 /* The first time we create the GNU bitmap and mask, | 7376 /* The first time we create the GNU bitmap and mask, |
| 7372 this increments the ref-count one extra time. | 7377 this increments the ref-count one extra time. |