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.73 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.80 by ayin, Tue Dec 11 09:10:56 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@
… …
27#elif HAVE_WCHAR_H 26#elif HAVE_WCHAR_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
31
32using namespace std;
32 33
33extern "C" { 34extern "C" {
34#include <X11/Xlib.h> 35#include <X11/Xlib.h>
35#include <X11/Xutil.h> 36#include <X11/Xutil.h>
36#include <X11/Xresource.h> 37#include <X11/Xresource.h>
… …
43@rxvt_int16_typedef@ 44@rxvt_int16_typedef@
44@rxvt_uint16_typedef@ 45@rxvt_uint16_typedef@
45@rxvt_int32_typedef@ 46@rxvt_int32_typedef@
46@rxvt_uint32_typedef@ 47@rxvt_uint32_typedef@
47 48
48/* whatever normal size corresponds to a integer pointer */
49@rxvt_intp_define@
50/* whatever normal size corresponds to a unsigned integer pointer */
51@rxvt_u_intp_define@
52
53struct rxvt_fontset; 49struct rxvt_fontset;
54struct rxvt_color; 50struct rxvt_color;
55struct rxvt_vars; /* defined later on */ 51struct rxvt_vars; /* defined later on */
56struct rxvt_term; 52struct rxvt_term;
57struct rxvt_im; 53struct rxvt_im;
… …
99 * |························= row_buf[0] 95 * |························= row_buf[0]
100 * |························= row_buf[1] 96 * |························= row_buf[1]
101 * |························= row_buf[2] etc. 97 * |························= row_buf[2] etc.
102 * | 98 * |
103 * +------------+···········= term_start + top_row 99 * +------------+···········= term_start + top_row
104 * | scrollback | 100 * | scrollback |
105 * | scrollback +---------+·= term_start + view_start 101 * | scrollback +---------+·= term_start + view_start
106 * | scrollback | display | 102 * | scrollback | display |
107 * | scrollback | display | 103 * | scrollback | display |
108 * +------------+·display·+·= term_start 104 * +------------+·display·+·= term_start
109 * | terminal | display | 105 * | terminal | display |
… …
184 wchar_t *text; /* selected text */ 180 wchar_t *text; /* selected text */
185 unsigned int len; /* length of selected text */ 181 unsigned int len; /* length of selected text */
186 unsigned int screen; /* screen being used */ 182 unsigned int screen; /* screen being used */
187 unsigned int clicks; /* number of clicks */ 183 unsigned int clicks; /* number of clicks */
188 selection_op_t op; /* current operation */ 184 selection_op_t op; /* current operation */
189 bool rect; /* rectangluar selection? */ 185 bool rect; /* rectangular selection? */
190 row_col_t beg; /* beginning of selection <= mark */ 186 row_col_t beg; /* beginning of selection <= mark */
191 row_col_t mark; /* point of initial click <= end */ 187 row_col_t mark; /* point of initial click <= end */
192 row_col_t end; /* one character past end point */ 188 row_col_t end; /* one character past end point */
193} selection_t; 189} selection_t;
194 190
… …
202#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 198#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
203#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 199#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
204 200
205/* rxvt_vars.options */ 201/* rxvt_vars.options */
206enum { 202enum {
207# define def(name,idx) Opt_ ## name = 1UL << (idx), 203# define def(name,idx) Opt_ ## name = idx,
208# define nodef(name) Opt_ ## name = 0, 204# define nodef(name) Opt_ ## name = 0,
209# include "optinc.h" 205# include "optinc.h"
210# undef nodef 206# undef nodef
211# undef def 207# undef def
208Opt_count
212}; 209};
213 210
214/* ------------------------------------------------------------------------- */ 211/* ------------------------------------------------------------------------- */
215 212
216typedef struct { 213typedef struct {
… …
231 void setDn() { state = 'D'; } 228 void setDn() { state = 'D'; }
232} scrollBar_t; 229} scrollBar_t;
233 230
234struct rxvt_vars : TermWin_t { 231struct rxvt_vars : TermWin_t {
235 scrollBar_t scrollBar; 232 scrollBar_t scrollBar;
236 uint32_t options; 233 uint8_t options[(Opt_count + 7) >> 3];
237 XSizeHints szHint; 234 XSizeHints szHint;
238 rxvt_color *pix_colors; 235 rxvt_color *pix_colors;
239 rxvt_color *pix_colors_focused; 236 rxvt_color *pix_colors_focused;
240#ifdef OFF_FOCUS_FADING 237#ifdef OFF_FOCUS_FADING
241 rxvt_color *pix_colors_unfocused; 238 rxvt_color *pix_colors_unfocused;

Diff Legend

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