… | |
… | |
29 | #else |
29 | #else |
30 | // stdlib.h might provide it |
30 | // stdlib.h might provide it |
31 | #endif |
31 | #endif |
32 | |
32 | |
33 | extern "C" { |
33 | extern "C" { |
34 | #include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */ |
34 | #include <X11/Xlib.h> |
|
|
35 | #include <X11/Xutil.h> |
|
|
36 | #include <X11/Xresource.h> |
35 | } |
37 | } |
36 | |
38 | |
37 | /* |
39 | /* |
38 | * If we haven't pulled in typedef's like int16_t then do them ourself |
40 | * If we haven't pulled in typedef's like int16_t then do them ourself |
39 | * type of (normal and unsigned) basic sizes |
41 | * type of (normal and unsigned) basic sizes |
… | |
… | |
50 | |
52 | |
51 | struct rxvt_fontset; |
53 | struct rxvt_fontset; |
52 | struct rxvt_color; |
54 | struct rxvt_color; |
53 | struct rxvt_vars; /* defined later on */ |
55 | struct rxvt_vars; /* defined later on */ |
54 | struct rxvt_term; |
56 | struct rxvt_term; |
55 | struct rxvt_display; |
|
|
56 | struct rxvt_im; |
57 | struct rxvt_im; |
57 | struct rxvt_drawable; |
58 | struct rxvt_drawable; |
58 | |
59 | |
59 | typedef struct rxvt_term *rxvt_t; |
60 | typedef struct rxvt_term *rxvt_t; |
60 | |
61 | |
… | |
… | |
232 | |
233 | |
233 | struct rxvt_vars : TermWin_t { |
234 | struct rxvt_vars : TermWin_t { |
234 | scrollBar_t scrollBar; |
235 | scrollBar_t scrollBar; |
235 | uint32_t options; |
236 | uint32_t options; |
236 | XSizeHints szHint; |
237 | XSizeHints szHint; |
237 | rxvt_display *display; |
|
|
238 | rxvt_color *pix_colors; |
238 | rxvt_color *pix_colors; |
239 | rxvt_color *pix_colors_focused; |
239 | rxvt_color *pix_colors_focused; |
240 | #ifdef OFF_FOCUS_FADING |
240 | #ifdef OFF_FOCUS_FADING |
241 | rxvt_color *pix_colors_unfocused; |
241 | rxvt_color *pix_colors_unfocused; |
242 | #endif |
242 | #endif |