comparison src/xterm.h @ 91375:4bb19b57806d

Merge unicode branch Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1037
author Miles Bader <miles@gnu.org>
date Fri, 01 Feb 2008 16:01:31 +0000
parents 606f2d163a64
children bcad1e8fbfa2
comparison
equal deleted inserted replaced
88119:70ca9e418f5d 91375:4bb19b57806d
403 extern void select_visual P_ ((struct x_display_info *)); 403 extern void select_visual P_ ((struct x_display_info *));
404 extern struct font_info *x_get_font_info P_ ((struct frame *f, int)); 404 extern struct font_info *x_get_font_info P_ ((struct frame *f, int));
405 extern struct font_info *x_load_font P_ ((struct frame *, char *, int)); 405 extern struct font_info *x_load_font P_ ((struct frame *, char *, int));
406 extern struct font_info *x_query_font P_ ((struct frame *, char *)); 406 extern struct font_info *x_query_font P_ ((struct frame *, char *));
407 extern void x_find_ccl_program P_ ((struct font_info *)); 407 extern void x_find_ccl_program P_ ((struct font_info *));
408 extern Lisp_Object x_get_font_repertory P_ ((struct frame *,
409 struct font_info *));
410
408 411
409 /* Each X frame object points to its own struct x_output object 412 /* Each X frame object points to its own struct x_output object
410 in the output_data.x field. The x_output structure contains 413 in the output_data.x field. The x_output structure contains
411 the information that is specific to X windows. */ 414 the information that is specific to X windows. */
412 415
484 int icon_bitmap; 487 int icon_bitmap;
485 488
486 /* Default ASCII font of this frame. */ 489 /* Default ASCII font of this frame. */
487 XFontStruct *font; 490 XFontStruct *font;
488 491
492 #ifdef USE_FONT_BACKEND
493 struct font *fontp;
494 #endif /* USE_FONT_BACKEND */
495
489 /* The baseline offset of the default ASCII font. */ 496 /* The baseline offset of the default ASCII font. */
490 int baseline_offset; 497 int baseline_offset;
491 498
492 /* If a fontset is specified for this frame instead of font, this 499 /* If a fontset is specified for this frame instead of font, this
493 value contains an ID of the fontset, else -1. */ 500 value contains an ID of the fontset, else -1. */
670 #define FRAME_FONT(f) ((f)->output_data.x->font) 677 #define FRAME_FONT(f) ((f)->output_data.x->font)
671 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset) 678 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset)
672 #define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height) 679 #define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height)
673 #define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height) 680 #define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height)
674 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.x->baseline_offset) 681 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.x->baseline_offset)
682
683 #ifdef USE_FONT_BACKEND
684 #define FRAME_FONT_OBJECT(f) ((f)->output_data.x->fontp)
685 #endif /* USE_FONT_BACKEND */
675 686
676 /* This gives the x_display_info structure for the display F is on. */ 687 /* This gives the x_display_info structure for the display F is on. */
677 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info) 688 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info)
678 689
679 /* This is the `Display *' which frame F is on. */ 690 /* This is the `Display *' which frame F is on. */