Mercurial > hg > xemacs-beta
comparison src/glyphs.c @ 284:558f606b08ae r21-0b40
Import from CVS: tag r21-0b40
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:34:13 +0200 |
parents | 7df0dd720c89 |
children | e11d67e05968 |
comparison
equal
deleted
inserted
replaced
283:fa3d41851a08 | 284:558f606b08ae |
---|---|
140 valid_image_instantiator_format_p (Lisp_Object format) | 140 valid_image_instantiator_format_p (Lisp_Object format) |
141 { | 141 { |
142 return (decode_image_instantiator_format (format, ERROR_ME_NOT) != 0); | 142 return (decode_image_instantiator_format (format, ERROR_ME_NOT) != 0); |
143 } | 143 } |
144 | 144 |
145 DEFUN ("valid-image-instantiator-format-p", | 145 DEFUN ("valid-image-instantiator-format-p", Fvalid_image_instantiator_format_p, |
146 Fvalid_image_instantiator_format_p, 1, 1, 0, /* | 146 1, 1, 0, /* |
147 Given an IMAGE-INSTANTIATOR-FORMAT, return non-nil if it is valid. | 147 Given an IMAGE-INSTANTIATOR-FORMAT, return non-nil if it is valid. |
148 Valid formats are some subset of 'nothing, 'string, 'formatted-string, | 148 Valid formats are some subset of 'nothing, 'string, 'formatted-string, |
149 'xpm, 'xbm, 'xface, 'gif, 'jpeg, 'png, 'tiff, 'cursor-font, 'font, | 149 'xpm, 'xbm, 'xface, 'gif, 'jpeg, 'png, 'tiff, 'cursor-font, 'font, |
150 'autodetect, and 'subwindow, depending on how XEmacs was compiled. | 150 'autodetect, and 'subwindow, depending on how XEmacs was compiled. |
151 */ | 151 */ |
153 { | 153 { |
154 return valid_image_instantiator_format_p (image_instantiator_format) ? | 154 return valid_image_instantiator_format_p (image_instantiator_format) ? |
155 Qt : Qnil; | 155 Qt : Qnil; |
156 } | 156 } |
157 | 157 |
158 DEFUN ("image-instantiator-format-list", | 158 DEFUN ("image-instantiator-format-list", Fimage_instantiator_format_list, |
159 Fimage_instantiator_format_list, 0, 0, 0, /* | 159 0, 0, 0, /* |
160 Return a list of valid image-instantiator formats. | 160 Return a list of valid image-instantiator formats. |
161 */ | 161 */ |
162 ()) | 162 ()) |
163 { | 163 { |
164 return Fcopy_sequence (Vimage_instantiator_format_list); | 164 return Fcopy_sequence (Vimage_instantiator_format_list); |
182 get_image_conversion_list (Lisp_Object console_type) | 182 get_image_conversion_list (Lisp_Object console_type) |
183 { | 183 { |
184 return &decode_console_type (console_type, ERROR_ME)->image_conversion_list; | 184 return &decode_console_type (console_type, ERROR_ME)->image_conversion_list; |
185 } | 185 } |
186 | 186 |
187 DEFUN ("set-console-type-image-conversion-list", | 187 DEFUN ("set-console-type-image-conversion-list", Fset_console_type_image_conversion_list, |
188 Fset_console_type_image_conversion_list, 2, 2, 0, /* | 188 2, 2, 0, /* |
189 Set the image-conversion-list for consoles of the given TYPE. | 189 Set the image-conversion-list for consoles of the given TYPE. |
190 The image-conversion-list specifies how image instantiators that | 190 The image-conversion-list specifies how image instantiators that |
191 are strings should be interpreted. Each element of the list should be | 191 are strings should be interpreted. Each element of the list should be |
192 a list of two elements (a regular expression string and a vector) or | 192 a list of two elements (a regular expression string and a vector) or |
193 a list of three elements (the preceding two plus an integer index into | 193 a list of three elements (the preceding two plus an integer index into |
250 | 250 |
251 *imlist = Fcopy_tree (list, Qt); | 251 *imlist = Fcopy_tree (list, Qt); |
252 return list; | 252 return list; |
253 } | 253 } |
254 | 254 |
255 DEFUN ("console-type-image-conversion-list", | 255 DEFUN ("console-type-image-conversion-list", Fconsole_type_image_conversion_list, |
256 Fconsole_type_image_conversion_list, 1, 1, 0, /* | 256 1, 1, 0, /* |
257 Return the image-conversion-list for devices of the given TYPE. | 257 Return the image-conversion-list for devices of the given TYPE. |
258 The image-conversion-list specifies how to interpret image string | 258 The image-conversion-list specifies how to interpret image string |
259 instantiators for the specified console type. See | 259 instantiators for the specified console type. See |
260 `set-console-type-image-conversion-list' for a description of its syntax. | 260 `set-console-type-image-conversion-list' for a description of its syntax. |
261 */ | 261 */ |
3141 IIFORMAT_HAS_METHOD (xpm, instantiate); | 3141 IIFORMAT_HAS_METHOD (xpm, instantiate); |
3142 | 3142 |
3143 IIFORMAT_VALID_KEYWORD (xpm, Q_data, check_valid_string); | 3143 IIFORMAT_VALID_KEYWORD (xpm, Q_data, check_valid_string); |
3144 IIFORMAT_VALID_KEYWORD (xpm, Q_file, check_valid_string); | 3144 IIFORMAT_VALID_KEYWORD (xpm, Q_file, check_valid_string); |
3145 IIFORMAT_VALID_KEYWORD (xpm, Q_color_symbols, check_valid_xpm_color_symbols); | 3145 IIFORMAT_VALID_KEYWORD (xpm, Q_color_symbols, check_valid_xpm_color_symbols); |
3146 #endif | 3146 #endif /* HAVE_XPM */ |
3147 } | 3147 } |
3148 | 3148 |
3149 void | 3149 void |
3150 vars_of_glyphs (void) | 3150 vars_of_glyphs (void) |
3151 { | 3151 { |
3205 | 3205 |
3206 The default value of this variable defines the logical color names | 3206 The default value of this variable defines the logical color names |
3207 \"foreground\" and \"background\" to be the colors of the `default' face. | 3207 \"foreground\" and \"background\" to be the colors of the `default' face. |
3208 */ ); | 3208 */ ); |
3209 Vxpm_color_symbols = Qnil; /* initialized in x-faces.el */ | 3209 Vxpm_color_symbols = Qnil; /* initialized in x-faces.el */ |
3210 #endif | 3210 #endif /* HAVE_XPM */ |
3211 } | 3211 } |
3212 | 3212 |
3213 void | 3213 void |
3214 specifier_vars_of_glyphs (void) | 3214 specifier_vars_of_glyphs (void) |
3215 { | 3215 { |