Mercurial > emacs
changeset 65771:3b00e34812bb
(struct _XCharStruct): New member valid_p.
(STORE_XCHARSTRUCT): Set valid_p.
(struct MacFontStruct) [USE_ATSUI]: New member mac_style.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Sat, 01 Oct 2005 11:09:44 +0000 |
| parents | 9324b7187dd7 |
| children | 797dc38b416e |
| files | src/macgui.h |
| diffstat | 1 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macgui.h Sat Oct 01 11:09:09 2005 +0000 +++ b/src/macgui.h Sat Oct 01 11:09:44 2005 +0000 @@ -103,6 +103,7 @@ #if 0 unsigned short attributes; /* per char flags (not predefined) */ #endif + unsigned valid_p : 1; } XCharStruct; #define STORE_XCHARSTRUCT(xcs, w, bds) \ @@ -110,7 +111,8 @@ (xcs).lbearing = (bds).left, \ (xcs).rbearing = (bds).right, \ (xcs).ascent = -(bds).top, \ - (xcs).descent = (bds).bottom) + (xcs).descent = (bds).bottom, \ + (xcs).valid_p = 1) struct MacFontStruct { char *full_name; @@ -123,19 +125,9 @@ #else short mac_scriptcode; /* Mac OS script code for font used */ #endif - -#if 0 - SInt16 mFontNum; /* font number of font used in this window */ - short mScriptCode; /* Mac OS script code for font used */ - int mFontSize; /* size of font */ - Style mFontFace; /* plain, bold, italics, etc. */ - int mHeight; /* height of one line of text in pixels */ - int mWidth; /* width of one character in pixels */ - int mAscent; - int mDescent; - int mLeading; - char mTwoByte; /* true for two-byte font */ -#endif /* 0 */ +#if USE_ATSUI + ATSUStyle mac_style; /* NULL if QuickDraw Text is used */ +#endif /* from Xlib.h */ #if 0