(struct _XCharStruct): New member valid_p.
(STORE_XCHARSTRUCT): Set valid_p. (struct MacFontStruct) [USE_ATSUI]: New member mac_style.
This commit is contained in:
parent
aa27f1e712
commit
04904a238e
1 changed files with 6 additions and 14 deletions
20
src/macgui.h
20
src/macgui.h
|
@ -103,6 +103,7 @@ typedef struct _XCharStruct
|
|||
#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 @@ typedef struct _XCharStruct
|
|||
(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 @@ struct MacFontStruct {
|
|||
#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
|
||||
|
|
Loading…
Add table
Reference in a new issue