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.20 by pcg, Fri Apr 2 18:00:01 2004 UTC vs.
Revision 1.38 by root, Wed Aug 25 03:52:09 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/*
… …
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 unsigned int width; /* window width [pixels] */
88 uint16_t height; /* window height [pixels] */ 90 unsigned int height; /* window height [pixels] */
89 uint16_t fwidth; /* font width [pixels] */ 91 unsigned int fwidth; /* font width [pixels] */
90 uint16_t fheight; /* font height [pixels] */ 92 unsigned int fheight; /* font height [pixels] */
93 unsigned int fweight, fslant;
91 uint16_t fbase; /* font ascent (baseline) [pixels] */ 94 unsigned int fbase; /* font ascent (baseline) [pixels] */
92 uint16_t propfont; /* font proportional flags */
93 uint16_t ncol; /* window columns [characters] */ 95 unsigned int ncol; /* window columns [characters] */
94 uint16_t nrow; /* window rows [characters] */ 96 unsigned int nrow; /* window rows [characters] */
95 uint16_t focus; /* window has focus */ 97 unsigned int focus; /* window has focus */
96 uint16_t mapped; /* window state mapped? */ 98 unsigned int mapped; /* window state mapped? */
97 uint16_t int_bwidth; /* internal border width */ 99 unsigned int int_bwidth; /* internal border width */
98 uint16_t ext_bwidth; /* external border width */ 100 unsigned int ext_bwidth; /* external border width */
99 uint16_t lineSpace; /* number of extra pixels between rows */ 101 unsigned int lineSpace; /* number of extra pixels between rows */
100 uint16_t saveLines; /* number of lines that fit in scrollback */ 102 unsigned int saveLines; /* number of lines that fit in scrollback */
101 uint16_t nscrolled; /* number of line actually scrolled */ 103 unsigned int nscrolled; /* number of line actually scrolled */
102 uint16_t view_start; /* scrollback view starts here */ 104 unsigned 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 {
… …
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 */
169 row_col_t beg; /* beginning of selection <= mark */ 171 row_col_t beg; /* beginning of selection <= mark */
170 row_col_t mark; /* point of initial click <= end */ 172 row_col_t mark; /* point of initial click <= end */
171 row_col_t end; /* one character past end point */ 173 row_col_t end; /* one character past end point */
172} selection_t; 174} selection_t;
… …
179#define Screen_Autowrap (1<<2) /* auto-wrap flag */ 181#define Screen_Autowrap (1<<2) /* auto-wrap flag */
180#define Screen_Insert (1<<3) /* insert mode (vs. overstrike) */ 182#define Screen_Insert (1<<3) /* insert mode (vs. overstrike) */
181#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 183#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
182#define Screen_DefaultFlags (Screen_VisibleCursor|Screen_Autowrap) 184#define Screen_DefaultFlags (Screen_VisibleCursor|Screen_Autowrap)
183 185
184/* rxvt_vars.Options */ 186/* rxvt_vars.options */
185#define Opt_console (1UL<<0) 187#define Opt_console (1UL<<0)
186#define Opt_loginShell (1UL<<1) 188#define Opt_loginShell (1UL<<1)
187#define Opt_iconic (1UL<<2) 189#define Opt_iconic (1UL<<2)
188#define Opt_visualBell (1UL<<3) 190#define Opt_visualBell (1UL<<3)
189#define Opt_mapAlert (1UL<<4) 191#define Opt_mapAlert (1UL<<4)
… …
195#define Opt_meta8 (1UL<<10) 197#define Opt_meta8 (1UL<<10)
196#define Opt_scrollTtyOutput (1UL<<11) 198#define Opt_scrollTtyOutput (1UL<<11)
197#define Opt_scrollTtyKeypress (1UL<<12) 199#define Opt_scrollTtyKeypress (1UL<<12)
198#define Opt_transparent (1UL<<13) 200#define Opt_transparent (1UL<<13)
199#define Opt_transparent_all (1UL<<14) 201#define Opt_transparent_all (1UL<<14)
200#define Opt_15 (1UL<<15) // UNALLOCATED
201#define Opt_tripleclickwords (1UL<<16) 202#define Opt_tripleclickwords (1UL<<15)
202#define Opt_scrollWithBuffer (1UL<<17) 203#define Opt_scrollWithBuffer (1UL<<16)
203#define Opt_jumpScroll (1UL<<18) 204#define Opt_jumpScroll (1UL<<17)
204#define Opt_mouseWheelScrollPage (1UL<<19) 205#define Opt_mouseWheelScrollPage (1UL<<18)
205#define Opt_pointerBlank (1UL<<20) 206#define Opt_pointerBlank (1UL<<19)
206#define Opt_cursorBlink (1UL<<21) 207#define Opt_cursorBlink (1UL<<20)
207#ifdef NO_FRILLS 208#define Opt_secondaryScreen (1UL<<21)
208# define Opt_insecure 0 209#define Opt_secondaryScroll (1UL<<22)
210#if ENABLE_FRILLS
211# define Opt_insecure (1UL<<23) // insecure esc sequences
212# define Opt_borderLess (1UL<<24) // mem borderless hints
209#else 213#else
210# define Opt_insecure (1UL<<22) // insecure esc sequences 214# define Opt_insecure 0
215# define Opt_borderLess 0
211#endif 216#endif
212#define Opt_secondaryScreen (1UL<<23)
213#define Opt_secondaryScroll (1UL<<24)
214/* place holder used for parsing command-line options */ 217/* place holder used for parsing command-line options */
215#define Opt_Reverse (1UL<<30) 218#define Opt_Reverse (1UL<<30)
216#define Opt_Boolean (1UL<<31) 219#define Opt_Boolean (1UL<<31)
217 220
218#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput | \ 221#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput | \
… …
227} menuBar_t; 230} menuBar_t;
228 231
229typedef struct { 232typedef struct {
230 char state; /* scrollbar state */ 233 char state; /* scrollbar state */
231 char init; /* scrollbar has been initialised */ 234 char init; /* scrollbar has been initialised */
232 short beg; /* slider sub-window begin height */ 235 unsigned int beg; /* slider sub-window begin height */
233 short end; /* slider sub-window end height */ 236 unsigned int end; /* slider sub-window end height */
234 short top; /* slider top position */ 237 unsigned int top; /* slider top position */
235 short bot; /* slider bottom position */ 238 unsigned int bot; /* slider bottom position */
236 short style; /* style: rxvt, xterm, next */ 239 unsigned int style; /* style: rxvt, xterm, next */
237 short width; /* scrollbar width */ 240 unsigned int width; /* scrollbar width */
238 Window win; 241 Window win;
239 int (rxvt_term::*update)(int, int, int, int); 242 int (rxvt_term::*update)(int, int, int, int);
240 243
241 void setIdle() { state = 1 ; } 244 void setIdle() { state = 1 ; }
242 void setMotion() { state = 'm'; } 245 void setMotion() { state = 'm'; }
… …
246 249
247struct rxvt_vars { 250struct rxvt_vars {
248 TermWin_t TermWin; 251 TermWin_t TermWin;
249 scrollBar_t scrollBar; 252 scrollBar_t scrollBar;
250 menuBar_t menuBar; 253 menuBar_t menuBar;
251 unsigned long Options; 254 unsigned long options;
252 XSizeHints szHint; 255 XSizeHints szHint;
253 rxvt_display *display; 256 rxvt_display *display;
254 rxvt_color *PixColors; 257 rxvt_color *pix_colors;
258 rxvt_color *pix_colors_focused;
259#ifdef OFF_FOCUS_FADING
260 rxvt_color *pix_colors_unfocused;
261#endif
255 short numPixColors; 262 short numpix_colors;
256 Cursor TermWin_cursor; /* cursor for vt window */ 263 Cursor TermWin_cursor; /* cursor for vt window */
257 int sb_shadow; /* scrollbar shadow width */ 264 int sb_shadow; /* scrollbar shadow width */
258 int cmd_fd; /* pty file descriptor; connected to command */ 265 rxvt_ptytty pty;
259 int tty_fd; /* tty file descriptor; connected to child */
260 int numlock_state; 266 int numlock_state;
261 text_t **drawn_text; /* text drawn on screen (characters) */ 267 text_t **drawn_text; /* text drawn on screen (characters) */
262 rend_t **drawn_rend; /* text drawn on screen (rendition) */ 268 rend_t **drawn_rend; /* text drawn on screen (rendition) */
263 text_t **buf_text; 269 text_t **buf_text;
264 rend_t **buf_rend; 270 rend_t **buf_rend;
… …
266 screen_t screen; 272 screen_t screen;
267 screen_t swap; 273 screen_t swap;
268 selection_t selection; 274 selection_t selection;
269}; 275};
270 276
271void rxvt_init_signals (); 277void rxvt_init ();
272rxvt_t rxvt_init (int argc, const char *const *argv);
273 278
274#endif /* _RXVTLIB_H_ */ 279#endif /* _RXVTLIB_H_ */
275 280

Diff Legend

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