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.61 by root, Sat Jan 7 23:18:56 2006 UTC vs.
Revision 1.72 by root, Wed Jan 25 21:03:04 2006 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
33#include "ptytty.h"
34
35extern "C" { 33extern "C" {
36#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */ 34#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */
37} 35}
38 36
39/* 37/*
… …
52 50
53struct rxvt_fontset; 51struct rxvt_fontset;
54struct rxvt_color; 52struct rxvt_color;
55struct rxvt_vars; /* defined later on */ 53struct rxvt_vars; /* defined later on */
56struct rxvt_term; 54struct rxvt_term;
57struct rxvt_display;
58struct rxvt_im; 55struct rxvt_im;
59struct rxvt_drawable; 56struct rxvt_drawable;
60 57
61typedef struct rxvt_term *rxvt_t; 58typedef struct rxvt_term *rxvt_t;
62 59
63extern rxvt_t rxvt_current_term; 60extern rxvt_t rxvt_current_term;
64 61
65#define SET_R(r) rxvt_current_term = (r) 62#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
66#define GET_R rxvt_current_term 63#define GET_R rxvt_current_term
67
68#define scrollbar_visible() scrollBar.state
69#define menubar_visible() menuBar.state
70 64
71typedef struct { 65typedef struct {
72 int row; 66 int row;
73 int col; 67 int col;
74} row_col_t; 68} row_col_t;
… …
90 * width : 1 <= width 84 * width : 1 <= width
91 * height : 1 <= height 85 * height : 1 <= height
92 * ncol : 1 <= ncol <= MAX(tlen_t) 86 * ncol : 1 <= ncol <= MAX(tlen_t)
93 * nrow : 1 <= nrow <= MAX(int) 87 * nrow : 1 <= nrow <= MAX(int)
94 * saveLines : 0 <= saveLines <= MAX(int) 88 * saveLines : 0 <= saveLines <= MAX(int)
89 * term_start : 0 <= term_start < saveLines
95 * total_rows : nrow + saveLines 90 * total_rows : nrow + saveLines
96 * nsaved : 0 <= nsaved <= saveLines 91 *
97 * term_start : 0 <= term_start < saveLines 92 * top_row : -saveLines <= top_row <= 0
98 * view_start : 0 <= view_start < saveLines 93 * view_start : top_row <= view_start <= 0
99 * 94 *
100 * | most coordinates are stored relative to term_start, 95 * | most coordinates are stored relative to term_start,
101 * ROW_BUF | which is the first line of the terminal screen 96 * ROW_BUF | which is the first line of the terminal screen
102 * |························= row_buf[0] 97 * |························= row_buf[0]
103 * |························= row_buf[1] 98 * |························= row_buf[1]
104 * |························= row_buf[2] etc. 99 * |························= row_buf[2] etc.
105 * | 100 * |
106 * +------------+···········= term_start - nsaved 101 * +------------+···········= term_start + top_row
107 * | scrollback | 102 * | scrollback |
108 * | scrollback +---------+·= term_start - view_start 103 * | scrollback +---------+·= term_start + view_start
109 * | scrollback | display | 104 * | scrollback | display |
110 * | scrollback | display | 105 * | scrollback | display |
111 * +------------+·display·+·= term_start 106 * +------------+·display·+·= term_start
112 * | terminal | display | 107 * | terminal | display |
113 * | terminal +---------+ 108 * | terminal +---------+
… …
132 int int_bwidth; /* internal border width */ 127 int int_bwidth; /* internal border width */
133 int ext_bwidth; /* external border width */ 128 int ext_bwidth; /* external border width */
134 int lineSpace; /* number of extra pixels between rows */ 129 int lineSpace; /* number of extra pixels between rows */
135 int saveLines; /* number of lines that fit in scrollback */ 130 int saveLines; /* number of lines that fit in scrollback */
136 int total_rows; /* total number of rows in this terminal */ 131 int total_rows; /* total number of rows in this terminal */
137 int nsaved; /* number of rows saved to scrollback */
138 int term_start; /* term lines start here */ 132 int term_start; /* term lines start here */
139 int view_start; /* scrollback view starts here */ 133 int view_start; /* scrollback view starts here */
134 int top_row; /* topmost row index of scrollback */
140 Window parent[6]; /* parent identifiers - we're parent[0] */ 135 Window parent[6]; /* parent identifiers - we're parent[0] */
141 Window vt; /* vt100 window */ 136 Window vt; /* vt100 window */
142 GC gc; /* GC for drawing */ 137 GC gc; /* GC for drawing */
143 Pixmap pixmap; 138 Pixmap pixmap;
144 rxvt_drawable *drawable; 139 rxvt_drawable *drawable;
… …
212# include "optinc.h" 207# include "optinc.h"
213# undef nodef 208# undef nodef
214# undef def 209# undef def
215}; 210};
216 211
217#define SET_OPTION(opt) (options |= (opt))
218#define CLR_OPTION(opt) (options &= ~(opt))
219#define OPTION(opt) (options & (opt))
220#define OPTION_R(opt) (r->options & (opt))
221#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
222 | Opt_jumpScroll | Opt_secondaryScreen \
223 | Opt_pastableTabs | Opt_intensityStyles)
224
225/* ------------------------------------------------------------------------- */ 212/* ------------------------------------------------------------------------- */
226
227typedef struct {
228 short state;
229 Window win;
230 struct rxvt_drawable *drawable;
231} menuBar_t;
232 213
233typedef struct { 214typedef struct {
234 char state; /* scrollbar state */ 215 char state; /* scrollbar state */
235 char init; /* scrollbar has been initialised */ 216 char init; /* scrollbar has been initialised */
236 unsigned int beg; /* slider sub-window begin height */ 217 unsigned int beg; /* slider sub-window begin height */
… …
248 void setDn() { state = 'D'; } 229 void setDn() { state = 'D'; }
249} scrollBar_t; 230} scrollBar_t;
250 231
251struct rxvt_vars : TermWin_t { 232struct rxvt_vars : TermWin_t {
252 scrollBar_t scrollBar; 233 scrollBar_t scrollBar;
253 menuBar_t menuBar; 234 uint32_t options;
254 unsigned long options;
255 XSizeHints szHint; 235 XSizeHints szHint;
256 rxvt_display *display;
257 rxvt_color *pix_colors; 236 rxvt_color *pix_colors;
258 rxvt_color *pix_colors_focused; 237 rxvt_color *pix_colors_focused;
259#ifdef OFF_FOCUS_FADING 238#ifdef OFF_FOCUS_FADING
260 rxvt_color *pix_colors_unfocused; 239 rxvt_color *pix_colors_unfocused;
261#endif 240#endif
262 short numpix_colors; 241 short numpix_colors;
263 Cursor TermWin_cursor; /* cursor for vt window */ 242 Cursor TermWin_cursor; /* cursor for vt window */
264 int sb_shadow; /* scrollbar shadow width */ 243 int sb_shadow; /* scrollbar shadow width */
265 rxvt_ptytty pty;
266 int numlock_state; 244 int numlock_state;
267 line_t *row_buf; // all lines, scrollback + terminal, circular 245 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
268 line_t *drawn_buf; // text on screen 246 line_t *drawn_buf; // text on screen
269 line_t *temp_buf; // temporary buffer
270 line_t *swap_buf; // lines for swap buffer 247 line_t *swap_buf; // lines for swap buffer
271 char *tabs; /* per location: 1 == tab-stop */ 248 char *tabs; /* per location: 1 == tab-stop */
272 screen_t screen; 249 screen_t screen;
273 screen_t swap; 250 screen_t swap;
274 selection_t selection; 251 selection_t selection;

Diff Legend

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