# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1128164984 0
# Node ID 3b00e34812bb1cc69296872f5df826eedbcccc86
# Parent  9324b7187dd735f1a324d099d25cff79c21388f9
(struct _XCharStruct): New member valid_p.
(STORE_XCHARSTRUCT): Set valid_p.
(struct MacFontStruct) [USE_ATSUI]: New member mac_style.

diff -r 9324b7187dd7 -r 3b00e34812bb src/macgui.h
--- 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