From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sat, 1 Oct 2005 11:09:44 +0000 (+0000)
Subject: (struct _XCharStruct): New member valid_p.
X-Git-Tag: emacs-pretest-22.0.90~6877
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04904a238eda88318e50c3d9b121ff492fb0cb72;p=emacs.git

(struct _XCharStruct): New member valid_p.
(STORE_XCHARSTRUCT): Set valid_p.
(struct MacFontStruct) [USE_ATSUI]: New member mac_style.
---

diff --git a/src/macgui.h b/src/macgui.h
index fc777de03ba..378dbcd9e5c 100644
--- a/src/macgui.h
+++ b/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