… | |
… | |
27 | #elif HAVE_WCHAR_H |
27 | #elif HAVE_WCHAR_H |
28 | # include <wchar.h> |
28 | # include <wchar.h> |
29 | #else |
29 | #else |
30 | // stdlib.h might provide it |
30 | // stdlib.h might provide it |
31 | #endif |
31 | #endif |
|
|
32 | |
|
|
33 | using namespace std; |
32 | |
34 | |
33 | extern "C" { |
35 | extern "C" { |
34 | #include <X11/Xlib.h> |
36 | #include <X11/Xlib.h> |
35 | #include <X11/Xutil.h> |
37 | #include <X11/Xutil.h> |
36 | #include <X11/Xresource.h> |
38 | #include <X11/Xresource.h> |
… | |
… | |
202 | #define Screen_WrapNext (1<<4) /* need to wrap for next char? */ |
204 | #define Screen_WrapNext (1<<4) /* need to wrap for next char? */ |
203 | #define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) |
205 | #define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) |
204 | |
206 | |
205 | /* rxvt_vars.options */ |
207 | /* rxvt_vars.options */ |
206 | enum { |
208 | enum { |
207 | # define def(name,idx) Opt_ ## name = 1UL << (idx), |
209 | # define def(name,idx) Opt_ ## name = idx, |
208 | # define nodef(name) Opt_ ## name = 0, |
210 | # define nodef(name) Opt_ ## name = 0, |
209 | # include "optinc.h" |
211 | # include "optinc.h" |
210 | # undef nodef |
212 | # undef nodef |
211 | # undef def |
213 | # undef def |
|
|
214 | Opt_count |
212 | }; |
215 | }; |
213 | |
216 | |
214 | /* ------------------------------------------------------------------------- */ |
217 | /* ------------------------------------------------------------------------- */ |
215 | |
218 | |
216 | typedef struct { |
219 | typedef struct { |
… | |
… | |
231 | void setDn() { state = 'D'; } |
234 | void setDn() { state = 'D'; } |
232 | } scrollBar_t; |
235 | } scrollBar_t; |
233 | |
236 | |
234 | struct rxvt_vars : TermWin_t { |
237 | struct rxvt_vars : TermWin_t { |
235 | scrollBar_t scrollBar; |
238 | scrollBar_t scrollBar; |
236 | uint32_t options; |
239 | uint8_t options[(Opt_count + 7) >> 3]; |
237 | XSizeHints szHint; |
240 | XSizeHints szHint; |
238 | rxvt_color *pix_colors; |
241 | rxvt_color *pix_colors; |
239 | rxvt_color *pix_colors_focused; |
242 | rxvt_color *pix_colors_focused; |
240 | #ifdef OFF_FOCUS_FADING |
243 | #ifdef OFF_FOCUS_FADING |
241 | rxvt_color *pix_colors_unfocused; |
244 | rxvt_color *pix_colors_unfocused; |