(struct x_output): New member fontp.

(FRAME_FONT_OBJECT): New macro.

diff --git a/src/xterm.h b/src/xterm.h
index 1d1319fca3163c8eb8a7da11e8900fa1fdfa73d4..411a7deea872b68fa456cb138aeb0b4954bd26a9 100644 (file)
--- 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)