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

[Jan Djärv]

Index: emacs/src/xterm.h
diff -c emacs/src/xterm.h:1.172 emacs/src/xterm.h:1.173
*** emacs/src/xterm.h:1.172     Sat Jan  8 16:49:14 2005
--- emacs/src/xterm.h   Sun Mar 20 22:28:55 2005
***************
*** 31,36 ****
--- 31,46 ----
  #include <X11/Xatom.h>
  #include <X11/Xresource.h>
  
+ #ifndef X_FONT_TYPE_DECL
+ #define X_FONT_TYPE_DECL
+ #ifdef HAVE_XFT
+ #include <X11/Xft/Xft.h>
+ typedef XftFont x_font_type;
+ #else
+ typedef XFontStruct x_font_type;
+ #endif
+ #endif /* not X_FONT_TYPE_DECL */
+ 
  #ifdef USE_X_TOOLKIT
  #include <X11/StringDefs.h>
  #include <X11/IntrinsicP.h>   /* CoreP.h needs this */
***************
*** 106,112 ****
--- 116,126 ----
  #define WHITE_PIX_DEFAULT(f) WhitePixel (FRAME_X_DISPLAY (f), \
                                         XScreenNumberOfScreen (FRAME_X_SCREEN 
(f)))
  
+ #ifdef HAVE_XFT
+ #define FONT_WIDTH(f) ((f)->max_advance_width)
+ #else
  #define FONT_WIDTH(f) ((f)->max_bounds.width)
+ #endif
  #define FONT_HEIGHT(f)        ((f)->ascent + (f)->descent)
  #define FONT_BASE(f)    ((f)->ascent)
  #define FONT_DESCENT(f) ((f)->descent)
***************
*** 512,518 ****
    int icon_bitmap;
  
    /* Default ASCII font of this frame.  */
!   XFontStruct *font;
  
    /* The baseline offset of the default ASCII font.  */
    int baseline_offset;
--- 526,532 ----
    int icon_bitmap;
  
    /* Default ASCII font of this frame.  */
!   x_font_type *font;
  
    /* The baseline offset of the default ASCII font.  */
    int baseline_offset;