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.49 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.55 by root, Sat Dec 31 16:06:48 2005 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
88 rend_t *r; // rendition, uses RS_ flags 88 rend_t *r; // rendition, uses RS_ flags
89 tlen_t l; // length of each text line, LINE_CONT == continued on next line 89 tlen_t l; // length of each text line, LINE_CONT == continued on next line
90 90
91 bool is_cont () 91 bool is_longer ()
92 { 92 {
93 return l < 0; 93 return l < 0;
94 }
95
96 void set_is_longer ()
97 {
98 l = LINE_CONT;
94 } 99 }
95 100
96 void clear () 101 void clear ()
97 { 102 {
98 t = 0; 103 t = 0;
… …
100 l = 0; 105 l = 0;
101 } 106 }
102}; 107};
103 108
104/* 109/*
105 * TermWin elements limits 110 * terminal limits:
111 *
106 * width : 1 <= width 112 * width : 1 <= width
107 * height : 1 <= height 113 * height : 1 <= height
108 * ncol : 1 <= ncol <= MAX(int16_t) 114 * ncol : 1 <= ncol <= MAX(tlen_t)
109 * nrow : 1 <= nrow <= MAX(int16_t) 115 * nrow : 1 <= nrow <= MAX(int)
110 * saveLines : 0 <= saveLines <= MAX(int16_t) 116 * saveLines : 0 <= saveLines <= MAX(int)
117 * total_rows : nrow + saveLines
111 * nsaved : 0 <= nscrolled <= saveLines 118 * nsaved : 0 <= nsaved <= saveLines
112 * term_start: 0 <= term_start < saveLines 119 * term_start : 0 <= term_start < saveLines
113 * 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
114 */ 142 */
115 143
116struct TermWin_t { 144struct TermWin_t {
117 int width; /* window width [pixels] */ 145 int width; /* window width [pixels] */
118 int height; /* window height [pixels] */ 146 int height; /* window height [pixels] */
119 int fwidth; /* font width [pixels] */ 147 int fwidth; /* font width [pixels] */
120 int fheight; /* font height [pixels] */ 148 int fheight; /* font height [pixels] */
121 int fweight, fslant;
122 int fbase; /* font ascent (baseline) [pixels] */ 149 int fbase; /* font ascent (baseline) [pixels] */
123 int ncol; /* window columns [characters] */ 150 int ncol; /* window columns [characters] */
124 int nrow; /* window rows [characters] */ 151 int nrow; /* window rows [characters] */
125 int focus; /* window has focus */ 152 int focus; /* window has focus */
126 int mapped; /* window state mapped? */ 153 int mapped; /* window state mapped? */
127 int int_bwidth; /* internal border width */ 154 int int_bwidth; /* internal border width */
128 int ext_bwidth; /* external border width */ 155 int ext_bwidth; /* external border width */
129 int lineSpace; /* number of extra pixels between rows */ 156 int lineSpace; /* number of extra pixels between rows */
130 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 */
131 int nsaved; /* number of line actually scrolled */ 159 int nsaved; /* number of rows saved to scrollback */
132 int nscrolled; /*D*///TODO remove
133 int term_start; /* term lines start here */ 160 int term_start; /* term lines start here */
134 int view_start; /* scrollback view starts here */ 161 int view_start; /* scrollback view starts here */
135 Window parent[6]; /* parent identifiers - we're parent[0] */ 162 Window parent[6]; /* parent identifiers - we're parent[0] */
136 Window vt; /* vt100 window */ 163 Window vt; /* vt100 window */
137 GC gc; /* GC for drawing */ 164 GC gc; /* GC for drawing */
… …
141}; 168};
142 169
143/* 170/*
144 * screen accounting: 171 * screen accounting:
145 * screen_t elements 172 * screen_t elements
146 * text: Contains all text information including the scrollback buffer.
147 * Each line is length ncol
148 * tlen: The length of the line or -1 for wrapped lines.
149 * rend: Contains rendition information: font, bold, colour, etc.
150 * * Note: Each line for both text and rend are only allocated on demand, and
151 * text[x] is allocated <=> rend[x] is allocated for all x.
152 * row: Cursor row position : 0 <= row < nrow 173 * row: Cursor row position : 0 <= row < nrow
153 * col: Cursor column position : 0 <= col < ncol 174 * col: Cursor column position : 0 <= col < ncol
154 * tscroll: Scrolling region top row inclusive : 0 <= row < nrow 175 * tscroll: Scrolling region top row inclusive : 0 <= row < nrow
155 * bscroll: Scrolling region bottom row inclusive : 0 <= row < nrow 176 * bscroll: Scrolling region bottom row inclusive : 0 <= row < nrow
156 * 177 *
… …
158 * 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
159 * nothing is selected 180 * nothing is selected
160 * beg: row/column of beginning of selection : never past mark 181 * beg: row/column of beginning of selection : never past mark
161 * mark: row/column of initial click : never past end 182 * mark: row/column of initial click : never past end
162 * end: row/column of one character past end of selection 183 * end: row/column of one character past end of selection
163 * * Note: -nscrolled <= beg.row <= mark.row <= end.row < nrow 184 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow
164 * * Note: col == -1 ==> we're left of screen 185 * * Note: col == -1 ==> we're left of screen
165 * 186 *
166 * Layout of text/rend information in the screen_t text/rend structures:
167 * Rows [0] ... [saveLines - 1]
168 * scrollback region : we're only here if view_start != 0
169 * Rows [saveLines] ... [saveLines + nrow - 1]
170 * normal `unscrolled' screen region
171 */ 187 */
172typedef struct { 188typedef struct {
173 line_t **line;
174
175 row_col_t cur; /* cursor position on the screen */ 189 row_col_t cur; /* cursor position on the screen */
176 unsigned int tscroll; /* top of settable scroll region */ 190 int tscroll; /* top of settable scroll region */
177 unsigned int bscroll; /* bottom of settable scroll region */ 191 int bscroll; /* bottom of settable scroll region */
178 unsigned int charset; /* character set number [0..3] */ 192 unsigned int charset; /* character set number [0..3] */
179 unsigned int flags; /* see below */ 193 unsigned int flags; /* see below */
180 row_col_t s_cur; /* saved cursor position */ 194 row_col_t s_cur; /* saved cursor position */
181 unsigned int s_charset; /* saved character set number [0..3] */ 195 unsigned int s_charset; /* saved character set number [0..3] */
182 char s_charset_char; 196 char s_charset_char;
… …
239#define Opt_pastableTabs (1UL<<22) 253#define Opt_pastableTabs (1UL<<22)
240#define Opt_cursorUnderline (1UL<<23) 254#define Opt_cursorUnderline (1UL<<23)
241#if ENABLE_FRILLS 255#if ENABLE_FRILLS
242# define Opt_insecure (1UL<<24) // insecure esc sequences 256# define Opt_insecure (1UL<<24) // insecure esc sequences
243# define Opt_borderLess (1UL<<25) // mem borderless hints 257# define Opt_borderLess (1UL<<25) // mem borderless hints
258# define Opt_hold (1UL<<26) // hold window open after exit
244#else 259#else
245# define Opt_insecure 0 260# define Opt_insecure 0
246# define Opt_borderLess 0 261# define Opt_borderLess 0
262# define Opt_hold 0
263#endif
264#if ENABLE_STYLES
265# define Opt_intensityStyles (1UL<<27) // font styles imply intensity
266#else
267# define Opt_intensityStyles 0
247#endif 268#endif
248/* place holder used for parsing command-line options */ 269/* place holder used for parsing command-line options */
249#define Opt_Reverse (1UL<<30) 270#define Opt_Reverse (1UL<<30)
250#define Opt_Boolean (1UL<<31) 271#define Opt_Boolean (1UL<<31)
251 272
252#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 273#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
253 | Opt_jumpScroll | Opt_secondaryScreen \ 274 | Opt_jumpScroll | Opt_secondaryScreen \
254 | Opt_pastableTabs) 275 | Opt_pastableTabs | Opt_intensityStyles)
255 276
256/* ------------------------------------------------------------------------- */ 277/* ------------------------------------------------------------------------- */
257 278
258typedef struct { 279typedef struct {
259 short state; 280 short state;
… …
293 short numpix_colors; 314 short numpix_colors;
294 Cursor TermWin_cursor; /* cursor for vt window */ 315 Cursor TermWin_cursor; /* cursor for vt window */
295 int sb_shadow; /* scrollbar shadow width */ 316 int sb_shadow; /* scrollbar shadow width */
296 rxvt_ptytty pty; 317 rxvt_ptytty pty;
297 int numlock_state; 318 int numlock_state;
298 line_t *save; // all lines, scorllback + terminal, circular 319 line_t *row_buf; // all lines, scrollback + terminal, circular
299 line_t *drawn; // text on screen 320 line_t *drawn_buf; // text on screen
300 line_t *buf; // temporary buffer 321 line_t *temp_buf; // temporary buffer
301 line_t *swap_save; // lines for swap buffer 322 line_t *swap_buf; // lines for swap buffer
302 char *tabs; /* per location: 1 == tab-stop */ 323 char *tabs; /* per location: 1 == tab-stop */
303 screen_t screen; 324 screen_t screen;
304 screen_t swap; 325 screen_t swap;
305 selection_t selection; 326 selection_t selection;
306}; 327};

Diff Legend

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