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.176 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
… …
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119 117
120/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
121void 119void
122rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
123{ 121{
124 if (!l.t) 122 if (!l.t)
125 { 123 {
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
155void 159void
156rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
157{ 161{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
162 scr_overlay_off (); 163 scr_overlay_off ();
163#endif 164#endif
164 165
165 view_start = 0; 166 view_start = 0;
… …
175 return; 176 return;
176 177
177 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
179 { 180 {
181 //TODO//FIXME
180 saveLines++; 182 saveLines++;
181 prev_nrow--; 183 prev_nrow--;
182 nsaved++; 184 top_row--;
183 } 185 }
184 186
185 want_refresh = 1; 187 want_refresh = 1;
186 188
187 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
188 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
189 191
190 screen.tscroll = 0; 192 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
192 194
193 if (!save) 195 if (!row_buf)
194 { 196 {
195 /* 197 /*
196 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
197 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 199 */
199 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
200 term_start = 0; 201 term_start = 0;
201 202
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 205
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 209
210 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
211 { 211 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 215 }
216 216
217 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 239 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 /* 243 /*
245 * add or delete rows as appropriate 244 * add or delete rows as appropriate
246 */ 245 */
247 246
248 rxvt_salloc *old_ta; 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 249
250#if 0
251 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
252 { 252 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k);
257
258 for (p = nrow; p < prev_nrow; p++) 253 for (int row = nrow; row < prev_nrow; row++)
259 { 254 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 255 lfree (swap_buf [row]);
262 lfree (drawn[p]); 256 lfree (drawn_buf[row]);
263 } 257 }
258 }
259#endif
264 260
265 /* we have fewer rows so fix up cursor position */ 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 263
268 scr_reset_realloc (); /* realloc _last_ */ 264 for (int row = min (nrow, prev_nrow); row--; )
265 {
266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]);
268 }
269
270 for (int row = prev_nrow; row < nrow; row++)
271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 }
275
276 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
269 } 278
270 else if (nrow > prev_nrow) 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (top_row)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
271 { 291 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 292 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 293 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 296#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 299
353 assert (llen >= 0); 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
357 --p; 304 plines++;
358 llen += prev_ncol; 305 llen += prev_ncol;
359 } 306 }
360 307
361 int qlines = llen / ncol + 1; 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
362 int lofs = 0; 316 int lofs = 0;
317 line_t *qline;
363 318
364 q -= qlines; 319 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
370 { 321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // see below for cursor adjustment rationale
371 if (qrow >= 0) 330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
372 { 335 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 336 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
383 338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
348 line_t &pline = old_buf [prow];
349
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 351
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); 352#if DEBUG_STRICT
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 353 assert (len);
354 assert (pline.t);
355#endif
400 356
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 359
404 lofs += len; 360 lofs += len;
405 qcol += len; 361 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 362 }
411 else
412 lofs += ncol;
413 } 363 }
364
365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 368 }
369 while (p != pend && q > 0);
370
371 term_start = total_rows - nrow;
372 top_row = q - term_start;
373
374 // make sure all terminal lines exist
375 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 }
378 else
415 } 379 {
380 // if no scrollback exists (yet), wing, instead of wrap
381
382 for (int row = min (nrow, prev_nrow); row--; )
383 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row];
416 386
417 free (screen.text); screen.text = tp; 387 qline = pline;
418 free (screen.rend); screen.rend = rp; 388 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 389 }
420 390
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 391 for (int row = prev_nrow; row < nrow; row++)
422#endif 392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
394 }
395
396 term_start = 0;
397 }
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
423 405
424 if (tabs) 406 if (tabs)
425 free (tabs); 407 free (tabs);
426 } 408 }
427 409
410 CLEAR_ALL_SELECTION ();
411
428 prev_nrow = nrow; 412 prev_nrow = nrow;
429 prev_ncol = ncol; 413 prev_ncol = ncol;
430 414
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 416
433 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
435 419
436 tt_winch (); 420 tt_winch ();
437}
438 421
439void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 423}
447 424
448/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
449/* 426/*
450 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
451 */ 428 */
452void 429void
453rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
454{ 431{
455 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
457 434
458 free (save); 435 free (row_buf);
459 free (swap_save); 436 free (swap_buf);
460 free (drawn); 437 free (drawn_buf);
461 free (buf);
462 free (tabs); 438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
463} 441}
464 442
465/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
466/* 444/*
467 * Hard reset 445 * Hard reset
468 */ 446 */
469void 447void
470rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
471{ 449{
472 scr_release (); 450 scr_release ();
473 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
474 scr_reset (); 452 scr_reset ();
475 453
476 scr_clear (true); 454 scr_clear (true);
477 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
478} 456}
479 457
480/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
481 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
482 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
484 * Save and Restore cursor 462 * Save and Restore cursor
485 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
486 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
487 */ 465 */
488void 466void
489rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
490{ 468{
491 screen_t *s; 469 screen_t *s;
492 470
493#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
494 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
518 set_font_style (); 496 set_font_style ();
519 break; 497 break;
520 } 498 }
521 499
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 501 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 502 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 505 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 506#endif
532} 507}
533 508
534/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
535/* 510/*
536 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
537 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 514 */
540int 515int
541rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
542{ 517{
543 want_refresh = 1; 518 want_refresh = 1;
544 view_start = 0; 519 view_start = 0;
545 520
546 if (current_screen == scrn) 521 if (current_screen == scrn)
547 return scrn; 522 return scrn;
548 523
549 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
550 525
551 SWAP_IT (scrn, current_screen, int); 526 int i = current_screen; current_screen = scrn; scrn = i;
552 527
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 528 ::swap (screen.cur.row, swap.cur.row);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 529 ::swap (screen.cur.col, swap.cur.col);
555 MAX_IT (screen.cur.row, 0); 530
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 533
560#if NSCREENS 534#if NSCREENS
561 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
562 { 536 {
563 num_scr = 0; 537 num_scr = 0;
564 538
565 for (int i = nrow; i--; ) 539 for (int i = prev_nrow; i--; )
566 SWAP_IT (ROW(i), swap_save[i], line_t); 540 ::swap (ROW(i), swap_buf [i]);
567 541
568 SWAP_IT (screen.charset, swap.charset, int16_t); 542 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 543 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
572 } 546 }
573 else 547 else
574#endif 548#endif
575 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
576 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577 551
578 return scrn; 552 return scrn;
579} 553}
580 554
581// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
582void 556void
583rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
584{ 558{
585 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
586 return; 560 return;
587 561
588 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
598/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
599/* 573/*
600 * Change the colour for following text 574 * Change the colour for following text
601 */ 575 */
602void 576void
603rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
604{ 578{
605 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
606 color = fgbg; 580 color = fgbg;
607 581
608 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
609 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
610 else 584 else
… …
614/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
615/* 589/*
616 * Change the rendition style for following text 590 * Change the rendition style for following text
617 */ 591 */
618void 592void
619rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
620 { 594 {
621 if (set) 595 if (set)
622 rstyle |= style; 596 rstyle |= style;
623 else if (style == ~RS_None) 597 else if (style == ~RS_None)
624 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 606 * count positive ==> scroll up
633 * count negative ==> scroll down 607 * count negative ==> scroll down
634 */ 608 */
635int 609int
636rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 611{
638 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
639 return 0; 613 return 0;
640 614
641 want_refresh = 1; 615 want_refresh = 1;
642 num_scr += count; 616 num_scr += count;
643 617
644 if (row1 == 0 && count > 0 618 if (count > 0
619 && row1 == 0
645 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
646 { 621 {
647 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
648 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
649 626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
650 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
651 { 661 {
652 selection.beg.row -= count; 662 selection.beg.row -= count;
653 selection.end.row -= count; 663 selection.end.row -= count;
654 selection.mark.row -= count; 664 selection.mark.row -= count;
655 665
656 selection_check (0); 666 if (selection.beg.row < top_row
657 } 667 || selection.end.row < top_row
658 668 || selection.mark.row < top_row)
659 for (int i = count; i--; )
660 scr_blank_screen_mem (ROW(row2 - i), rstyle);
661
662 if ((options & Opt_scrollWithBuffer)
663 && view_start != 0
664 && view_start != saveLines)
665 scr_page (UP, count);
666 }
667 else
668 {
669 if (selection.op && current_screen == selection.screen)
670 {
671 int i = selection.beg.row;
672 int j = selection.end.row;
673
674 if ((i < row1 && j > row1)
675 || (i < row2 && j > row2)
676 || (i - count < row1 && i >= row1)
677 || (i - count > row2 && i <= row2)
678 || (j - count < row1 && j >= row1)
679 || (j - count > row2 && j <= row2))
680 { 669 {
681 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
682 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
683 } 672 }
684 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
687 {
688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
685 { 699 {
686 /* move selected region too */ 700 /* move selected region too */
687 selection.beg.row -= count; 701 selection.beg.row -= count;
688 selection.end.row -= count; 702 selection.end.row -= count;
689 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
695 // use a simple and robust scrolling algorithm, this 709 // use a simple and robust scrolling algorithm, this
696 // part of scr_scroll_text is not time-critical. 710 // part of scr_scroll_text is not time-critical.
697 711
698 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
699 713
714 min_it (count, rows);
715
716 line_t *temp_buf = row_buf + total_rows;
717
700 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
701 { 719 {
702 buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
703 721
704 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
705 scr_blank_screen_mem (buf [row], rstyle); 723 scr_blank_screen_mem (temp_buf [row], rstyle);
706 } 724 }
707 725
708 for (int row = 0; row < rows; row++) 726 for (int row = 0; row < rows; row++)
709 ROW(row1 + row) = buf [row]; 727 ROW(row1 + row) = temp_buf [row];
710 } 728 }
711 729
712 return count; 730 return count;
713} 731}
714 732
715/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
716/* 734/*
717 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
718 */ 736 */
719void 737void
720rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
721{ 739{
722 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
723 return; 741 return;
724 742
725 unsigned char checksel; 743 unsigned char checksel;
726 unicode_t c; 744 unicode_t c;
727 int row, last_col; 745 int ncol = this->ncol;
728 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
729 747
730 want_refresh = 1; 748 want_refresh = 1;
731 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
732 last_col = ncol;
733 750
734 if (nlines > 0) 751 if (minlines > 0)
735 { 752 {
736 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
737 if ((nlines > 0) 755 if (minlines > 0
738 && (screen.tscroll == 0) 756 && screen.tscroll == 0
739 && (screen.bscroll == (nrow - 1))) 757 && screen.bscroll == nrow - 1)
740 { 758 {
741 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
742 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
743 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
744 } 762 }
745 } 763 }
746 764
747#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
748 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
749 assert ((screen.cur.row < nrow) 767 assert (screen.cur.row < nrow
750 && (screen.cur.row >= - (int32_t)nsaved)); 768 && screen.cur.row >= top_row);
751#else /* drive with your eyes closed */
752 MIN_IT (screen.cur.col, last_col - 1);
753 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
754 MAX_IT (screen.cur.row, - (int32_t)nsaved);
755#endif 769#endif
756 row = screen.cur.row; 770 int row = screen.cur.row;
757 771
758 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
759 773
760 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
761 775
762 while (str < strend) 776 while (str < strend)
763 { 777 {
764 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
765 779
766 if (c < 0x20) 780 if (c < 0x20)
767 if (c == C0_LF) 781 if (c == C0_LF)
768 { 782 {
769 if (!line->is_longer ()) /* XXX: think about this */
770 MAX_IT (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
771 784
772 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
773 786
774 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
775 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
779 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
780 continue; 793 continue;
781 } 794 }
782 else if (c == C0_CR) 795 else if (c == C0_CR)
783 { 796 {
784 if (!line->is_longer ()) /* XXX: think about this */
785 MAX_IT (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
786 798
787 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
788 screen.cur.col = 0; 800 screen.cur.col = 0;
789 continue; 801 continue;
790 } 802 }
… …
807 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
808 } 820 }
809 821
810 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
811 { 823 {
812 line->set_is_longer ();
813
814 scr_do_wrap (); 824 scr_do_wrap ();
815 825
826 line->l = ncol;
827 line->is_longer (1);
828
816 row = screen.cur.row; 829 row = screen.cur.row;
817 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
818 } 831 }
819 832
820 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
825 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
826 // for the line drawing characters below as they might be invalid in the current 839 // for the line drawing characters below as they might be invalid in the current
827 // locale. 840 // locale.
828 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
829 842
830 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
831 { 844 {
832 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
833 // 5f-7e standard vt100 846 // 5f-7e standard vt100
834 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
835 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 } 900 }
888 901
889 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
890 903
891 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
892 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
893 { 906 {
894 // ...output spaces 907 // ...output spaces
895 c = ' '; 908 c = ' ';
896 // and try the same character next loop iteration 909 // and try the same character next loop iteration
897 --str; 910 --str;
898 } 911 }
899 912
913 line->touch ();
914
900 do 915 do
901 { 916 {
902 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
903 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
904 919
905 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
906 screen.cur.col++; 921 screen.cur.col++;
907 else 922 else
908 { 923 {
909 line->l = last_col; 924 line->l = ncol;
910 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
911 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
912 break; 927 break;
913 } 928 }
914 929
… …
916 } 931 }
917 while (--width > 0); 932 while (--width > 0);
918 933
919 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
920 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
921 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
922 { 940 {
923 line->t[c] = ' '; 941 line->t[c] = ' ';
924 line->r[c] = rend; 942 line->r[c] = rend;
925 } 943 }
944 }
926 } 945 }
927 else // width == 0 946 else // width == 0
928 { 947 {
929#if ENABLE_COMBINING 948#if ENABLE_COMBINING
930 // handle combining characters 949 // handle combining characters
931 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
932 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
933 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
934 text_t *tp; 954 text_t *tp;
935 rend_t *rp; 955 rend_t *rp;
936 956
937 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
938 { 958 {
959 linep = line;
939 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
940 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
941
942 while (*tp == NOCHAR && tp > line->t)
943 tp--, rp--;
944 } 962 }
945 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
946 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
947 { 965 {
948 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
949
950 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
951 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
952
953 while (*tp == NOCHAR && tp > line->t)
954 tp--, rp--;
955 } 969 }
956 else 970 else
957 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
958 977
959 // first try to find a precomposed character 978 // first try to find a precomposed character
960 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 980 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
965 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
966#endif 985#endif
967 } 986 }
968 } 987 }
969 988
970 if (!line->is_longer ()) /* XXX: think about this */
971 MAX_IT (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
972 990
973#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
974 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
975#else /* drive with your eyes closed */
976 MAX_IT (screen.cur.row, 0);
977#endif 993#endif
978} 994}
979 995
980/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
981/* 997/*
982 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
983 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
984 */ 1000 */
985void 1001void
986rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
987{ 1003{
988 want_refresh = 1; 1004 want_refresh = 1;
989 1005
990 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
991 { 1007 {
… …
1009 * Process Horizontal Tab 1025 * Process Horizontal Tab
1010 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
1011 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
1012 */ 1028 */
1013void 1029void
1014rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
1015{ 1031{
1016 int i, x; 1032 int i, x;
1017 1033
1018 want_refresh = 1; 1034 want_refresh = 1;
1019 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
1020 1036
1021 if (count == 0) 1037 if (count == 0)
1022 return; 1038 return;
1023 else if (count > 0) 1039 else if (count > 0)
1024 { 1040 {
1025 int row = screen.cur.row;
1026
1027 line_t &l = ROW(row); 1041 line_t &l = ROW(screen.cur.row);
1028 rend_t base_rend = l.r[i]; 1042 rend_t base_rend = l.r[i];
1029 ht &= l.t[i] == ' '; 1043 ht &= l.t[i] == ' ';
1030 1044
1031 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
1032 if (tabs[i]) 1046 if (tabs[i])
1033 { 1047 {
1034 x = i; 1048 x = i;
1049
1035 if (!--count) 1050 if (!--count)
1036 break; 1051 break;
1037 } 1052 }
1038 else 1053 else
1039 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
1042 if (count) 1057 if (count)
1043 x = ncol - 1; 1058 x = ncol - 1;
1044 1059
1045 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1046 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1047 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
1048 { 1063 {
1049 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1050 1065
1051 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
1052 MAX_IT (l.l, x);
1053 1067
1054 i = screen.cur.col; 1068 i = screen.cur.col;
1055 1069
1056 l.t[i] = '\t'; 1070 l.t[i] = '\t';
1057 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1088 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1089 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1090 */ 1104 */
1091#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1092void 1106void
1093rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1094{ 1108{
1095 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1096 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1097 else 1111 else
1098 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1105 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1106 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1107 */ 1121 */
1108#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1109void 1123void
1110rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1111{ 1125{
1112 int row;
1113
1114 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1115 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1116 else 1128 else
1117 { 1129 {
1118 row = screen.cur.row; 1130 line_t &l = ROW(screen.cur.row);
1119 1131
1120 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1132 l.touch ();
1121 ROW(row).l = ncol; 1133 l.is_longer (0);
1122 1134
1123 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1124 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1125 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1126 } 1138 }
… …
1130/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1131/* 1143/*
1132 * Goto Row/Column 1144 * Goto Row/Column
1133 */ 1145 */
1134void 1146void
1135rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1136{ 1148{
1137 want_refresh = 1; 1149 want_refresh = 1;
1138 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1139 1151
1140 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1141 MAX_IT (screen.cur.col, 0); 1153 clamp_it (screen.cur.col, 0, ncol - 1);
1142 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1143 1154
1144 screen.flags &= ~Screen_WrapNext; 1155 screen.flags &= ~Screen_WrapNext;
1145 1156
1146 if (relative & R_RELATIVE) 1157 if (relative & R_RELATIVE)
1147 { 1158 {
… …
1165 else 1176 else
1166 { 1177 {
1167 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1168 { /* relative origin mode */ 1179 { /* relative origin mode */
1169 screen.cur.row = row + screen.tscroll; 1180 screen.cur.row = row + screen.tscroll;
1170 MIN_IT (screen.cur.row, screen.bscroll); 1181 min_it (screen.cur.row, screen.bscroll);
1171 } 1182 }
1172 else 1183 else
1173 screen.cur.row = row; 1184 screen.cur.row = row;
1174 } 1185 }
1175 1186
1176 MAX_IT (screen.cur.row, 0); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1177 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1178} 1188}
1179 1189
1180/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1181/* 1191/*
1182 * direction should be UP or DN 1192 * direction should be UP or DN
1183 */ 1193 */
1184void 1194void
1185rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1186{ 1196{
1187 int dirn; 1197 int dirn;
1188 1198
1189 want_refresh = 1; 1199 want_refresh = 1;
1190 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1197 || (screen.cur.row == screen.tscroll && direction == DN)) 1207 || (screen.cur.row == screen.tscroll && direction == DN))
1198 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1208 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1199 else 1209 else
1200 screen.cur.row += dirn; 1210 screen.cur.row += dirn;
1201 1211
1202 MAX_IT (screen.cur.row, 0); 1212 clamp_it (screen.cur.row, 0, nrow - 1);
1203 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1204 selection_check (0); 1213 selection_check (0);
1205} 1214}
1206 1215
1207/* ------------------------------------------------------------------------- */ 1216/* ------------------------------------------------------------------------- */
1208/* 1217/*
… …
1210 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1211 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1212 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1213 */ 1222 */
1214void 1223void
1215rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1216{ 1225{
1217 unsigned int row, col, num; 1226 unsigned int col, num;
1218 1227
1219 want_refresh = 1; 1228 want_refresh = 1;
1220 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1221 1230
1222 selection_check (1); 1231 selection_check (1);
1223 1232
1224 row = screen.cur.row; 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1225 1237
1226 switch (mode) 1238 switch (mode)
1227 { 1239 {
1228 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1229 col = screen.cur.col; 1241 col = screen.cur.col;
1230 num = ncol - col; 1242 num = ncol - col;
1231 MIN_IT (ROW(row).l, (int16_t)col); 1243 min_it (line.l, col);
1232 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1233 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1234 CLEAR_SELECTION (); 1246 CLEAR_SELECTION ();
1235 break; 1247 break;
1236 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
… …
1241 CLEAR_SELECTION (); 1253 CLEAR_SELECTION ();
1242 break; 1254 break;
1243 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1244 col = 0; 1256 col = 0;
1245 num = ncol; 1257 num = ncol;
1246 ROW(row).l = 0; 1258 line.l = 0;
1247 if (selection.beg.row <= screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1248 && selection.end.row >= screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1249 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1250 break; 1262 break;
1251 default: 1263 default:
1252 return; 1264 return;
1253 } 1265 }
1254 1266
1255 scr_blank_line (ROW(row), col, num, rstyle); 1267 scr_blank_line (line, col, num, rstyle);
1256} 1268}
1257 1269
1258/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1259/* 1271/*
1260 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
1261 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1262 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1263 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1264 */ 1276 */
1265void 1277void
1266rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1267{ 1279{
1268 int num; 1280 int num;
1269 int32_t row; 1281 int32_t row;
1270 rend_t ren; 1282 rend_t ren;
1271 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1303 CLEAR_SELECTION (); 1315 CLEAR_SELECTION ();
1304 1316
1305 if (row >= nrow) /* Out Of Bounds */ 1317 if (row >= nrow) /* Out Of Bounds */
1306 return; 1318 return;
1307 1319
1308 MIN_IT (num, (nrow - row)); 1320 min_it (num, nrow - row);
1309 1321
1310 if (rstyle & (RS_RVid | RS_Uline)) 1322 if (rstyle & (RS_RVid | RS_Uline))
1311 ren = (rend_t) ~RS_None; 1323 ren = (rend_t) ~RS_None;
1312 else if (GET_BASEBG (rstyle) == Color_bg) 1324 else if (GET_BASEBG (rstyle) == Color_bg)
1313 { 1325 {
… …
1315 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1316 } 1328 }
1317 else 1329 else
1318 { 1330 {
1319 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1321 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1323 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1325 } 1337 }
1326 1338
1327 for (; num--; row++) 1339 for (; num--; row++)
1328 { 1340 {
1329 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1330 ROW (row).l = 0;
1331 scr_blank_line (drawn[row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1332 } 1343 }
1333} 1344}
1334 1345
1335#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1336void 1347void
1337rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1338{ 1349{
1339 want_refresh = 1; 1350 want_refresh = 1;
1340 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1341 1352
1342 nsaved = 0; 1353 top_row = 0;
1343} 1354}
1344#endif 1355#endif
1345 1356
1346/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1347/* 1358/*
1348 * Fill the screen with `E's 1359 * Fill the screen with `E's
1349 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1350 */ 1361 */
1351void 1362void
1352rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1353{ 1364{
1354 rend_t fs; 1365 rend_t fs;
1355 1366
1356 want_refresh = 1; 1367 want_refresh = 1;
1357 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1368 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1369 1380
1370 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1371 *r1++ = fs; 1382 *r1++ = fs;
1372 1383
1373 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1374 } 1386 }
1375} 1387}
1376 1388
1377/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1378/* 1390/*
1379 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1380 */ 1392 */
1381void 1393void
1382rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1383{ 1395{
1384 int end; 1396 int end;
1385 1397
1386 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1387 1399
… …
1407/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1408/* 1420/*
1409 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1410 */ 1422 */
1411void 1423void
1412rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1413{ 1425{
1414 int col, row; 1426 int col, row;
1415 rend_t tr; 1427 rend_t tr;
1416 1428
1417 want_refresh = 1; 1429 want_refresh = 1;
… …
1421 return; 1433 return;
1422 1434
1423 scr_do_wrap (); 1435 scr_do_wrap ();
1424 1436
1425 selection_check (1); 1437 selection_check (1);
1426 MIN_IT (count, (ncol - screen.cur.col)); 1438 min_it (count, ncol - screen.cur.col);
1427 1439
1428 row = screen.cur.row; 1440 row = screen.cur.row;
1429 1441
1430 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1431 1446
1432 switch (insdel) 1447 switch (insdel)
1433 { 1448 {
1434 case INSERT: 1449 case INSERT:
1435 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1436 { 1451 {
1437 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1438 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1439 } 1454 }
1440 1455
1441 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1442 {
1443 line->l += count;
1444 MIN_IT (line->l, ncol);
1445 }
1446 1457
1447 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1448 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1449 { 1460 {
1450 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1463 1474
1464 case ERASE: 1475 case ERASE:
1465 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1466 selection_check (1); 1477 selection_check (1);
1467 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1468 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1469 break; 1482 break;
1470 1483
1471 case DELETE: 1484 case DELETE:
1472 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1475 { 1488 {
1476 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1477 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1478 } 1491 }
1479 1492
1493 line->l = max (line->l - count, 0);
1480 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1481
1482 if (line->is_longer ()) /* break line continuation */
1483 line->l = ncol;
1484
1485 line->l = max (line->l - count, 0);
1486 1495
1487 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1489 { 1498 {
1490 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1508/* 1517/*
1509 * Set the scrolling region 1518 * Set the scrolling region
1510 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1511 */ 1520 */
1512void 1521void
1513rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1514{ 1523{
1515 MAX_IT (top, 0); 1524 max_it (top, 0);
1516 MIN_IT (bot, (int)nrow - 1); 1525 min_it (bot, nrow - 1);
1517 1526
1518 if (top > bot) 1527 if (top > bot)
1519 return; 1528 return;
1520 1529
1521 screen.tscroll = top; 1530 screen.tscroll = top;
… …
1528 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1529 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1530 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1531 */ 1540 */
1532void 1541void
1533rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1534{ 1543{
1535 want_refresh = 1; 1544 want_refresh = 1;
1536 1545
1537 if (mode) 1546 if (mode)
1538 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1545 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1546 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1547 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1548 */ 1557 */
1549void 1558void
1550rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1551{ 1560{
1552 if (mode) 1561 if (mode)
1553 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1554 else 1563 else
1555 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1564 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1565 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1566 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1567 */ 1576 */
1568void 1577void
1569rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1570{ 1579{
1571 if (mode) 1580 if (mode)
1572 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1573 else 1582 else
1574 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1581 * Set insert/replace mode 1590 * Set insert/replace mode
1582 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1583 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1584 */ 1593 */
1585void 1594void
1586rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1587{ 1596{
1588 if (mode) 1597 if (mode)
1589 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1590 else 1599 else
1591 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1597 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1598 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1599 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1600 */ 1609 */
1601void 1610void
1602rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1603{ 1612{
1604 if (mode < 0) 1613 if (mode < 0)
1605 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1606 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1607 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1608} 1617}
1609 1618
1610/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1611/* 1620/*
1612 * Set reverse/normal video 1621 * Set reverse/normal video
1613 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1614 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1615 */ 1624 */
1616void 1625void
1617rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1618{ 1627{
1619 XGCValues gcvalue; 1628 rvideo_mode = on;
1620 1629
1630#ifndef NO_BELL
1631 on ^= rvideo_bell;
1632#endif
1633
1621 if (rvideo != mode) 1634 if (rvideo_state != on)
1622 { 1635 {
1623 rvideo = mode; 1636 rvideo_state = on;
1637
1624 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1625#if XPM_BACKGROUND 1639#if XPM_BACKGROUND
1626 if (bgPixmap.pixmap == None) 1640 if (bgPixmap.pixmap == None)
1627#endif 1641#endif
1628#if TRANSPARENT 1642#if TRANSPARENT
1629 if (! (options & Opt_transparent) || am_transparent == 0) 1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1630#endif 1644#endif
1631 XSetWindowBackground (display->display, vt, 1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1632 pix_colors[Color_bg]);
1633 1646
1647 XGCValues gcvalue;
1634 gcvalue.foreground = pix_colors[Color_fg]; 1648 gcvalue.foreground = pix_colors[Color_fg];
1635 gcvalue.background = pix_colors[Color_bg]; 1649 gcvalue.background = pix_colors[Color_bg];
1636 XChangeGC (display->display, gc, GCBackground | GCForeground, 1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1637 &gcvalue); 1651
1638 scr_clear (); 1652 scr_clear ();
1639 scr_touch (true); 1653 scr_touch (true);
1640 } 1654 }
1641} 1655}
1642 1656
… …
1644/* 1658/*
1645 * Report current cursor position 1659 * Report current cursor position
1646 * XTERM_SEQ: Report position: ESC [ 6 n 1660 * XTERM_SEQ: Report position: ESC [ 6 n
1647 */ 1661 */
1648void 1662void
1649rxvt_term::scr_report_position () 1663rxvt_term::scr_report_position () NOTHROW
1650{ 1664{
1651 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1665 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1652} 1666}
1653 1667
1654/* ------------------------------------------------------------------------- * 1668/* ------------------------------------------------------------------------- *
… …
1657 1671
1658/* 1672/*
1659 * Set font style 1673 * Set font style
1660 */ 1674 */
1661void 1675void
1662rxvt_term::set_font_style () 1676rxvt_term::set_font_style () NOTHROW
1663{ 1677{
1678#if 0
1664 switch (charsets[screen.charset]) 1679 switch (charsets [screen.charset])
1665 { 1680 {
1666 case '0': /* DEC Special Character & Line Drawing Set */ 1681 case '0': /* DEC Special Character & Line Drawing Set */
1667 break; 1682 break;
1668 case 'A': /* United Kingdom (UK) */ 1683 case 'A': /* United Kingdom (UK) */
1669 break; 1684 break;
… …
1676 case 'C': /* Finnish character set */ 1691 case 'C': /* Finnish character set */
1677 break; 1692 break;
1678 case 'K': /* German character set */ 1693 case 'K': /* German character set */
1679 break; 1694 break;
1680 } 1695 }
1696#endif
1681} 1697}
1682 1698
1683/* ------------------------------------------------------------------------- */ 1699/* ------------------------------------------------------------------------- */
1684/* 1700/*
1685 * Choose a font 1701 * Choose a font
… …
1687 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1703 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1688 * XTERM_SEQ: Invoke G2 character set: ESC N 1704 * XTERM_SEQ: Invoke G2 character set: ESC N
1689 * XTERM_SEQ: Invoke G3 character set: ESC O 1705 * XTERM_SEQ: Invoke G3 character set: ESC O
1690 */ 1706 */
1691void 1707void
1692rxvt_term::scr_charset_choose (int set) 1708rxvt_term::scr_charset_choose (int set) NOTHROW
1693{ 1709{
1694 screen.charset = set; 1710 screen.charset = set;
1695 set_font_style (); 1711 set_font_style ();
1696} 1712}
1697 1713
… …
1703 * XTERM_SEQ: Set G2 character set: ESC * <C> 1719 * XTERM_SEQ: Set G2 character set: ESC * <C>
1704 * XTERM_SEQ: Set G3 character set: ESC + <C> 1720 * XTERM_SEQ: Set G3 character set: ESC + <C>
1705 * See set_font_style for possible values for <C> 1721 * See set_font_style for possible values for <C>
1706 */ 1722 */
1707void 1723void
1708rxvt_term::scr_charset_set (int set, unsigned int ch) 1724rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1709{ 1725{
1710 charsets[set] = (unsigned char)ch; 1726 charsets[set] = (unsigned char)ch;
1711 set_font_style (); 1727 set_font_style ();
1712} 1728}
1713 1729
… …
1718 1734
1719/* 1735/*
1720 * refresh matching text. 1736 * refresh matching text.
1721 */ 1737 */
1722bool 1738bool
1723rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1739rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1724{ 1740{
1725 bool found = false; 1741 bool found = false;
1726 1742
1727 for (int i = 0; i < nrow; i++) 1743 for (int i = 0; i < nrow; i++)
1728 { 1744 {
1729 int col = 0; 1745 int col = 0;
1730 rend_t *drp = drawn[i].r; 1746 rend_t *drp = drawn_buf[i].r;
1731 1747
1732 for (; col < ncol; col++, drp++) 1748 for (; col < ncol; col++, drp++)
1733 if ((*drp & mask) == value) 1749 if ((*drp & mask) == value)
1734 { 1750 {
1735 found = true; 1751 found = true;
… …
1748 PART_END, 1764 PART_END,
1749 RC_COUNT 1765 RC_COUNT
1750}; 1766};
1751 1767
1752void 1768void
1753rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1769rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1754{ 1770{
1755 int i; 1771 int i;
1756 row_col_t rc[RC_COUNT]; 1772 row_col_t rc[RC_COUNT];
1757 1773
1758 if (!drawn) /* sanity check */ 1774 if (!drawn_buf) /* sanity check */
1759 return; 1775 return;
1760 1776
1761#ifndef NO_SLOW_LINK_SUPPORT 1777#ifndef NO_SLOW_LINK_SUPPORT
1762 if (refresh_type == FAST_REFRESH && !display->is_local) 1778 if (refresh_type == FAST_REFRESH && !display->is_local)
1763 { 1779 {
1764 y = 0; 1780 y = 0;
1765 eheight = height; 1781 eheight = height;
1766 } 1782 }
1767#endif
1768
1769#ifdef DEBUG_STRICT
1770 x = max (x, 0);
1771 x = min (x, (int)width);
1772 y = max (y, 0);
1773 y = min (y, (int)height);
1774#endif 1783#endif
1775 1784
1776 /* round down */ 1785 /* round down */
1777 rc[PART_BEG].col = Pixel2Col (x); 1786 rc[PART_BEG].col = Pixel2Col (x);
1778 rc[PART_BEG].row = Pixel2Row (y); 1787 rc[PART_BEG].row = Pixel2Row (y);
… …
1781 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1790 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1782 1791
1783 /* sanity checks */ 1792 /* sanity checks */
1784 for (i = PART_BEG; i < RC_COUNT; i++) 1793 for (i = PART_BEG; i < RC_COUNT; i++)
1785 { 1794 {
1786 MIN_IT (rc[i].col, ncol - 1); 1795 min_it (rc[i].col, ncol - 1);
1787 MIN_IT (rc[i].row, nrow - 1); 1796 min_it (rc[i].row, nrow - 1);
1788 } 1797 }
1789 1798
1790 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1791 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1801
1802 num_scr_allow = 0;
1792 1803
1793 if (refresh) 1804 if (refresh)
1794 scr_refresh (SLOW_REFRESH); 1805 scr_refresh ();
1795} 1806}
1796 1807
1797/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1798/* 1809/*
1799 * Refresh the entire screen 1810 * Refresh the entire screen
1800 */ 1811 */
1801void 1812void
1802rxvt_term::scr_touch (bool refresh) 1813rxvt_term::scr_touch (bool refresh) NOTHROW
1803{ 1814{
1804 scr_expose (0, 0, width, height, refresh); 1815 scr_expose (0, 0, width, height, refresh);
1805} 1816}
1806 1817
1807/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1808/* 1819/*
1809 * Move the display so that the line represented by scrollbar value Y is at 1820 * Move the display so that the line represented by scrollbar value Y is at
1810 * the top of the screen 1821 * the top of the screen
1811 */ 1822 */
1812int 1823void
1813rxvt_term::scr_move_to (int y, int len) 1824rxvt_term::scr_move_to (int y, int len) NOTHROW
1814{ 1825{
1815 long p = 0; 1826 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1816 unsigned int oldviewstart;
1817
1818 oldviewstart = view_start;
1819
1820 if (y < len)
1821 {
1822 p = (nrow + nsaved) * (len - y) / len;
1823 p -= (long) (nrow - 1);
1824 p = max (p, 0);
1825 }
1826
1827 view_start = (unsigned int)min (p, nsaved);
1828
1829 return scr_changeview (oldviewstart);
1830} 1827}
1831 1828
1832/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1833/* 1830/*
1834 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1835 * direction should be UP or DN 1832 * direction should be UP or DN
1836 */ 1833 */
1837int 1834bool
1838rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1839{ 1836{
1840 int n; 1837 int new_view_start =
1841 unsigned int oldviewstart;
1842
1843 oldviewstart = view_start;
1844
1845 if (direction == UP)
1846 {
1847 n = view_start + nlines;
1848 view_start = min (n, nsaved);
1849 }
1850 else
1851 {
1852 n = view_start - nlines; 1838 direction == UP ? view_start - nlines
1853 view_start = max (n, 0); 1839 : view_start + nlines;
1854 }
1855 1840
1856 return scr_changeview (oldviewstart); 1841 return scr_changeview (new_view_start);
1857} 1842}
1858 1843
1859int 1844bool
1860rxvt_term::scr_changeview (unsigned int oldviewstart) 1845rxvt_term::scr_changeview (int new_view_start) NOTHROW
1861{ 1846{
1847 clamp_it (new_view_start, top_row, 0);
1848
1862 if (view_start != oldviewstart) 1849 if (new_view_start == view_start)
1863 { 1850 return false;
1851
1852 num_scr += new_view_start - view_start;
1853 view_start = new_view_start;
1864 want_refresh = 1; 1854 want_refresh = 1;
1865 num_scr -= (view_start - oldviewstart);
1866 }
1867 1855
1868 return (int) (view_start - oldviewstart); 1856 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1869}
1870 1857
1871/* ------------------------------------------------------------------------- */ 1858 return true;
1859}
1860
1861#ifndef NO_BELL
1872void 1862void
1863rxvt_term::bell_cb (time_watcher &w)
1864{
1865 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode);
1867}
1868#endif
1869
1870/* ------------------------------------------------------------------------- */
1871void
1873rxvt_term::scr_bell () 1872rxvt_term::scr_bell () NOTHROW
1874{ 1873{
1875#ifndef NO_BELL 1874#ifndef NO_BELL
1876 1875
1877# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
1879 if (options & Opt_mapAlert) 1878 if (OPTION (Opt_mapAlert))
1880# endif 1879# endif
1881 XMapWindow (display->display, parent[0]); 1880 XMapWindow (display->display, parent[0]);
1882# endif 1881# endif
1883 1882
1884 if (options & Opt_visualBell) 1883 if (OPTION (Opt_visualBell))
1885 { 1884 {
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 rvideo_bell = true;
1887 rxvt_usleep (VISUAL_BELL_DURATION); 1886 scr_rvideo_mode (rvideo_mode);
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1887 display->flush ();
1888
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1889 } 1890 }
1890 else 1891 else
1891 XBell (display->display, 0); 1892 XBell (display->display, 0);
1892 1893
1893#endif 1894#endif
1894} 1895}
1895 1896
1896/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
1897/* ARGSUSED */ 1898/* ARGSUSED */
1898void 1899void
1899rxvt_term::scr_printscreen (int fullhist) 1900rxvt_term::scr_printscreen (int fullhist) NOTHROW
1900{ 1901{
1901#ifdef PRINTPIPE 1902#ifdef PRINTPIPE
1902 int nrows, row_start; 1903 int nrows, row_start;
1903 FILE *fd; 1904 FILE *fd;
1904 1905
1905 if ((fd = popen_printer ()) == NULL) 1906 if ((fd = popen_printer ()) == NULL)
1906 return; 1907 return;
1907 1908
1908 if (fullhist) 1909 if (fullhist)
1909 { 1910 {
1910 nrows = nrow + nsaved; 1911 nrows = nrow - top_row;
1911 row_start = -nsaved; 1912 row_start = top_row;
1912 } 1913 }
1913 else 1914 else
1914 { 1915 {
1915 nrows = nrow; 1916 nrows = nrow;
1916 row_start = -view_start; 1917 row_start = view_start;
1917 } 1918 }
1918 1919
1919 wctomb (0, 0); 1920 wctomb (0, 0);
1920 1921
1921 for (int r1 = 0; r1 < nrows; r1++) 1922 for (int r1 = 0; r1 < nrows; r1++)
… …
1953 * Refresh the screen 1954 * Refresh the screen
1954 * drawn_text/drawn_rend contain the screen information before the update. 1955 * drawn_text/drawn_rend contain the screen information before the update.
1955 * screen.text/screen.rend contain what the screen will change to. 1956 * screen.text/screen.rend contain what the screen will change to.
1956 */ 1957 */
1957void 1958void
1958rxvt_term::scr_refresh (unsigned char refresh_type) 1959rxvt_term::scr_refresh () NOTHROW
1959{ 1960{
1960 unsigned char must_clear, /* use draw_string not draw_image_string */ 1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1961 showcursor; /* show the cursor */ 1962 showcursor; /* show the cursor */
1962 int16_t col, row, /* column/row we're processing */ 1963 int16_t col, row, /* column/row we're processing */
1963 ocrow; /* old cursor row */ 1964 ocrow; /* old cursor row */
1964 int i, /* tmp */ 1965 int i; /* tmp */
1965 row_offset; /* basic offset in screen structure */
1966#ifndef NO_CURSORCOLOR 1966#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 1967 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 1968#endif
1969 rend_t *crp; // cursor rendition pointer 1969 rend_t *crp; // cursor rendition pointer
1970 1970
… …
1977 * A: set up vars 1977 * A: set up vars
1978 */ 1978 */
1979 must_clear = 0; 1979 must_clear = 0;
1980 refresh_count = 0; 1980 refresh_count = 0;
1981 1981
1982 row_offset = term_start - view_start;
1983
1984#if XPM_BACKGROUND 1982#if XPM_BACKGROUND
1985 must_clear |= bgPixmap.pixmap != None; 1983 must_clear |= bgPixmap.pixmap != None;
1986#endif 1984#endif
1987#if TRANSPARENT 1985#if TRANSPARENT
1988 must_clear |= (options & Opt_transparent) && am_transparent; 1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1989#endif 1987#endif
1990 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1991 1989
1992 /* 1990 /*
1993 * B: reverse any characters which are selected 1991 * B: reverse any characters which are selected
… …
2017 2015
2018 crp = &ROW(screen.cur.row).r[col]; 2016 crp = &ROW(screen.cur.row).r[col];
2019 2017
2020 if (showcursor && focus) 2018 if (showcursor && focus)
2021 { 2019 {
2022 if (options & Opt_cursorUnderline) 2020 if (OPTION (Opt_cursorUnderline))
2023 *crp ^= RS_Uline; 2021 *crp ^= RS_Uline;
2024 else 2022 else
2025 { 2023 {
2026 *crp ^= RS_RVid; 2024 *crp ^= RS_RVid;
2027 2025
… …
2029 cc1 = *crp & (RS_fgMask | RS_bgMask); 2027 cc1 = *crp & (RS_fgMask | RS_bgMask);
2030 if (ISSET_PIXCOLOR (Color_cursor)) 2028 if (ISSET_PIXCOLOR (Color_cursor))
2031 ccol1 = Color_cursor; 2029 ccol1 = Color_cursor;
2032 else 2030 else
2033#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2031#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2034 ccol1 = GET_FGCOLOR (rstyle); 2032 ccol1 = fgcolor_of (rstyle);
2035#else 2033#else
2036 ccol1 = Color_fg; 2034 ccol1 = Color_fg;
2037#endif 2035#endif
2038 if (ISSET_PIXCOLOR (Color_cursor2)) 2036 if (ISSET_PIXCOLOR (Color_cursor2))
2039 ccol2 = Color_cursor2; 2037 ccol2 = Color_cursor2;
2040 else 2038 else
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol2 = GET_BGCOLOR (rstyle); 2040 ccol2 = bgcolor_of (rstyle);
2043#else 2041#else
2044 ccol2 = Color_bg; 2042 ccol2 = Color_bg;
2045#endif 2043#endif
2046 *crp = SET_FGCOLOR (*crp, ccol1); 2044 *crp = SET_FGCOLOR (*crp, ccol1);
2047 *crp = SET_BGCOLOR (*crp, ccol2); 2045 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2052 2050
2053 /* make sure no outline cursor is left around */ 2051 /* make sure no outline cursor is left around */
2054 setoldcursor = 0; 2052 setoldcursor = 0;
2055 if (ocrow != -1) 2053 if (ocrow != -1)
2056 { 2054 {
2057 if (screen.cur.row + view_start != ocrow 2055 if (screen.cur.row - view_start != ocrow
2058 || screen.cur.col != oldcursor.col) 2056 || screen.cur.col != oldcursor.col)
2059 { 2057 {
2060 if (ocrow < nrow 2058 if (ocrow < nrow
2061 && oldcursor.col < ncol) 2059 && oldcursor.col < ncol)
2062 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2060 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2063 2061
2064 if (focus || !showcursor) 2062 if (focus || !showcursor)
2065 oldcursor.row = -1; 2063 oldcursor.row = -1;
2066 else 2064 else
2067 setoldcursor = 1; 2065 setoldcursor = 1;
… …
2070 else if (!focus) 2068 else if (!focus)
2071 setoldcursor = 1; 2069 setoldcursor = 1;
2072 2070
2073 if (setoldcursor) 2071 if (setoldcursor)
2074 { 2072 {
2075 if (screen.cur.row + view_start >= nrow) 2073 if (screen.cur.row - view_start >= nrow)
2076 oldcursor.row = -1; 2074 oldcursor.row = -1;
2077 else 2075 else
2078 { 2076 {
2079 oldcursor.row = screen.cur.row + view_start; 2077 oldcursor.row = screen.cur.row - view_start;
2080 oldcursor.col = screen.cur.col; 2078 oldcursor.col = screen.cur.col;
2081 } 2079 }
2082 } 2080 }
2083 } 2081 }
2084 2082
2083 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2085#if ENABLE_OVERLAY 2084#if ENABLE_OVERLAY
2086 scr_swap_overlay (); 2085 scr_swap_overlay ();
2087#endif 2086#endif
2088 2087
2089#ifndef NO_SLOW_LINK_SUPPORT 2088#ifndef NO_SLOW_LINK_SUPPORT
2090 /* 2089 /*
2091 * D: CopyArea pass - very useful for slower links 2090 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2091 * This has been deliberately kept simple.
2093 */ 2092 */
2094 i = num_scr;
2095 if (!display->is_local 2093 if (!display->is_local
2096 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2097 && abs (num_scr) < nrow && !must_clear) 2095 && abs (num_scr) < nrow && !must_clear)
2098 { 2096 {
2099 int16_t nits; 2097 int16_t nits;
2100 int j; 2098 int j;
2101 int len, wlen; 2099 int len, wlen;
2100 dLocal (int, num_scr);
2102 2101
2103 j = nrow; 2102 j = nrow;
2104 wlen = len = -1; 2103 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2104 row = i > 0 ? 0 : j - 1;
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2106 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2108 {
2110 line_t s = save[(row + row_offset) % total_rows]; 2109 line_t s = ROW(view_start + row);
2111 line_t d = drawn[row]; 2110 line_t d = drawn_buf[row];
2112 line_t d2 = drawn[row + i]; 2111 line_t d2 = drawn_buf[row + i];
2113 2112
2114 for (nits = 0, col = ncol; col--; ) 2113 for (nits = 0, col = ncol; col--; )
2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2114 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2116 nits--; 2115 nits--;
2117 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2116 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2135 2134
2136 if (len != -1) 2135 if (len != -1)
2137 { 2136 {
2138 /* also comes here at end if needed because of >= above */ 2137 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2138 if (wlen < len)
2140 SWAP_IT (wlen, len, int); 2139 ::swap (wlen, len);
2141 2140
2142 XCopyArea (display->display, vt, vt, 2141 XCopyArea (display->display, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2142 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)TermWin_TotalWidth (), 2143 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2144 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2145 0, Row2Pixel (len));
2147 len = -1; 2146 len = -1;
2148 } 2147 }
2149 } 2148 }
… …
2153 /* 2152 /*
2154 * E: main pass across every character 2153 * E: main pass across every character
2155 */ 2154 */
2156 for (row = 0; row < nrow; row++) 2155 for (row = 0; row < nrow; row++)
2157 { 2156 {
2158 text_t *stp = save[(row + row_offset) % total_rows].t; 2157 text_t *stp = ROW(view_start + row).t;
2159 rend_t *srp = save[(row + row_offset) % total_rows].r; 2158 rend_t *srp = ROW(view_start + row).r;
2160 text_t *dtp = drawn[row].t; 2159 text_t *dtp = drawn_buf[row].t;
2161 rend_t *drp = drawn[row].r; 2160 rend_t *drp = drawn_buf[row].r;
2162 2161
2163 /* 2162 /*
2164 * E2: OK, now the real pass 2163 * E2: OK, now the real pass
2165 */ 2164 */
2166 int ypixel = (int)Row2Pixel (row); 2165 int ypixel = (int)Row2Pixel (row);
… …
2228 count++, i--; 2227 count++, i--;
2229 2228
2230 /* 2229 /*
2231 * Determine the attributes for the string 2230 * Determine the attributes for the string
2232 */ 2231 */
2233 int fore = GET_FGCOLOR (rend); // desired foreground 2232 int fore = fgcolor_of (rend); // desired foreground
2234 int back = GET_BGCOLOR (rend); // desired background 2233 int back = bgcolor_of (rend); // desired background
2235 2234
2236 // only do special processing if any attributes are set, which is rare 2235 // only do special processing if any attributes are set, which is unlikely
2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2238 { 2237 {
2239#if ENABLE_STYLES 2238#if ENABLE_STYLES
2240 // force redraw after "careful" characters to avoid pixel droppings 2239 // force redraw after "careful" characters to avoid pixel droppings
2241 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2277 fore = Color_UL; 2276 fore = Color_UL;
2278#endif 2277#endif
2279 2278
2280 if (invert) 2279 if (invert)
2281 { 2280 {
2282 SWAP_IT (fore, back, int); 2281 ::swap (fore, back);
2283 2282
2284#ifndef NO_BOLD_UNDERLINE_REVERSE 2283#ifndef NO_BOLD_UNDERLINE_REVERSE
2285 if (ISSET_PIXCOLOR (Color_RV)) 2284 if (ISSET_PIXCOLOR (Color_RV))
2286 back = Color_RV; 2285 back = Color_RV;
2287 2286
… …
2352 } /* for (row....) */ 2351 } /* for (row....) */
2353 2352
2354#if ENABLE_OVERLAY 2353#if ENABLE_OVERLAY
2355 scr_swap_overlay (); 2354 scr_swap_overlay ();
2356#endif 2355#endif
2356 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2357 2357
2358 /* 2358 /*
2359 * G: cleanup cursor and display outline cursor if necessary 2359 * G: cleanup cursor and display outline cursor if necessary
2360 */ 2360 */
2361 if (showcursor) 2361 if (showcursor)
2362 { 2362 {
2363 if (focus) 2363 if (focus)
2364 { 2364 {
2365 if (options & Opt_cursorUnderline) 2365 if (OPTION (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2366 *crp ^= RS_Uline;
2367 else 2367 else
2368 { 2368 {
2369 *crp ^= RS_RVid; 2369 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2370#ifndef NO_CURSORCOLOR
… …
2379 2379
2380 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2380 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2381 col--; 2381 col--;
2382 2382
2383 while (col + cursorwidth < ncol 2383 while (col + cursorwidth < ncol
2384 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2385 cursorwidth++;
2386 2386
2387#ifndef NO_CURSORCOLOR 2387#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2388 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2400 /* 2400 /*
2401 * H: cleanup selection 2401 * H: cleanup selection
2402 */ 2402 */
2403 scr_reverse_selection (); 2403 scr_reverse_selection ();
2404 2404
2405 if (refresh_type & SMOOTH_REFRESH)
2406 XFlush (display->display);
2407
2408 num_scr = 0; 2405 num_scr = 0;
2409 num_scr_allow = 1; 2406 num_scr_allow = 1;
2410} 2407}
2411 2408
2412void 2409void
2413rxvt_term::scr_remap_chars (const line_t &l) 2410rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2414{ 2411{
2415 if (!l.t) 2412 if (!l.t)
2416 return; 2413 return;
2417 2414
2415 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2416
2418 for (int i = ncol; i--; ) 2417 for (int i = ncol; i--; )
2419 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2420} 2419}
2421 2420
2422void 2421void
2423rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars () NOTHROW
2424{ 2423{
2425 for (int i = total_rows; i--; ) 2424 for (int i = total_rows; i--; )
2426 scr_remap_chars (save[i]); 2425 scr_remap_chars (row_buf [i]);
2427 2426
2428 for (int i = nrow; i--; ) 2427 for (int i = nrow; i--; )
2429 { 2428 {
2430 scr_remap_chars (drawn[i]); 2429 scr_remap_chars (drawn_buf [i]);
2431 scr_remap_chars (swap_save[i]); 2430 scr_remap_chars (swap_buf [i]);
2432 } 2431 }
2433} 2432}
2434 2433
2435void 2434void
2436rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour () NOTHROW
2437{ 2436{
2438 if (1 2437 if (1
2439#if TRANSPARENT 2438#if TRANSPARENT
2440 && !am_transparent 2439 && !am_transparent
2441#endif 2440#endif
… …
2462 want_refresh = 1; 2461 want_refresh = 1;
2463} 2462}
2464 2463
2465/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2466void 2465void
2467rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really) NOTHROW
2468{ 2467{
2469 if (!mapped) 2468 if (!mapped)
2470 return; 2469 return;
2471 2470
2472 num_scr_allow = 0; 2471 num_scr_allow = 0;
… …
2474 2473
2475 if (really) 2474 if (really)
2476 XClearWindow (display->display, vt); 2475 XClearWindow (display->display, vt);
2477} 2476}
2478 2477
2479/* ------------------------------------------------------------------------- */
2480void 2478void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{
2481 int view_end = view_start + nrow;
2482 int row, col;
2483
2484 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2485 {
2486 text_t *stp = ROW(row).t;
2487 rend_t *srp = ROW(row).r;
2488
2489 for (col = beg_col; col < end_col; col++)
2490 srp[col] ^= rstyle1;
2491
2492 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2493 srp[col] ^= rstyle2;
2494
2495 if (++col < end_col)
2496 srp[col] ^= rstyle2;
2497 }
2498}
2499
2500void
2501rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2502{
2503 int view_end = view_start + nrow;
2504 int row, col;
2505
2506 if (beg_row >= view_start)
2507 {
2508 col = beg_col;
2509 row = beg_row;
2510 }
2511 else
2512 {
2513 col = 0;
2514 row = view_start;
2515 }
2516
2517 for (; row < min (end_row, view_end); row++, col = 0)
2518 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2519 srp[col] ^= rstyle;
2520
2521 if (row == end_row)
2522 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2523 srp[col] ^= rstyle;
2524}
2525
2526/* ------------------------------------------------------------------------- */
2527void
2481rxvt_term::scr_reverse_selection () 2528rxvt_term::scr_reverse_selection () NOTHROW
2482{ 2529{
2483 if (selection.op 2530 if (selection.op
2484 && current_screen == selection.screen 2531 && current_screen == selection.screen
2485 && selection.end.row >= -view_start) 2532 && selection.end.row >= view_start)
2486 { 2533 {
2487 int view_end = -view_start + nrow;
2488 int row, col;
2489
2490#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2491 if (selection.rect) 2535 if (selection.rect)
2492 { 2536 scr_xor_rect (selection.beg.row, selection.beg.col,
2493 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2537 selection.end.row, selection.end.col,
2494 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2538 RS_RVid, RS_RVid | RS_Uline);
2495 srp[col] ^= RS_RVid;
2496 }
2497 else 2539 else
2498#endif 2540#endif
2499 { 2541 scr_xor_span (selection.beg.row, selection.beg.col,
2500 if (selection.beg.row >= -view_start) 2542 selection.end.row, selection.end.col,
2501 { 2543 RS_RVid);
2502 col = selection.beg.col;
2503 row = selection.beg.row;
2504 }
2505 else
2506 {
2507 col = 0;
2508 row = view_start;
2509 }
2510
2511 for (; row < min (selection.end.row, view_end); row++, col = 0)
2512 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2513 srp[col] ^= RS_RVid;
2514
2515 if (row == selection.end.row)
2516 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2517 srp[col] ^= RS_RVid;
2518 }
2519 } 2544 }
2520} 2545}
2521 2546
2522/* ------------------------------------------------------------------------- */ 2547/* ------------------------------------------------------------------------- */
2523/* 2548/*
2524 * Dump the whole scrollback and screen to the passed filedescriptor. The 2549 * Dump the whole scrollback and screen to the passed filedescriptor. The
2525 * invoking routine must close the fd. 2550 * invoking routine must close the fd.
2526 */ 2551 */
2527#if 0 2552#if 0
2528void 2553void
2529rxvt_term::scr_dump (int fd) 2554rxvt_term::scr_dump (int fd) NOTHROW
2530{ 2555{
2531 int row, wrote; 2556 int row, wrote;
2532 unsigned int width, towrite; 2557 unsigned int width, towrite;
2533 char r1[] = "\n"; 2558 char r1[] = "\n";
2534 2559
2535 for (row = saveLines - nsaved; 2560 for (row = saveLines - nsaved;
2536 row < saveLines + nrow - 1; row++) 2561 row < saveLines + nrow - 1; row++)
2537 { 2562 {
2538 width = save[row].l >= 0 ? save[row].l 2563 width = row_buf[row].l >= 0 ? row_buf[row].l
2539 : ncol; 2564 : ncol;
2540 for (towrite = width; towrite; towrite -= wrote) 2565 for (towrite = width; towrite; towrite -= wrote)
2541 { 2566 {
2542 wrote = write (fd, & (save[row].t[width - towrite]), 2567 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2543 towrite); 2568 towrite);
2544 if (wrote < 0) 2569 if (wrote < 0)
2545 return; /* XXX: death, no report */ 2570 return; /* XXX: death, no report */
2546 } 2571 }
2547 if (save[row].l >= 0) 2572 if (row_buf[row].l >= 0)
2548 if (write (fd, r1, 1) <= 0) 2573 if (write (fd, r1, 1) <= 0)
2549 return; /* XXX: death, no report */ 2574 return; /* XXX: death, no report */
2550 } 2575 }
2551} 2576}
2552#endif 2577#endif
2553 2578
2554/* ------------------------------------------------------------------------- * 2579/* ------------------------------------------------------------------------- *
2555 * CHARACTER SELECTION * 2580 * CHARACTER SELECTION *
2556 * ------------------------------------------------------------------------- */ 2581 * ------------------------------------------------------------------------- */
2557void 2582void
2558rxvt_term::selection_check (int check_more) 2583rxvt_term::selection_check (int check_more) NOTHROW
2559{ 2584{
2560 row_col_t pos; 2585 row_col_t pos;
2561 2586
2562 if (!selection.op) 2587 if (!selection.op)
2563 return; 2588 return;
2564 2589
2565 pos.row = pos.col = 0; 2590 pos.row = pos.col = 0;
2566 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2591 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2567 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2592 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2568 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2593 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2569 || (check_more == 1 2594 || (check_more == 1
2570 && current_screen == selection.screen 2595 && current_screen == selection.screen
2571 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2596 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2572 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2597 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2573 || (check_more == 2 2598 || (check_more == 2
… …
2584/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2585/* 2610/*
2586 * Paste a selection direct to the command fd 2611 * Paste a selection direct to the command fd
2587 */ 2612 */
2588void 2613void
2589rxvt_term::paste (unsigned char *data, unsigned int len) 2614rxvt_term::paste (char *data, unsigned int len) NOTHROW
2590{ 2615{
2591 /* convert normal newline chars into common keyboard Return key sequence */ 2616 /* convert normal newline chars into common keyboard Return key sequence */
2592 for (unsigned int i = 0; i < len; i++) 2617 for (unsigned int i = 0; i < len; i++)
2593 if (data[i] == C0_LF) 2618 if (data[i] == C0_LF)
2594 data[i] = C0_CR; 2619 data[i] = C0_CR;
… …
2600/* 2625/*
2601 * Respond to a notification that a primary selection has been sent 2626 * Respond to a notification that a primary selection has been sent
2602 * EXT: SelectionNotify 2627 * EXT: SelectionNotify
2603 */ 2628 */
2604void 2629void
2605rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2606{ 2631{
2607 if (prop == None) /* check for failed XConvertSelection */ 2632 if (prop == None) /* check for failed XConvertSelection */
2608 { 2633 {
2609 if ((selection_type & Sel_CompoundText)) 2634 if ((selection_type & Sel_CompoundText))
2610 { 2635 {
… …
2738 { 2763 {
2739 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2740 char *s = rxvt_wcstombs (w); 2765 char *s = rxvt_wcstombs (w);
2741 free (w); 2766 free (w);
2742 // TODO: strlen == only the first element will be converted. well... 2767 // TODO: strlen == only the first element will be converted. well...
2743 paste ((unsigned char *)s, strlen (s)); 2768 paste (s, strlen (s));
2744 free (s); 2769 free (s);
2745 } 2770 }
2746 else 2771 else
2747#endif 2772#endif
2748 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2749 && cl) 2774 && cl)
2750 { 2775 {
2751 for (int i = 0; i < cr; i++) 2776 for (int i = 0; i < cr; i++)
2752 paste ((unsigned char *)cl[i], strlen (cl[i])); 2777 paste (cl[i], strlen (cl[i]));
2753 2778
2754 XFreeStringList (cl); 2779 XFreeStringList (cl);
2755 } 2780 }
2756 else 2781 else
2757 paste (ct.value, ct.nitems); // paste raw 2782 paste ((char *)ct.value, ct.nitems); // paste raw
2758 2783
2759bailout: 2784bailout:
2760 XFree (ct.value); 2785 XFree (ct.value);
2761 2786
2762 if (selection_wait == Sel_normal) 2787 if (selection_wait == Sel_normal)
2763 selection_wait = Sel_none; 2788 selection_wait = Sel_none;
2764} 2789}
2765 2790
2766void 2791void
2767rxvt_term::incr_cb (time_watcher &w) 2792rxvt_term::incr_cb (time_watcher &w) NOTHROW
2768{ 2793{
2769 selection_wait = Sel_none; 2794 selection_wait = Sel_none;
2770 2795
2771 incr_buf_size = 0; 2796 incr_buf_size = 0;
2772 free (incr_buf); 2797 free (incr_buf);
2773 2798
2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2775} 2800}
2776 2801
2777void 2802void
2778rxvt_term::selection_property (Window win, Atom prop) 2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2779{ 2804{
2780 if (prop == None || selection_wait != Sel_incr) 2805 if (prop == None || selection_wait != Sel_incr)
2781 return; 2806 return;
2782 2807
2783 selection_paste (win, prop, true); 2808 selection_paste (win, prop, true);
… …
2792 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2793 * will auto fallback to CUT_BUFFER0 2818 * will auto fallback to CUT_BUFFER0
2794 * EXT: button 2 release 2819 * EXT: button 2 release
2795 */ 2820 */
2796void 2821void
2797rxvt_term::selection_request (Time tm, int x, int y) 2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2798{ 2823{
2799 if (x < 0 || x >= width || y < 0 || y >= height) 2824 if (selection.text && selnum == Sel_Primary)
2800 return; /* outside window */
2801
2802 if (selection.text)
2803 { /* internal selection */ 2825 { /* internal selection */
2804 char *str = rxvt_wcstombs (selection.text, selection.len); 2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2805 paste ((unsigned char *)str, strlen (str)); 2827 paste (str, strlen (str));
2806 free (str); 2828 free (str);
2807 return; 2829 return;
2808 } 2830 }
2809 else 2831 else
2810 { 2832 {
2811 int i;
2812
2813 selection_request_time = tm; 2833 selection_request_time = tm;
2814 selection_wait = Sel_normal; 2834 selection_wait = Sel_normal;
2815 2835
2816 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2817 {
2818#if X_HAVE_UTF8_STRING 2836#if X_HAVE_UTF8_STRING
2819 selection_type = Sel_UTF8String; 2837 selection_type = Sel_UTF8String;
2820 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2821 return; 2839 return;
2822#else 2840#else
2823 selection_type = Sel_CompoundText; 2841 selection_type = Sel_CompoundText;
2824 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2825 return; 2843 return;
2826#endif 2844#endif
2827 }
2828 } 2845 }
2829 2846
2830 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2831 selection_paste (display->root, XA_CUT_BUFFER0, false); 2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2832} 2849}
2833 2850
2834int 2851int
2835rxvt_term::selection_request_other (Atom target, int selnum) 2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2836{ 2853{
2837 Atom sel; 2854 Atom sel;
2838 2855
2839 selection_type |= selnum; 2856 selection_type |= selnum;
2840 2857
… …
2859/* 2876/*
2860 * Clear all selected text 2877 * Clear all selected text
2861 * EXT: SelectionClear 2878 * EXT: SelectionClear
2862 */ 2879 */
2863void 2880void
2864rxvt_term::selection_clear () 2881rxvt_term::selection_clear () NOTHROW
2865{ 2882{
2866 want_refresh = 1; 2883 want_refresh = 1;
2867 free (selection.text); 2884 free (selection.text);
2868 selection.text = NULL; 2885 selection.text = NULL;
2869 selection.len = 0; 2886 selection.len = 0;
… …
2902 selection.op = SELECTION_DONE; 2919 selection.op = SELECTION_DONE;
2903 2920
2904 if (selection.clicks == 4) 2921 if (selection.clicks == 4)
2905 return; /* nothing selected, go away */ 2922 return; /* nothing selected, go away */
2906 2923
2924 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2925 return;
2926
2907 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2927 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2908 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2928 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2909 2929
2910 int ofs = 0; 2930 int ofs = 0;
2911 int extra = 0; 2931 int extra = 0;
… …
2923 col = selection.beg.col; 2943 col = selection.beg.col;
2924 end_col = ncol + 1; 2944 end_col = ncol + 1;
2925 } 2945 }
2926 else 2946 else
2927#endif 2947#endif
2928 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2948 end_col = ROW(row).l;
2929 2949
2930 col = max (col, 0); 2950 col = max (col, 0);
2931 2951
2932 if (row == selection.end.row || selection.rect) 2952 if (row == selection.end.row
2953#if ENABLE_FRILLS
2954 || selection.rect
2955#endif
2956 )
2933 end_col = min (end_col, selection.end.col); 2957 min_it (end_col, selection.end.col);
2934 2958
2935 t = ROW(row).t + col; 2959 t = ROW(row).t + col;
2960
2936 for (; col < end_col; col++) 2961 for (; col < end_col; col++)
2937 { 2962 {
2938 if (*t == NOCHAR) 2963 if (*t == NOCHAR)
2939 t++; 2964 t++;
2940#if ENABLE_COMBINING 2965#if ENABLE_COMBINING
… …
2956#endif 2981#endif
2957 else 2982 else
2958 new_selection_text[ofs++] = *t++; 2983 new_selection_text[ofs++] = *t++;
2959 } 2984 }
2960 2985
2986#if ENABLE_FRILLS
2987 if (selection.rect)
2988 {
2989 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1]))
2992 --ofs;
2993
2994 new_selection_text[ofs++] = C0_LF;
2995 }
2996 else
2997#endif
2961 if (!ROW(row).is_longer () && row != selection.end.row) 2998 if (!ROW(row).is_longer () && row != selection.end.row)
2962 new_selection_text[ofs++] = C0_LF; 2999 new_selection_text[ofs++] = C0_LF;
2963 } 3000 }
2964 3001
2965 if (end_col != selection.end.col) 3002 if (end_col != selection.end.col)
2966 new_selection_text[ofs++] = C0_LF; 3003 new_selection_text[ofs++] = C0_LF;
2967 3004
… …
2977 3014
2978 // we usually allocate much more than necessary, so realloc it smaller again 3015 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 3016 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3017 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 3018
3019 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3020 return;
3021
3022 selection_grab (tm);
3023}
3024
3025bool
3026rxvt_term::selection_grab (Time tm) NOTHROW
3027{
3028 selection_time = tm;
3029
2982 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2983 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3032 {
2984 display->set_selection_owner (this); 3033 display->set_selection_owner (this);
3034 return true;
3035 }
2985 else 3036 else
2986 rxvt_warn ("can't get primary selection, ignoring.\n"); 3037 {
3038 selection_clear ();
3039 return false;
3040 }
2987 3041
2988#if 0 3042#if 0
2989 XTextProperty ct; 3043 XTextProperty ct;
2990 3044
2991 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2992 { 3046 {
2993 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2994 XFree (ct.value); 3048 XFree (ct.value);
2995 } 3049 }
2996#endif 3050#endif
2997
2998 selection_time = tm;
2999} 3051}
3000 3052
3001/* ------------------------------------------------------------------------- */ 3053/* ------------------------------------------------------------------------- */
3002/* 3054/*
3003 * Mark or select text based upon number of clicks: 1, 2, or 3 3055 * Mark or select text based upon number of clicks: 1, 2, or 3
3004 * EXT: button 1 press 3056 * EXT: button 1 press
3005 */ 3057 */
3006void 3058void
3007rxvt_term::selection_click (int clicks, int x, int y) 3059rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3008{ 3060{
3009 clicks = ((clicks - 1) % 3) + 1; 3061 clicks = ((clicks - 1) % 3) + 1;
3010 selection.clicks = clicks; /* save clicks so extend will work */ 3062 selection.clicks = clicks; /* save clicks so extend will work */
3011 3063
3064 if (clicks == 2 && !selection.rect
3065 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3066 {
3067 MEvent.clicks = 1; // what a mess
3068 selection.screen = current_screen;
3069 selection.op = SELECTION_CONT;
3070 return;
3071 }
3072
3012 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3073 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3013 3074
3014 if (clicks == 2 || clicks == 3) 3075 if (clicks == 2 || clicks == 3)
3015 selection_extend_colrow (selection.mark.col, 3076 selection_extend_colrow (selection.mark.col,
3016 selection.mark.row + view_start, 3077 selection.mark.row - view_start,
3017 0, /* button 3 */ 3078 0, /* button 3 */
3018 1, /* button press */ 3079 1, /* button press */
3019 0); /* click change */ 3080 0); /* click change */
3020} 3081}
3021 3082
3022/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
3023/* 3084/*
3024 * Mark a selection at the specified col/row 3085 * Mark a selection at the specified col/row
3025 */ 3086 */
3026void 3087void
3027rxvt_term::selection_start_colrow (int col, int row) 3088rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3028{ 3089{
3029 want_refresh = 1; 3090 want_refresh = 1;
3030 3091
3031 selection.mark.row = row - view_start; 3092 selection.mark.row = row + view_start;
3032 selection.mark.col = col; 3093 selection.mark.col = col;
3033 3094
3034 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3095 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3035 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3036 3097
3037 while (selection.mark.col > 0 3098 while (selection.mark.col > 0
3038 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3039 --selection.mark.col; 3100 --selection.mark.col;
3040 3101
… …
3058#define DELIMIT_TEXT(x) \ 3119#define DELIMIT_TEXT(x) \
3059 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3120 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3060#define DELIMIT_REND(x) 1 3121#define DELIMIT_REND(x) 1
3061 3122
3062void 3123void
3063rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3124rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3064{ 3125{
3065 int col, row, dirnadd, tcol, trow, w1, w2; 3126 int col, row, dirnadd, tcol, trow, w1, w2;
3066 row_col_t bound; 3127 row_col_t bound;
3067 text_t *stp; 3128 text_t *stp;
3068 rend_t *srp; 3129 rend_t *srp;
3069 3130
3070 if (dirn == UP) 3131 if (dirn == UP)
3071 { 3132 {
3072 bound.row = - nsaved - 1; 3133 bound.row = top_row - 1;
3073 bound.col = 0; 3134 bound.col = 0;
3074 dirnadd = -1; 3135 dirnadd = -1;
3075 } 3136 }
3076 else 3137 else
3077 { 3138 {
… …
3125 } 3186 }
3126 } 3187 }
3127 break; 3188 break;
3128 } 3189 }
3129 3190
3130Old_Word_Selection_You_Die:
3131 if (dirn == DN) 3191 if (dirn == DN)
3132 col++; /* put us on one past the end */ 3192 col++; /* put us on one past the end */
3133 3193
3134 /* Poke the values back in */ 3194 /* Poke the values back in */
3135 ret->row = row; 3195 ret->row = row;
… …
3143 * flag == 0 ==> button 1 3203 * flag == 0 ==> button 1
3144 * flag == 1 ==> button 3 press 3204 * flag == 1 ==> button 3 press
3145 * flag == 2 ==> button 3 motion 3205 * flag == 2 ==> button 3 motion
3146 */ 3206 */
3147void 3207void
3148rxvt_term::selection_extend (int x, int y, int flag) 3208rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3149{ 3209{
3150 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3210 int col = clamp (Pixel2Col (x), 0, ncol);
3151 int row = min (max (Pixel2Row (y), 0), ncol); 3211 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3152 3212
3153 /* 3213 /*
3154 * If we're selecting characters (single click) then we must check first 3214 * If we're selecting characters (single click) then we must check first
3155 * if we are at the same place as the original mark. If we are then 3215 * if we are at the same place as the original mark. If we are then
3156 * select nothing. Otherwise, if we're to the right of the mark, you have to 3216 * select nothing. Otherwise, if we're to the right of the mark, you have to
3157 * be _past_ a character for it to be selected. 3217 * be _past_ a character for it to be selected.
3158 */ 3218 */
3159 if (((selection.clicks % 3) == 1) && !flag 3219 if (((selection.clicks % 3) == 1) && !flag
3160 && (col == selection.mark.col 3220 && (col == selection.mark.col
3161 && (row == selection.mark.row + view_start))) 3221 && (row == selection.mark.row - view_start)))
3162 { 3222 {
3163 /* select nothing */ 3223 /* select nothing */
3164 selection.beg.row = selection.end.row = 0; 3224 selection.beg.row = selection.end.row = 0;
3165 selection.beg.col = selection.end.col = 0; 3225 selection.beg.col = selection.end.col = 0;
3166 selection.clicks = 4; 3226 selection.clicks = 4;
… …
3179/* ------------------------------------------------------------------------- */ 3239/* ------------------------------------------------------------------------- */
3180/* 3240/*
3181 * Extend the selection to the specified col/row 3241 * Extend the selection to the specified col/row
3182 */ 3242 */
3183void 3243void
3184rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3244rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3185{ 3245{
3186 row_col_t pos; 3246 row_col_t pos;
3187 enum { 3247 enum {
3188 LEFT, RIGHT 3248 LEFT, RIGHT
3189 } closeto = RIGHT; 3249 } closeto = RIGHT;
… …
3221 selection.beg.col = selection.end.col = selection.mark.col; 3281 selection.beg.col = selection.end.col = selection.mark.col;
3222 selection.beg.row = selection.end.row = selection.mark.row; 3282 selection.beg.row = selection.end.row = selection.mark.row;
3223 } 3283 }
3224 3284
3225 pos.col = col; 3285 pos.col = col;
3226 pos.row = row - view_start; 3286 pos.row = view_start + row;
3227 3287
3228 /* 3288 /*
3229 * This is mainly xterm style selection with a couple of differences, mainly 3289 * This is mainly xterm style selection with a couple of differences, mainly
3230 * in the way button3 drag extension works. 3290 * in the way button3 drag extension works.
3231 * We're either doing: button1 drag; button3 press; or button3 drag 3291 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3318 selection_delimit_word (DN, &selection.end, &selection.end); 3378 selection_delimit_word (DN, &selection.end, &selection.end);
3319 } 3379 }
3320 else if (selection.clicks == 3) 3380 else if (selection.clicks == 3)
3321 { 3381 {
3322#if ENABLE_FRILLS 3382#if ENABLE_FRILLS
3323 if (options & Opt_tripleclickwords) 3383 if (OPTION (Opt_tripleclickwords))
3324 { 3384 {
3325 selection_delimit_word (UP, &selection.beg, &selection.beg); 3385 selection_delimit_word (UP, &selection.beg, &selection.beg);
3326 3386
3327 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3328 { 3388 {
… …
3369 } 3429 }
3370 } 3430 }
3371 3431
3372#if ENABLE_FRILLS 3432#if ENABLE_FRILLS
3373 if (selection.rect && selection.beg.col > selection.end.col) 3433 if (selection.rect && selection.beg.col > selection.end.col)
3374 SWAP_IT (selection.beg.col, selection.end.col, int); 3434 ::swap (selection.beg.col, selection.end.col);
3375#endif 3435#endif
3376} 3436}
3377 3437
3378#if ENABLE_FRILLS 3438#if ENABLE_FRILLS
3379void 3439void
3380rxvt_term::selection_remove_trailing_spaces () 3440rxvt_term::selection_remove_trailing_spaces () NOTHROW
3381{ 3441{
3382 int32_t end_col, end_row; 3442 int32_t end_col, end_row;
3383 text_t *stp; 3443 text_t *stp;
3384 3444
3385 end_col = selection.end.col; 3445 end_col = selection.end.col;
… …
3389 { 3449 {
3390 stp = ROW(end_row).t; 3450 stp = ROW(end_row).t;
3391 3451
3392 while (--end_col >= 0) 3452 while (--end_col >= 0)
3393 { 3453 {
3394 if (stp[end_col] != ' ' 3454 if (stp[end_col] != NOCHAR
3395 && stp[end_col] != '\t' 3455 && !unicode::is_space (stp[end_col]))
3396 && stp[end_col] != NOCHAR)
3397 break; 3456 break;
3398 } 3457 }
3399 3458
3400 if (end_col >= 0 3459 if (end_col >= 0
3401 || !ROW(end_row - 1).is_longer ()) 3460 || !ROW(end_row - 1).is_longer ())
… …
3424/* 3483/*
3425 * Double click on button 3 when already selected 3484 * Double click on button 3 when already selected
3426 * EXT: button 3 double click 3485 * EXT: button 3 double click
3427 */ 3486 */
3428void 3487void
3429rxvt_term::selection_rotate (int x, int y) 3488rxvt_term::selection_rotate (int x, int y) NOTHROW
3430{ 3489{
3431 selection.clicks = selection.clicks % 3 + 1; 3490 selection.clicks = selection.clicks % 3 + 1;
3432 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3491 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3433} 3492}
3434 3493
… …
3436/* 3495/*
3437 * Respond to a request for our current selection 3496 * Respond to a request for our current selection
3438 * EXT: SelectionRequest 3497 * EXT: SelectionRequest
3439 */ 3498 */
3440void 3499void
3441rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3442{ 3501{
3443 XSelectionEvent ev; 3502 XSelectionEvent ev;
3444 dDisp; 3503 dDisp;
3445 3504
3446 ev.type = SelectionNotify; 3505 ev.type = SelectionNotify;
… …
3574 3633
3575/* 3634/*
3576 * return col/row values corresponding to x/y pixel values 3635 * return col/row values corresponding to x/y pixel values
3577 */ 3636 */
3578void 3637void
3579rxvt_term::pixel_position (int *x, int *y) 3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3580{ 3639{
3581 *x = Pixel2Col (*x); 3640 *x = Pixel2Col (*x);
3582 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3583 *y = Pixel2Row (*y); 3642 *y = Pixel2Row (*y);
3584 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3585} 3644}
3586 3645
3587/* ------------------------------------------------------------------------- */ 3646/* ------------------------------------------------------------------------- */
3588#ifdef USE_XIM 3647#ifdef USE_XIM
3589void 3648void
3590rxvt_term::im_set_position (XPoint &pos) 3649rxvt_term::im_set_position (XPoint &pos) NOTHROW
3591{ 3650{
3592 XWindowAttributes xwa; 3651 XWindowAttributes xwa;
3593 3652
3594 XGetWindowAttributes (display->display, vt, &xwa); 3653 XGetWindowAttributes (display->display, vt, &xwa);
3595 3654
… …
3598} 3657}
3599#endif 3658#endif
3600 3659
3601#if ENABLE_OVERLAY 3660#if ENABLE_OVERLAY
3602void 3661void
3603rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3662rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3604{ 3663{
3605 if (nrow < 3 || ncol < 3) 3664 if (nrow < 1 || ncol < 1)
3606 return; 3665 return;
3607 3666
3608 want_refresh = 1; 3667 want_refresh = 1;
3609 3668
3610 scr_overlay_off (); 3669 scr_overlay_off ();
3611 3670
3612 if (x < 0) x = ncol - w; 3671 if (x < 0) x = ncol - w;
3613 if (y < 0) y = nrow - h; 3672 if (y < 0) y = nrow - h;
3614 3673
3615 // make space for border 3674 // make space for border
3616 w += 2; MIN_IT (w, ncol); 3675 w += 2; min_it (w, ncol);
3617 h += 2; MIN_IT (h, nrow); 3676 h += 2; min_it (h, nrow);
3618 3677
3619 x -= 1; MAX_IT (x, 0); 3678 x -= 1; clamp_it (x, 0, ncol - w);
3620 y -= 1; MAX_IT (y, 0); 3679 y -= 1; clamp_it (y, 0, nrow - h);
3621
3622 MIN_IT (x, ncol - w);
3623 MIN_IT (y, nrow - h);
3624 3680
3625 ov_x = x; ov_y = y; 3681 ov_x = x; ov_y = y;
3626 ov_w = w; ov_h = h; 3682 ov_w = w; ov_h = h;
3627 3683
3628 ov_text = new text_t *[h]; 3684 ov_text = new text_t *[h];
… …
3656 *rp = r; 3712 *rp = r;
3657 } 3713 }
3658} 3714}
3659 3715
3660void 3716void
3661rxvt_term::scr_overlay_off () 3717rxvt_term::scr_overlay_off () NOTHROW
3662{ 3718{
3663 if (!ov_text) 3719 if (!ov_text)
3664 return; 3720 return;
3665 3721
3666 want_refresh = 1; 3722 want_refresh = 1;
… …
3674 delete [] ov_text; ov_text = 0; 3730 delete [] ov_text; ov_text = 0;
3675 delete [] ov_rend; ov_rend = 0; 3731 delete [] ov_rend; ov_rend = 0;
3676} 3732}
3677 3733
3678void 3734void
3679rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3680{ 3736{
3681 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3682 return; 3738 return;
3683 3739
3684 x++, y++; 3740 x++, y++;
… …
3686 ov_text[y][x] = text; 3742 ov_text[y][x] = text;
3687 ov_rend[y][x] = rend; 3743 ov_rend[y][x] = rend;
3688} 3744}
3689 3745
3690void 3746void
3691rxvt_term::scr_overlay_set (int x, int y, const char *s) 3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3692{ 3748{
3693 while (*s) 3749 while (*s)
3694 scr_overlay_set (x++, y, *s++); 3750 scr_overlay_set (x++, y, *s++);
3695} 3751}
3696 3752
3697void 3753void
3698rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3699{ 3755{
3700 while (*s) 3756 while (*s)
3701 { 3757 {
3702 text_t t = *s++; 3758 text_t t = *s++;
3703 int width = wcwidth (t); 3759 int width = wcwidth (t);
… …
3709 } 3765 }
3710 } 3766 }
3711} 3767}
3712 3768
3713void 3769void
3714rxvt_term::scr_swap_overlay () 3770rxvt_term::scr_swap_overlay () NOTHROW
3715{ 3771{
3716 if (!ov_text) 3772 if (!ov_text)
3717 return; 3773 return;
3718 3774
3719 // swap screen mem with overlay 3775 // swap screen mem with overlay
3720 for (int y = ov_h; y--; ) 3776 for (int y = ov_h; y--; )
3721 { 3777 {
3722 text_t *t1 = ov_text[y]; 3778 text_t *t1 = ov_text[y];
3723 rend_t *r1 = ov_rend[y]; 3779 rend_t *r1 = ov_rend[y];
3724 3780
3725 text_t *t2 = ROW(y - view_start).t + ov_x; 3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3726 rend_t *r2 = ROW(y - view_start).r + ov_x; 3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3727 3783
3728 for (int x = ov_w; x--; ) 3784 for (int x = ov_w; x--; )
3729 { 3785 {
3730 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3786 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3731 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3787 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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