[Emacs-diffs] Changes to emacs/src/macgui.h

[YAMAMOTO Mitsuharu]

Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.23 emacs/src/macgui.h:1.24
*** emacs/src/macgui.h:1.23     Wed Sep 28 08:15:24 2005
--- emacs/src/macgui.h  Sat Oct  1 11:09:44 2005
***************
*** 103,108 ****
--- 103,109 ----
  #if 0
    unsigned short attributes;  /* per char flags (not predefined) */
  #endif
+   unsigned valid_p : 1;
  } XCharStruct;
  
  #define STORE_XCHARSTRUCT(xcs, w, bds)                        \
***************
*** 110,116 ****
     (xcs).lbearing = (bds).left,                               \
     (xcs).rbearing = (bds).right,                      \
     (xcs).ascent = -(bds).top,                         \
!    (xcs).descent = (bds).bottom)
  
  struct MacFontStruct {
    char *full_name;
--- 111,118 ----
     (xcs).lbearing = (bds).left,                               \
     (xcs).rbearing = (bds).right,                      \
     (xcs).ascent = -(bds).top,                         \
!    (xcs).descent = (bds).bottom,                      \
!    (xcs).valid_p = 1)
  
  struct MacFontStruct {
    char *full_name;
***************
*** 123,141 ****
  #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 */
  
  /* from Xlib.h */
  #if 0
--- 125,133 ----
  #else
    short mac_scriptcode;  /* Mac OS script code for font used */
  #endif
! #if USE_ATSUI
!   ATSUStyle mac_style;                /* NULL if QuickDraw Text is used */
! #endif
  
  /* from Xlib.h */
  #if 0