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

Diff Legend

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