Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 122:d2f30a177268 r20-1b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b14
author cvs
date Mon, 13 Aug 2007 09:26:03 +0200
parents cca96a509cfe
children 9b50b4588a93
comparison
equal deleted inserted replaced
121:419db647c998 122:d2f30a177268
102 DEFINE_IMAGE_INSTANTIATOR_FORMAT (cursor_font); 102 DEFINE_IMAGE_INSTANTIATOR_FORMAT (cursor_font);
103 Lisp_Object Qcursor_font; 103 Lisp_Object Qcursor_font;
104 104
105 DEFINE_IMAGE_INSTANTIATOR_FORMAT (font); 105 DEFINE_IMAGE_INSTANTIATOR_FORMAT (font);
106 106
107 DEFINE_IMAGE_INSTANTIATOR_FORMAT (automatic_conversion); 107 DEFINE_IMAGE_INSTANTIATOR_FORMAT (autodetect);
108 108
109 static void cursor_font_instantiate (Lisp_Object image_instance, 109 static void cursor_font_instantiate (Lisp_Object image_instance,
110 Lisp_Object instantiator, 110 Lisp_Object instantiator,
111 Lisp_Object pointer_fg, 111 Lisp_Object pointer_fg,
112 Lisp_Object pointer_bg, 112 Lisp_Object pointer_bg,
3113 3113
3114 #endif /* HAVE_XFACE */ 3114 #endif /* HAVE_XFACE */
3115 3115
3116 3116
3117 /********************************************************************** 3117 /**********************************************************************
3118 * Automatic_Conversion * 3118 * Autodetect *
3119 **********************************************************************/ 3119 **********************************************************************/
3120 3120
3121 static void 3121 static void
3122 automatic_conversion_validate (Lisp_Object instantiator) 3122 autodetect_validate (Lisp_Object instantiator)
3123 { 3123 {
3124 data_must_be_present (instantiator); 3124 data_must_be_present (instantiator);
3125 } 3125 }
3126 3126
3127 static Lisp_Object 3127 static Lisp_Object
3128 automatic_conversion_normalize (Lisp_Object instantiator, 3128 autodetect_normalize (Lisp_Object instantiator,
3129 Lisp_Object console_type) 3129 Lisp_Object console_type)
3130 { 3130 {
3131 Lisp_Object file = find_keyword_in_vector (instantiator, Q_data); 3131 Lisp_Object file = find_keyword_in_vector (instantiator, Q_data);
3132 Lisp_Object filename = Qnil; 3132 Lisp_Object filename = Qnil;
3133 Lisp_Object data = Qnil; 3133 Lisp_Object data = Qnil;
3197 /* If we couldn't convert it, just put it back as it is. 3197 /* If we couldn't convert it, just put it back as it is.
3198 We might try to further frob it later as a cursor-font 3198 We might try to further frob it later as a cursor-font
3199 specification. (We can't do that now because we don't know 3199 specification. (We can't do that now because we don't know
3200 what dest-types it's going to be instantiated into.) */ 3200 what dest-types it's going to be instantiated into.) */
3201 { 3201 {
3202 Lisp_Object result = alist_to_tagged_vector (Qautomatic_conversion, alist); 3202 Lisp_Object result = alist_to_tagged_vector (Qautodetect, alist);
3203 free_alist (alist); 3203 free_alist (alist);
3204 RETURN_UNGCPRO (result); 3204 RETURN_UNGCPRO (result);
3205 } 3205 }
3206 } 3206 }
3207 3207
3208 static int 3208 static int
3209 automatic_conversion_possible_dest_types (void) 3209 autodetect_possible_dest_types (void)
3210 { 3210 {
3211 return 3211 return
3212 IMAGE_MONO_PIXMAP_MASK | 3212 IMAGE_MONO_PIXMAP_MASK |
3213 IMAGE_COLOR_PIXMAP_MASK | 3213 IMAGE_COLOR_PIXMAP_MASK |
3214 IMAGE_POINTER_MASK | 3214 IMAGE_POINTER_MASK |
3215 IMAGE_TEXT_MASK; 3215 IMAGE_TEXT_MASK;
3216 } 3216 }
3217 3217
3218 static void 3218 static void
3219 automatic_conversion_instantiate (Lisp_Object image_instance, 3219 autodetect_instantiate (Lisp_Object image_instance,
3220 Lisp_Object instantiator, 3220 Lisp_Object instantiator,
3221 Lisp_Object pointer_fg, 3221 Lisp_Object pointer_fg,
3222 Lisp_Object pointer_bg, 3222 Lisp_Object pointer_bg,
3223 int dest_mask) 3223 int dest_mask)
3224 { 3224 {
3937 IIFORMAT_VALID_KEYWORD (xface, Q_hotspot_y, check_valid_int); 3937 IIFORMAT_VALID_KEYWORD (xface, Q_hotspot_y, check_valid_int);
3938 IIFORMAT_VALID_KEYWORD (xface, Q_foreground, check_valid_string); 3938 IIFORMAT_VALID_KEYWORD (xface, Q_foreground, check_valid_string);
3939 IIFORMAT_VALID_KEYWORD (xface, Q_background, check_valid_string); 3939 IIFORMAT_VALID_KEYWORD (xface, Q_background, check_valid_string);
3940 #endif 3940 #endif
3941 3941
3942 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (automatic_conversion, 3942 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (autodetect,
3943 "automatic-conversion"); 3943 "autodetect");
3944 3944
3945 IIFORMAT_HAS_METHOD (automatic_conversion, validate); 3945 IIFORMAT_HAS_METHOD (autodetect, validate);
3946 IIFORMAT_HAS_METHOD (automatic_conversion, normalize); 3946 IIFORMAT_HAS_METHOD (autodetect, normalize);
3947 IIFORMAT_HAS_METHOD (automatic_conversion, possible_dest_types); 3947 IIFORMAT_HAS_METHOD (autodetect, possible_dest_types);
3948 IIFORMAT_HAS_METHOD (automatic_conversion, instantiate); 3948 IIFORMAT_HAS_METHOD (autodetect, instantiate);
3949 3949
3950 IIFORMAT_VALID_KEYWORD (automatic_conversion, Q_data, check_valid_string); 3950 IIFORMAT_VALID_KEYWORD (autodetect, Q_data, check_valid_string);
3951 } 3951 }
3952 3952
3953 void 3953 void
3954 vars_of_glyphs_x (void) 3954 vars_of_glyphs_x (void)
3955 { 3955 {