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.71 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.77 by ayin, Sat Jun 23 13:43:06 2007 UTC

… …
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 32
33using namespace std;
34
33extern "C" { 35extern "C" {
34#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */ 36#include <X11/Xlib.h>
37#include <X11/Xutil.h>
38#include <X11/Xresource.h>
35} 39}
36 40
37/* 41/*
38 * If we haven't pulled in typedef's like int16_t then do them ourself 42 * If we haven't pulled in typedef's like int16_t then do them ourself
39 * type of (normal and unsigned) basic sizes 43 * type of (normal and unsigned) basic sizes
… …
50 54
51struct rxvt_fontset; 55struct rxvt_fontset;
52struct rxvt_color; 56struct rxvt_color;
53struct rxvt_vars; /* defined later on */ 57struct rxvt_vars; /* defined later on */
54struct rxvt_term; 58struct rxvt_term;
55struct rxvt_display;
56struct rxvt_im; 59struct rxvt_im;
57struct rxvt_drawable; 60struct rxvt_drawable;
58 61
59typedef struct rxvt_term *rxvt_t; 62typedef struct rxvt_term *rxvt_t;
60 63
… …
183 wchar_t *text; /* selected text */ 186 wchar_t *text; /* selected text */
184 unsigned int len; /* length of selected text */ 187 unsigned int len; /* length of selected text */
185 unsigned int screen; /* screen being used */ 188 unsigned int screen; /* screen being used */
186 unsigned int clicks; /* number of clicks */ 189 unsigned int clicks; /* number of clicks */
187 selection_op_t op; /* current operation */ 190 selection_op_t op; /* current operation */
188 bool rect; /* rectangluar selection? */ 191 bool rect; /* rectangular selection? */
189 row_col_t beg; /* beginning of selection <= mark */ 192 row_col_t beg; /* beginning of selection <= mark */
190 row_col_t mark; /* point of initial click <= end */ 193 row_col_t mark; /* point of initial click <= end */
191 row_col_t end; /* one character past end point */ 194 row_col_t end; /* one character past end point */
192} selection_t; 195} selection_t;
193 196
… …
201#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 204#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
202#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 205#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
203 206
204/* rxvt_vars.options */ 207/* rxvt_vars.options */
205enum { 208enum {
206# define def(name,idx) Opt_ ## name = 1UL << (idx), 209# define def(name,idx) Opt_ ## name = idx,
207# define nodef(name) Opt_ ## name = 0, 210# define nodef(name) Opt_ ## name = 0,
208# include "optinc.h" 211# include "optinc.h"
209# undef nodef 212# undef nodef
210# undef def 213# undef def
214Opt_count
211}; 215};
212 216
213/* ------------------------------------------------------------------------- */ 217/* ------------------------------------------------------------------------- */
214 218
215typedef struct { 219typedef struct {
… …
230 void setDn() { state = 'D'; } 234 void setDn() { state = 'D'; }
231} scrollBar_t; 235} scrollBar_t;
232 236
233struct rxvt_vars : TermWin_t { 237struct rxvt_vars : TermWin_t {
234 scrollBar_t scrollBar; 238 scrollBar_t scrollBar;
235 uint32_t options; 239 uint8_t options[(Opt_count + 7) >> 3];
236 XSizeHints szHint; 240 XSizeHints szHint;
237 rxvt_display *display;
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;
242#endif 245#endif

Diff Legend

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