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.50 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.58 by root, Wed Jan 4 20:43:38 2006 UTC

… …
77typedef uint32_t text_t; 77typedef uint32_t text_t;
78#else 78#else
79typedef uint16_t text_t; // saves lots of memory 79typedef uint16_t text_t; // saves lots of memory
80#endif 80#endif
81typedef uint32_t rend_t; 81typedef uint32_t rend_t;
82typedef int16_t tlen_t; 82typedef int32_t tlen_t; // was int16_t, but this result sin smaller code and memory use
83 83
84#define LINE_CONT -1 84#define LINE_CONT -1
85 85
86struct line_t { 86struct line_t {
87 text_t *t; // terminal the text 87 text_t *t; // terminal the text
… …
105 l = 0; 105 l = 0;
106 } 106 }
107}; 107};
108 108
109/* 109/*
110 * TermWin elements limits 110 * terminal limits:
111 *
111 * width : 1 <= width 112 * width : 1 <= width
112 * height : 1 <= height 113 * height : 1 <= height
113 * ncol : 1 <= ncol <= MAX(int16_t) 114 * ncol : 1 <= ncol <= MAX(tlen_t)
114 * nrow : 1 <= nrow <= MAX(int16_t) 115 * nrow : 1 <= nrow <= MAX(int)
115 * saveLines : 0 <= saveLines <= MAX(int16_t) 116 * saveLines : 0 <= saveLines <= MAX(int)
117 * total_rows : nrow + saveLines
116 * nsaved : 0 <= nscrolled <= saveLines 118 * nsaved : 0 <= nsaved <= saveLines
117 * term_start: 0 <= term_start < saveLines 119 * term_start : 0 <= term_start < saveLines
118 * view_start: 0 <= view_start < saveLines 120 * view_start : 0 <= view_start < saveLines
121 *
122 * | most coordinates are stored relative to term_start,
123 * ROW_BUF | which is the first line of the terminal screen
124 * |························= row_buf[0]
125 * |························= row_buf[1]
126 * |························= row_buf[2] etc.
127 * |
128 * +------------+···········= term_start - nsaved
129 * | scrollback |
130 * | scrollback +---------+·= term_start - view_start
131 * | scrollback | display |
132 * | scrollback | display |
133 * +------------+·display·+·= term_start
134 * | terminal | display |
135 * | terminal +---------+
136 * | terminal |
137 * | terminal |
138 * +------------+···········= term_stat + nrow - 1
139 * |
140 * |
141 * END······················= total_rows
119 */ 142 */
120 143
121struct TermWin_t { 144struct TermWin_t {
122 int width; /* window width [pixels] */ 145 int width; /* window width [pixels] */
123 int height; /* window height [pixels] */ 146 int height; /* window height [pixels] */
124 int fwidth; /* font width [pixels] */ 147 int fwidth; /* font width [pixels] */
125 int fheight; /* font height [pixels] */ 148 int fheight; /* font height [pixels] */
126 int fweight, fslant;
127 int fbase; /* font ascent (baseline) [pixels] */ 149 int fbase; /* font ascent (baseline) [pixels] */
128 int ncol; /* window columns [characters] */ 150 int ncol; /* window columns [characters] */
129 int nrow; /* window rows [characters] */ 151 int nrow; /* window rows [characters] */
130 int focus; /* window has focus */ 152 int focus; /* window has focus */
131 int mapped; /* window state mapped? */ 153 int mapped; /* window state mapped? */
132 int int_bwidth; /* internal border width */ 154 int int_bwidth; /* internal border width */
133 int ext_bwidth; /* external border width */ 155 int ext_bwidth; /* external border width */
134 int lineSpace; /* number of extra pixels between rows */ 156 int lineSpace; /* number of extra pixels between rows */
135 int saveLines; /* number of lines that fit in scrollback */ 157 int saveLines; /* number of lines that fit in scrollback */
158 int total_rows; /* total number of rows in this terminal */
136 int nsaved; /* number of line actually scrolled */ 159 int nsaved; /* number of rows saved to scrollback */
137 int nscrolled; /*D*///TODO remove
138 int term_start; /* term lines start here */ 160 int term_start; /* term lines start here */
139 int view_start; /* scrollback view starts here */ 161 int view_start; /* scrollback view starts here */
140 Window parent[6]; /* parent identifiers - we're parent[0] */ 162 Window parent[6]; /* parent identifiers - we're parent[0] */
141 Window vt; /* vt100 window */ 163 Window vt; /* vt100 window */
142 GC gc; /* GC for drawing */ 164 GC gc; /* GC for drawing */
… …
146}; 168};
147 169
148/* 170/*
149 * screen accounting: 171 * screen accounting:
150 * screen_t elements 172 * screen_t elements
151 * text: Contains all text information including the scrollback buffer.
152 * Each line is length ncol
153 * tlen: The length of the line or -1 for wrapped lines.
154 * rend: Contains rendition information: font, bold, colour, etc.
155 * * Note: Each line for both text and rend are only allocated on demand, and
156 * text[x] is allocated <=> rend[x] is allocated for all x.
157 * row: Cursor row position : 0 <= row < nrow 173 * row: Cursor row position : 0 <= row < nrow
158 * col: Cursor column position : 0 <= col < ncol 174 * col: Cursor column position : 0 <= col < ncol
159 * tscroll: Scrolling region top row inclusive : 0 <= row < nrow 175 * tscroll: Scrolling region top row inclusive : 0 <= row < nrow
160 * bscroll: Scrolling region bottom row inclusive : 0 <= row < nrow 176 * bscroll: Scrolling region bottom row inclusive : 0 <= row < nrow
161 * 177 *
… …
163 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 179 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
164 * nothing is selected 180 * nothing is selected
165 * beg: row/column of beginning of selection : never past mark 181 * beg: row/column of beginning of selection : never past mark
166 * mark: row/column of initial click : never past end 182 * mark: row/column of initial click : never past end
167 * end: row/column of one character past end of selection 183 * end: row/column of one character past end of selection
168 * * Note: -nscrolled <= beg.row <= mark.row <= end.row < nrow 184 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow
169 * * Note: col == -1 ==> we're left of screen 185 * * Note: col == -1 ==> we're left of screen
170 * 186 *
171 * Layout of text/rend information in the screen_t text/rend structures:
172 * Rows [0] ... [saveLines - 1]
173 * scrollback region : we're only here if view_start != 0
174 * Rows [saveLines] ... [saveLines + nrow - 1]
175 * normal `unscrolled' screen region
176 */ 187 */
177typedef struct { 188typedef struct {
178 line_t **line;
179
180 row_col_t cur; /* cursor position on the screen */ 189 row_col_t cur; /* cursor position on the screen */
181 unsigned int tscroll; /* top of settable scroll region */ 190 int tscroll; /* top of settable scroll region */
182 unsigned int bscroll; /* bottom of settable scroll region */ 191 int bscroll; /* bottom of settable scroll region */
183 unsigned int charset; /* character set number [0..3] */ 192 unsigned int charset; /* character set number [0..3] */
184 unsigned int flags; /* see below */ 193 unsigned int flags; /* see below */
185 row_col_t s_cur; /* saved cursor position */ 194 row_col_t s_cur; /* saved cursor position */
186 unsigned int s_charset; /* saved character set number [0..3] */ 195 unsigned int s_charset; /* saved character set number [0..3] */
187 char s_charset_char; 196 char s_charset_char;
… …
243#define Opt_secondaryScroll (1UL<<21) 252#define Opt_secondaryScroll (1UL<<21)
244#define Opt_pastableTabs (1UL<<22) 253#define Opt_pastableTabs (1UL<<22)
245#define Opt_cursorUnderline (1UL<<23) 254#define Opt_cursorUnderline (1UL<<23)
246#if ENABLE_FRILLS 255#if ENABLE_FRILLS
247# define Opt_insecure (1UL<<24) // insecure esc sequences 256# define Opt_insecure (1UL<<24) // insecure esc sequences
248# define Opt_borderLess (1UL<<25) // mem borderless hints 257# define Opt_borderLess (1UL<<25) // mwm borderless hints
258# define Opt_hold (1UL<<26) // hold window open after exit
259# define Opt_skipBuiltinGlyphs (1UL<<27) // do not use internal glyphs
249#else 260#else
250# define Opt_insecure 0 261# define Opt_insecure 0
251# define Opt_borderLess 0 262# define Opt_borderLess 0
263# define Opt_hold 0
264# define Opt_skipBuiltinGlyphs 0
252#endif 265#endif
253/* place holder used for parsing command-line options */ 266#if ENABLE_STYLES
254#define Opt_Reverse (1UL<<30) 267# define Opt_intensityStyles (1UL<<28) // font styles imply intensity
255#define Opt_Boolean (1UL<<31) 268#else
269# define Opt_intensityStyles 0
270#endif
256 271
272#define SET_OPTION(opt) (options |= (opt))
273#define CLR_OPTION(opt) (options &= ~(opt))
274#define OPTION(opt) (options & (opt))
275#define OPTION_R(opt) (r->options & (opt))
257#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 276#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
258 | Opt_jumpScroll | Opt_secondaryScreen \ 277 | Opt_jumpScroll | Opt_secondaryScreen \
259 | Opt_pastableTabs) 278 | Opt_pastableTabs | Opt_intensityStyles)
260 279
261/* ------------------------------------------------------------------------- */ 280/* ------------------------------------------------------------------------- */
262 281
263typedef struct { 282typedef struct {
264 short state; 283 short state;
… …
298 short numpix_colors; 317 short numpix_colors;
299 Cursor TermWin_cursor; /* cursor for vt window */ 318 Cursor TermWin_cursor; /* cursor for vt window */
300 int sb_shadow; /* scrollbar shadow width */ 319 int sb_shadow; /* scrollbar shadow width */
301 rxvt_ptytty pty; 320 rxvt_ptytty pty;
302 int numlock_state; 321 int numlock_state;
303 line_t *save; // all lines, scorllback + terminal, circular 322 line_t *row_buf; // all lines, scrollback + terminal, circular
304 line_t *drawn; // text on screen 323 line_t *drawn_buf; // text on screen
305 line_t *buf; // temporary buffer 324 line_t *temp_buf; // temporary buffer
306 line_t *swap_save; // lines for swap buffer 325 line_t *swap_buf; // lines for swap buffer
307 char *tabs; /* per location: 1 == tab-stop */ 326 char *tabs; /* per location: 1 == tab-stop */
308 screen_t screen; 327 screen_t screen;
309 screen_t swap; 328 screen_t swap;
310 selection_t selection; 329 selection_t selection;
311}; 330};

Diff Legend

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