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.26 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.44 by root, Sun Feb 13 08:56:28 2005 UTC

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

Diff Legend

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