Mercurial > hg > xemacs-beta
comparison src/objects.h @ 424:11054d720c21 r21-2-20
Import from CVS: tag r21-2-20
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:26:11 +0200 |
parents | 697ef44129c6 |
children |
comparison
equal
deleted
inserted
replaced
423:28d9c139be4c | 424:11054d720c21 |
---|---|
36 { | 36 { |
37 Lisp_Object face; /* face this is attached to, or nil */ | 37 Lisp_Object face; /* face this is attached to, or nil */ |
38 Lisp_Object face_property; /* property of that face */ | 38 Lisp_Object face_property; /* property of that face */ |
39 }; | 39 }; |
40 | 40 |
41 #define COLOR_SPECIFIER_DATA(g) (SPECIFIER_TYPE_DATA (g, color)) | 41 #define COLOR_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, color) |
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); |
61 { | 61 { |
62 Lisp_Object face; /* face this is attached to, or nil */ | 62 Lisp_Object face; /* face this is attached to, or nil */ |
63 Lisp_Object face_property; /* property of that face */ | 63 Lisp_Object face_property; /* property of that face */ |
64 }; | 64 }; |
65 | 65 |
66 #define FONT_SPECIFIER_DATA(g) (SPECIFIER_TYPE_DATA (g, font)) | 66 #define FONT_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, font) |
67 #define FONT_SPECIFIER_FACE(g) (FONT_SPECIFIER_DATA (g)->face) | 67 #define FONT_SPECIFIER_FACE(g) (FONT_SPECIFIER_DATA (g)->face) |
68 #define FONT_SPECIFIER_FACE_PROPERTY(g) \ | 68 #define FONT_SPECIFIER_FACE_PROPERTY(g) \ |
69 (FONT_SPECIFIER_DATA (g)->face_property) | 69 (FONT_SPECIFIER_DATA (g)->face_property) |
70 | 70 |
71 DECLARE_SPECIFIER_TYPE (font); | 71 DECLARE_SPECIFIER_TYPE (font); |
86 { | 86 { |
87 Lisp_Object face; /* face this is attached to, or nil */ | 87 Lisp_Object face; /* face this is attached to, or nil */ |
88 Lisp_Object face_property; /* property of that face */ | 88 Lisp_Object face_property; /* property of that face */ |
89 }; | 89 }; |
90 | 90 |
91 #define FACE_BOOLEAN_SPECIFIER_DATA(g) (SPECIFIER_TYPE_DATA (g, face_boolean)) | 91 #define FACE_BOOLEAN_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, face_boolean) |
92 #define FACE_BOOLEAN_SPECIFIER_FACE(g) (FACE_BOOLEAN_SPECIFIER_DATA (g)->face) | 92 #define FACE_BOOLEAN_SPECIFIER_FACE(g) (FACE_BOOLEAN_SPECIFIER_DATA (g)->face) |
93 #define FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY(g) \ | 93 #define FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY(g) \ |
94 (FACE_BOOLEAN_SPECIFIER_DATA (g)->face_property) | 94 (FACE_BOOLEAN_SPECIFIER_DATA (g)->face_property) |
95 | 95 |
96 DECLARE_SPECIFIER_TYPE (face_boolean); | 96 DECLARE_SPECIFIER_TYPE (face_boolean); |
114 DECLARE_LRECORD (color_instance, struct Lisp_Color_Instance); | 114 DECLARE_LRECORD (color_instance, struct Lisp_Color_Instance); |
115 #define XCOLOR_INSTANCE(x) \ | 115 #define XCOLOR_INSTANCE(x) \ |
116 XRECORD (x, color_instance, struct Lisp_Color_Instance) | 116 XRECORD (x, color_instance, struct Lisp_Color_Instance) |
117 #define XSETCOLOR_INSTANCE(x, p) XSETRECORD (x, p, color_instance) | 117 #define XSETCOLOR_INSTANCE(x, p) XSETRECORD (x, p, color_instance) |
118 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) | 118 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) |
119 #define GC_COLOR_INSTANCEP(x) GC_RECORDP (x, color_instance) | |
120 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) | 119 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) |
121 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) | 120 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) |
122 | 121 |
123 EXFUN (Fmake_color_instance, 3); | 122 EXFUN (Fmake_color_instance, 3); |
124 | 123 |
143 | 142 |
144 DECLARE_LRECORD (font_instance, struct Lisp_Font_Instance); | 143 DECLARE_LRECORD (font_instance, struct Lisp_Font_Instance); |
145 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, struct Lisp_Font_Instance) | 144 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, struct Lisp_Font_Instance) |
146 #define XSETFONT_INSTANCE(x, p) XSETRECORD (x, p, font_instance) | 145 #define XSETFONT_INSTANCE(x, p) XSETRECORD (x, p, font_instance) |
147 #define FONT_INSTANCEP(x) RECORDP (x, font_instance) | 146 #define FONT_INSTANCEP(x) RECORDP (x, font_instance) |
148 #define GC_FONT_INSTANCEP(x) GC_RECORDP (x, font_instance) | |
149 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) | 147 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) |
150 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) | 148 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) |
151 | 149 |
152 #ifdef MULE | 150 #ifdef MULE |
153 int font_spec_matches_charset (struct device *d, Lisp_Object charset, | 151 int font_spec_matches_charset (struct device *d, Lisp_Object charset, |