comparison src/objects.h @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents e121b013d1f0
children 74fd4e045ea6
comparison
equal deleted inserted replaced
271:c7b7086b0a39 272:c5d627a313b1
42 #define COLOR_SPECIFIER_FACE(g) (COLOR_SPECIFIER_DATA (g)->face) 42 #define COLOR_SPECIFIER_FACE(g) (COLOR_SPECIFIER_DATA (g)->face)
43 #define COLOR_SPECIFIER_FACE_PROPERTY(g) \ 43 #define COLOR_SPECIFIER_FACE_PROPERTY(g) \
44 (COLOR_SPECIFIER_DATA (g)->face_property) 44 (COLOR_SPECIFIER_DATA (g)->face_property)
45 45
46 DECLARE_SPECIFIER_TYPE (color); 46 DECLARE_SPECIFIER_TYPE (color);
47 extern Lisp_Object Qcolor;
48 #define XCOLOR_SPECIFIER(x) XSPECIFIER_TYPE (x, color) 47 #define XCOLOR_SPECIFIER(x) XSPECIFIER_TYPE (x, color)
49 #define XSETCOLOR_SPECIFIER(x, p) XSETSPECIFIER_TYPE (x, p, color) 48 #define XSETCOLOR_SPECIFIER(x, p) XSETSPECIFIER_TYPE (x, p, color)
50 #define COLOR_SPECIFIERP(x) SPECIFIER_TYPEP (x, color) 49 #define COLOR_SPECIFIERP(x) SPECIFIER_TYPEP (x, color)
51 #define CHECK_COLOR_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, color) 50 #define CHECK_COLOR_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, color)
52 #define CONCHECK_COLOR_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, color) 51 #define CONCHECK_COLOR_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, color)
68 #define FONT_SPECIFIER_FACE(g) (FONT_SPECIFIER_DATA (g)->face) 67 #define FONT_SPECIFIER_FACE(g) (FONT_SPECIFIER_DATA (g)->face)
69 #define FONT_SPECIFIER_FACE_PROPERTY(g) \ 68 #define FONT_SPECIFIER_FACE_PROPERTY(g) \
70 (FONT_SPECIFIER_DATA (g)->face_property) 69 (FONT_SPECIFIER_DATA (g)->face_property)
71 70
72 DECLARE_SPECIFIER_TYPE (font); 71 DECLARE_SPECIFIER_TYPE (font);
73 extern Lisp_Object Qfont;
74 #define XFONT_SPECIFIER(x) XSPECIFIER_TYPE (x, font) 72 #define XFONT_SPECIFIER(x) XSPECIFIER_TYPE (x, font)
75 #define XSETFONT_SPECIFIER(x, p) XSETSPECIFIER_TYPE (x, p, font) 73 #define XSETFONT_SPECIFIER(x, p) XSETSPECIFIER_TYPE (x, p, font)
76 #define FONT_SPECIFIERP(x) SPECIFIER_TYPEP (x, font) 74 #define FONT_SPECIFIERP(x) SPECIFIER_TYPEP (x, font)
77 #define CHECK_FONT_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, font) 75 #define CHECK_FONT_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, font)
78 #define CONCHECK_FONT_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, font) 76 #define CONCHECK_FONT_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, font)
120 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) 118 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance)
121 #define GC_COLOR_INSTANCEP(x) GC_RECORDP (x, color_instance) 119 #define GC_COLOR_INSTANCEP(x) GC_RECORDP (x, color_instance)
122 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) 120 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance)
123 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) 121 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance)
124 122
125 Lisp_Object Fmake_color_instance (Lisp_Object name, Lisp_Object device, 123 EXFUN (Fmake_color_instance, 3);
126 Lisp_Object no_error);
127 Lisp_Object Fcolor_instance_p (Lisp_Object obj);
128 Lisp_Object Fcolor_instance_name (Lisp_Object obj);
129 124
130 extern Lisp_Object Vthe_null_color_instance; 125 extern Lisp_Object Vthe_null_color_instance;
131 126
132 struct Lisp_Color_Instance 127 struct Lisp_Color_Instance
133 { 128 {
159 CONST Bufbyte *nonreloc, 154 CONST Bufbyte *nonreloc,
160 Lisp_Object reloc, Bytecount offset, 155 Lisp_Object reloc, Bytecount offset,
161 Bytecount length); 156 Bytecount length);
162 #endif 157 #endif
163 158
164 Lisp_Object Fmake_font_instance (Lisp_Object name, Lisp_Object device, 159 EXFUN (Fmake_font_instance, 3);
165 Lisp_Object no_error); 160 EXFUN (Ffont_instance_name, 1);
166 Lisp_Object Ffont_instance_p (Lisp_Object obj); 161 EXFUN (Ffont_instance_p, 1);
167 Lisp_Object Ffont_instance_name (Lisp_Object obj); 162 EXFUN (Ffont_instance_truename, 1);
168 Lisp_Object Ffont_instance_truename (Lisp_Object obj);
169 163
170 extern Lisp_Object Vthe_null_font_instance; 164 extern Lisp_Object Vthe_null_font_instance;
171 165
172 struct Lisp_Font_Instance 166 struct Lisp_Font_Instance
173 { 167 {