diff options
| author | Jason Rumney | 2007-05-31 00:52:52 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-05-31 00:52:52 +0000 |
| commit | 47e420b58081680be9a4dd409bdbdee917bc5bd5 (patch) | |
| tree | 42971389eb01bc5c8f2756c964c341483f7789e9 /src/w32term.h | |
| parent | a1fe5c00611579c40e48c20eaf08360c4ed87a89 (diff) | |
| download | emacs-47e420b58081680be9a4dd409bdbdee917bc5bd5.tar.gz emacs-47e420b58081680be9a4dd409bdbdee917bc5bd5.zip | |
(w32_output_data) [USE_FONT_BACKEND]: Add fontp member.
(FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro from xterm.h.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/w32term.h b/src/w32term.h index 6a3f7267e25..52b6d9c9427 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -324,6 +324,10 @@ struct w32_output | |||
| 324 | /* Default ASCII font of this frame. */ | 324 | /* Default ASCII font of this frame. */ |
| 325 | XFontStruct *font; | 325 | XFontStruct *font; |
| 326 | 326 | ||
| 327 | #ifdef USE_FONT_BACKEND | ||
| 328 | struct font *fontp; | ||
| 329 | #endif /* USE_FONT_BACKEND */ | ||
| 330 | |||
| 327 | /* The baseline offset of the default ASCII font. */ | 331 | /* The baseline offset of the default ASCII font. */ |
| 328 | int baseline_offset; | 332 | int baseline_offset; |
| 329 | 333 | ||
| @@ -413,6 +417,10 @@ extern struct w32_output w32term_display; | |||
| 413 | #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset) | 417 | #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset) |
| 414 | #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset) | 418 | #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset) |
| 415 | 419 | ||
| 420 | #ifdef USE_FONT_BACKEND | ||
| 421 | #define FRAME_FONT_OBJECT(f) ((f)->output_data.w32->fontp) | ||
| 422 | #endif /* USE_FONT_BACKEND */ | ||
| 423 | |||
| 416 | /* This gives the w32_display_info structure for the display F is on. */ | 424 | /* This gives the w32_display_info structure for the display F is on. */ |
| 417 | #define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info) | 425 | #define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info) |
| 418 | #define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info) | 426 | #define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info) |