Mercurial > emacs

comparison src/xterm.h @ 90459:81011b9fc603

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(struct x_output): New member fontp. (FRAME_FONT_OBJECT): New macro.
author Kenichi Handa <handa@m17n.org>
date Fri, 16 Jun 2006 12:11:19 +0000
parents a8190f7e546e
children 138027c8c982
comparison
equal deleted inserted replaced
90458:60db44f4be6a 90459:81011b9fc603
513 int icon_bitmap; 513 int icon_bitmap;
514 514
515 /* Default ASCII font of this frame. */ 515 /* Default ASCII font of this frame. */
516 XFontStruct *font; 516 XFontStruct *font;
517 517
518 #ifdef USE_FONT_BACKEND
519 struct font *fontp;
520 #endif /* USE_FONT_BACKEND */
521
518 /* The baseline offset of the default ASCII font. */ 522 /* The baseline offset of the default ASCII font. */
519 int baseline_offset; 523 int baseline_offset;
520 524
521 /* If a fontset is specified for this frame instead of font, this 525 /* If a fontset is specified for this frame instead of font, this
522 value contains an ID of the fontset, else -1. */ 526 value contains an ID of the fontset, else -1. */
701 #define FRAME_FONT(f) ((f)->output_data.x->font) 705 #define FRAME_FONT(f) ((f)->output_data.x->font)
702 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset) 706 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset)
703 #define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height) 707 #define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height)
704 #define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height) 708 #define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height)
705 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.x->baseline_offset) 709 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.x->baseline_offset)
710
711 #ifdef USE_FONT_BACKEND
712 #define FRAME_FONT_OBJECT(f) ((f)->output_data.x->fontp)
713 #endif /* USE_FONT_BACKEND */
706 714
707 /* This gives the x_display_info structure for the display F is on. */ 715 /* This gives the x_display_info structure for the display F is on. */
708 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info) 716 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info)
709 717
710 /* This is the `Display *' which frame F is on. */ 718 /* This is the `Display *' which frame F is on. */