From: Kenichi Handa <handa@m17n.org>
Date: Fri, 16 Jun 2006 12:11:19 +0000 (+0000)
Subject: (struct x_output): New member fontp.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~891
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e95dad7564e6034d2a227a637bbc97f5c5957f2c;p=emacs.git

(struct x_output): New member fontp.
(FRAME_FONT_OBJECT): New macro.
---

diff --git a/src/xterm.h b/src/xterm.h
index 1d1319fca31..411a7deea87 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -515,6 +515,10 @@ struct x_output
   /* Default ASCII font of this frame.  */
   XFontStruct *font;
 
+#ifdef USE_FONT_BACKEND
+  struct font *fontp;
+#endif	/* USE_FONT_BACKEND */
+
   /* The baseline offset of the default ASCII font.  */
   int baseline_offset;
 
@@ -704,6 +708,10 @@ enum
 #define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height)
 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.x->baseline_offset)
 
+#ifdef USE_FONT_BACKEND
+#define FRAME_FONT_OBJECT(f) ((f)->output_data.x->fontp)
+#endif	/* USE_FONT_BACKEND */
+
 /* This gives the x_display_info structure for the display F is on.  */
 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info)