Mercurial > hg > xemacs-beta
comparison src/objects-impl.h @ 3094:ad2f4ae9895b
[xemacs-hg @ 2005-11-26 11:45:47 by stephent]
Xft merge. <87k6ev4p8q.fsf@tleepslib.sk.tsukuba.ac.jp>
author | stephent |
---|---|
date | Sat, 26 Nov 2005 11:46:25 +0000 |
parents | 1e7cc382eb16 |
children | 5502045ec510 d1247f3cc363 |
comparison
equal
deleted
inserted
replaced
3093:769dc945b085 | 3094:ad2f4ae9895b |
---|---|
123 Lisp_Object name; /* the instantiator used to create the font instance */ | 123 Lisp_Object name; /* the instantiator used to create the font instance */ |
124 Lisp_Object truename; /* used by the device-specific methods; we need to | 124 Lisp_Object truename; /* used by the device-specific methods; we need to |
125 call them to get the truename (#### in reality, | 125 call them to get the truename (#### in reality, |
126 they all probably just store the truename here | 126 they all probably just store the truename here |
127 if they know it, and nil otherwise; we should | 127 if they know it, and nil otherwise; we should |
128 check this and enforce it as a general policy) */ | 128 check this and enforce it as a general policy |
129 X and GTK do this, except that when they don't | |
130 know they return NAME and don't update TRUENAME. | |
131 MS Windows initializes TRUENAME when the font is | |
132 initialized. TTY doesn't do truename.) */ | |
129 Lisp_Object device; | 133 Lisp_Object device; |
134 Lisp_Object charset; /* Mule charset, or whatever */ | |
130 | 135 |
131 /* See comment in struct console about console variants. */ | 136 /* See comment in struct console about console variants. */ |
132 enum console_variant font_instance_type; | 137 enum console_variant font_instance_type; |
133 | 138 |
134 unsigned short ascent; /* extracted from `font', or made up */ | 139 unsigned short ascent; /* extracted from `font', or made up */ |
140 /* console-type-specific data */ | 145 /* console-type-specific data */ |
141 void *data; | 146 void *data; |
142 }; | 147 }; |
143 | 148 |
144 #define FONT_INSTANCE_NAME(f) ((f)->name) | 149 #define FONT_INSTANCE_NAME(f) ((f)->name) |
145 #define FONT_INSTANCE_TRUENAME(f) ((f)->name) | 150 #define FONT_INSTANCE_TRUENAME(f) ((f)->truename) |
151 #define FONT_INSTANCE_CHARSET(f) ((f)->charset) | |
146 #define FONT_INSTANCE_DEVICE(f) ((f)->device) | 152 #define FONT_INSTANCE_DEVICE(f) ((f)->device) |
147 #define FONT_INSTANCE_ASCENT(f) ((f)->ascent) | 153 #define FONT_INSTANCE_ASCENT(f) ((f)->ascent) |
148 #define FONT_INSTANCE_DESCENT(f) ((f)->descent) | 154 #define FONT_INSTANCE_DESCENT(f) ((f)->descent) |
149 #define FONT_INSTANCE_WIDTH(f) ((f)->width) | 155 #define FONT_INSTANCE_WIDTH(f) ((f)->width) |
150 #define FONT_INSTANCE_HEIGHT(f) ((f)->height) | 156 #define FONT_INSTANCE_HEIGHT(f) ((f)->height) |
151 | 157 |
152 #define XFONT_INSTANCE_NAME(f) FONT_INSTANCE_NAME (XFONT_INSTANCE (f)) | 158 #define XFONT_INSTANCE_NAME(f) FONT_INSTANCE_NAME (XFONT_INSTANCE (f)) |
153 #define XFONT_INSTANCE_TRUENAME(f) FONT_INSTANCE_TRUENAME (XFONT_INSTANCE (f)) | 159 #define XFONT_INSTANCE_TRUENAME(f) FONT_INSTANCE_TRUENAME (XFONT_INSTANCE (f)) |
160 #define XFONT_INSTANCE_CHARSET(f) FONT_INSTANCE_CHARSET (XFONT_INSTANCE (f)) | |
154 #define XFONT_INSTANCE_DEVICE(f) FONT_INSTANCE_DEVICE (XFONT_INSTANCE (f)) | 161 #define XFONT_INSTANCE_DEVICE(f) FONT_INSTANCE_DEVICE (XFONT_INSTANCE (f)) |
155 #define XFONT_INSTANCE_ASCENT(f) FONT_INSTANCE_ASCENT (XFONT_INSTANCE (f)) | 162 #define XFONT_INSTANCE_ASCENT(f) FONT_INSTANCE_ASCENT (XFONT_INSTANCE (f)) |
156 #define XFONT_INSTANCE_DESCENT(f) FONT_INSTANCE_DESCENT (XFONT_INSTANCE (f)) | 163 #define XFONT_INSTANCE_DESCENT(f) FONT_INSTANCE_DESCENT (XFONT_INSTANCE (f)) |
157 #define XFONT_INSTANCE_WIDTH(f) FONT_INSTANCE_WIDTH (XFONT_INSTANCE (f)) | 164 #define XFONT_INSTANCE_WIDTH(f) FONT_INSTANCE_WIDTH (XFONT_INSTANCE (f)) |
158 #define XFONT_INSTANCE_HEIGHT(f) FONT_INSTANCE_HEIGHT (XFONT_INSTANCE (f)) | 165 #define XFONT_INSTANCE_HEIGHT(f) FONT_INSTANCE_HEIGHT (XFONT_INSTANCE (f)) |