diff options
| author | Kenichi Handa | 2006-06-16 12:11:19 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-06-16 12:11:19 +0000 |
| commit | e95dad7564e6034d2a227a637bbc97f5c5957f2c (patch) | |
| tree | 346415f147148441cf64b88fe2485203ec44a967 /src | |
| parent | 8140317c7b62df97e16ae78d05d8abe7521952ef (diff) | |
| download | emacs-e95dad7564e6034d2a227a637bbc97f5c5957f2c.tar.gz emacs-e95dad7564e6034d2a227a637bbc97f5c5957f2c.zip | |
(struct x_output): New member fontp.
(FRAME_FONT_OBJECT): New macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.h | 8 |
1 files changed, 8 insertions, 0 deletions
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 | |||
| 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 | ||
| @@ -704,6 +708,10 @@ enum | |||
| 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) |
| 706 | 710 | ||
| 711 | #ifdef USE_FONT_BACKEND | ||
| 712 | #define FRAME_FONT_OBJECT(f) ((f)->output_data.x->fontp) | ||
| 713 | #endif /* USE_FONT_BACKEND */ | ||
| 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 | ||