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.17 by pcg, Sun Mar 14 23:14:39 2004 UTC vs.
Revision 1.41 by root, Tue Aug 31 07:55:15 2004 UTC

… …
22#include <sys/wait.h> 22#include <sys/wait.h>
23#include <sys/stat.h> 23#include <sys/stat.h>
24 24
25#include <cwchar> 25#include <cwchar>
26 26
27#include "ptytty.h"
28
27extern "C" { 29extern "C" {
28#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */ 30#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */
29} 31}
30 32
31/* 33/*
… …
59 61
60#define scrollbar_visible() scrollBar.state 62#define scrollbar_visible() scrollBar.state
61#define menubar_visible() menuBar.state 63#define menubar_visible() menuBar.state
62 64
63typedef struct { 65typedef struct {
64 int32_t row; 66 int row;
65 int32_t col; 67 int col;
66} row_col_t; 68} row_col_t;
67 69
68#if UNICODE_3 70#if UNICODE_3
69typedef uint32_t text_t; 71typedef uint32_t text_t;
70#else 72#else
… …
82 * nscrolled : 0 <= nscrolled <= saveLines 84 * nscrolled : 0 <= nscrolled <= saveLines
83 * view_start: 0 <= view_start <= nscrolled 85 * view_start: 0 <= view_start <= nscrolled
84 */ 86 */
85 87
86typedef struct { 88typedef struct {
87 uint16_t width; /* window width [pixels] */ 89 int width; /* window width [pixels] */
88 uint16_t height; /* window height [pixels] */ 90 int height; /* window height [pixels] */
89 uint16_t fwidth; /* font width [pixels] */ 91 int fwidth; /* font width [pixels] */
90 uint16_t fheight; /* font height [pixels] */ 92 int fheight; /* font height [pixels] */
93 int fweight, fslant;
91 uint16_t fbase; /* font ascent (baseline) [pixels] */ 94 int fbase; /* font ascent (baseline) [pixels] */
92 uint16_t propfont; /* font proportional flags */
93 uint16_t ncol; /* window columns [characters] */ 95 int ncol; /* window columns [characters] */
94 uint16_t nrow; /* window rows [characters] */ 96 int nrow; /* window rows [characters] */
95 uint16_t focus; /* window has focus */ 97 int focus; /* window has focus */
96 uint16_t mapped; /* window state mapped? */ 98 int mapped; /* window state mapped? */
97 uint16_t int_bwidth; /* internal border width */ 99 int int_bwidth; /* internal border width */
98 uint16_t ext_bwidth; /* external border width */ 100 int ext_bwidth; /* external border width */
99 uint16_t lineSpace; /* number of extra pixels between rows */ 101 int lineSpace; /* number of extra pixels between rows */
100 uint16_t saveLines; /* number of lines that fit in scrollback */ 102 int saveLines; /* number of lines that fit in scrollback */
101 uint16_t nscrolled; /* number of line actually scrolled */ 103 int nscrolled; /* number of line actually scrolled */
102 uint16_t view_start; /* scrollback view starts here */ 104 int view_start; /* scrollback view starts here */
103 Window parent[6]; /* parent identifiers - we're parent[0] */ 105 Window parent[6]; /* parent identifiers - we're parent[0] */
104 Window vt; /* vt100 window */ 106 Window vt; /* vt100 window */
105 GC gc; /* GC for drawing */ 107 GC gc; /* GC for drawing */
106 Pixmap pixmap; 108 Pixmap pixmap;
107 rxvt_fontset *fontset;
108 rxvt_drawable *drawable; 109 rxvt_drawable *drawable;
110 rxvt_fontset *fontset[4];
109} TermWin_t; 111} TermWin_t;
110 112
111/* 113/*
112 * screen accounting: 114 * screen accounting:
113 * screen_t elements 115 * screen_t elements
… …
140typedef struct { 142typedef struct {
141 int16_t *tlen; /* length of each text line */ 143 int16_t *tlen; /* length of each text line */
142 text_t **text; /* _all_ the text */ 144 text_t **text; /* _all_ the text */
143 rend_t **rend; /* rendition, uses RS_ flags */ 145 rend_t **rend; /* rendition, uses RS_ flags */
144 row_col_t cur; /* cursor position on the screen */ 146 row_col_t cur; /* cursor position on the screen */
145 uint16_t tscroll; /* top of settable scroll region */ 147 unsigned int tscroll; /* top of settable scroll region */
146 uint16_t bscroll; /* bottom of settable scroll region */ 148 unsigned int bscroll; /* bottom of settable scroll region */
147 uint16_t charset; /* character set number [0..3] */ 149 unsigned int charset; /* character set number [0..3] */
148 unsigned int flags; /* see below */ 150 unsigned int flags; /* see below */
149 row_col_t s_cur; /* saved cursor position */ 151 row_col_t s_cur; /* saved cursor position */
150 uint16_t s_charset; /* saved character set number [0..3] */ 152 unsigned int s_charset; /* saved character set number [0..3] */
151 char s_charset_char; 153 char s_charset_char;
152 rend_t s_rstyle; /* saved rendition style */ 154 rend_t s_rstyle; /* saved rendition style */
153} screen_t; 155} screen_t;
154 156
155enum selection_op_t { 157enum selection_op_t {
… …
159 SELECTION_CONT, /* continued selection */ 161 SELECTION_CONT, /* continued selection */
160 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 162 SELECTION_DONE /* selection put in CUT_BUFFER0 */
161}; 163};
162 164
163typedef struct { 165typedef struct {
164 wchar_t *text; /* selected text */ 166 wchar_t *text; /* selected text */
165 uint32_t len; /* length of selected text */ 167 unsigned int len; /* length of selected text */
166 short screen; /* screen being used */ 168 unsigned int screen; /* screen being used */
167 short clicks; /* number of clicks */ 169 unsigned int clicks; /* number of clicks */
168 selection_op_t op; /* current operation */ 170 selection_op_t op; /* current operation */
171 bool rect; /* rectangluar selection? */
169 row_col_t beg; /* beginning of selection <= mark */ 172 row_col_t beg; /* beginning of selection <= mark */
170 row_col_t mark; /* point of initial click <= end */ 173 row_col_t mark; /* point of initial click <= end */
171 row_col_t end; /* one character past end point */ 174 row_col_t end; /* one character past end point */
172} selection_t; 175} selection_t;
173 176
174/* ------------------------------------------------------------------------- */ 177/* ------------------------------------------------------------------------- */
175 178
176/* screen_t flags */ 179/* screen_t flags */
… …
179#define Screen_Autowrap (1<<2) /* auto-wrap flag */ 182#define Screen_Autowrap (1<<2) /* auto-wrap flag */
180#define Screen_Insert (1<<3) /* insert mode (vs. overstrike) */ 183#define Screen_Insert (1<<3) /* insert mode (vs. overstrike) */
181#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 184#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
182#define Screen_DefaultFlags (Screen_VisibleCursor|Screen_Autowrap) 185#define Screen_DefaultFlags (Screen_VisibleCursor|Screen_Autowrap)
183 186
184/* rxvt_vars.Options */ 187/* rxvt_vars.options */
185#define Opt_console (1LU<<0) 188#define Opt_console (1UL<<0)
186#define Opt_loginShell (1LU<<1) 189#define Opt_loginShell (1UL<<1)
187#define Opt_iconic (1LU<<2) 190#define Opt_iconic (1UL<<2)
188#define Opt_visualBell (1LU<<3) 191#define Opt_visualBell (1UL<<3)
189#define Opt_mapAlert (1LU<<4) 192#define Opt_mapAlert (1UL<<4)
190#define Opt_reverseVideo (1LU<<5) 193#define Opt_reverseVideo (1UL<<5)
191#define Opt_utmpInhibit (1LU<<6) 194#define Opt_utmpInhibit (1UL<<6)
192#define Opt_scrollBar (1LU<<7) 195#define Opt_scrollBar (1UL<<7)
193#define Opt_scrollBar_right (1LU<<8) 196#define Opt_scrollBar_right (1UL<<8)
194#define Opt_scrollBar_floating (1LU<<9) 197#define Opt_scrollBar_floating (1UL<<9)
195#define Opt_meta8 (1LU<<10) 198#define Opt_meta8 (1UL<<10)
196#define Opt_scrollTtyOutput (1LU<<11) 199#define Opt_scrollTtyOutput (1UL<<11)
197#define Opt_scrollTtyKeypress (1LU<<12) 200#define Opt_scrollTtyKeypress (1UL<<12)
198#define Opt_transparent (1LU<<13) 201#define Opt_transparent (1UL<<13)
199#define Opt_transparent_all (1LU<<14) 202#define Opt_transparent_all (1UL<<14)
200#define Opt_15 (1LU<<15) // UNALLOCATED
201#define Opt_tripleclickwords (1LU<<16) 203#define Opt_tripleclickwords (1UL<<15)
202#define Opt_scrollWithBuffer (1LU<<17) 204#define Opt_scrollWithBuffer (1UL<<16)
203#define Opt_jumpScroll (1LU<<18) 205#define Opt_jumpScroll (1UL<<17)
204#define Opt_mouseWheelScrollPage (1LU<<19) 206#define Opt_mouseWheelScrollPage (1UL<<18)
205#define Opt_pointerBlank (1LU<<20) 207#define Opt_pointerBlank (1UL<<19)
206#define Opt_cursorBlink (1LU<<21) 208#define Opt_cursorBlink (1UL<<20)
209#define Opt_secondaryScreen (1UL<<21)
210#define Opt_secondaryScroll (1UL<<22)
211#if ENABLE_FRILLS
212# define Opt_insecure (1UL<<23) // insecure esc sequences
213# define Opt_borderLess (1UL<<24) // mem borderless hints
214#else
215# define Opt_insecure 0
216# define Opt_borderLess 0
217#endif
207/* place holder used for parsing command-line options */ 218/* place holder used for parsing command-line options */
208#define Opt_Reverse (1LU<<30) 219#define Opt_Reverse (1UL<<30)
209#define Opt_Boolean (1LU<<31) 220#define Opt_Boolean (1UL<<31)
210 221
211#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 222#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput | \
212 | Opt_jumpScroll) 223 Opt_jumpScroll | Opt_secondaryScreen)
213 224
214/* ------------------------------------------------------------------------- */ 225/* ------------------------------------------------------------------------- */
215 226
216typedef struct { 227typedef struct {
217 short state; 228 short state;
… …
220} menuBar_t; 231} menuBar_t;
221 232
222typedef struct { 233typedef struct {
223 char state; /* scrollbar state */ 234 char state; /* scrollbar state */
224 char init; /* scrollbar has been initialised */ 235 char init; /* scrollbar has been initialised */
225 short beg; /* slider sub-window begin height */ 236 unsigned int beg; /* slider sub-window begin height */
226 short end; /* slider sub-window end height */ 237 unsigned int end; /* slider sub-window end height */
227 short top; /* slider top position */ 238 unsigned int top; /* slider top position */
228 short bot; /* slider bottom position */ 239 unsigned int bot; /* slider bottom position */
229 short style; /* style: rxvt, xterm, next */ 240 unsigned int style; /* style: rxvt, xterm, next */
230 short width; /* scrollbar width */ 241 unsigned int width; /* scrollbar width */
231 Window win; 242 Window win;
232 int (rxvt_term::*update)(int, int, int, int); 243 int (rxvt_term::*update)(int, int, int, int);
233 244
234 void setIdle() { state = 1 ; } 245 void setIdle() { state = 1 ; }
235 void setMotion() { state = 'm'; } 246 void setMotion() { state = 'm'; }
… …
239 250
240struct rxvt_vars { 251struct rxvt_vars {
241 TermWin_t TermWin; 252 TermWin_t TermWin;
242 scrollBar_t scrollBar; 253 scrollBar_t scrollBar;
243 menuBar_t menuBar; 254 menuBar_t menuBar;
244 unsigned long Options; 255 unsigned long options;
245 XSizeHints szHint; 256 XSizeHints szHint;
246 rxvt_display *display; 257 rxvt_display *display;
247 rxvt_color *PixColors; 258 rxvt_color *pix_colors;
259 rxvt_color *pix_colors_focused;
260#ifdef OFF_FOCUS_FADING
261 rxvt_color *pix_colors_unfocused;
262#endif
248 short numPixColors; 263 short numpix_colors;
249 Cursor TermWin_cursor; /* cursor for vt window */ 264 Cursor TermWin_cursor; /* cursor for vt window */
250 int sb_shadow; /* scrollbar shadow width */ 265 int sb_shadow; /* scrollbar shadow width */
251 int cmd_fd; /* pty file descriptor; connected to command */ 266 rxvt_ptytty pty;
252 int tty_fd; /* tty file descriptor; connected to child */
253 int numlock_state; 267 int numlock_state;
254 text_t **drawn_text; /* text drawn on screen (characters) */ 268 text_t **drawn_text; /* text drawn on screen (characters) */
255 rend_t **drawn_rend; /* text drawn on screen (rendition) */ 269 rend_t **drawn_rend; /* text drawn on screen (rendition) */
256 text_t **buf_text; 270 text_t **buf_text;
257 rend_t **buf_rend; 271 rend_t **buf_rend;
… …
259 screen_t screen; 273 screen_t screen;
260 screen_t swap; 274 screen_t swap;
261 selection_t selection; 275 selection_t selection;
262}; 276};
263 277
264void rxvt_init_signals (); 278void rxvt_init ();
265rxvt_t rxvt_init (int argc, const char *const *argv);
266 279
267#endif /* _RXVTLIB_H_ */ 280#endif /* _RXVTLIB_H_ */
268 281

Diff Legend

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