Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 223:2c611d1463a6 r20-4b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b10
author cvs
date Mon, 13 Aug 2007 10:10:54 +0200
parents 6c0ae1f9357f
children 12579d965149
comparison
equal deleted inserted replaced
222:aae4c8b01452 223:2c611d1463a6
55 #include "opaque.h" 55 #include "opaque.h"
56 56
57 #include "sysfile.h" 57 #include "sysfile.h"
58 58
59 #ifdef HAVE_IMAGEMAGICK 59 #ifdef HAVE_IMAGEMAGICK
60 #ifdef SOLARIS2 /* Try to trick magick.h into not including Xos.h */
61 #define _XOS_H_
62 #endif
63 #ifdef MAGICK_HEADERS_ARE_UNDER_X11
64 #include <X11/magick/magick.h>
65 #else
60 #include <magick/magick.h> 66 #include <magick/magick.h>
67 #endif
61 /*#include <image.h>*/ 68 /*#include <image.h>*/
62 #include <assert.h> 69 /*#include <assert.h>*/
63 70
64 #define OLDCOMPAT /* allow lisp code using the old names to still function */ 71 #define OLDCOMPAT /* allow lisp code using the old names to still function */
65 #endif 72 #endif
66 73
67 #define LISP_DEVICE_TO_X_SCREEN(dev) \ 74 #define LISP_DEVICE_TO_X_SCREEN(dev) \
1097 1104
1098 GCPRO3 (name, retval, temp_buffer); 1105 GCPRO3 (name, retval, temp_buffer);
1099 1106
1100 specbind (Qinhibit_quit, Qt); 1107 specbind (Qinhibit_quit, Qt);
1101 set_buffer_internal (XBUFFER (temp_buffer)); 1108 set_buffer_internal (XBUFFER (temp_buffer));
1102 Ferase_buffer (Fcurrent_buffer ()); 1109 Ferase_buffer (Qnil);
1103 1110
1104 buffer_insert_c_string (current_buffer, "/* XPM */\r"); 1111 buffer_insert_c_string (current_buffer, "/* XPM */\r");
1105 buffer_insert_c_string (current_buffer, "static char *pixmap[] = {\r"); 1112 buffer_insert_c_string (current_buffer, "static char *pixmap[] = {\r");
1106 1113
1107 sscanf (data[0], "%d %d %d", &height, &width, &ncolors); 1114 sscanf (data[0], "%d %d %d", &height, &width, &ncolors);
1114 buffer_insert_c_string (current_buffer, "\",\r"); 1121 buffer_insert_c_string (current_buffer, "\",\r");
1115 else 1122 else
1116 buffer_insert_c_string (current_buffer, "\"};\r"); 1123 buffer_insert_c_string (current_buffer, "\"};\r");
1117 } 1124 }
1118 1125
1119 retval = Fbuffer_substring (Qnil, Qnil, Fcurrent_buffer ()); 1126 retval = Fbuffer_substring (Qnil, Qnil, Qnil);
1120 XpmFree (data); 1127 XpmFree (data);
1121 1128
1122 set_buffer_internal (old_buffer); 1129 set_buffer_internal (old_buffer);
1123 unbind_to (speccount, Qnil); 1130 unbind_to (speccount, Qnil);
1124 1131