comparison src/glyphs.h @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5
author cvs
date Mon, 13 Aug 2007 11:07:10 +0200
parents cc15677e0335
children bbff43aa5eb7
comparison
equal deleted inserted replaced
379:76b7d63099ad 380:8626e4521993
110 110
111 #define HAS_IIFORMAT_METH_P(mstruc, m) ((mstruc)->m##_method) 111 #define HAS_IIFORMAT_METH_P(mstruc, m) ((mstruc)->m##_method)
112 #define IIFORMAT_METH(mstruc, m, args) (((mstruc)->m##_method) args) 112 #define IIFORMAT_METH(mstruc, m, args) (((mstruc)->m##_method) args)
113 113
114 /* Call a void-returning specifier method, if it exists */ 114 /* Call a void-returning specifier method, if it exists */
115 #define MAYBE_IIFORMAT_METH(mstruc, m, args) \ 115 #define MAYBE_IIFORMAT_METH(mstruc, m, args) do { \
116 do { \ 116 struct image_instantiator_methods *maybe_iiformat_meth_mstruc = (mstruc); \
117 struct image_instantiator_methods *_maybe_iiformat_meth_mstruc = (mstruc); \ 117 if (HAS_IIFORMAT_METH_P (maybe_iiformat_meth_mstruc, m)) \
118 if (HAS_IIFORMAT_METH_P (_maybe_iiformat_meth_mstruc, m)) \ 118 IIFORMAT_METH (maybe_iiformat_meth_mstruc, m, args); \
119 IIFORMAT_METH (_maybe_iiformat_meth_mstruc, m, args); \
120 } while (0) 119 } while (0)
121 120
122 /* Call a specifier method, if it exists; otherwise return 121 /* Call a specifier method, if it exists; otherwise return
123 the specified value */ 122 the specified value */
124 123
183 Lisp_Object find_keyword_in_vector (Lisp_Object vector, 182 Lisp_Object find_keyword_in_vector (Lisp_Object vector,
184 Lisp_Object keyword); 183 Lisp_Object keyword);
185 Lisp_Object find_keyword_in_vector_or_given (Lisp_Object vector, 184 Lisp_Object find_keyword_in_vector_or_given (Lisp_Object vector,
186 Lisp_Object keyword, 185 Lisp_Object keyword,
187 Lisp_Object default_); 186 Lisp_Object default_);
188 Lisp_Object simple_image_type_normalize (Lisp_Object inst, 187 Lisp_Object simple_image_type_normalize (Lisp_Object inst,
189 Lisp_Object console_type, 188 Lisp_Object console_type,
190 Lisp_Object image_type_tag); 189 Lisp_Object image_type_tag);
191 Lisp_Object potential_pixmap_file_instantiator (Lisp_Object instantiator, 190 Lisp_Object potential_pixmap_file_instantiator (Lisp_Object instantiator,
192 Lisp_Object file_keyword, 191 Lisp_Object file_keyword,
193 Lisp_Object data_keyword, 192 Lisp_Object data_keyword,
401 Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid); 400 Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid);
402 #endif /* HAVE_XPM */ 401 #endif /* HAVE_XPM */
403 #ifdef HAVE_WINDOW_SYSTEM 402 #ifdef HAVE_WINDOW_SYSTEM
404 Lisp_Object bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot, 403 Lisp_Object bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot,
405 int ok_if_data_invalid); 404 int ok_if_data_invalid);
406 int read_bitmap_data_from_file (CONST char *filename, unsigned int *width, 405 int read_bitmap_data_from_file (CONST char *filename, unsigned int *width,
407 unsigned int *height, unsigned char **datap, 406 unsigned int *height, unsigned char **datap,
408 int *x_hot, int *y_hot); 407 int *x_hot, int *y_hot);
409 Lisp_Object xbm_mask_file_munging (Lisp_Object alist, Lisp_Object file, 408 Lisp_Object xbm_mask_file_munging (Lisp_Object alist, Lisp_Object file,
410 Lisp_Object mask_file, 409 Lisp_Object mask_file,
411 Lisp_Object console_type); 410 Lisp_Object console_type);
412 #endif 411 #endif
413 412
414 /************************************************************************/ 413 /************************************************************************/
415 /* Glyph Object */ 414 /* Glyph Object */