ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.200 by root, Tue Dec 27 01:54:08 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
… …
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
52 if (options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
53 TermWin.view_start = 0 52 view_start = 0
54#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
58 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
… …
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 92 */
94#define drawBuffer TermWin.vt 93#define drawBuffer vt
95 94
96#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
97 if (TermWin.mapped) \ 96 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 97 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 99 (unsigned int)Height2Pixel (num), False)
101 100
102#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
103 if (TermWin.mapped) \ 102 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 104 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 105 (unsigned int)Height2Pixel (1), False)
107 106
108#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 109 0, Row2Pixel (row), \
111 (unsigned int)TermWin.width, \ 110 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
113 112
114/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
117 116
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
121{ 120{
121 if (!l.t)
122 {
123 lalloc (l);
124 col = 0;
125 width = ncol;
126 }
127
122 efs &= ~RS_baseattrMask; 128 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 130
131 text_t *et = l.t + col;
132 rend_t *er = l.r + col;
133
125 while (width--) 134 while (width--)
126 { 135 {
127 *et++ = ' '; 136 *et++ = ' ';
128 *er++ = efs; 137 *er++ = efs;
129 } 138 }
130} 139}
131 140
132/* ------------------------------------------------------------------------- */ 141/* ------------------------------------------------------------------------- */
133/* Fill a full line with blanks - make sure it is allocated first */ 142/* Fill a full line with blanks - make sure it is allocated first */
134void 143void
135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
136{ 145{
137#ifdef DEBUG_STRICT 146 scr_blank_line (l, 0, ncol, efs);
138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
139#endif
140 if (tp[row] == NULL)
141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145
146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
147} 147}
148 148
149/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
152void 153void
153rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
154{ 155{
155 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q;
157 int k;
158 rend_t setrstyle;
159
160#if ENABLE_OVERLAY 156#if ENABLE_OVERLAY
161 scr_overlay_off (); 157 scr_overlay_off ();
162#endif 158#endif
163 159
164 TermWin.view_start = 0; 160 view_start = 0;
165 num_scr = 0; 161 num_scr = 0;
166 162
167 if (TermWin.ncol == 0) 163 if (ncol == 0)
168 TermWin.ncol = 80; 164 ncol = 80;
169 165
170 if (TermWin.nrow == 0) 166 if (nrow == 0)
171 TermWin.nrow = 24; 167 nrow = 24;
172
173 ncol = TermWin.ncol;
174 nrow = TermWin.nrow;
175 168
176 if (ncol == prev_ncol && nrow == prev_nrow) 169 if (ncol == prev_ncol && nrow == prev_nrow)
177 return; 170 return;
178 171
179 // we need at least two lines for wrapping to work correctly 172 // we need at least two lines for wrapping to work correctly
180 if (nrow + TermWin.saveLines < 2) 173 if (nrow + saveLines < 2)
181 { 174 {
175 //TODO//FIXME
182 TermWin.saveLines++; 176 saveLines++;
183 prev_nrow--; 177 prev_nrow--;
184 TermWin.nscrolled++; 178 nsaved++;
185 } 179 }
186 180
187 want_refresh = 1; 181 want_refresh = 1;
188 182
189 prev_total_rows = prev_nrow + TermWin.saveLines; 183 int prev_total_rows = prev_nrow + saveLines;
190 total_rows = nrow + TermWin.saveLines; 184 total_rows = nrow + saveLines;
191 185
192 screen.tscroll = 0; 186 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
194 188
195 if (!talloc) 189 if (!row_buf)
196 {
197 talloc = new rxvt_salloc (ncol * sizeof (text_t));
198 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
199 }
200
201 if (!screen.text)
202 { 190 {
203 /* 191 /*
204 * first time called so just malloc everything: don't rely on realloc 192 * first time called so just malloc everything: don't rely on realloc
205 * Note: this is still needed so that all the scrollback lines are NULL 193 * Note: this is still needed so that all the scrollback lines are NULL
206 */ 194 */
195 nsaved = 0; /* no saved lines */
196 term_start = 0;
197
198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
208 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
211
212 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214 205
215 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 206 for (int row = nrow; row--; )
216 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
217 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
219
220 for (p = 0; p < nrow; p++)
221 { 207 {
222 q = p + TermWin.saveLines;
223 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
224 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
225 screen.tlen[q] = swap.tlen[p] = 0;
226 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
227 } 211 }
228 212
229 memset (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
230 TermWin.nscrolled = 0; /* no saved lines */
231 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
232 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
233 screen.cur.row = screen.cur.col = 0; 216 screen.cur.row = screen.cur.col = 0;
234 screen.charset = 0; 217 screen.charset = 0;
235 current_screen = PRIMARY; 218 current_screen = PRIMARY;
… …
255 else 238 else
256 { 239 {
257 /* 240 /*
258 * add or delete rows as appropriate 241 * add or delete rows as appropriate
259 */ 242 */
260 setrstyle = DEFAULT_RSTYLE;
261 243
244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
246
247#if 0
262 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
263 { 249 {
264 /* delete rows */
265 k = min (TermWin.nscrolled, prev_nrow - nrow);
266 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
267
268 for (p = nrow; p < prev_nrow; p++) 250 for (int row = nrow; row < prev_nrow; row++)
269 { 251 {
270 q = p + TermWin.saveLines; 252 lfree (swap_buf [row]);
253 lfree (drawn_buf[row]);
254 }
255 }
256#endif
271 257
272 if (screen.text[q]) 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261
262 for (int row = min (nrow, prev_nrow); row--; )
263 {
264 lresize (drawn_buf[row]);
265 lresize (swap_buf [row]);
266 }
267
268 for (int row = prev_nrow; row < nrow; row++)
269 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
275
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows);
278 int q = total_rows; // rewrapped row
279
280 if (nsaved)
281 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm.
284
285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287
288 do
289 {
290 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294
295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
297
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
273 { 299 {
274#ifdef DEBUG_STRICT 300 p = MOD (p - 1, prev_total_rows);
275 assert (screen.rend[q]); 301
276#endif 302 plines++;
277 talloc->free (screen.text[q]); 303 llen += prev_ncol;
278 ralloc->free (screen.rend[q]);
279 } 304 }
280 305
281 if (swap.text[p]) 306 int qlines = max (0, (llen - 1) / ncol) + 1;
307
308 // drop partial lines completely
309 if (q < qlines)
310 break;
311
312 q -= qlines;
313
314 int lofs = 0;
315 line_t *qline;
316
317 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++)
282 { 319 {
283#ifdef DEBUG_STRICT 320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
328 {
329 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol;
331
332 prow = MOD (p + prow, prev_total_rows);
333
334 // we only adjust the cursor _row_ and put it into
335 // the topmost line of "long line" it was in, as
336 // this seems to upset applications/shells/readline
337 // least.
338 if (prow == ocur.row)
339 screen.cur.row = q - (total_rows - nrow);
340
341 line_t &pline = old_buf [prow];
342
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344
284 assert (swap.rend[p]); 345 assert (len);
285#endif 346 assert (pline.t);
286 talloc->free (swap.text[p]); 347
287 ralloc->free (swap.rend[p]); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350
351 lofs += len;
352 qcol += len;
353 }
288 } 354 }
289 355
290#ifdef DEBUG_STRICT 356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
291 assert (drawn_text[p] && drawn_rend[p]); 357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
292#endif 363#endif
293 talloc->free (drawn_text[p]); 364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
294 ralloc->free (drawn_rend[p]);
295 } 365 }
366 while (p != pend && q > 0);
296 367
297 /* we have fewer rows so fix up cursor position */ 368 term_start = total_rows - nrow;
298 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
299 374
300 scr_reset_realloc (); /* realloc _last_ */
301 }
302 else if (nrow > prev_nrow)
303 { 375 }
304 /* add rows */ 376 else
305 scr_reset_realloc (); /* realloc _first_ */ 377 {
306 378 // if no scrollback exists (yet), wing, instead of wrap
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 379
308 380 for (int row = min (nrow, prev_nrow); row--; )
309 k = min (TermWin.nscrolled, nrow - prev_nrow);
310
311 for (p = prev_total_rows; p < total_rows; p++)
312 { 381 {
313 screen.tlen[p] = 0; 382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
314 screen.text[p] = NULL; 383 line_t &qline = row_buf [row];
315 screen.rend[p] = NULL; 384
385 qline = pline;
386 lresize (qline);
316 } 387 }
317 388
318 for (p = prev_total_rows; p < total_rows - k; p++)
319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
320
321 for (p = prev_nrow; p < nrow; p++) 389 for (int row = prev_nrow; row < nrow; row++)
322 { 390 {
323 swap.tlen[p] = 0; 391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
324 swap.text[p] = NULL;
325 swap.rend[p] = NULL;
326 drawn_text[p] = NULL;
327 drawn_rend[p] = NULL;
328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
330 } 392 }
331 393
332 if (k > 0) 394 term_start = 0;
333 {
334 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k;
336 screen.s_cur.row += k;
337 TermWin.nscrolled -= k;
338 }
339
340#ifdef DEBUG_STRICT
341 assert (screen.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */
343 MIN_IT (screen.cur.row, nrow - 1);
344#endif
345 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
346 }
347
348 /* resize columns */
349 if (ncol != prev_ncol)
350 { 395 }
351 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
352 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
353 396
354 for (p = 0; p < total_rows; p++) 397#ifdef DEBUG_STRICT //TODO: remove
355 { 398 for (int i = -nsaved; i < nrow; i++)
356 if (screen.text[p]) 399 assert (ROW (i).t);
357 { 400#endif
358 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
359 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
360 401
361 MIN_IT (screen.tlen[p], (int16_t)ncol); 402 free (old_buf);
403 delete old_ta;
404 delete old_ra;
362 405
363 if (ncol > prev_ncol) 406 clamp_it (screen.cur.row, 0, nrow - 1);
364 scr_blank_line (&screen.text[p][prev_ncol], 407 clamp_it (screen.cur.col, 0, ncol - 1);
365 &screen.rend[p][prev_ncol],
366 ncol - prev_ncol, setrstyle);
367 }
368 }
369
370 for (p = 0; p < nrow; p++)
371 {
372 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
373 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
374
375 if (ncol > prev_ncol)
376 scr_blank_line (&drawn_text[p][prev_ncol],
377 &drawn_rend[p][prev_ncol],
378 ncol - prev_ncol, setrstyle);
379
380 if (swap.text[p])
381 {
382 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
383 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
384
385 MIN_IT (swap.tlen[p], (int16_t)ncol);
386
387 if (ncol > prev_ncol)
388 scr_blank_line (&swap.text[p][prev_ncol],
389 &swap.rend[p][prev_ncol],
390 ncol - prev_ncol, setrstyle);
391 }
392
393 }
394
395 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
396
397 delete talloc; talloc = ta;
398 delete ralloc; ralloc = ra;
399 }
400 408
401 if (tabs) 409 if (tabs)
402 free (tabs); 410 free (tabs);
403 } 411 }
404 412
405 prev_nrow = nrow; 413 prev_nrow = nrow;
406 prev_ncol = ncol; 414 prev_ncol = ncol;
407 415
408 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 416 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
409 417
410 for (p = 0; p < ncol; p++) 418 for (int col = ncol; col--; )
411 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 419 tabs [col] = col % TABSIZE == 0;
412 420
413 tt_winch (); 421 tt_winch ();
414} 422}
415 423
416void
417rxvt_term::scr_reset_realloc ()
418{
419 unsigned int total_rows, nrow;
420
421 nrow = TermWin.nrow;
422 total_rows = nrow + TermWin.saveLines;
423 /* *INDENT-OFF* */
424 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
425 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
426 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
427 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
428
429 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
430 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
431
432 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
433 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
434 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
435 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
436 /* *INDENT-ON* */
437}
438
439/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
440/* 425/*
441 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
442 */ 427 */
443void 428void
444rxvt_term::scr_release () 429rxvt_term::scr_release ()
445{ 430{
446 unsigned int total_rows;
447 int i;
448
449 total_rows = TermWin.nrow + TermWin.saveLines;
450
451 delete talloc; talloc = 0; 431 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
453 433
454 free (screen.text); 434 free (row_buf);
455 free (screen.tlen); 435 free (swap_buf);
456 free (screen.rend);
457 free (drawn_text); 436 free (drawn_buf);
458 free (drawn_rend); 437 free (temp_buf);
459 free (swap.text);
460 free (swap.tlen);
461 free (swap.rend);
462 free (buf_text);
463 free (buf_rend);
464 free (tabs); 438 free (tabs);
465 439
466 /* NULL these so if anything tries to use them, we'll know about it */ 440 row_buf = 0; // signal that we freed all the arrays
467 screen.text = drawn_text = swap.text = NULL;
468 screen.rend = drawn_rend = swap.rend = NULL;
469 screen.tlen = swap.tlen = NULL;
470 buf_text = NULL;
471 buf_rend = NULL;
472 tabs = NULL;
473} 441}
474 442
475/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
476/* 444/*
477 * Hard reset 445 * Hard reset
… …
528 set_font_style (); 496 set_font_style ();
529 break; 497 break;
530 } 498 }
531 499
532 /* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
533 MIN_IT (s->cur.row, TermWin.nrow - 1); 501 min_it (s->cur.row, nrow - 1);
534 MIN_IT (s->cur.col, TermWin.ncol - 1); 502 min_it (s->cur.col, ncol - 1);
535#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
536 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
537 assert (s->cur.col >= 0); 505 assert (s->cur.col >= 0);
538#else /* drive with your eyes closed */
539 MAX_IT (s->cur.row, 0);
540 MAX_IT (s->cur.col, 0);
541#endif 506#endif
542} 507}
543 508
544/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
545/* 510/*
… …
548 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
549 */ 514 */
550int 515int
551rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn)
552{ 517{
553 int i;
554#if NSCREENS
555 int offset;
556#endif
557
558 want_refresh = 1; 518 want_refresh = 1;
559
560 TermWin.view_start = 0; 519 view_start = 0;
561 520
562 if (current_screen == scrn) 521 if (current_screen == scrn)
563 return scrn; 522 return scrn;
564 523
565 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
566 525
567 i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
568 527
569 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 528 ::swap (screen.cur.row, swap.cur.row);
570 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 529 ::swap (screen.cur.col, swap.cur.col);
571 MAX_IT (screen.cur.row, 0); 530
572 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
573 MAX_IT (screen.cur.col, 0); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
574 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
575 533
576#if NSCREENS 534#if NSCREENS
577 if (options & Opt_secondaryScreen) 535 if (options & Opt_secondaryScreen)
578 { 536 {
579 num_scr = 0; 537 num_scr = 0;
580 offset = TermWin.saveLines;
581 538
582 for (i = prev_nrow; i--;) 539 for (int i = prev_nrow; i--; )
583 { 540 ::swap (ROW(i), swap_buf [i]);
584 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
585 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
586 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
587 }
588 541
589 SWAP_IT (screen.charset, swap.charset, int16_t); 542 ::swap (screen.charset, swap.charset);
590 SWAP_IT (screen.flags, swap.flags, int); 543 ::swap (screen.flags, swap.flags);
591 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
592 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
593 } 546 }
594 else 547 else
595#endif 548#endif
596 if (options & Opt_secondaryScroll) 549 if (options & Opt_secondaryScroll)
597 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
598 551
599 return scrn; 552 return scrn;
600} 553}
601 554
602// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
… …
609 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
610 563
611 screen.cur.col = 0; 564 screen.cur.col = 0;
612 565
613 if (screen.cur.row == screen.bscroll) 566 if (screen.cur.row == screen.bscroll)
614 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 567 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
615 else if (screen.cur.row < TermWin.nrow - 1) 568 else if (screen.cur.row < nrow - 1)
616 screen.cur.row++; 569 screen.cur.row++;
617} 570}
618 571
619/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
620/* 573/*
… …
650/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
651/* 604/*
652 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
653 * count positive ==> scroll up 606 * count positive ==> scroll up
654 * count negative ==> scroll down 607 * count negative ==> scroll down
655 * spec == 0 for normal routines
656 */ 608 */
657int 609int
658rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 610rxvt_term::scr_scroll_text (int row1, int row2, int count)
659{ 611{
660 int i, j;
661 long nscrolled;
662
663 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
664 return 0; 613 return 0;
665 614
666 want_refresh = 1; 615 want_refresh = 1;
616 num_scr += count;
667 617
668 if (row1 == 0 && count > 0 618 if (count > 0
619 && row1 == 0
620 && row2 == nrow - 1
669 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 621 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
670 { 622 {
671 nscrolled = (long)TermWin.nscrolled + (long)count; 623 nsaved = min (nsaved + count, saveLines);
624 term_start = (term_start + count) % total_rows;
672 625
673 if (nscrolled > (long)TermWin.saveLines) 626 if (selection.op && current_screen == selection.screen)
674 TermWin.nscrolled = TermWin.saveLines; 627 {
628 selection.beg.row -= count;
629 selection.end.row -= count;
630 selection.mark.row -= count;
631
632 if (selection.beg.row < -nsaved
633 || selection.end.row < -nsaved
634 || selection.mark.row < -nsaved)
635 {
636 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR;
638 }
639 }
640
641 for (int i = count; i--; )
642 {
643 ROW(row2 - i).l = 0;
644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
675 else 646
676 TermWin.nscrolled = (unsigned int)nscrolled;
677
678 if ((options & Opt_scrollWithBuffer) 647 if ((options & Opt_scrollWithBuffer)
679 && TermWin.view_start != 0 648 && view_start != 0
680 && TermWin.view_start != TermWin.saveLines) 649 && view_start != saveLines)
681 scr_page (UP, count); 650 scr_page (UP, count);
682 } 651 }
683 else if (!spec) 652 else
684 row1 += TermWin.saveLines; 653 {
685
686 row2 += TermWin.saveLines;
687
688 if (selection.op && current_screen == selection.screen) 654 if (selection.op && current_screen == selection.screen)
689 { 655 {
690 i = selection.beg.row + TermWin.saveLines; 656 if ((selection.beg.row < row1 && selection.end.row > row1)
691 j = selection.end.row + TermWin.saveLines; 657 || (selection.beg.row < row2 && selection.end.row > row2)
692 if ((i < row1 && j > row1) 658 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
693 || (i < row2 && j > row2) 659 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
694 || (i - count < row1 && i >= row1) 660 || (selection.end.row - count < row1 && selection.end.row >= row1)
695 || (i - count > row2 && i <= row2) 661 || (selection.end.row - count > row2 && selection.end.row <= row2))
696 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2))
698 { 662 {
699 CLEAR_ALL_SELECTION (); 663 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 664 selection.op = SELECTION_CLEAR;
701 } 665 }
702 else if (j >= row1 && j <= row2) 666 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 667 {
704 /* move selected region too */ 668 /* move selected region too */
705 selection.beg.row -= count; 669 selection.beg.row -= count;
706 selection.end.row -= count; 670 selection.end.row -= count;
707 selection.mark.row -= count; 671 selection.mark.row -= count;
672
673 selection_check (0);
708 } 674 }
709 }
710
711 selection_check (0); /* _after_ TermWin.nscrolled update */
712
713 num_scr += count;
714 j = count;
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 {
724 /* A: scroll up */
725
726 /* A1: Copy lines that will get clobbered by the rotation */
727 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
728 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
729
730 /* A2: Rotate lines */
731 i = row2 - row1 - count + 1;
732 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
733 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
734 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
735
736 j = row2 - count + 1, i = count;
737 }
738 else /* if (j < 0) */
739 {
740 /* B: scroll down */
741
742 /* B1: Copy lines that will get clobbered by the rotation */
743 for (i = 0, j = row2; i < count; i++, j--)
744 { 675 }
745 buf_text[i] = screen.text[j]; 676
746 buf_rend[i] = screen.rend[j]; 677 // use a simple and robust scrolling algorithm, this
678 // part of scr_scroll_text is not time-critical.
679
680 int rows = row2 - row1 + 1;
681
682 min_it (count, rows);
683
684 for (int row = 0; row < rows; row++)
747 } 685 {
686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 687
749 /* B2: Rotate lines */ 688 if (!IN_RANGE_EXC (row + count, 0, rows))
750 for (j = row2, i = j - count; i >= row1; i--, j--) 689 scr_blank_screen_mem (temp_buf [row], rstyle);
751 { 690 }
752 screen.tlen[j] = screen.tlen[i];
753 screen.text[j] = screen.text[i];
754 screen.rend[j] = screen.rend[i];
755 }
756 691
757 j = row1, i = count; 692 for (int row = 0; row < rows; row++)
758 count = -count; 693 ROW(row1 + row) = temp_buf [row];
759 } 694 }
760
761 /* C: Resurrect lines */
762 memset (screen.tlen + j, 0, i * sizeof (int16_t));
763 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
764 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
765 if (!spec) /* line length may not equal TermWin.ncol */
766 for (; i--; j++)
767 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
768 695
769 return count; 696 return count;
770} 697}
771 698
772/* ------------------------------------------------------------------------- */ 699/* ------------------------------------------------------------------------- */
… …
774 * Add text given in <str> of length <len> to screen struct 701 * Add text given in <str> of length <len> to screen struct
775 */ 702 */
776void 703void
777rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 704rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
778{ 705{
706 if (len <= 0) /* sanity */
707 return;
708
779 unsigned char checksel; 709 unsigned char checksel;
780 unicode_t c; 710 unicode_t c;
781 int i, row, last_col; 711 int last_col;
782 text_t *stp; 712 const unicode_t *strend = str + len;
783 rend_t *srp;
784
785 if (len <= 0) /* sanity */
786 return;
787 713
788 want_refresh = 1; 714 want_refresh = 1;
789 ZERO_SCROLLBACK (); 715 ZERO_SCROLLBACK ();
790 last_col = TermWin.ncol; 716 last_col = ncol;
791 717
792 if (nlines > 0) 718 if (nlines > 0)
793 { 719 {
794 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
795 if ((nlines > 0) 721 if (nlines > 0
796 && (screen.tscroll == 0) 722 && screen.tscroll == 0
797 && (screen.bscroll == (TermWin.nrow - 1))) 723 && screen.bscroll == (nrow - 1))
798 { 724 {
799 /* _at least_ this many lines need to be scrolled */ 725 /* _at least_ this many lines need to be scrolled */
800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
801 screen.cur.row -= nlines; 727 screen.cur.row -= nlines;
802 } 728 }
803 } 729 }
804 730
805#ifdef DEBUG_STRICT 731#ifdef DEBUG_STRICT
806 assert (screen.cur.col < last_col); 732 assert (screen.cur.col < last_col);
807 assert ((screen.cur.row < TermWin.nrow) 733 assert (screen.cur.row < nrow
808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 734 && screen.cur.row >= -nsaved);
809#else /* drive with your eyes closed */
810 MIN_IT (screen.cur.col, last_col - 1);
811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
813#endif 735#endif
814 row = screen.cur.row + TermWin.saveLines; 736 int row = screen.cur.row;
815 737
816 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 738 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817 739
818 stp = screen.text[row]; 740 line_t *line = &ROW(row);
819 srp = screen.rend[row];
820 741
821 while (len--) 742 while (str < strend)
822 { 743 {
823 c = *str++; 744 c = *str++;
824 745
825 if (c < 0x20) 746 if (c < 0x20)
826 switch (c) 747 if (c == C0_LF)
827 { 748 {
828 case C0_HT: 749 if (!line->is_longer ()) /* XXX: think about this */
829 scr_tab (1, true); 750 max_it (line->l, screen.cur.col);
830 continue;
831 751
832 case C0_LF:
833 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col);
835
836 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
837 753
838 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
839 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
840 else if (screen.cur.row < (TermWin.nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
841 row = (++screen.cur.row) + TermWin.saveLines; 757 row = ++screen.cur.row;
842 758
843 stp = screen.text[row]; /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
844 srp = screen.rend[row]; /* _must_ refresh */
845 continue; 760 continue;
761 }
762 else if (c == C0_CR)
763 {
764 if (!line->is_longer ()) /* XXX: think about this */
765 max_it (line->l, screen.cur.col);
846 766
847 case C0_CR:
848 if (screen.tlen[row] != -1) /* XXX: think about this */
849 MAX_IT (screen.tlen[row], screen.cur.col);
850
851 screen.flags &= ~Screen_WrapNext; 767 screen.flags &= ~Screen_WrapNext;
852 screen.cur.col = 0; 768 screen.cur.col = 0;
853 continue; 769 continue;
770 }
771 else if (c == C0_HT)
772 {
773 scr_tab (1, true);
774 continue;
854 } 775 }
855 776
856 if (checksel /* see if we're writing within selection */ 777 if (checksel /* see if we're writing within selection */
857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 778 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 779 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
866 CLEAR_SELECTION (); 787 CLEAR_SELECTION ();
867 } 788 }
868 789
869 if (screen.flags & Screen_WrapNext) 790 if (screen.flags & Screen_WrapNext)
870 { 791 {
871 screen.tlen[row] = -1; 792 line->set_is_longer ();
872 793
873 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 794 scr_do_wrap ();
874
875 stp = screen.text[row]; /* _must_ refresh */
876 srp = screen.rend[row]; /* _must_ refresh */
877 } 795
796 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */
798 }
799
800 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd;
878 803
879 // rely on wcwidth to tell us the character width, at least for non-latin1 804 // rely on wcwidth to tell us the character width, at least for non-latin1
880 // do wcwidth before further replacements, as wcwidth says that line-drawing 805 // do wcwidth before further replacements, as wcwidth might return -1
881 // characters have width -1 (DOH!) on GNU/Linux sometimes. 806 // for the line drawing characters below as they might be invalid in the current
807 // locale.
882 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
883 809
884 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets[screen.charset] == '0') // DEC SPECIAL
885 { 811 {
886 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
887 // 5f-7e standard vt100 813 // 5f-7e standard vt100
888 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
889 static uint16_t vt100_0[63] = { // 40 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
890 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 816 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 817 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 818 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
893 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 819 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
894 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 820 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
895 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 821 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
896 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 822 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
897 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 823 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
898 }; 824 };
899 825
900 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 826 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
901 { 827 {
902 c = vt100_0[c - 0x40]; 828 c = vt100_0[c - 0x41];
903 width = 1; 829 width = 1; // vt100 line drawing characters are always single-width
904 } 830 }
905 } 831 }
906 832
907 if (screen.flags & Screen_Insert) 833 if (screen.flags & Screen_Insert)
908 scr_insdel_chars (width, INSERT); 834 scr_insdel_chars (width, INSERT);
909 835
910 if (width != 0) 836 if (width != 0)
911 { 837 {
912 // some utf-8 decoders decode surrogate characters.
913 if (0xd800 <= c && c <= 0xdfff)
914 c = 0xfffd;
915
916#if !UNICODE_3 838#if !UNICODE_3
917 // trim characters we can't store directly :( 839 // trim characters we can't store directly :(
918 if (c >= 0x10000) 840 if (c >= 0x10000)
919# if ENABLE_COMBINING 841# if ENABLE_COMBINING
920 c = rxvt_composite.compose (c); // map to lower 16 bits 842 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
922 c = 0xfffd; 844 c = 0xfffd;
923# endif 845# endif
924#endif 846#endif
925 847
926 // nuke the character at this position, if required 848 // nuke the character at this position, if required
927 if (stp[screen.cur.col] == NOCHAR 849 if (line->t[screen.cur.col] == NOCHAR
928 || (screen.cur.col < TermWin.ncol - 1 850 || (screen.cur.col < ncol - 1
929 && stp[screen.cur.col + 1] == NOCHAR)) 851 && line->t[screen.cur.col + 1] == NOCHAR))
930 { 852 {
931 int col = screen.cur.col; 853 int col = screen.cur.col;
932 854
933 // find begin 855 // find begin
934 while (col > 0 && stp[col] == NOCHAR) 856 while (col > 0 && line->t[col] == NOCHAR)
935 col--; 857 col--;
936 858
937 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 859 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
938 860
939 // found begin, nuke 861 // found begin, nuke
940 do { 862 do {
941 stp[col] = ' '; 863 line->t[col] = ' ';
942 srp[col] = rend; 864 line->r[col] = rend;
943 col++; 865 col++;
944 } while (col < TermWin.ncol && stp[col] == NOCHAR); 866 } while (col < ncol && line->t[col] == NOCHAR);
945 } 867 }
946 868
947 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870
871 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > last_col - width && last_col >= width)
873 {
874 // ...output spaces
875 c = ' ';
876 // and try the same character next loop iteration
877 --str;
878 }
948 879
949 do 880 do
950 { 881 {
951 stp[screen.cur.col] = c; 882 line->t[screen.cur.col] = c;
952 srp[screen.cur.col] = rend; 883 line->r[screen.cur.col] = rend;
953 884
954 if (screen.cur.col < last_col - 1) 885 if (screen.cur.col < last_col - 1)
955 screen.cur.col++; 886 screen.cur.col++;
956 else 887 else
957 { 888 {
958 screen.tlen[row] = last_col; 889 line->l = last_col;
959 if (screen.flags & Screen_Autowrap) 890 if (screen.flags & Screen_Autowrap)
960 screen.flags |= Screen_WrapNext; 891 screen.flags |= Screen_WrapNext;
961 break; 892 break;
962 } 893 }
963 894
… …
965 } 896 }
966 while (--width > 0); 897 while (--width > 0);
967 898
968 // pad with spaces when overwriting wide character with smaller one 899 // pad with spaces when overwriting wide character with smaller one
969 if (!width) 900 if (!width)
970 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 901 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
971 { 902 {
972 stp[c] = ' '; 903 line->t[c] = ' ';
973 srp[c] = rend; 904 line->r[c] = rend;
974 } 905 }
975 } 906 }
976 else if (width == 0) 907 else // width == 0
977 { 908 {
978#if ENABLE_COMBINING 909#if ENABLE_COMBINING
979 // handle combining characters 910 // handle combining characters
980 // we just tag the accent on the previous on-screen character. 911 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong. 912 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet. 913 // we don't handle double-width characters nicely yet.
983
984 text_t *tp; 914 text_t *tp;
985 rend_t *rp; 915 rend_t *rp;
986 916
987 if (screen.cur.col > 0) 917 if (screen.cur.col > 0)
988 { 918 {
989 tp = stp + screen.cur.col - 1; 919 tp = line->t + screen.cur.col - 1;
990 rp = srp + screen.cur.col - 1; 920 rp = line->r + screen.cur.col - 1;
991 921
992 while (*tp == NOCHAR && tp > stp) 922 while (*tp == NOCHAR && tp > line->t)
993 tp--, rp--; 923 tp--, rp--;
994 } 924 }
995 else if (screen.cur.row > 0 925 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 926 && ROW(screen.cur.row - 1).is_longer ())
997 { 927 {
998 int line = screen.cur.row - 1 + TermWin.saveLines; 928 line_t *line = &ROW(screen.cur.row - 1);
999 929
1000 tp = screen.text[line] + last_col - 1; 930 tp = line->t + last_col - 1;
1001 rp = screen.rend[line] + last_col - 1; 931 rp = line->r + last_col - 1;
1002 932
1003 while (*tp == NOCHAR && tp > screen.text[line]) 933 while (*tp == NOCHAR && tp > line->t)
1004 tp--, rp--; 934 tp--, rp--;
1005 } 935 }
1006 else 936 else
1007 continue; 937 continue;
1008 938
… …
1015 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1016#endif 946#endif
1017 } 947 }
1018 } 948 }
1019 949
1020 if (screen.tlen[row] != -1) /* XXX: think about this */ 950 if (!line->is_longer ()) /* XXX: think about this */
1021 MAX_IT (screen.tlen[row], screen.cur.col); 951 max_it (line->l, screen.cur.col);
1022 952
1023#ifdef DEBUG_STRICT 953#ifdef DEBUG_STRICT
1024 assert (screen.cur.row >= 0); 954 assert (screen.cur.row >= 0);
1025#else /* drive with your eyes closed */
1026 MAX_IT (screen.cur.row, 0);
1027#endif 955#endif
1028} 956}
1029 957
1030/* ------------------------------------------------------------------------- */ 958/* ------------------------------------------------------------------------- */
1031/* 959/*
… …
1040 if (screen.cur.col == 0) 968 if (screen.cur.col == 0)
1041 { 969 {
1042 if (screen.cur.row > 0) 970 if (screen.cur.row > 0)
1043 { 971 {
1044#ifdef TERMCAP_HAS_BW 972#ifdef TERMCAP_HAS_BW
1045 screen.cur.col = TermWin.ncol - 1; 973 screen.cur.col = ncol - 1;
1046 screen.cur.row--; 974 screen.cur.row--;
1047 return; 975 return;
1048#endif 976#endif
1049 } 977 }
1050 } 978 }
… …
1070 998
1071 if (count == 0) 999 if (count == 0)
1072 return; 1000 return;
1073 else if (count > 0) 1001 else if (count > 0)
1074 { 1002 {
1075 int row = TermWin.saveLines + screen.cur.row; 1003 line_t &l = ROW(screen.cur.row);
1076 text_t *tp = screen.text[row];
1077 rend_t *rp = screen.rend[row];
1078 rend_t base_rend = rp[i]; 1004 rend_t base_rend = l.r[i];
1079 ht &= tp[i] == ' '; 1005 ht &= l.t[i] == ' ';
1080 1006
1081 for (; ++i < TermWin.ncol; ) 1007 for (; ++i < ncol; )
1082 if (tabs[i]) 1008 if (tabs[i])
1083 { 1009 {
1084 x = i; 1010 x = i;
1085 if (!--count) 1011 if (!--count)
1086 break; 1012 break;
1087 } 1013 }
1088 else 1014 else
1089 ht &= tp[i] == ' ' 1015 ht &= l.t[i] == ' '
1090 && RS_SAME (rp[i], base_rend); 1016 && RS_SAME (l.r[i], base_rend);
1091 1017
1092 if (count) 1018 if (count)
1093 x = TermWin.ncol - 1; 1019 x = ncol - 1;
1094 1020
1095 // store horizontal tab commands as characters inside the text 1021 // store horizontal tab commands as characters inside the text
1096 // buffer so they can be selected and pasted. 1022 // buffer so they can be selected and pasted.
1097 if (ht && options & Opt_pastableTabs) 1023 if (ht && options & Opt_pastableTabs)
1098 { 1024 {
1099 base_rend = SET_FONT (base_rend, 0); 1025 base_rend = SET_FONT (base_rend, 0);
1100 1026
1101 if (screen.tlen[row] != -1) /* XXX: think about this */ 1027 if (!l.is_longer ()) /* XXX: think about this */
1102 MAX_IT (screen.tlen[row], x); 1028 max_it (l.l, x);
1103 1029
1104 i = screen.cur.col; 1030 i = screen.cur.col;
1105 1031
1106 tp[i] = '\t'; 1032 l.t[i] = '\t';
1107 rp[i] = base_rend; 1033 l.r[i] = base_rend;
1108 1034
1109 while (++i < x) 1035 while (++i < x)
1110 { 1036 {
1111 tp[i] = NOCHAR; 1037 l.t[i] = NOCHAR;
1112 rp[i] = base_rend; 1038 l.r[i] = base_rend;
1113 } 1039 }
1114 } 1040 }
1115 } 1041 }
1116 else /* if (count < 0) */ 1042 else /* if (count < 0) */
1117 { 1043 {
… …
1143rxvt_term::scr_backindex () 1069rxvt_term::scr_backindex ()
1144{ 1070{
1145 if (screen.cur.col > 0) 1071 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1073 else
1148 {
1149 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1150 return; /* um, yeah? */
1151
1152 scr_insdel_chars (1, INSERT); 1074 scr_insdel_chars (1, INSERT);
1153 }
1154} 1075}
1155#endif 1076#endif
1156/* ------------------------------------------------------------------------- */ 1077/* ------------------------------------------------------------------------- */
1157/* 1078/*
1158 * Process DEC Forward Index 1079 * Process DEC Forward Index
… …
1162 */ 1083 */
1163#if ENABLE_FRILLS 1084#if ENABLE_FRILLS
1164void 1085void
1165rxvt_term::scr_forwardindex () 1086rxvt_term::scr_forwardindex ()
1166{ 1087{
1167 int row;
1168
1169 if (screen.cur.col < TermWin.ncol - 1) 1088 if (screen.cur.col < ncol - 1)
1170 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1171 else 1090 else
1172 { 1091 {
1173 row = screen.cur.row + TermWin.saveLines; 1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1174 1093 ROW(screen.cur.row).l = ncol;
1175 if (screen.tlen[row] == 0)
1176 return; /* um, yeah? */
1177 else if (screen.tlen[row] == -1)
1178 screen.tlen[row] = TermWin.ncol;
1179 1094
1180 scr_gotorc (0, 0, R_RELATIVE); 1095 scr_gotorc (0, 0, R_RELATIVE);
1181 scr_insdel_chars (1, DELETE); 1096 scr_insdel_chars (1, DELETE);
1182 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1097 scr_gotorc (0, ncol - 1, R_RELATIVE);
1183 } 1098 }
1184} 1099}
1185#endif 1100#endif
1186 1101
1187/* ------------------------------------------------------------------------- */ 1102/* ------------------------------------------------------------------------- */
… …
1193{ 1108{
1194 want_refresh = 1; 1109 want_refresh = 1;
1195 ZERO_SCROLLBACK (); 1110 ZERO_SCROLLBACK ();
1196 1111
1197 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1112 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1198 MAX_IT (screen.cur.col, 0); 1113 clamp_it (screen.cur.col, 0, ncol - 1);
1199 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1200 1114
1201 screen.flags &= ~Screen_WrapNext; 1115 screen.flags &= ~Screen_WrapNext;
1202 1116
1203 if (relative & R_RELATIVE) 1117 if (relative & R_RELATIVE)
1204 { 1118 {
… …
1222 else 1136 else
1223 { 1137 {
1224 if (screen.flags & Screen_Relative) 1138 if (screen.flags & Screen_Relative)
1225 { /* relative origin mode */ 1139 { /* relative origin mode */
1226 screen.cur.row = row + screen.tscroll; 1140 screen.cur.row = row + screen.tscroll;
1227 MIN_IT (screen.cur.row, screen.bscroll); 1141 min_it (screen.cur.row, screen.bscroll);
1228 } 1142 }
1229 else 1143 else
1230 screen.cur.row = row; 1144 screen.cur.row = row;
1231 } 1145 }
1232 1146
1233 MAX_IT (screen.cur.row, 0); 1147 clamp_it (screen.cur.row, 0, nrow - 1);
1234 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1235} 1148}
1236 1149
1237/* ------------------------------------------------------------------------- */ 1150/* ------------------------------------------------------------------------- */
1238/* 1151/*
1239 * direction should be UP or DN 1152 * direction should be UP or DN
… …
1250 1163
1251 screen.flags &= ~Screen_WrapNext; 1164 screen.flags &= ~Screen_WrapNext;
1252 1165
1253 if ((screen.cur.row == screen.bscroll && direction == UP) 1166 if ((screen.cur.row == screen.bscroll && direction == UP)
1254 || (screen.cur.row == screen.tscroll && direction == DN)) 1167 || (screen.cur.row == screen.tscroll && direction == DN))
1255 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1168 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1256 else 1169 else
1257 screen.cur.row += dirn; 1170 screen.cur.row += dirn;
1258 1171
1259 MAX_IT (screen.cur.row, 0); 1172 clamp_it (screen.cur.row, 0, nrow - 1);
1260 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1261 selection_check (0); 1173 selection_check (0);
1262} 1174}
1263 1175
1264/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1265/* 1177/*
… …
1269 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1270 */ 1182 */
1271void 1183void
1272rxvt_term::scr_erase_line (int mode) 1184rxvt_term::scr_erase_line (int mode)
1273{ 1185{
1274 unsigned int row, col, num; 1186 unsigned int col, num;
1275 1187
1276 want_refresh = 1; 1188 want_refresh = 1;
1277 ZERO_SCROLLBACK (); 1189 ZERO_SCROLLBACK ();
1278 1190
1279 selection_check (1); 1191 selection_check (1);
1280 1192
1281 row = TermWin.saveLines + screen.cur.row; 1193 line_t &line = ROW(screen.cur.row);
1194
1282 switch (mode) 1195 switch (mode)
1283 { 1196 {
1284 case 0: /* erase to end of line */ 1197 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1198 col = screen.cur.col;
1286 num = TermWin.ncol - col; 1199 num = ncol - col;
1287 MIN_IT (screen.tlen[row], (int16_t)col); 1200 min_it (line.l, col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1201 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1202 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1203 CLEAR_SELECTION ();
1291 break; 1204 break;
1292 case 1: /* erase to beginning of line */ 1205 case 1: /* erase to beginning of line */
… …
1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1209 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1297 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1298 break; 1211 break;
1299 case 2: /* erase whole line */ 1212 case 2: /* erase whole line */
1300 col = 0; 1213 col = 0;
1301 num = TermWin.ncol; 1214 num = ncol;
1302 screen.tlen[row] = 0; 1215 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1216 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1217 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1218 CLEAR_SELECTION ();
1306 break; 1219 break;
1307 default: 1220 default:
1308 return; 1221 return;
1309 } 1222 }
1310 1223
1311 if (screen.text[row]) 1224 scr_blank_line (line, col, num, rstyle);
1312 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1313 else
1314 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1315} 1225}
1316 1226
1317/* ------------------------------------------------------------------------- */ 1227/* ------------------------------------------------------------------------- */
1318/* 1228/*
1319 * Erase part of whole of the screen 1229 * Erase part of whole of the screen
… …
1323 */ 1233 */
1324void 1234void
1325rxvt_term::scr_erase_screen (int mode) 1235rxvt_term::scr_erase_screen (int mode)
1326{ 1236{
1327 int num; 1237 int num;
1328 int32_t row, row_offset; 1238 int32_t row;
1329 rend_t ren; 1239 rend_t ren;
1330 XGCValues gcvalue; 1240 XGCValues gcvalue;
1331 1241
1332 want_refresh = 1; 1242 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)TermWin.saveLines;
1336 1244
1337 switch (mode) 1245 switch (mode)
1338 { 1246 {
1339 case 0: /* erase to end of screen */ 1247 case 0: /* erase to end of screen */
1340 selection_check (1); 1248 selection_check (1);
1341 scr_erase_line (0); 1249 scr_erase_line (0);
1342 row = screen.cur.row + 1; /* possible OOB */ 1250 row = screen.cur.row + 1; /* possible OOB */
1343 num = TermWin.nrow - row; 1251 num = nrow - row;
1344 break; 1252 break;
1345 case 1: /* erase to beginning of screen */ 1253 case 1: /* erase to beginning of screen */
1346 selection_check (3); 1254 selection_check (3);
1347 scr_erase_line (1); 1255 scr_erase_line (1);
1348 row = 0; 1256 row = 0;
1349 num = screen.cur.row; 1257 num = screen.cur.row;
1350 break; 1258 break;
1351 case 2: /* erase whole screen */ 1259 case 2: /* erase whole screen */
1352 selection_check (3); 1260 selection_check (3);
1353 row = 0; 1261 row = 0;
1354 num = TermWin.nrow; 1262 num = nrow;
1355 break; 1263 break;
1356 default: 1264 default:
1357 return; 1265 return;
1358 } 1266 }
1359 1267
… …
1361 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1269 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1362 || (selection.end.row >= row 1270 || (selection.end.row >= row
1363 && selection.end.row <= row + num))) 1271 && selection.end.row <= row + num)))
1364 CLEAR_SELECTION (); 1272 CLEAR_SELECTION ();
1365 1273
1366 if (row >= TermWin.nrow) /* Out Of Bounds */ 1274 if (row >= nrow) /* Out Of Bounds */
1367 return; 1275 return;
1368 1276
1369 MIN_IT (num, (TermWin.nrow - row)); 1277 min_it (num, nrow - row);
1370 1278
1371 if (rstyle & (RS_RVid | RS_Uline)) 1279 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1280 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1281 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1282 {
… …
1377 } 1285 }
1378 else 1286 else
1379 { 1287 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1288 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1289 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1382 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1290 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1291 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1292 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1293 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386 } 1294 }
1387 1295
1388 for (; num--; row++) 1296 for (; num--; row++)
1389 { 1297 {
1390 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1298 ROW (row).l = 0;
1391 screen.tlen[row + row_offset] = 0; 1299 scr_blank_screen_mem (ROW (row), rstyle);
1392 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1300 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1301 }
1394} 1302}
1303
1304#if ENABLE_FRILLS
1305void
1306rxvt_term::scr_erase_savelines ()
1307{
1308 want_refresh = 1;
1309 ZERO_SCROLLBACK ();
1310
1311 nsaved = 0;
1312}
1313#endif
1395 1314
1396/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1397/* 1316/*
1398 * Fill the screen with `E's 1317 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1318 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1319 */
1401void 1320void
1402rxvt_term::scr_E () 1321rxvt_term::scr_E ()
1403{ 1322{
1404 int i, j, k; 1323 rend_t fs;
1405 rend_t *r1, fs;
1406 1324
1407 want_refresh = 1; 1325 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1409 1327
1410 num_scr_allow = 0; 1328 num_scr_allow = 0;
1411 selection_check (3); 1329 selection_check (3);
1412 1330
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1331 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1332 for (int row = nrow; row--; )
1415 { 1333 {
1416 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1334 line_t &line = ROW(row);
1335
1417 fill_text (screen.text[k], 'E', TermWin.ncol); 1336 fill_text (line.t, 'E', ncol);
1418 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1337 rend_t *r1 = line.r;
1338
1339 for (int j = ncol; j--; )
1419 *r1++ = fs; 1340 *r1++ = fs;
1341
1342 line.l = ncol; /* make the `E's selectable */
1420 } 1343 }
1421} 1344}
1422 1345
1423/* ------------------------------------------------------------------------- */ 1346/* ------------------------------------------------------------------------- */
1424/* 1347/*
… …
1445 count = end; 1368 count = end;
1446 } 1369 }
1447 1370
1448 scr_do_wrap (); 1371 scr_do_wrap ();
1449 1372
1450 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1373 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1451} 1374}
1452 1375
1453/* ------------------------------------------------------------------------- */ 1376/* ------------------------------------------------------------------------- */
1454/* 1377/*
1455 * Insert/Delete <count> characters from the current position 1378 * Insert/Delete <count> characters from the current position
… …
1457void 1380void
1458rxvt_term::scr_insdel_chars (int count, int insdel) 1381rxvt_term::scr_insdel_chars (int count, int insdel)
1459{ 1382{
1460 int col, row; 1383 int col, row;
1461 rend_t tr; 1384 rend_t tr;
1462 text_t *stp;
1463 rend_t *srp;
1464 int16_t *slp;
1465 1385
1466 want_refresh = 1; 1386 want_refresh = 1;
1467 ZERO_SCROLLBACK (); 1387 ZERO_SCROLLBACK ();
1468 1388
1469 if (count <= 0) 1389 if (count <= 0)
1470 return; 1390 return;
1471 1391
1472 scr_do_wrap (); 1392 scr_do_wrap ();
1473 1393
1474 selection_check (1); 1394 selection_check (1);
1475 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1395 min_it (count, ncol - screen.cur.col);
1476 1396
1477 row = screen.cur.row + TermWin.saveLines;
1478
1479 stp = screen.text[row];
1480 srp = screen.rend[row]; 1397 row = screen.cur.row;
1481 slp = &screen.tlen[row]; 1398
1399 line_t *line = &ROW(row);
1482 1400
1483 switch (insdel) 1401 switch (insdel)
1484 { 1402 {
1485 case INSERT: 1403 case INSERT:
1486 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1487 { 1405 {
1488 stp[col] = stp[col - count]; 1406 line->t[col] = line->t[col - count];
1489 srp[col] = srp[col - count]; 1407 line->r[col] = line->r[col - count];
1490 } 1408 }
1491 1409
1492 if (*slp != -1) 1410 if (!line->is_longer ())
1493 { 1411 {
1494 *slp += count; 1412 line->l += count;
1495 MIN_IT (*slp, TermWin.ncol); 1413 min_it (line->l, ncol);
1496 } 1414 }
1497 1415
1498 if (selection.op && current_screen == selection.screen 1416 if (selection.op && current_screen == selection.screen
1499 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1500 { 1418 {
1501 if (selection.end.row != screen.cur.row 1419 if (selection.end.row != screen.cur.row
1502 || (selection.end.col + count >= TermWin.ncol)) 1420 || (selection.end.col + count >= ncol))
1503 CLEAR_SELECTION (); 1421 CLEAR_SELECTION ();
1504 else 1422 else
1505 { /* shift selection */ 1423 { /* shift selection */
1506 selection.beg.col += count; 1424 selection.beg.col += count;
1507 selection.mark.col += count; /* XXX: yes? */ 1425 selection.mark.col += count; /* XXX: yes? */
1508 selection.end.col += count; 1426 selection.end.col += count;
1509 } 1427 }
1510 } 1428 }
1511 1429
1512 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1430 scr_blank_line (*line, screen.cur.col, count, rstyle);
1513 (unsigned int)count, rstyle);
1514 break; 1431 break;
1515 1432
1516 case ERASE: 1433 case ERASE:
1517 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1434 screen.cur.col += count; /* don't worry if > ncol */
1518 selection_check (1); 1435 selection_check (1);
1519 screen.cur.col -= count; 1436 screen.cur.col -= count;
1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1437 scr_blank_line (*line, screen.cur.col, count, rstyle);
1521 (unsigned int)count, rstyle);
1522 break; 1438 break;
1523 1439
1524 case DELETE: 1440 case DELETE:
1525 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1526 1442
1527 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1443 for (col = screen.cur.col; (col + count) < ncol; col++)
1528 { 1444 {
1529 stp[col] = stp[col + count]; 1445 line->t[col] = line->t[col + count];
1530 srp[col] = srp[col + count]; 1446 line->r[col] = line->r[col + count];
1531 } 1447 }
1532 1448
1533 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1449 scr_blank_line (*line, ncol - count, count, tr);
1534 (unsigned int)count, tr);
1535 1450
1536 if (*slp == -1) /* break line continuation */ 1451 if (line->is_longer ()) /* break line continuation */
1537 *slp = TermWin.ncol; 1452 line->l = ncol;
1538 1453
1539 *slp -= count; 1454 line->l = max (line->l - count, 0);
1540 MAX_IT (*slp, 0);
1541 1455
1542 if (selection.op && current_screen == selection.screen 1456 if (selection.op && current_screen == selection.screen
1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1544 { 1458 {
1545 if (selection.end.row != screen.cur.row 1459 if (selection.end.row != screen.cur.row
1546 || (screen.cur.col >= selection.beg.col - count) 1460 || (screen.cur.col >= selection.beg.col - count)
1547 || selection.end.col >= TermWin.ncol) 1461 || selection.end.col >= ncol)
1548 CLEAR_SELECTION (); 1462 CLEAR_SELECTION ();
1549 else 1463 else
1550 { 1464 {
1551 /* shift selection */ 1465 /* shift selection */
1552 selection.beg.col -= count; 1466 selection.beg.col -= count;
… …
1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1479 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1566 */ 1480 */
1567void 1481void
1568rxvt_term::scr_scroll_region (int top, int bot) 1482rxvt_term::scr_scroll_region (int top, int bot)
1569{ 1483{
1570 MAX_IT (top, 0); 1484 max_it (top, 0);
1571 MIN_IT (bot, (int)TermWin.nrow - 1); 1485 min_it (bot, nrow - 1);
1572 1486
1573 if (top > bot) 1487 if (top > bot)
1574 return; 1488 return;
1575 1489
1576 screen.tscroll = top; 1490 screen.tscroll = top;
… …
1655 */ 1569 */
1656void 1570void
1657rxvt_term::scr_set_tab (int mode) 1571rxvt_term::scr_set_tab (int mode)
1658{ 1572{
1659 if (mode < 0) 1573 if (mode < 0)
1660 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1574 memset (tabs, 0, ncol * sizeof (char));
1661 else if (screen.cur.col < TermWin.ncol) 1575 else if (screen.cur.col < ncol)
1662 tabs[screen.cur.col] = (mode ? 1 : 0); 1576 tabs[screen.cur.col] = (mode ? 1 : 0);
1663} 1577}
1664 1578
1665/* ------------------------------------------------------------------------- */ 1579/* ------------------------------------------------------------------------- */
1666/* 1580/*
… …
1674 XGCValues gcvalue; 1588 XGCValues gcvalue;
1675 1589
1676 if (rvideo != mode) 1590 if (rvideo != mode)
1677 { 1591 {
1678 rvideo = mode; 1592 rvideo = mode;
1679 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1680#if XPM_BACKGROUND 1594#if XPM_BACKGROUND
1681 if (bgPixmap.pixmap == None) 1595 if (bgPixmap.pixmap == None)
1682#endif 1596#endif
1683#if TRANSPARENT 1597#if TRANSPARENT
1684 if (! (options & Opt_transparent) || am_transparent == 0) 1598 if (! (options & Opt_transparent) || am_transparent == 0)
1685#endif 1599#endif
1686 XSetWindowBackground (display->display, TermWin.vt, 1600 XSetWindowBackground (display->display, vt,
1687 pix_colors[Color_bg]); 1601 pix_colors[Color_bg]);
1688 1602
1689 gcvalue.foreground = pix_colors[Color_fg]; 1603 gcvalue.foreground = pix_colors[Color_fg];
1690 gcvalue.background = pix_colors[Color_bg]; 1604 gcvalue.background = pix_colors[Color_bg];
1691 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1605 XChangeGC (display->display, gc, GCBackground | GCForeground,
1692 &gcvalue); 1606 &gcvalue);
1693 scr_clear (); 1607 scr_clear ();
1694 scr_touch (true); 1608 scr_touch (true);
1695 } 1609 }
1696} 1610}
… …
1777bool 1691bool
1778rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1692rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1779{ 1693{
1780 bool found = false; 1694 bool found = false;
1781 1695
1782 for (int i = 0; i < TermWin.nrow; i++) 1696 for (int i = 0; i < nrow; i++)
1783 { 1697 {
1784 int col = 0; 1698 int col = 0;
1785 rend_t *drp = drawn_rend [i]; 1699 rend_t *drp = drawn_buf[i].r;
1786 1700
1787 for (; col < TermWin.ncol; col++, drp++) 1701 for (; col < ncol; col++, drp++)
1788 if ((*drp & mask) == value) 1702 if ((*drp & mask) == value)
1789 { 1703 {
1790 found = true; 1704 found = true;
1791 *drp = ~value; 1705 *drp = ~value;
1792 } 1706 }
… …
1803 PART_END, 1717 PART_END,
1804 RC_COUNT 1718 RC_COUNT
1805}; 1719};
1806 1720
1807void 1721void
1808rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1722rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1809{ 1723{
1810 int i; 1724 int i;
1811 row_col_t rc[RC_COUNT]; 1725 row_col_t rc[RC_COUNT];
1812 1726
1813 if (drawn_text == NULL) /* sanity check */ 1727 if (!drawn_buf) /* sanity check */
1814 return; 1728 return;
1815 1729
1816#ifndef NO_SLOW_LINK_SUPPORT 1730#ifndef NO_SLOW_LINK_SUPPORT
1817 if (refresh_type == FAST_REFRESH && !display->is_local) 1731 if (refresh_type == FAST_REFRESH && !display->is_local)
1818 { 1732 {
1819 y = 0; 1733 y = 0;
1820 height = TermWin.height; 1734 eheight = height;
1821 } 1735 }
1822#endif
1823
1824#ifdef DEBUG_STRICT
1825 x = max (x, 0);
1826 x = min (x, (int)TermWin.width);
1827 y = max (y, 0);
1828 y = min (y, (int)TermWin.height);
1829#endif 1736#endif
1830 1737
1831 /* round down */ 1738 /* round down */
1832 rc[PART_BEG].col = Pixel2Col (x); 1739 rc[PART_BEG].col = Pixel2Col (x);
1833 rc[PART_BEG].row = Pixel2Row (y); 1740 rc[PART_BEG].row = Pixel2Row (y);
1834 /* round up */ 1741 /* round up */
1835 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1742 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1836 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1743 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1837 1744
1838 /* sanity checks */ 1745 /* sanity checks */
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1746 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1747 {
1841 MIN_IT (rc[i].col, TermWin.ncol - 1); 1748 min_it (rc[i].col, ncol - 1);
1842 MIN_IT (rc[i].row, TermWin.nrow - 1); 1749 min_it (rc[i].row, nrow - 1);
1843 } 1750 }
1844 1751
1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1846 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1847 1754
1848 if (refresh) 1755 if (refresh)
1849 scr_refresh (SLOW_REFRESH); 1756 scr_refresh (SLOW_REFRESH);
1850} 1757}
1851 1758
… …
1854 * Refresh the entire screen 1761 * Refresh the entire screen
1855 */ 1762 */
1856void 1763void
1857rxvt_term::scr_touch (bool refresh) 1764rxvt_term::scr_touch (bool refresh)
1858{ 1765{
1859 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1766 scr_expose (0, 0, width, height, refresh);
1860} 1767}
1861 1768
1862/* ------------------------------------------------------------------------- */ 1769/* ------------------------------------------------------------------------- */
1863/* 1770/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1771 * Move the display so that the line represented by scrollbar value Y is at
… …
1868rxvt_term::scr_move_to (int y, int len) 1775rxvt_term::scr_move_to (int y, int len)
1869{ 1776{
1870 long p = 0; 1777 long p = 0;
1871 unsigned int oldviewstart; 1778 unsigned int oldviewstart;
1872 1779
1873 oldviewstart = TermWin.view_start; 1780 oldviewstart = view_start;
1874 1781
1875 if (y < len) 1782 if (y < len)
1876 { 1783 {
1877 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1784 p = (nrow + nsaved) * (len - y) / len;
1878 p -= (long) (TermWin.nrow - 1); 1785 p -= (long) (nrow - 1);
1879 p = max (p, 0); 1786 p = max (p, 0);
1880 } 1787 }
1881 1788
1882 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1789 view_start = (unsigned int)min (p, nsaved);
1883 1790
1884 return scr_changeview (oldviewstart); 1791 return scr_changeview (oldviewstart);
1885} 1792}
1886 1793
1887/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
… …
1893rxvt_term::scr_page (enum page_dirn direction, int nlines) 1800rxvt_term::scr_page (enum page_dirn direction, int nlines)
1894{ 1801{
1895 int n; 1802 int n;
1896 unsigned int oldviewstart; 1803 unsigned int oldviewstart;
1897 1804
1898#ifdef DEBUG_STRICT
1899 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1900#endif
1901 oldviewstart = TermWin.view_start; 1805 oldviewstart = view_start;
1806
1902 if (direction == UP) 1807 if (direction == UP)
1903 { 1808 {
1904 n = TermWin.view_start + nlines; 1809 n = view_start + nlines;
1905 TermWin.view_start = min (n, TermWin.nscrolled); 1810 view_start = min (n, nsaved);
1906 } 1811 }
1907 else 1812 else
1908 { 1813 {
1909 n = TermWin.view_start - nlines; 1814 n = view_start - nlines;
1910 TermWin.view_start = max (n, 0); 1815 view_start = max (n, 0);
1911 } 1816 }
1817
1912 return scr_changeview (oldviewstart); 1818 return scr_changeview (oldviewstart);
1913} 1819}
1914 1820
1915int 1821int
1916rxvt_term::scr_changeview (unsigned int oldviewstart) 1822rxvt_term::scr_changeview (unsigned int oldviewstart)
1917{ 1823{
1918 if (TermWin.view_start != oldviewstart) 1824 if (view_start != oldviewstart)
1919 { 1825 {
1920 want_refresh = 1; 1826 want_refresh = 1;
1921 num_scr -= (TermWin.view_start - oldviewstart); 1827 num_scr -= (view_start - oldviewstart);
1922 } 1828 }
1923 1829
1924 return (int) (TermWin.view_start - oldviewstart); 1830 return (int) (view_start - oldviewstart);
1925} 1831}
1926 1832
1927/* ------------------------------------------------------------------------- */ 1833/* ------------------------------------------------------------------------- */
1928void 1834void
1929rxvt_term::scr_bell () 1835rxvt_term::scr_bell ()
1930{ 1836{
1931#ifndef NO_BELL 1837#ifndef NO_BELL
1838
1932# ifndef NO_MAPALERT 1839# ifndef NO_MAPALERT
1933# ifdef MAPALERT_OPTION 1840# ifdef MAPALERT_OPTION
1934 if (options & Opt_mapAlert) 1841 if (options & Opt_mapAlert)
1935# endif 1842# endif
1936 XMapWindow (display->display, TermWin.parent[0]); 1843 XMapWindow (display->display, parent[0]);
1937# endif 1844# endif
1845
1938 if (options & Opt_visualBell) 1846 if (options & Opt_visualBell)
1939 { 1847 {
1940 scr_rvideo_mode (!rvideo); /* refresh also done */ 1848 scr_rvideo_mode (!rvideo); /* refresh also done */
1849 rxvt_usleep (VISUAL_BELL_DURATION);
1941 scr_rvideo_mode (!rvideo); /* refresh also done */ 1850 scr_rvideo_mode (!rvideo); /* refresh also done */
1942 } 1851 }
1943 else 1852 else
1944 XBell (display->display, 0); 1853 XBell (display->display, 0);
1854
1945#endif 1855#endif
1946} 1856}
1947 1857
1948/* ------------------------------------------------------------------------- */ 1858/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */ 1859/* ARGSUSED */
1950void 1860void
1951rxvt_term::scr_printscreen (int fullhist) 1861rxvt_term::scr_printscreen (int fullhist)
1952{ 1862{
1953#ifdef PRINTPIPE 1863#ifdef PRINTPIPE
1954 int i, r1, nrows, row_offset; 1864 int nrows, row_start;
1955 FILE *fd; 1865 FILE *fd;
1956 1866
1957 if ((fd = popen_printer ()) == NULL) 1867 if ((fd = popen_printer ()) == NULL)
1958 return; 1868 return;
1959 1869
1960 nrows = TermWin.nrow;
1961 row_offset = TermWin.saveLines;
1962
1963 if (!fullhist) 1870 if (fullhist)
1964 row_offset -= TermWin.view_start; 1871 {
1872 nrows = nrow + nsaved;
1873 row_start = -nsaved;
1874 }
1965 else 1875 else
1966 { 1876 {
1967 nrows += TermWin.nscrolled; 1877 nrows = nrow;
1968 row_offset -= TermWin.nscrolled; 1878 row_start = -view_start;
1969 } 1879 }
1970 1880
1971 wctomb (0, 0); 1881 wctomb (0, 0);
1972 1882
1973 for (r1 = 0; r1 < nrows; r1++) 1883 for (int r1 = 0; r1 < nrows; r1++)
1974 { 1884 {
1975 text_t *tp = screen.text[r1 + row_offset]; 1885 text_t *tp = ROW(r1).t;
1976 int len = screen.tlen[r1 + row_offset]; 1886 int len = ROW(r1).l;
1977 1887
1978 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1888 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1979 { 1889 {
1980 char mb[MB_LEN_MAX]; 1890 char mb[MB_LEN_MAX];
1981 text_t t = *tp++; 1891 text_t t = *tp++;
1982 if (t == NOCHAR) 1892 if (t == NOCHAR)
1983 continue; 1893 continue;
… …
2004/* 1914/*
2005 * Refresh the screen 1915 * Refresh the screen
2006 * drawn_text/drawn_rend contain the screen information before the update. 1916 * drawn_text/drawn_rend contain the screen information before the update.
2007 * screen.text/screen.rend contain what the screen will change to. 1917 * screen.text/screen.rend contain what the screen will change to.
2008 */ 1918 */
2009
2010#define FONT_WIDTH(X, Y) \
2011 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2012#define FONT_RBEAR(X, Y) \
2013 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2014#define FONT_LBEAR(X, Y) \
2015 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2016#define IS_FONT_CHAR(X, Y) \
2017 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2018
2019void 1919void
2020rxvt_term::scr_refresh (unsigned char refresh_type) 1920rxvt_term::scr_refresh (unsigned char refresh_type)
2021{ 1921{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1922 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 1923 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1924 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1925 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1926 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1927#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1928 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1929#endif
2031 rend_t *crp; // cursor rendition pointer 1930 rend_t *crp; // cursor rendition pointer
2032 1931
2033 want_refresh = 0; /* screen is current */ 1932 want_refresh = 0; /* screen is current */
2034 1933
2035 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1934 if (refresh_type == NO_REFRESH || !mapped)
2036 return; 1935 return;
2037 1936
2038 /* 1937 /*
2039 * A: set up vars 1938 * A: set up vars
2040 */ 1939 */
2041 must_clear = 0; 1940 must_clear = 0;
2042 refresh_count = 0; 1941 refresh_count = 0;
2043 1942
2044 row_offset = TermWin.saveLines - TermWin.view_start;
2045
2046#if XPM_BACKGROUND 1943#if XPM_BACKGROUND
2047 must_clear |= (bgPixmap.pixmap != None); 1944 must_clear |= bgPixmap.pixmap != None;
2048#endif 1945#endif
2049#if TRANSPARENT 1946#if TRANSPARENT
2050 must_clear |= ((options & Opt_transparent) && am_transparent); 1947 must_clear |= (options & Opt_transparent) && am_transparent;
2051#endif 1948#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1949 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 1950
2054 /* 1951 /*
2055 * B: reverse any characters which are selected 1952 * B: reverse any characters which are selected
… …
2072 1969
2073 if (showcursor) 1970 if (showcursor)
2074 { 1971 {
2075 int col = screen.cur.col; 1972 int col = screen.cur.col;
2076 1973
2077 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1974 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 1975 col--;
2079 1976
2080 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1977 crp = &ROW(screen.cur.row).r[col];
2081 1978
2082 if (showcursor && TermWin.focus) 1979 if (showcursor && focus)
2083 { 1980 {
1981 if (options & Opt_cursorUnderline)
1982 *crp ^= RS_Uline;
1983 else
1984 {
2084 *crp ^= RS_RVid; 1985 *crp ^= RS_RVid;
1986
2085#ifndef NO_CURSORCOLOR 1987#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask); 1988 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 1989 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 1990 ccol1 = Color_cursor;
2089 else 1991 else
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol1 = GET_FGCOLOR (rstyle); 1993 ccol1 = GET_FGCOLOR (rstyle);
2092#else 1994#else
2093 ccol1 = Color_fg; 1995 ccol1 = Color_fg;
2094#endif 1996#endif
2095 if (ISSET_PIXCOLOR (Color_cursor2)) 1997 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2; 1998 ccol2 = Color_cursor2;
2097 else 1999 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol2 = GET_BGCOLOR (rstyle); 2001 ccol2 = GET_BGCOLOR (rstyle);
2100#else 2002#else
2101 ccol2 = Color_bg; 2003 ccol2 = Color_bg;
2102#endif 2004#endif
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2005 *crp = SET_FGCOLOR (*crp, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2006 *crp = SET_BGCOLOR (*crp, ccol2);
2105#endif 2007#endif
2008 }
2106 } 2009 }
2107 } 2010 }
2108 2011
2109 /* make sure no outline cursor is left around */ 2012 /* make sure no outline cursor is left around */
2110 setoldcursor = 0; 2013 setoldcursor = 0;
2111 if (ocrow != -1) 2014 if (ocrow != -1)
2112 { 2015 {
2113 if (screen.cur.row + TermWin.view_start != ocrow 2016 if (screen.cur.row + view_start != ocrow
2114 || screen.cur.col != oldcursor.col) 2017 || screen.cur.col != oldcursor.col)
2115 { 2018 {
2116 if (ocrow < TermWin.nrow 2019 if (ocrow < nrow
2117 && oldcursor.col < TermWin.ncol) 2020 && oldcursor.col < ncol)
2118 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2119 2022
2120 if (TermWin.focus || !showcursor) 2023 if (focus || !showcursor)
2121 oldcursor.row = -1; 2024 oldcursor.row = -1;
2122 else 2025 else
2123 setoldcursor = 1; 2026 setoldcursor = 1;
2124 } 2027 }
2125 } 2028 }
2126 else if (!TermWin.focus) 2029 else if (!focus)
2127 setoldcursor = 1; 2030 setoldcursor = 1;
2128 2031
2129 if (setoldcursor) 2032 if (setoldcursor)
2130 { 2033 {
2131 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2034 if (screen.cur.row + view_start >= nrow)
2132 oldcursor.row = -1; 2035 oldcursor.row = -1;
2133 else 2036 else
2134 { 2037 {
2135 oldcursor.row = screen.cur.row + TermWin.view_start; 2038 oldcursor.row = screen.cur.row + view_start;
2136 oldcursor.col = screen.cur.col; 2039 oldcursor.col = screen.cur.col;
2137 } 2040 }
2138 } 2041 }
2139 } 2042 }
2140 2043
2141#if ENABLE_OVERLAY 2044#if ENABLE_OVERLAY
2142 scr_swap_overlay (); 2045 scr_swap_overlay ();
2143#endif 2046#endif
2144
2145 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2146 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2147 2047
2148#ifndef NO_SLOW_LINK_SUPPORT 2048#ifndef NO_SLOW_LINK_SUPPORT
2149 /* 2049 /*
2150 * D: CopyArea pass - very useful for slower links 2050 * D: CopyArea pass - very useful for slower links
2151 * This has been deliberately kept simple. 2051 * This has been deliberately kept simple.
2152 */ 2052 */
2153 i = num_scr; 2053 i = num_scr;
2154 if (!display->is_local 2054 if (!display->is_local
2155 && refresh_type == FAST_REFRESH && num_scr_allow && i 2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2156 && abs (i) < TermWin.nrow && !must_clear) 2056 && abs (num_scr) < nrow && !must_clear)
2157 { 2057 {
2158 int16_t nits; 2058 int16_t nits;
2159 int j; 2059 int j;
2160 int len, wlen; 2060 int len, wlen;
2161 2061
2162 j = TermWin.nrow; 2062 j = nrow;
2163 wlen = len = -1; 2063 wlen = len = -1;
2164 row = i > 0 ? 0 : j - 1; 2064 row = i > 0 ? 0 : j - 1;
2165 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2166 { 2066 {
2167 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2168 { 2068 {
2169 text_t *stp = screen.text[row + row_offset]; 2069 line_t s = ROW(row - view_start);
2170 rend_t *srp = screen.rend[row + row_offset];
2171 text_t *dtp = drawn_text[row]; 2070 line_t d = drawn_buf[row];
2172 text_t *dtp2 = drawn_text[row + i]; 2071 line_t d2 = drawn_buf[row + i];
2173 rend_t *drp = drawn_rend[row];
2174 rend_t *drp2 = drawn_rend[row + i];
2175 2072
2176 for (nits = 0, col = TermWin.ncol; col--; ) 2073 for (nits = 0, col = ncol; col--; )
2177 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2075 nits--;
2179 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2076 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2180 nits++; 2077 nits++;
2181 2078
2182 if (nits > 8) /* XXX: arbitrary choice */ 2079 if (nits > 8) /* XXX: arbitrary choice */
2183 { 2080 {
2184 for (col = TermWin.ncol; col--; ) 2081 for (col = ncol; col--; )
2185 { 2082 {
2186 *dtp++ = *dtp2++; 2083 *d.t++ = *d2.t++;
2187 *drp++ = *drp2++; 2084 *d.r++ = *d2.r++;
2188 } 2085 }
2189 2086
2190 if (len == -1) 2087 if (len == -1)
2191 len = row; 2088 len = row;
2192 2089
… …
2197 2094
2198 if (len != -1) 2095 if (len != -1)
2199 { 2096 {
2200 /* also comes here at end if needed because of >= above */ 2097 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2098 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2099 ::swap (wlen, len);
2203 2100
2204 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2101 XCopyArea (display->display, vt, vt,
2205 TermWin.gc, 0, Row2Pixel (len + i), 2102 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2103 (unsigned int)TermWin_TotalWidth (),
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2104 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2105 0, Row2Pixel (len));
2209 len = -1; 2106 len = -1;
2210 } 2107 }
… …
2213#endif 2110#endif
2214 2111
2215 /* 2112 /*
2216 * E: main pass across every character 2113 * E: main pass across every character
2217 */ 2114 */
2218 for (row = 0; row < TermWin.nrow; row++) 2115 for (row = 0; row < nrow; row++)
2219 { 2116 {
2220 text_t *stp = screen.text[row + row_offset]; 2117 text_t *stp = ROW(row - view_start).t;
2221 rend_t *srp = screen.rend[row + row_offset]; 2118 rend_t *srp = ROW(row - view_start).r;
2222 text_t *dtp = drawn_text[row]; 2119 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn_rend[row]; 2120 rend_t *drp = drawn_buf[row].r;
2224 2121
2225 /* 2122 /*
2226 * E2: OK, now the real pass 2123 * E2: OK, now the real pass
2227 */ 2124 */
2228 int ypixel = (int)Row2Pixel (row); 2125 int ypixel = (int)Row2Pixel (row);
2229 2126
2230 for (col = 0; col < TermWin.ncol; col++) 2127 for (col = 0; col < ncol; col++)
2231 { 2128 {
2232 /* compare new text with old - if exactly the same then continue */ 2129 /* compare new text with old - if exactly the same then continue */
2233 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2130 if (stp[col] == dtp[col] /* Must match characters to skip. */
2234 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2131 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2235 || (stp[col] == ' ' /* space w/ no background change */ 2132 || (stp[col] == ' ' /* space w/ no background change */
… …
2249 dtp[col] = stp[col]; 2146 dtp[col] = stp[col];
2250 drp[col] = rend; 2147 drp[col] = rend;
2251 2148
2252 int xpixel = Col2Pixel (col); 2149 int xpixel = Col2Pixel (col);
2253 2150
2254 for (i = 0; ++col < TermWin.ncol; ) 2151 for (i = 0; ++col < ncol; )
2255 { 2152 {
2256 if (stp[col] == NOCHAR) 2153 if (stp[col] == NOCHAR)
2257 { 2154 {
2258 dtp[col] = stp[col]; 2155 dtp[col] = stp[col];
2259 drp[col] = rend; 2156 drp[col] = rend;
… …
2287 2184
2288 // sometimes we optimize away the trailing NOCHAR's, add them back 2185 // sometimes we optimize away the trailing NOCHAR's, add them back
2289 while (i && text[count] == NOCHAR) 2186 while (i && text[count] == NOCHAR)
2290 count++, i--; 2187 count++, i--;
2291 2188
2292#if ENABLE_STYLES
2293 // force redraw after "careful" characters to avoid pixel droppings
2294 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2295 drp[col + 1] = ~srp[col + 1];
2296
2297 // include previous careful character(s) if possible, looks nicer (best effort...)
2298 while (text > stp
2299 && srp[text - stp - 1] & RS_Careful
2300 && RS_SAME (rend, srp[text - stp - 1]))
2301 text--, count++, xpixel -= TermWin.fwidth;
2302#endif
2303
2304 /* 2189 /*
2305 * Determine the attributes for the string 2190 * Determine the attributes for the string
2306 */ 2191 */
2307 int fore = GET_FGCOLOR (rend); // desired foreground 2192 int fore = GET_FGCOLOR (rend); // desired foreground
2308 int back = GET_BGCOLOR (rend); // desired background 2193 int back = GET_BGCOLOR (rend); // desired background
2309 2194
2310 // only do special processing if ana attributes are set, which is rare 2195 // only do special processing if any attributes are set, which is unlikely
2311 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2312 { 2197 {
2198#if ENABLE_STYLES
2199 // force redraw after "careful" characters to avoid pixel droppings
2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2201 drp[col + 1] = ~srp[col + 1];
2202
2203 // include previous careful character(s) if possible, looks nicer (best effort...)
2204 while (text > stp
2205 && srp[text - stp - 1] & RS_Careful
2206 && RS_SAME (rend, srp[text - stp - 1]))
2207 text--, count++, xpixel -= fwidth;
2208#endif
2209
2313 bool invert = rend & RS_RVid; 2210 bool invert = rend & RS_RVid;
2314 2211
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2212#ifndef NO_BOLD_UNDERLINE_REVERSE
2316 if (rend & RS_Bold 2213 if (rend & RS_Bold
2317 && fore == Color_fg) 2214 && fore == Color_fg)
… …
2339 fore = Color_UL; 2236 fore = Color_UL;
2340#endif 2237#endif
2341 2238
2342 if (invert) 2239 if (invert)
2343 { 2240 {
2344 SWAP_IT (fore, back, int); 2241 ::swap (fore, back);
2345 2242
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2243#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV)) 2244 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2245 back = Color_RV;
2246
2247 if (fore == back)
2248 {
2249 fore = Color_bg;
2250 back = Color_fg;
2251 }
2349#endif 2252#endif
2350 } 2253 }
2351 2254
2352#ifdef TEXT_BLINK 2255#ifdef TEXT_BLINK
2353 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2256 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2364 } 2267 }
2365 2268
2366 /* 2269 /*
2367 * Actually do the drawing of the string here 2270 * Actually do the drawing of the string here
2368 */ 2271 */
2369 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2272 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2370 2273
2371 if (back == fore) 2274 if (back == fore)
2372 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2275 font->clear_rect (*drawable, xpixel, ypixel,
2373 TermWin.fwidth * count, TermWin.fheight, 2276 fwidth * count, fheight,
2374 back); 2277 back);
2375 else if (back == Color_bg) 2278 else if (back == Color_bg)
2376 { 2279 {
2377 if (must_clear) 2280 if (must_clear)
2378 { 2281 {
2379 CLEAR_CHARS (xpixel, ypixel, count); 2282 CLEAR_CHARS (xpixel, ypixel, count);
2380 2283
2381 for (i = 0; i < count; i++) /* don't draw empty strings */ 2284 for (i = 0; i < count; i++) /* don't draw empty strings */
2382 if (text[i] != ' ') 2285 if (text[i] != ' ')
2383 { 2286 {
2384 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2287 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2385 break; 2288 break;
2386 } 2289 }
2387 } 2290 }
2388 else 2291 else
2389 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2292 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2390 } 2293 }
2391 else 2294 else
2392 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2295 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2393 2296
2394 if (rend & RS_Uline && font->descent > 1 && fore != back) 2297 if (rend & RS_Uline && font->descent > 1 && fore != back)
2395 { 2298 {
2396#if ENABLE_FRILLS 2299#if ENABLE_FRILLS
2397 if (ISSET_PIXCOLOR (Color_underline)) 2300 if (ISSET_PIXCOLOR (Color_underline))
2398 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2301 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2399 else 2302 else
2400#endif 2303#endif
2401 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2304 XSetForeground (display->display, gc, pix_colors[fore]);
2402 2305
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2306 XDrawLine (display->display, drawBuffer, gc,
2404 xpixel, ypixel + font->ascent + 1, 2307 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2308 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2309 }
2407 } /* for (col....) */ 2310 } /* for (col....) */
2408 } /* for (row....) */ 2311 } /* for (row....) */
… …
2414 /* 2317 /*
2415 * G: cleanup cursor and display outline cursor if necessary 2318 * G: cleanup cursor and display outline cursor if necessary
2416 */ 2319 */
2417 if (showcursor) 2320 if (showcursor)
2418 { 2321 {
2419 if (TermWin.focus) 2322 if (focus)
2323 {
2324 if (options & Opt_cursorUnderline)
2325 *crp ^= RS_Uline;
2326 else
2420 { 2327 {
2421 *crp ^= RS_RVid; 2328 *crp ^= RS_RVid;
2422#ifndef NO_CURSORCOLOR 2329#ifndef NO_CURSORCOLOR
2423 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2330 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2424#endif 2331#endif
2332 }
2425 } 2333 }
2426 else if (oldcursor.row >= 0) 2334 else if (oldcursor.row >= 0)
2427 { 2335 {
2336 int cursorwidth = 1;
2337 int col = oldcursor.col;
2338
2339 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2340 col--;
2341
2342 while (col + cursorwidth < ncol
2343 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2344 cursorwidth++;
2345
2428#ifndef NO_CURSORCOLOR 2346#ifndef NO_CURSORCOLOR
2429 if (ISSET_PIXCOLOR (Color_cursor)) 2347 if (ISSET_PIXCOLOR (Color_cursor))
2430 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2348 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2431#endif 2349#endif
2432 int cursorwidth = 1;
2433 while (oldcursor.col + cursorwidth < TermWin.ncol
2434 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2435 cursorwidth++;
2436 2350
2437 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2351 XDrawRectangle (display->display, drawBuffer, gc,
2438 Col2Pixel (oldcursor.col), 2352 Col2Pixel (col),
2439 Row2Pixel (oldcursor.row), 2353 Row2Pixel (oldcursor.row),
2440 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2354 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2441 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2355 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2442 } 2356 }
2443 } 2357 }
2444 2358
2445 /* 2359 /*
2446 * H: cleanup selection 2360 * H: cleanup selection
… …
2453 num_scr = 0; 2367 num_scr = 0;
2454 num_scr_allow = 1; 2368 num_scr_allow = 1;
2455} 2369}
2456 2370
2457void 2371void
2458rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2372rxvt_term::scr_remap_chars (const line_t &l)
2459{ 2373{
2460 if (!rp || !tp) 2374 if (!l.t)
2461 return; 2375 return;
2462 2376
2463 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2377 for (int i = ncol; i--; )
2464 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2378 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2465} 2379}
2466 2380
2467void 2381void
2468rxvt_term::scr_remap_chars () 2382rxvt_term::scr_remap_chars ()
2469{ 2383{
2470 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2384 for (int i = total_rows; i--; )
2471 scr_remap_chars (screen.text[i], screen.rend[i]); 2385 scr_remap_chars (row_buf [i]);
2472 2386
2473 for (int i = TermWin.nrow; i--; ) 2387 for (int i = nrow; i--; )
2474 { 2388 {
2475 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2389 scr_remap_chars (drawn_buf [i]);
2476 scr_remap_chars (swap.text[i], swap.rend[i]); 2390 scr_remap_chars (swap_buf [i]);
2477 } 2391 }
2478} 2392}
2479 2393
2480void 2394void
2481rxvt_term::scr_recolour () 2395rxvt_term::scr_recolour ()
… …
2487#if XPM_BACKGROUND 2401#if XPM_BACKGROUND
2488 && !bgPixmap.pixmap 2402 && !bgPixmap.pixmap
2489#endif 2403#endif
2490 ) 2404 )
2491 { 2405 {
2492 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2406 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2493 XClearWindow (display->display, TermWin.parent[0]); 2407 XClearWindow (display->display, parent[0]);
2494 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2408 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2495#if HAVE_SCROLLBARS 2409#if HAVE_SCROLLBARS
2496 if (scrollBar.win) 2410 if (scrollBar.win)
2497 { 2411 {
2498 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2412 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2499 scrollBar.setIdle (); 2413 scrollBar.setIdle ();
… …
2509 2423
2510/* ------------------------------------------------------------------------- */ 2424/* ------------------------------------------------------------------------- */
2511void 2425void
2512rxvt_term::scr_clear (bool really) 2426rxvt_term::scr_clear (bool really)
2513{ 2427{
2514 if (!TermWin.mapped) 2428 if (!mapped)
2515 return; 2429 return;
2516 2430
2517 num_scr_allow = 0; 2431 num_scr_allow = 0;
2518 want_refresh = 1; 2432 want_refresh = 1;
2519 2433
2520#if TRANSPARENT
2521 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2522 {
2523 int i;
2524
2525 if (!(options & Opt_transparent_all))
2526 i = 0;
2527 else
2528 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2529
2530 while (i--)
2531 if (TermWin.parent[i] != None)
2532 XClearWindow (display->display, TermWin.parent[i]);
2533 }
2534#endif
2535
2536 if (really) 2434 if (really)
2537 XClearWindow (display->display, TermWin.vt); 2435 XClearWindow (display->display, vt);
2538} 2436}
2539 2437
2540/* ------------------------------------------------------------------------- */ 2438/* ------------------------------------------------------------------------- */
2541void 2439void
2542rxvt_term::scr_reverse_selection () 2440rxvt_term::scr_reverse_selection ()
2543{ 2441{
2442 if (selection.op
2544 if (selection.op && current_screen == selection.screen) 2443 && current_screen == selection.screen
2444 && selection.end.row >= -view_start)
2545 { 2445 {
2546 int end_row = TermWin.saveLines - TermWin.view_start; 2446 int view_end = -view_start + nrow;
2547 int i = selection.beg.row + TermWin.saveLines; 2447 int row, col;
2548 int col, row = selection.end.row + TermWin.saveLines;
2549 rend_t *srp;
2550 2448
2551#if ENABLE_FRILLS 2449#if ENABLE_FRILLS
2552 if (selection.rect) 2450 if (selection.rect)
2553 { 2451 {
2554 end_row += TermWin.nrow; 2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2453 {
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2555 2456
2556 for (; i <= row && i <= end_row; i++)
2557 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2457 for (col = selection.beg.col; col < selection.end.col; col++)
2558 srp[col] ^= RS_RVid; 2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462 }
2559 } 2463 }
2560 else 2464 else
2561#endif 2465#endif
2562 { 2466 {
2563 if (i >= end_row) 2467 if (selection.beg.row >= -view_start)
2468 {
2564 col = selection.beg.col; 2469 col = selection.beg.col;
2470 row = selection.beg.row;
2471 }
2565 else 2472 else
2566 { 2473 {
2567 col = 0; 2474 col = 0;
2568 i = end_row; 2475 row = -view_start;
2569 } 2476 }
2570 2477
2571 end_row += TermWin.nrow; 2478 for (; row < min (selection.end.row, view_end); row++, col = 0)
2572 2479 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2573 for (; i < row && i < end_row; i++, col = 0)
2574 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2575 srp[col] ^= RS_RVid; 2480 srp[col] ^= RS_RVid;
2576 2481
2577 if (i == row && i < end_row) 2482 if (row == selection.end.row)
2578 for (srp = screen.rend[i]; col < selection.end.col; col++) 2483 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2579 srp[col] ^= RS_RVid; 2484 srp[col] ^= RS_RVid;
2580 } 2485 }
2581 } 2486 }
2582} 2487}
2583 2488
… …
2592{ 2497{
2593 int row, wrote; 2498 int row, wrote;
2594 unsigned int width, towrite; 2499 unsigned int width, towrite;
2595 char r1[] = "\n"; 2500 char r1[] = "\n";
2596 2501
2597 for (row = TermWin.saveLines - TermWin.nscrolled; 2502 for (row = saveLines - nsaved;
2598 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2503 row < saveLines + nrow - 1; row++)
2599 { 2504 {
2600 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2505 width = row_buf[row].l >= 0 ? row_buf[row].l
2601 : TermWin.ncol; 2506 : ncol;
2602 for (towrite = width; towrite; towrite -= wrote) 2507 for (towrite = width; towrite; towrite -= wrote)
2603 { 2508 {
2604 wrote = write (fd, & (screen.text[row][width - towrite]), 2509 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2605 towrite); 2510 towrite);
2606 if (wrote < 0) 2511 if (wrote < 0)
2607 return; /* XXX: death, no report */ 2512 return; /* XXX: death, no report */
2608 } 2513 }
2609 if (screen.tlen[row] >= 0) 2514 if (row_buf[row].l >= 0)
2610 if (write (fd, r1, 1) <= 0) 2515 if (write (fd, r1, 1) <= 0)
2611 return; /* XXX: death, no report */ 2516 return; /* XXX: death, no report */
2612 } 2517 }
2613} 2518}
2614#endif 2519#endif
2615 2520
2616/* ------------------------------------------------------------------------- * 2521/* ------------------------------------------------------------------------- *
2617 * CHARACTER SELECTION * 2522 * CHARACTER SELECTION *
2618 * ------------------------------------------------------------------------- */ 2523 * ------------------------------------------------------------------------- */
2619
2620/*
2621 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2622 */
2623void 2524void
2624rxvt_term::selection_check (int check_more) 2525rxvt_term::selection_check (int check_more)
2625{ 2526{
2626 row_col_t pos; 2527 row_col_t pos;
2627 2528
2628 if (!selection.op) 2529 if (!selection.op)
2629 return; 2530 return;
2630 2531
2631 pos.row = pos.col = 0; 2532 pos.row = pos.col = 0;
2632 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2533 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2633 || (selection.beg.row >= TermWin.nrow) 2534 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2634 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2535 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2635 || (selection.mark.row >= TermWin.nrow)
2636 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2637 || (selection.end.row >= TermWin.nrow)
2638 || (check_more == 1 2536 || (check_more == 1
2639 && current_screen == selection.screen 2537 && current_screen == selection.screen
2640 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2538 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2641 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2539 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2642 || (check_more == 2 2540 || (check_more == 2
… …
2644 && ROWCOL_IS_AFTER (selection.end, pos)) 2542 && ROWCOL_IS_AFTER (selection.end, pos))
2645 || (check_more == 3 2543 || (check_more == 3
2646 && ROWCOL_IS_AFTER (selection.end, pos)) 2544 && ROWCOL_IS_AFTER (selection.end, pos))
2647 || (check_more == 4 /* screen width change */ 2545 || (check_more == 4 /* screen width change */
2648 && (selection.beg.row != selection.end.row 2546 && (selection.beg.row != selection.end.row
2649 || selection.end.col > TermWin.ncol))) 2547 || selection.end.col > ncol)))
2650 CLEAR_SELECTION (); 2548 CLEAR_SELECTION ();
2651} 2549}
2652 2550
2653/* ------------------------------------------------------------------------- */ 2551/* ------------------------------------------------------------------------- */
2654/* 2552/*
… …
2863 * EXT: button 2 release 2761 * EXT: button 2 release
2864 */ 2762 */
2865void 2763void
2866rxvt_term::selection_request (Time tm, int x, int y) 2764rxvt_term::selection_request (Time tm, int x, int y)
2867{ 2765{
2868 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2766 if (x < 0 || x >= width || y < 0 || y >= height)
2869 return; /* outside window */ 2767 return; /* outside window */
2870 2768
2871 if (selection.text) 2769 if (selection.text)
2872 { /* internal selection */ 2770 { /* internal selection */
2873 char *str = rxvt_wcstombs (selection.text, selection.len); 2771 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2902 2800
2903int 2801int
2904rxvt_term::selection_request_other (Atom target, int selnum) 2802rxvt_term::selection_request_other (Atom target, int selnum)
2905{ 2803{
2906 Atom sel; 2804 Atom sel;
2907#ifdef DEBUG_SELECT
2908 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2909#endif
2910 2805
2911 selection_type |= selnum; 2806 selection_type |= selnum;
2912 2807
2913 if (selnum == Sel_Primary) 2808 if (selnum == Sel_Primary)
2914 sel = XA_PRIMARY; 2809 sel = XA_PRIMARY;
… …
2918 sel = xa[XA_CLIPBOARD]; 2813 sel = xa[XA_CLIPBOARD];
2919 2814
2920 if (XGetSelectionOwner (display->display, sel) != None) 2815 if (XGetSelectionOwner (display->display, sel) != None)
2921 { 2816 {
2922 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2817 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2923 TermWin.vt, selection_request_time); 2818 vt, selection_request_time);
2924 return 1; 2819 return 1;
2925 } 2820 }
2926 2821
2927 return 0; 2822 return 0;
2928} 2823}
… …
2951 * EXT: button 1 or 3 release 2846 * EXT: button 1 or 3 release
2952 */ 2847 */
2953void 2848void
2954rxvt_term::selection_make (Time tm) 2849rxvt_term::selection_make (Time tm)
2955{ 2850{
2956 int i, col, end_col, row, end_row; 2851 int i;
2957 wchar_t *new_selection_text; 2852 wchar_t *new_selection_text;
2958 text_t *t; 2853 text_t *t;
2959 2854
2960 switch (selection.op) 2855 switch (selection.op)
2961 { 2856 {
… …
2974 selection.op = SELECTION_DONE; 2869 selection.op = SELECTION_DONE;
2975 2870
2976 if (selection.clicks == 4) 2871 if (selection.clicks == 4)
2977 return; /* nothing selected, go away */ 2872 return; /* nothing selected, go away */
2978 2873
2979 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2874 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2980 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2981 2876
2982 col = selection.beg.col;
2983 row = selection.beg.row + TermWin.saveLines;
2984 end_row = selection.end.row + TermWin.saveLines;
2985 int ofs = 0; 2877 int ofs = 0;
2986 int extra = 0; 2878 int extra = 0;
2987 2879
2880 int col = selection.beg.col;
2881 int row = selection.beg.row;
2882
2883 int end_col;
2884
2988 for (; row <= end_row; row++, col = 0) 2885 for (; row <= selection.end.row; row++, col = 0)
2989 { 2886 {
2990 end_col = screen.tlen[row];
2991
2992#if ENABLE_FRILLS 2887#if ENABLE_FRILLS
2993 if (selection.rect) 2888 if (selection.rect)
2994 { 2889 {
2995 col = selection.beg.col; 2890 col = selection.beg.col;
2996 end_col = TermWin.ncol + 1; 2891 end_col = ncol + 1;
2892 }
2893 else
2894#endif
2895 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2896
2897 col = max (col, 0);
2898
2899 if (row == selection.end.row
2900#if ENABLE_FRILLS
2901 || selection.rect
2902#endif
2997 } 2903 )
2998#endif
2999
3000 MAX_IT (col, 0);
3001
3002 if (end_col == -1)
3003 end_col = TermWin.ncol;
3004
3005 if (row == end_row || selection.rect)
3006 MIN_IT (end_col, selection.end.col); 2904 min_it (end_col, selection.end.col);
3007 2905
3008 t = &screen.text[row][col]; 2906 t = ROW(row).t + col;
3009 for (; col < end_col; col++) 2907 for (; col < end_col; col++)
3010 { 2908 {
3011 if (*t == NOCHAR) 2909 if (*t == NOCHAR)
3012 t++; 2910 t++;
3013#if ENABLE_COMBINING 2911#if ENABLE_COMBINING
… …
3029#endif 2927#endif
3030 else 2928 else
3031 new_selection_text[ofs++] = *t++; 2929 new_selection_text[ofs++] = *t++;
3032 } 2930 }
3033 2931
3034 if (screen.tlen[row] != -1 && row != end_row) 2932#if ENABLE_FRILLS
2933 if (selection.rect)
2934 {
2935 while (ofs
2936 && new_selection_text[ofs - 1] != C0_LF
2937 && unicode::is_space (new_selection_text[ofs - 1]))
2938 --ofs;
2939
3035 new_selection_text[ofs++] = C0_LF; 2940 new_selection_text[ofs++] = C0_LF;
2941 }
2942 else
2943#endif
2944 if (!ROW(row).is_longer () && row != selection.end.row)
2945 new_selection_text[ofs++] = C0_LF;
3036 } 2946 }
3037 2947
3038 if (end_col != selection.end.col) 2948 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF; 2949 new_selection_text[ofs++] = C0_LF;
3040 2950
… …
3050 2960
3051 // we usually allocate much more than necessary, so realloc it smaller again 2961 // we usually allocate much more than necessary, so realloc it smaller again
3052 selection.len = ofs; 2962 selection.len = ofs;
3053 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2963 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3054 2964
3055 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2965 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3056 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2966 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3057 display->set_selection_owner (this); 2967 display->set_selection_owner (this);
3058 else 2968 else
3059 rxvt_warn ("can't get primary selection, ignoring.\n"); 2969 rxvt_warn ("can't get primary selection, ignoring.\n");
3060 2970
3061#if 0 2971#if 0
… …
3084 2994
3085 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2995 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3086 2996
3087 if (clicks == 2 || clicks == 3) 2997 if (clicks == 2 || clicks == 3)
3088 selection_extend_colrow (selection.mark.col, 2998 selection_extend_colrow (selection.mark.col,
3089 selection.mark.row + TermWin.view_start, 2999 selection.mark.row + view_start,
3090 0, /* button 3 */ 3000 0, /* button 3 */
3091 1, /* button press */ 3001 1, /* button press */
3092 0); /* click change */ 3002 0); /* click change */
3093} 3003}
3094 3004
… …
3098 */ 3008 */
3099void 3009void
3100rxvt_term::selection_start_colrow (int col, int row) 3010rxvt_term::selection_start_colrow (int col, int row)
3101{ 3011{
3102 want_refresh = 1; 3012 want_refresh = 1;
3013
3014 selection.mark.row = row - view_start;
3103 selection.mark.col = col; 3015 selection.mark.col = col;
3104 selection.mark.row = row - TermWin.view_start;
3105 3016
3106 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3017 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3107 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3018 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 MAX_IT (selection.mark.col, 0);
3109 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3110 3019
3111 while (selection.mark.col > 0 3020 while (selection.mark.col > 0
3112 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3021 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3113 --selection.mark.col; 3022 --selection.mark.col;
3114 3023
3115 if (selection.op) 3024 if (selection.op)
3116 { /* clear the old selection */ 3025 { /* clear the old selection */
3117 selection.beg.row = selection.end.row = selection.mark.row; 3026 selection.beg.row = selection.end.row = selection.mark.row;
… …
3141 text_t *stp; 3050 text_t *stp;
3142 rend_t *srp; 3051 rend_t *srp;
3143 3052
3144 if (dirn == UP) 3053 if (dirn == UP)
3145 { 3054 {
3146 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3055 bound.row = - nsaved - 1;
3147 bound.col = 0; 3056 bound.col = 0;
3148 dirnadd = -1; 3057 dirnadd = -1;
3149 } 3058 }
3150 else 3059 else
3151 { 3060 {
3152 bound.row = TermWin.saveLines + TermWin.nrow; 3061 bound.row = nrow;
3153 bound.col = TermWin.ncol - 1; 3062 bound.col = ncol - 1;
3154 dirnadd = 1; 3063 dirnadd = 1;
3155 } 3064 }
3156 3065
3157 row = mark->row + TermWin.saveLines; 3066 row = mark->row;
3158 col = mark->col; 3067 col = max (mark->col, 0);
3159 MAX_IT (col, 0); 3068
3160 /* find the edge of a word */ 3069 /* find the edge of a word */
3161 stp = &screen.text[row][col]; 3070 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3162 w1 = DELIMIT_TEXT (*stp); 3071 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3163
3164 srp = &screen.rend[row][col];
3165 w2 = DELIMIT_REND (*srp);
3166 3072
3167 for (;;) 3073 for (;;)
3168 { 3074 {
3169 for (; col != bound.col; col += dirnadd) 3075 for (; col != bound.col; col += dirnadd)
3170 { 3076 {
… …
3180 break; 3086 break;
3181 } 3087 }
3182 3088
3183 if ((col == bound.col) && (row != bound.row)) 3089 if ((col == bound.col) && (row != bound.row))
3184 { 3090 {
3185 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3091 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3186 { 3092 {
3187 trow = row + dirnadd; 3093 trow = row + dirnadd;
3188 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3094 tcol = dirn == UP ? ncol - 1 : 0;
3189 3095
3190 if (screen.text[trow] == NULL) 3096 if (!ROW(trow).t)
3191 break; 3097 break;
3192 3098
3193 stp = & (screen.text[trow][tcol]); 3099 stp = ROW(trow).t + tcol;
3194 srp = & (screen.rend[trow][tcol]); 3100 srp = ROW(trow).r + tcol;
3195 3101
3196 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3102 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3197 break; 3103 break;
3198 3104
3199 row = trow; 3105 row = trow;
… …
3207Old_Word_Selection_You_Die: 3113Old_Word_Selection_You_Die:
3208 if (dirn == DN) 3114 if (dirn == DN)
3209 col++; /* put us on one past the end */ 3115 col++; /* put us on one past the end */
3210 3116
3211 /* Poke the values back in */ 3117 /* Poke the values back in */
3212 ret->row = row - TermWin.saveLines; 3118 ret->row = row;
3213 ret->col = col; 3119 ret->col = col;
3214} 3120}
3215 3121
3216/* ------------------------------------------------------------------------- */ 3122/* ------------------------------------------------------------------------- */
3217/* 3123/*
… …
3222 * flag == 2 ==> button 3 motion 3128 * flag == 2 ==> button 3 motion
3223 */ 3129 */
3224void 3130void
3225rxvt_term::selection_extend (int x, int y, int flag) 3131rxvt_term::selection_extend (int x, int y, int flag)
3226{ 3132{
3227 int col, row; 3133 int col = clamp (Pixel2Col (x), 0, ncol);
3228 3134 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3229 col = Pixel2Col (x);
3230 row = Pixel2Row (y);
3231 MAX_IT (row, 0);
3232 MIN_IT (row, (int)TermWin.nrow - 1);
3233 MAX_IT (col, 0);
3234 MIN_IT (col, (int)TermWin.ncol);
3235 3135
3236 /* 3136 /*
3237 * If we're selecting characters (single click) then we must check first 3137 * If we're selecting characters (single click) then we must check first
3238 * if we are at the same place as the original mark. If we are then 3138 * if we are at the same place as the original mark. If we are then
3239 * select nothing. Otherwise, if we're to the right of the mark, you have to 3139 * select nothing. Otherwise, if we're to the right of the mark, you have to
3240 * be _past_ a character for it to be selected. 3140 * be _past_ a character for it to be selected.
3241 */ 3141 */
3242 if (((selection.clicks % 3) == 1) && !flag 3142 if (((selection.clicks % 3) == 1) && !flag
3243 && (col == selection.mark.col 3143 && (col == selection.mark.col
3244 && (row == selection.mark.row + TermWin.view_start))) 3144 && (row == selection.mark.row + view_start)))
3245 { 3145 {
3246 /* select nothing */ 3146 /* select nothing */
3247 selection.beg.row = selection.end.row = 0; 3147 selection.beg.row = selection.end.row = 0;
3248 selection.beg.col = selection.end.col = 0; 3148 selection.beg.col = selection.end.col = 0;
3249 selection.clicks = 4; 3149 selection.clicks = 4;
… …
3264 * Extend the selection to the specified col/row 3164 * Extend the selection to the specified col/row
3265 */ 3165 */
3266void 3166void
3267rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3167rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3268{ 3168{
3269 int16_t ncol = TermWin.ncol;
3270 int end_col;
3271 row_col_t pos; 3169 row_col_t pos;
3272 enum { 3170 enum {
3273 LEFT, RIGHT 3171 LEFT, RIGHT
3274 } closeto = RIGHT; 3172 } closeto = RIGHT;
3275 3173
… …
3306 selection.beg.col = selection.end.col = selection.mark.col; 3204 selection.beg.col = selection.end.col = selection.mark.col;
3307 selection.beg.row = selection.end.row = selection.mark.row; 3205 selection.beg.row = selection.end.row = selection.mark.row;
3308 } 3206 }
3309 3207
3310 pos.col = col; 3208 pos.col = col;
3311 pos.row = row; 3209 pos.row = row - view_start;
3312
3313 pos.row -= TermWin.view_start; /* adjust for scroll */
3314 3210
3315 /* 3211 /*
3316 * This is mainly xterm style selection with a couple of differences, mainly 3212 * This is mainly xterm style selection with a couple of differences, mainly
3317 * in the way button3 drag extension works. 3213 * in the way button3 drag extension works.
3318 * We're either doing: button1 drag; button3 press; or button3 drag 3214 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3377 } 3273 }
3378 } 3274 }
3379 3275
3380 if (selection.clicks == 1) 3276 if (selection.clicks == 1)
3381 { 3277 {
3382 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3278 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3383 3279 && !ROW(selection.beg.row).is_longer ()
3384 if (selection.beg.col > end_col
3385 && end_col != -1
3386#if ENABLE_FRILLS 3280#if ENABLE_FRILLS
3387 && !selection.rect 3281 && !selection.rect
3388#endif 3282#endif
3389 ) 3283 )
3390 selection.beg.col = ncol; 3284 selection.beg.col = ncol;
3391 3285
3392 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3393
3394 if ( 3286 if (
3395 selection.end.col > end_col 3287 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3396 && end_col != -1 3288 && !ROW(selection.end.row).is_longer ()
3397#if ENABLE_FRILLS 3289#if ENABLE_FRILLS
3398 && !selection.rect 3290 && !selection.rect
3399#endif 3291#endif
3400 ) 3292 )
3401 selection.end.col = ncol; 3293 selection.end.col = ncol;
… …
3411 else if (selection.clicks == 3) 3303 else if (selection.clicks == 3)
3412 { 3304 {
3413#if ENABLE_FRILLS 3305#if ENABLE_FRILLS
3414 if (options & Opt_tripleclickwords) 3306 if (options & Opt_tripleclickwords)
3415 { 3307 {
3416 int end_row;
3417
3418 selection_delimit_word (UP, &selection.beg, &selection.beg); 3308 selection_delimit_word (UP, &selection.beg, &selection.beg);
3419 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3420 3309
3421 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3310 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3422 { 3311 {
3423 end_col = screen.tlen[end_row + TermWin.saveLines]; 3312 if (!ROW(end_row).is_longer ())
3424
3425 if (end_col != -1)
3426 { 3313 {
3427 selection.end.row = end_row; 3314 selection.end.row = end_row;
3428 selection.end.col = end_col; 3315 selection.end.col = ROW(end_row).l;
3429 selection_remove_trailing_spaces (); 3316 selection_remove_trailing_spaces ();
3430 break; 3317 break;
3431 } 3318 }
3432 } 3319 }
3433 } 3320 }
… …
3439 3326
3440 selection.beg.col = 0; 3327 selection.beg.col = 0;
3441 selection.end.col = ncol; 3328 selection.end.col = ncol;
3442 3329
3443 // select a complete logical line 3330 // select a complete logical line
3444 while (selection.beg.row > -TermWin.saveLines 3331 while (selection.beg.row > -saveLines
3445 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3332 && ROW(selection.beg.row - 1).is_longer ())
3446 selection.beg.row--; 3333 selection.beg.row--;
3447 3334
3448 while (selection.end.row < TermWin.nrow 3335 while (selection.end.row < nrow
3449 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3336 && ROW(selection.end.row).is_longer ())
3450 selection.end.row++; 3337 selection.end.row++;
3451 } 3338 }
3452 } 3339 }
3453 3340
3454 if (button3 && buttonpress) 3341 if (button3 && buttonpress)
… …
3465 } 3352 }
3466 } 3353 }
3467 3354
3468#if ENABLE_FRILLS 3355#if ENABLE_FRILLS
3469 if (selection.rect && selection.beg.col > selection.end.col) 3356 if (selection.rect && selection.beg.col > selection.end.col)
3470 SWAP_IT (selection.beg.col, selection.end.col, int); 3357 ::swap (selection.beg.col, selection.end.col);
3471#endif 3358#endif
3472} 3359}
3473 3360
3474#if ENABLE_FRILLS 3361#if ENABLE_FRILLS
3475void 3362void
… …
3479 text_t *stp; 3366 text_t *stp;
3480 3367
3481 end_col = selection.end.col; 3368 end_col = selection.end.col;
3482 end_row = selection.end.row; 3369 end_row = selection.end.row;
3483 3370
3484 for ( ; end_row >= selection.beg.row; ) 3371 for (; end_row >= selection.beg.row; )
3485 { 3372 {
3486 stp = screen.text[end_row + TermWin.saveLines]; 3373 stp = ROW(end_row).t;
3487 3374
3488 while (--end_col >= 0) 3375 while (--end_col >= 0)
3489 { 3376 {
3490 if (stp[end_col] != ' ' 3377 if (stp[end_col] != NOCHAR
3491 && stp[end_col] != '\t' 3378 && !unicode::is_space (stp[end_col]))
3492 && stp[end_col] != NOCHAR)
3493 break; 3379 break;
3494 } 3380 }
3495 3381
3496 if (end_col >= 0 3382 if (end_col >= 0
3497 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3383 || !ROW(end_row - 1).is_longer ())
3498 { 3384 {
3499 selection.end.col = end_col + 1; 3385 selection.end.col = end_col + 1;
3500 selection.end.row = end_row; 3386 selection.end.row = end_row;
3501 break; 3387 break;
3502 } 3388 }
3503 3389
3504 end_row--; 3390 end_row--;
3505 end_col = TermWin.ncol; 3391 end_col = ncol;
3506 } 3392 }
3507 3393
3508 if (selection.mark.row > selection.end.row) 3394 if (selection.mark.row > selection.end.row)
3509 { 3395 {
3510 selection.mark.row = selection.end.row; 3396 selection.mark.row = selection.end.row;
… …
3673 */ 3559 */
3674void 3560void
3675rxvt_term::pixel_position (int *x, int *y) 3561rxvt_term::pixel_position (int *x, int *y)
3676{ 3562{
3677 *x = Pixel2Col (*x); 3563 *x = Pixel2Col (*x);
3678 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3564 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3679 *y = Pixel2Row (*y); 3565 *y = Pixel2Row (*y);
3680 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3566 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3681} 3567}
3682 3568
3683/* ------------------------------------------------------------------------- */ 3569/* ------------------------------------------------------------------------- */
3684#ifdef USE_XIM 3570#ifdef USE_XIM
3685void 3571void
3686rxvt_term::im_set_position (XPoint &pos) 3572rxvt_term::im_set_position (XPoint &pos)
3687{ 3573{
3688 XWindowAttributes xwa; 3574 XWindowAttributes xwa;
3689 3575
3690 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3576 XGetWindowAttributes (display->display, vt, &xwa);
3691 3577
3692 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3578 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3579 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3694} 3580}
3695#endif 3581#endif
3696 3582
3697#if ENABLE_OVERLAY 3583#if ENABLE_OVERLAY
3698void 3584void
3699rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3585rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3700{ 3586{
3701 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3587 if (nrow < 3 || ncol < 3)
3702 return; 3588 return;
3703 3589
3704 want_refresh = 1; 3590 want_refresh = 1;
3705 3591
3706 scr_overlay_off (); 3592 scr_overlay_off ();
3707 3593
3708 if (x < 0) x = TermWin.ncol - w; 3594 if (x < 0) x = ncol - w;
3709 if (y < 0) y = TermWin.nrow - h; 3595 if (y < 0) y = nrow - h;
3710 3596
3711 // make space for border 3597 // make space for border
3712 w += 2; MIN_IT (w, TermWin.ncol); 3598 w += 2; min_it (w, ncol);
3713 h += 2; MIN_IT (h, TermWin.nrow); 3599 h += 2; min_it (h, nrow);
3714 3600
3715 x -= 1; MAX_IT (x, 0); 3601 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; MAX_IT (y, 0); 3602 y -= 1; clamp_it (y, 0, nrow - h);
3717
3718 MIN_IT (x, TermWin.ncol - w);
3719 MIN_IT (y, TermWin.nrow - h);
3720 3603
3721 ov_x = x; ov_y = y; 3604 ov_x = x; ov_y = y;
3722 ov_w = w; ov_h = h; 3605 ov_w = w; ov_h = h;
3723 3606
3724 ov_text = new text_t *[h]; 3607 ov_text = new text_t *[h];
… …
3789 while (*s) 3672 while (*s)
3790 scr_overlay_set (x++, y, *s++); 3673 scr_overlay_set (x++, y, *s++);
3791} 3674}
3792 3675
3793void 3676void
3677rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3678{
3679 while (*s)
3680 {
3681 text_t t = *s++;
3682 int width = wcwidth (t);
3683
3684 while (width--)
3685 {
3686 scr_overlay_set (x++, y, t);
3687 t = NOCHAR;
3688 }
3689 }
3690}
3691
3692void
3794rxvt_term::scr_swap_overlay () 3693rxvt_term::scr_swap_overlay ()
3795{ 3694{
3796 if (!ov_text) 3695 if (!ov_text)
3797 return; 3696 return;
3798 3697
3799 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3800
3801 // swap screen mem with overlay 3698 // swap screen mem with overlay
3802 for (int y = ov_h; y--; ) 3699 for (int y = ov_h; y--; )
3803 { 3700 {
3804 text_t *t1 = ov_text[y]; 3701 text_t *t1 = ov_text[y];
3805 rend_t *r1 = ov_rend[y]; 3702 rend_t *r1 = ov_rend[y];
3806 3703
3807 text_t *t2 = screen.text[y + row_offset] + ov_x; 3704 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3808 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3705 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3809 3706
3810 for (int x = ov_w; x--; ) 3707 for (int x = ov_w; x--; )
3811 { 3708 {
3812 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3815 } 3712 }
3816} 3713}
3817 3714
3818#endif 3715#endif
3819/* ------------------------------------------------------------------------- */ 3716/* ------------------------------------------------------------------------- */
3717

Diff Legend

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