Mercurial > hg > xemacs-beta
comparison lwlib/xlwmenuP.h @ 3094:ad2f4ae9895b
[xemacs-hg @ 2005-11-26 11:45:47 by stephent]
Xft merge. <87k6ev4p8q.fsf@tleepslib.sk.tsukuba.ac.jp>
author | stephent |
---|---|
date | Sat, 26 Nov 2005 11:46:25 +0000 |
parents | 8de8e3f6228a |
children | 6aa26bef0527 |
comparison
equal
deleted
inserted
replaced
3093:769dc945b085 | 3094:ad2f4ae9895b |
---|---|
1 #ifndef INCLUDED_xlwmenuP_h_ | 1 #ifndef INCLUDED_xlwmenuP_h_ |
2 #define INCLUDED_xlwmenuP_h_ | 2 #define INCLUDED_xlwmenuP_h_ |
3 | 3 |
4 #include "xlwmenu.h" | 4 #include "xlwmenu.h" |
5 #include <X11/CoreP.h> | 5 #include <X11/CoreP.h> |
6 | |
7 #ifdef USE_XFT_MENUBARS | |
8 #include <X11/Xft/Xft.h> | |
9 #endif | |
10 | |
6 | 11 |
7 /* Elements in the stack arrays. */ | 12 /* Elements in the stack arrays. */ |
8 typedef struct _window_state | 13 typedef struct _window_state |
9 { | 14 { |
10 Window window; | 15 Window window; |
20 /* New fields for the XlwMenu widget instance record */ | 25 /* New fields for the XlwMenu widget instance record */ |
21 typedef struct _XlwMenu_part | 26 typedef struct _XlwMenu_part |
22 { | 27 { |
23 /* slots set by the resources */ | 28 /* slots set by the resources */ |
24 | 29 |
25 #ifdef NEED_MOTIF | 30 #if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS) |
26 XmFontList font_list; | 31 XmFontList font_list; |
27 XmFontList font_list_2; | 32 XmFontList font_list_2; |
28 XmFontList fallback_font_list; | 33 XmFontList fallback_font_list; |
29 #else | 34 #else |
30 XFontStruct * font; | 35 XFontStruct * font; |
36 #ifdef USE_XFT_MENUBARS | |
37 /* #### Fix naming convention here */ | |
38 String renderFontSpec; | |
39 XftFont *renderFont; | |
40 #endif | |
31 # ifdef USE_XFONTSET | 41 # ifdef USE_XFONTSET |
32 XFontSet font_set; | 42 XFontSet font_set; |
33 # endif | 43 # endif |
34 #endif | 44 #endif |
35 Dimension font_ascent, font_descent; /* extracted from font/fontlist */ | 45 Dimension font_ascent, font_descent; /* extracted from font/fontlist */ |
45 Dimension shadow_thickness; | 55 Dimension shadow_thickness; |
46 Dimension indicator_size; | 56 Dimension indicator_size; |
47 Pixel top_shadow_color; | 57 Pixel top_shadow_color; |
48 Pixel bottom_shadow_color; | 58 Pixel bottom_shadow_color; |
49 Pixel select_color; | 59 Pixel select_color; |
60 #ifdef USE_XFT_MENUBARS | |
61 #endif | |
50 Pixmap top_shadow_pixmap; | 62 Pixmap top_shadow_pixmap; |
51 Pixmap bottom_shadow_pixmap; | 63 Pixmap bottom_shadow_pixmap; |
52 Cursor cursor_shape; | 64 Cursor cursor_shape; |
53 XtCallbackList open; | 65 XtCallbackList open; |
54 XtCallbackList select; | 66 XtCallbackList select; |