ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtlib.h.in
(Generate patch)

Comparing rxvt-unicode/src/rxvtlib.h.in (file contents):
Revision 1.72 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.79 by ayin, Tue Dec 11 08:54:08 2007 UTC

… …
9@include_stdint_h@ 9@include_stdint_h@
10#include <sys/types.h> 10#include <sys/types.h>
11@include_unistd_h@ 11@include_unistd_h@
12@include_string_h@ 12@include_string_h@
13@include_fcntl_h@ 13@include_fcntl_h@
14@include_util_h@
15@include_assert_h@ 14@include_assert_h@
16@include_sys_ioctl_h@ 15@include_sys_ioctl_h@
17@include_sys_time_h@ 16@include_sys_time_h@
18@include_time_h@ 17@include_time_h@
19@include_sys_select_h@ 18@include_sys_select_h@
… …
28# include <wchar.h> 27# include <wchar.h>
29#else 28#else
30// stdlib.h might provide it 29// stdlib.h might provide it
31#endif 30#endif
32 31
32using namespace std;
33
33extern "C" { 34extern "C" {
34#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */ 35#include <X11/Xlib.h>
36#include <X11/Xutil.h>
37#include <X11/Xresource.h>
35} 38}
36 39
37/* 40/*
38 * If we haven't pulled in typedef's like int16_t then do them ourself 41 * If we haven't pulled in typedef's like int16_t then do them ourself
39 * type of (normal and unsigned) basic sizes 42 * type of (normal and unsigned) basic sizes
… …
97 * |························= row_buf[0] 100 * |························= row_buf[0]
98 * |························= row_buf[1] 101 * |························= row_buf[1]
99 * |························= row_buf[2] etc. 102 * |························= row_buf[2] etc.
100 * | 103 * |
101 * +------------+···········= term_start + top_row 104 * +------------+···········= term_start + top_row
102 * | scrollback | 105 * | scrollback |
103 * | scrollback +---------+·= term_start + view_start 106 * | scrollback +---------+·= term_start + view_start
104 * | scrollback | display | 107 * | scrollback | display |
105 * | scrollback | display | 108 * | scrollback | display |
106 * +------------+·display·+·= term_start 109 * +------------+·display·+·= term_start
107 * | terminal | display | 110 * | terminal | display |
… …
182 wchar_t *text; /* selected text */ 185 wchar_t *text; /* selected text */
183 unsigned int len; /* length of selected text */ 186 unsigned int len; /* length of selected text */
184 unsigned int screen; /* screen being used */ 187 unsigned int screen; /* screen being used */
185 unsigned int clicks; /* number of clicks */ 188 unsigned int clicks; /* number of clicks */
186 selection_op_t op; /* current operation */ 189 selection_op_t op; /* current operation */
187 bool rect; /* rectangluar selection? */ 190 bool rect; /* rectangular selection? */
188 row_col_t beg; /* beginning of selection <= mark */ 191 row_col_t beg; /* beginning of selection <= mark */
189 row_col_t mark; /* point of initial click <= end */ 192 row_col_t mark; /* point of initial click <= end */
190 row_col_t end; /* one character past end point */ 193 row_col_t end; /* one character past end point */
191} selection_t; 194} selection_t;
192 195
… …
200#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 203#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
201#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 204#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
202 205
203/* rxvt_vars.options */ 206/* rxvt_vars.options */
204enum { 207enum {
205# define def(name,idx) Opt_ ## name = 1UL << (idx), 208# define def(name,idx) Opt_ ## name = idx,
206# define nodef(name) Opt_ ## name = 0, 209# define nodef(name) Opt_ ## name = 0,
207# include "optinc.h" 210# include "optinc.h"
208# undef nodef 211# undef nodef
209# undef def 212# undef def
213Opt_count
210}; 214};
211 215
212/* ------------------------------------------------------------------------- */ 216/* ------------------------------------------------------------------------- */
213 217
214typedef struct { 218typedef struct {
… …
229 void setDn() { state = 'D'; } 233 void setDn() { state = 'D'; }
230} scrollBar_t; 234} scrollBar_t;
231 235
232struct rxvt_vars : TermWin_t { 236struct rxvt_vars : TermWin_t {
233 scrollBar_t scrollBar; 237 scrollBar_t scrollBar;
234 uint32_t options; 238 uint8_t options[(Opt_count + 7) >> 3];
235 XSizeHints szHint; 239 XSizeHints szHint;
236 rxvt_color *pix_colors; 240 rxvt_color *pix_colors;
237 rxvt_color *pix_colors_focused; 241 rxvt_color *pix_colors_focused;
238#ifdef OFF_FOCUS_FADING 242#ifdef OFF_FOCUS_FADING
239 rxvt_color *pix_colors_unfocused; 243 rxvt_color *pix_colors_unfocused;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines