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.373 by sf-exg, Sat Feb 12 00:30:01 2011 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32
33#include "salloc.C" // HACK, should be a separate compile!
34 33
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
… …
96 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
97 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
98 97
99/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
100void 99void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
102{ 101{
103 if (!l.t) 102 if (!l.valid ())
104 { 103 {
105 lalloc (l); 104 l.alloc ();
106 col = 0; 105 col = 0;
107 width = ncol; 106 width = ncol;
108 } 107 }
109 108
110 l.touch (); 109 l.touch ();
111 110
112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
114 113
115 text_t *et = l.t + col; 114 text_t *et = l.t + col;
116 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
117 116
118 while (width--) 117 while (width--)
… …
123} 122}
124 123
125/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
126/* Fill a full line with blanks - make sure it is allocated first */ 125/* Fill a full line with blanks - make sure it is allocated first */
127void 126void
128rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW 127rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
129{ 128{
130 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
131 130
132 l.l = 0; 131 l.l = 0;
133 l.f = 0; 132 l.f = 0;
134} 133}
135 134
136// nuke a single wide character at the given column 135// nuke a single wide character at the given column
137void 136void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
139{ 138{
140 // find begin 139 // find begin
141 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
142 col--; 141 col--;
143 142
144 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
146 145
147 l.touch (); 146 l.touch ();
148 147
149 // found start, nuke 148 // found start, nuke
150 do { 149 do {
… …
152 l.r[col] = rend; 151 l.r[col] = rend;
153 col++; 152 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
155} 154}
156 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
157/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
160 169
161void 170void
171rxvt_term::scr_alloc () noexcept
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
162rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
163{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
164 view_start = 0; 221 view_start = 0;
165 num_scr = 0; 222 num_scr = 0;
166 223
167 if (ncol == 0) 224 if (ncol == 0)
168 ncol = 80; 225 ncol = 80;
… …
188 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
189 246
190 screen.tscroll = 0; 247 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
192 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
193 if (!row_buf) 258 if (!prev_row_buf)
194 { 259 {
195 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0; 260 top_row = 0;
199 term_start = 0; 261 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 262
215 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
241 { 289 {
242 /* 290 /*
243 * add or delete rows as appropriate 291 * add or delete rows as appropriate
244 */ 292 */
245 293
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 295
263 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
264 { 297 {
265 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 301
269 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 303 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 304
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
281 308
282 if (top_row) 309 if ((rewrap_always || top_row) && !rewrap_never)
283 { 310 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change 313 // TODO: maybe optimise when width didn't change
287 314
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 317
291 do 318 do
292 { 319 {
293 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 322 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 324
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 326 {
300 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
301 328
302 plines++; 329 plines++;
303 llen += prev_ncol; 330 llen += prev_ncol;
… …
316 343
317 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
319 { 346 {
320 qline = row_buf + qrow; 347 qline = row_buf + qrow;
321 lalloc (*qline); 348 qline->alloc (); // redundant with next line
322 qline->l = ncol; 349 qline->l = ncol;
323 qline->is_longer (1); 350 qline->is_longer (1);
324 351
325 int qcol = 0; 352 int qcol = 0;
326 353
… …
341 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
342 // least. 369 // least.
343 if (prow == ocur.row) 370 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
345 372
346 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
347 374
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 376
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 399 {
373 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
374 401
375 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
376 { 403 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
379 406
380 qline = pline; 407 copy_line (dst, src);
381 lresize (qline);
382 } 408 }
383 409
384 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 412
389 term_start = 0; 413 term_start = 0;
390 } 414 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 415
396 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 418 }
399 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
400 free (tabs); 429 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
402 431
403 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
… …
411 tt_winch (); 440 tt_winch ();
412 441
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 443}
415 444
416/* ------------------------------------------------------------------------- */ 445void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
422{ 447{
423 if (row_buf) 448 chunk_free (chunk, chunk_size);
424 { 449 chunk = 0;
425 delete talloc; talloc = 0; 450 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 451
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 452 free (tabs);
434 tabs = 0; 453 tabs = 0;
435 }
436} 454}
437 455
438/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
439/* 457/*
440 * Hard/Soft reset 458 * Hard/Soft reset
441 */ 459 */
442void 460void ecb_cold
443rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
444{ 462{
445 scr_release (); 463 scr_release ();
464
446 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 466 rvideo_mode = false;
448 scr_soft_reset (); 467 scr_soft_reset ();
449 scr_reset (); 468 scr_reset ();
450 469
451 scr_clear (true); 470 scr_clear (true);
452 scr_refresh (); 471 scr_refresh ();
453} 472}
454 473
455void 474void ecb_cold
456rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () noexcept
457{ 476{
458 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
460 scr_overlay_off (); 479 scr_overlay_off ();
461#endif 480#endif
… …
475 * Save and Restore cursor 494 * Save and Restore cursor
476 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
477 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
478 */ 497 */
479void 498void
480rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
481{ 500{
482 screen_t *s; 501 screen_t *s;
483 502
484#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
485 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
516 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
518} 537}
519 538
520void 539void
521rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () noexcept
522{ 541{
523 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
524 return; 543 return;
525 544
526 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
545 return; 564 return;
546 565
547 want_refresh = 1; 566 want_refresh = 1;
548 view_start = 0; 567 view_start = 0;
549 568
550 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
551 575
552 current_screen = scrn; 576 current_screen = scrn;
553 577
554#if NSCREENS 578#if NSCREENS
555 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
569 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
570} 594}
571 595
572// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
573void 597void
574rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
575{ 599{
576 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
577 return; 601 return;
578 602
579 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
589/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
590/* 614/*
591 * Change the colour for following text 615 * Change the colour for following text
592 */ 616 */
593void 617void
594rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
595{ 619{
596 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
597 color = fgbg; 621 color = fgbg;
598 622
599 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
600 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
601 else 625 else
… …
605/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
606/* 630/*
607 * Change the rendition style for following text 631 * Change the rendition style for following text
608 */ 632 */
609void 633void
610rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
611{ 635{
612 if (set) 636 if (set)
613 rstyle |= style; 637 rstyle |= style;
614 else if (style == ~RS_None) 638 else if (style == ~RS_None)
615 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
621/* 645/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 647 * count positive ==> scroll up
624 * count negative ==> scroll down 648 * count negative ==> scroll down
625 */ 649 */
626int 650int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
628{ 652{
629 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
630 return 0; 654 return 0;
631 655
632 want_refresh = 1; 656 want_refresh = 1;
… …
634 658
635 if (count > 0 659 if (count > 0
636 && row1 == 0 660 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
639 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 666
644 // sever bottommost line 667 // sever bottommost line
645 { 668 {
646 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
647 l.is_longer (0); 670 l.is_longer (0);
648 l.touch (); 671 l.touch ();
649 } 672 }
650 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
651 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 690 for (int i = count; i--; )
653 { 691 {
654 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
655 693
656 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 697 {
660 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 699 l.l = 0;
… …
663 } 701 }
664 else 702 else
665 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
666 } 704 }
667 705
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 706 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
682 { 709 {
683 selection.beg.row -= count; 710 selection.beg.row -= count;
684 selection.end.row -= count; 711 selection.end.row -= count;
685 selection.mark.row -= count; 712 selection.mark.row -= count;
686 713
687 if (selection.beg.row < top_row 714 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 715 }
695 716
696 // finally move the view window, if desired 717 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 719 && view_start != 0
699 && view_start != -saveLines) 720 && view_start != -saveLines)
700 scr_page (UP, count); 721 scr_page (count);
701 722
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704 } 725 }
705 else 726 else
… …
728 } 749 }
729 750
730 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
732 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
733 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
734 763
735 min_it (count, rows); 764 min_it (count, rows);
736 765
737 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 767
739 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
740 { 769 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 771
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 774 }
746 775
747 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
749 } 785 }
750 786
751 return count; 787 return count;
752} 788}
753 789
754/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
755/* 791/*
756 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
757 */ 793 */
758void 794void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
760{ 796{
761 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
762 return; 798 return;
763 799
764 unsigned char checksel; 800 bool checksel;
765 unicode_t c; 801 unicode_t c;
766 int ncol = this->ncol; 802 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
768 804
769 want_refresh = 1; 805 want_refresh = 1;
… …
795 831
796 while (str < strend) 832 while (str < strend)
797 { 833 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 835
800 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 837 if (c == C0_LF)
802 { 838 {
803 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
804 840
805 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
824 { 860 {
825 scr_tab (1, true); 861 scr_tab (1, true);
826 continue; 862 continue;
827 } 863 }
828 864
829 if (expect_false ( 865 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 869 ))
834 { 870 {
… …
839 * should be a similar check. 875 * should be a similar check.
840 */ 876 */
841 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
842 } 878 }
843 879
844 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 881 {
846 scr_do_wrap (); 882 scr_do_wrap ();
847 883
848 line->l = ncol; 884 line->l = ncol;
849 line->is_longer (1); 885 line->is_longer (1);
… …
851 row = screen.cur.row; 887 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
853 } 889 }
854 890
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 893 c = 0xfffd;
858 894
859 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
862 // locale. 898 // locale.
863 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
864 900
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 902 {
867 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 904 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
885 } 921 }
886 } 922 }
887 923
888 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
890 926
891 if (width != 0) 927 if (width != 0)
892 { 928 {
893#if !UNICODE_3 929#if !UNICODE_3
… …
901#endif 937#endif
902 938
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 940
905 // if the character doesn't fit into the remaining columns... 941 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 943 {
908 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
909 { 945 {
910 // ... artificially enlargen the previous one 946 // ... artificially enlargen the previous one
911 c = NOCHAR; 947 c = NOCHAR;
… …
918 954
919 // nuke the character at this position, if required 955 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 956 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 957 // we never have to check for overwriting a wide char itself,
922 // only its tail. 958 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
925 961
926 line->touch (); 962 line->touch ();
927 963
928 do 964 do
929 { 965 {
930 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
932 968
933 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 970 screen.cur.col++;
935 else 971 else
936 { 972 {
937 line->l = ncol; 973 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 977 goto end_of_line;
942 } 978 }
943 979
944 c = NOCHAR; 980 c = NOCHAR;
945 } 981 }
946 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
947 983
948 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 986 {
951 line->t[c] = ' '; 987 line->t[c] = ' ';
952 line->r[c] = rend; 988 line->r[c] = rend;
953 } 989 }
954 990
… …
976 } 1012 }
977 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
979 { 1015 {
980 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
982 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
983 } 1019 }
984 else 1020 else
985 continue; 1021 continue;
986 1022
987 linep->touch (); 1023 linep->touch ();
… …
1010/* 1046/*
1011 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
1012 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1013 */ 1049 */
1014void 1050void
1015rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1016{ 1052{
1017 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1018 { 1054 {
1019 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1020 { 1056 {
… …
1037 * Process Horizontal Tab 1073 * Process Horizontal Tab
1038 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1039 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1040 */ 1076 */
1041void 1077void
1042rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1043{ 1079{
1044 int i, x; 1080 int i, x;
1045 1081
1046 want_refresh = 1; 1082 want_refresh = 1;
1047 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1113 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1116 */ 1152 */
1117#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1118void 1154void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1120{ 1156{
1121 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1159 else
1124 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1130 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1133 */ 1169 */
1134#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1135void 1171void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1137{ 1173{
1138 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1176 else
1141 { 1177 {
… …
1154/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1155/* 1191/*
1156 * Goto Row/Column 1192 * Goto Row/Column
1157 */ 1193 */
1158void 1194void
1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1160{ 1196{
1161 want_refresh = 1; 1197 want_refresh = 1;
1162 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1163 1199
1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1203/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1204/* 1240/*
1205 * direction should be UP or DN 1241 * direction should be UP or DN
1206 */ 1242 */
1207void 1243void
1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1209{ 1245{
1210 int dirn;
1211
1212 want_refresh = 1; 1246 want_refresh = 1;
1213 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1214 1248
1215 dirn = ((direction == UP) ? 1 : -1);
1216
1217 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1218 1250
1219 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1220 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1221 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1222 else 1254 else
1223 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1224 1256
1225 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1226 selection_check (0); 1258 selection_check (0);
1227} 1259}
1228 1260
… …
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1268 */
1237void 1269void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1239{ 1271{
1240 unsigned int col, num; 1272 unsigned int col, num;
1241 1273
1242 want_refresh = 1; 1274 want_refresh = 1;
1243 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1291 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1292} 1324}
1293 1325
1294/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1295/* 1327/*
1296 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1332 */
1301void 1333void
1302rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1303{ 1335{
1304 int num; 1336 int num;
1305 int32_t row; 1337 int32_t row;
1306 rend_t ren; 1338 rend_t ren;
1307 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1310 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1311 1343
1312 switch (mode) 1344 switch (mode)
1313 { 1345 {
1314 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1347 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1349 num = nrow - row;
1319 break; 1350 break;
1320 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1352 scr_erase_line (1);
1323 row = 0; 1353 row = 0;
1324 num = screen.cur.row; 1354 num = screen.cur.row;
1325 break; 1355 break;
1326 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1357 row = 0;
1329 num = nrow; 1358 num = nrow;
1330 break; 1359 break;
1331 default: 1360 default:
1332 return; 1361 return;
… …
1349 { 1378 {
1350 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1351 1380
1352 if (mapped) 1381 if (mapped)
1353 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1356 } 1385 }
1357 else 1386 else
1358 { 1387 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1362 { 1391 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1396 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1400 }
1372 } 1401 }
… …
1380 } 1409 }
1381} 1410}
1382 1411
1383#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1384void 1413void
1385rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1386{ 1415{
1387 want_refresh = 1; 1416 want_refresh = 1;
1388 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1389 1418
1390 top_row = 0; 1419 top_row = 0;
… …
1394/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1395/* 1424/*
1396 * Fill the screen with `E's 1425 * Fill the screen with `E's
1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1398 */ 1427 */
1399void 1428void ecb_cold
1400rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1401{ 1430{
1402 rend_t fs; 1431 rend_t fs;
1403 1432
1404 want_refresh = 1; 1433 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1406 1435
1407 num_scr_allow = 0; 1436 num_scr_allow = 0;
1408 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1409 1442
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1412 { 1445 {
1413 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1426/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1427/* 1460/*
1428 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1429 */ 1462 */
1430void 1463void
1431rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1432{ 1465{
1433 int end; 1466 int end;
1434 1467
1435 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1436 1469
… …
1456/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1457/* 1490/*
1458 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1459 */ 1492 */
1460void 1493void
1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1462{ 1495{
1463 want_refresh = 1; 1496 want_refresh = 1;
1464 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1465 1498
1466 if (count <= 0) 1499 if (count <= 0)
… …
1564/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1565/* 1598/*
1566 * Set the scrolling region 1599 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1601 */
1569void 1602void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1571{ 1604{
1572 max_it (top, 0); 1605 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1574 1607
1575 if (top > bot) 1608 if (top > bot)
… …
1584/* 1617/*
1585 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1621 */
1589void 1622void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1591{ 1624{
1592 want_refresh = 1; 1625 want_refresh = 1;
1593 1626
1594 if (mode) 1627 if (mode)
1595 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1601/* 1634/*
1602 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1638 */
1606void 1639void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1608{ 1641{
1609 if (mode) 1642 if (mode)
1610 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1611 else 1644 else
1612 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1657 */
1625void 1658void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1627{ 1660{
1628 if (mode) 1661 if (mode)
1629 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1630 else 1663 else
1631 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1637/* 1670/*
1638 * Set insert/replace mode 1671 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1674 */
1642void 1675void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1644{ 1677{
1645 if (mode) 1678 if (mode)
1646 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1647 else 1680 else
1648 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1653 * Set/Unset tabs 1686 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1690 */
1658void 1691void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1660{ 1693{
1661 if (mode < 0) 1694 if (mode < 0)
1662 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1664 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1669 * Set reverse/normal video 1702 * Set reverse/normal video
1670 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1671 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1672 */ 1705 */
1673void 1706void
1674rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1675{ 1708{
1676 rvideo_mode = on; 1709 rvideo_mode = on;
1677 1710
1678#ifndef NO_BELL 1711#ifndef NO_BELL
1679 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1681 1714
1682 if (rvideo_state != on) 1715 if (rvideo_state != on)
1683 { 1716 {
1684 rvideo_state = on; 1717 rvideo_state = on;
1685 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1688 if (bg_pixmap == None) 1729 if (bg_img == 0)
1689#endif 1730#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1732
1692 XGCValues gcvalue; 1733 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1702/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1703/* 1744/*
1704 * Report current cursor position 1745 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1747 */
1707void 1748void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1709{ 1750{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1752}
1712 1753
1713/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1715 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1716 1757
1717/* 1758/*
1718 * Set font style 1759 * Set font style
1719 */ 1760 */
1720void 1761void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1722{ 1763{
1723#if 0 1764#if 0
1724 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1725 { 1766 {
1726 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1792 */
1752void 1793void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1754{ 1795{
1755 screen.charset = set; 1796 screen.charset = set;
1756 set_font_style (); 1797 set_font_style ();
1757} 1798}
1758 1799
… …
1764 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1765 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1766 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1767 */ 1808 */
1768void 1809void
1769rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1770{ 1811{
1771 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1772 set_font_style (); 1813 set_font_style ();
1773} 1814}
1774 1815
… …
1778 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1779 1820
1780/* 1821/*
1781 * refresh matching text. 1822 * refresh matching text.
1782 */ 1823 */
1783bool 1824bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1785{ 1826{
1786 bool found = false; 1827 bool found = false;
1787 1828
1788 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1789 { 1830 {
… …
1807 PART_BEG = 0, 1848 PART_BEG = 0,
1808 PART_END, 1849 PART_END,
1809 RC_COUNT 1850 RC_COUNT
1810}; 1851};
1811 1852
1812void 1853void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1814{ 1855{
1815 int i; 1856 int i;
1816 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1817 1858
1818 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1852/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1853/* 1894/*
1854 * Refresh the entire screen 1895 * Refresh the entire screen
1855 */ 1896 */
1856void 1897void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1858{ 1899{
1859 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1901}
1861 1902
1862/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1863/* 1904/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1865 * the top of the screen 1906 * the top of the screen
1866 */ 1907 */
1867void 1908void
1868rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1869{ 1910{
1870 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1871} 1913}
1872 1914
1873/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1874/* 1916/*
1875 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1876 * direction should be UP or DN 1918 * direction should be UP or DN
1877 */ 1919 */
1878bool 1920bool
1879rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1880{ 1922{
1881 int new_view_start =
1882 direction == UP ? view_start - nlines
1883 : view_start + nlines;
1884
1885 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1886} 1924}
1887 1925
1888bool 1926bool
1889rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1890{ 1928{
1891 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1892 1930
1893 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1894 return false; 1932 return false;
… …
1912} 1950}
1913#endif 1951#endif
1914 1952
1915/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1916void 1954void
1917rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1918{ 1956{
1919#ifndef NO_BELL 1957#ifndef NO_BELL
1920 1958
1921# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1961 if (option (Opt_mapAlert))
1924# endif 1962# endif
1925 XMapWindow (dpy, parent[0]); 1963 XMapWindow (dpy, parent);
1926# endif 1964# endif
1927 1965
1928# if ENABLE_FRILLS 1966# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1967 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1968 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1982#endif
1945} 1983}
1946 1984
1947/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */ 1986void ecb_cold
1949void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1951{ 1988{
1952#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1953 int nrows, row_start; 1990 int nrows, row_start;
1954 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1955 1992
… …
2003/* 2040/*
2004 * Refresh the screen 2041 * Refresh the screen
2005 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2006 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2007 */ 2044 */
2008void 2045void ecb_hot
2009rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2010{ 2047{
2011 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2012 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2013 int i; /* tmp */ 2050 int i; /* tmp */
2014#ifndef NO_CURSORCOLOR
2015 rend_t cc1; /* store colours at cursor position (s) */
2016#endif
2017 rend_t *crp; // cursor rendition pointer
2018 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2019 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2020 2056
2021 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2022 2058
2023 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2024 return; 2060 return;
… …
2027 * A: set up vars 2063 * A: set up vars
2028 */ 2064 */
2029 refresh_count = 0; 2065 refresh_count = 0;
2030 2066
2031 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2068 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2034 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2035#endif 2071#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2073
2038 /* 2074 /*
2039 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2081 scr_swap_overlay ();
2046#endif 2082#endif
2047 2083
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2085
2050 /* 2086 /*
2051 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2052 */ 2088 */
2053 { 2089 {
2054 unsigned char setoldcursor;
2055
2056#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2091 if (hidden_cursor)
2058 showcursor = 0; 2092 showcursor = 0;
2059#endif 2093#endif
2060 2094
… …
2063 int col = screen.cur.col; 2097 int col = screen.cur.col;
2064 2098
2065 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2066 col--; 2100 col--;
2067 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2068 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2069 2109
2070#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2071 cc1 = *crp & (RS_fgMask | RS_bgMask);
2072 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2073 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2074 else 2113 else
2075#endif 2114#endif
2076#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2088 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2089#else 2128#else
2090 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2091#endif 2130#endif
2092 2131
2093 if (focus) 2132 if (focus && cursor_type == 0)
2094 { 2133 {
2095 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2096 *crp ^= RS_Uline; 2135
2097 else
2098 {
2099 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2100 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2101 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2102 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2103 } 2141 }
2104 } 2142 }
2105 2143
2106 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2107 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2108 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2109 { 2153 {
2110 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2111 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2112 {
2113 if (ocrow < nrow
2114 && oldcursor.col < ncol)
2115 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2116
2117 if (focus || !showcursor)
2118 oldcursor.row = -1;
2119 else
2120 setoldcursor = 1;
2121 }
2122 } 2156 }
2123 else if (!focus) 2157 else
2124 setoldcursor = 1;
2125
2126 if (setoldcursor)
2127 {
2128 if (screen.cur.row - view_start >= nrow)
2129 oldcursor.row = -1; 2158 oldcursor.row = -1;
2130 else
2131 {
2132 oldcursor.row = screen.cur.row - view_start;
2133 oldcursor.col = screen.cur.col;
2134 }
2135 }
2136 } 2159 }
2137 2160
2138#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2139 /* 2162 /*
2140 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2146 { 2169 {
2147 int16_t nits; 2170 int16_t nits;
2148 int i = num_scr; 2171 int i = num_scr;
2149 int j; 2172 int j;
2150 int len, wlen; 2173 int len, wlen;
2151 dLocal (int, num_scr);
2152 2174
2153 j = nrow; 2175 j = nrow;
2154 wlen = len = -1; 2176 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2156 2178
… …
2222 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2223 2245
2224 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2225 { 2247 {
2226 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2227 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2228 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2229 || (stp[col] == ' ' /* space w/ no background change */
2230 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2231 continue; 2250 continue;
2232 2251
2233 // redraw one or more characters 2252 // redraw one or more characters
2234 2253
2235 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2255 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2256 --col;
2238 2257
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2258 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2259 text_t *text = stp + col;
2241 int count = 1; 2260 int count = 1;
… …
2279 2298
2280 col--; /* went one too far. move back */ 2299 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2300 count -= i; /* dump any matching trailing chars */
2282 2301
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2302 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2303 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2304 count++, i--;
2286 2305
2287 /* 2306 /*
2288 * Determine the attributes for the string 2307 * Determine the attributes for the string
2289 */ 2308 */
2290 int fore = fgcolor_of (rend); // desired foreground 2309 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2310 int back = bgcolor_of (rend); // desired background
2292 2311
2293 // only do special processing if any attributes are set, which is unlikely 2312 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2313 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2314 {
2296 bool invert = rend & RS_RVid; 2315 bool invert = rend & RS_RVid;
2297 2316
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2318 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2407 /*
2389 * Actually do the drawing of the string here 2408 * Actually do the drawing of the string here
2390 */ 2409 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2410 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2411
2393 if (expect_true (have_bg && back == Color_bg)) 2412 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2413 {
2395 // this is very ugly, maybe push it into ->draw? 2414 // this is very ugly, maybe push it into ->draw?
2396 2415
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2416 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2417 if (text[i] != ' ')
… …
2405 did_clear: ; 2424 did_clear: ;
2406 } 2425 }
2407 else 2426 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2428
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2412#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2438 else
2416#endif 2439#endif
… …
2428 */ 2451 */
2429 if (showcursor) 2452 if (showcursor)
2430 { 2453 {
2431 if (focus) 2454 if (focus)
2432 { 2455 {
2433 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2434 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 else 2458 else if (oldcursor.row >= 0)
2436 { 2459 {
2437 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2438#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2439 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2440#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2441 } 2473 }
2442 } 2474 }
2443 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2444 { 2476 {
2445 int cursorwidth = 1;
2446 int col = oldcursor.col;
2447
2448 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2449 col--;
2450
2451 while (col + cursorwidth < ncol
2452 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2453 cursorwidth++;
2454
2455#ifndef NO_CURSORCOLOR
2456 if (ISSET_PIXCOLOR (Color_cursor))
2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458 else
2459#endif
2460 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 2478
2462 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2484 }
2468 } 2485 }
2469 2486
2470 /* 2487 /*
2471 * H: cleanup selection 2488 * H: cleanup selection
… …
2480 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2481 num_scr = 0; 2498 num_scr = 0;
2482 num_scr_allow = 1; 2499 num_scr_allow = 1;
2483} 2500}
2484 2501
2485void 2502void ecb_cold
2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2487{ 2504{
2488 if (!l.t) 2505 if (!l.valid ())
2489 return; 2506 return;
2490 2507
2491 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2492 2509
2493 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2494 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495} 2512}
2496 2513
2497void 2514void ecb_cold
2498rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2499{ 2516{
2500 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2501 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2502 2519
2503 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2505 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2507 } 2524 }
2508} 2525}
2509 2526
2510void 2527void ecb_cold
2511rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2512{ 2529{
2513 bool transparent = false; 2530 bool transparent = false;
2514 2531
2515#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_IMG
2516 if (bg_pixmap != None) 2533 if (bg_img != 0)
2517 { 2534 {
2518# ifdef ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2537 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2540
2524 transparent = true; 2541 transparent = true;
2525 } 2542 }
2526 else 2543 else
2527# endif 2544# endif
2528 { 2545 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2531 } 2548 }
2532 } 2549 }
2533 else 2550 else
2534#endif 2551#endif
2535 { 2552 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2555 }
2539 2556
2540 XClearWindow (dpy, parent[0]); 2557 XClearWindow (dpy, parent);
2541 2558
2542 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2543 { 2560 {
2544 if (transparent) 2561 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2563 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2548 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2566 scrollBar.show (0);
2550 } 2567 }
2551 2568
2552 if (refresh) 2569 if (refresh)
2553 { 2570 {
… …
2557 want_refresh = 1; 2574 want_refresh = 1;
2558} 2575}
2559 2576
2560/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2561void 2578void
2562rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2563{ 2580{
2564 if (!mapped) 2581 if (!mapped)
2565 return; 2582 return;
2566 2583
2567 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2570 if (really) 2587 if (really)
2571 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2572} 2589}
2573 2590
2574void 2591void
2575rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2576{ 2593{
2577 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2578 int row, col; 2595 int row, col;
2579 2596
2580 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2592 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2593 } 2610 }
2594} 2611}
2595 2612
2596void 2613void
2597rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2598{ 2615{
2599 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2600 int row, col; 2617 int row, col;
2601 2618
2602 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2620} 2637}
2621 2638
2622/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2623void 2640void ecb_hot
2624rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2625{ 2642{
2626 if (selection.op 2643 if (selection.op
2627 && current_screen == selection.screen 2644 && current_screen == selection.screen
2628 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2629 { 2646 {
… …
2645 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2646 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2647 */ 2664 */
2648#if 0 2665#if 0
2649void 2666void
2650rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2651{ 2668{
2652 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2653 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2654 const char r1[] = "\n";
2655
2656 for (row = saveLines + top_row;
2657 row < saveLines + nrow - 1; row++)
2658 {
2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2660 : ncol;
2661 for (towrite = width; towrite; towrite -= wrote)
2662 {
2663 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2664 towrite);
2665 if (wrote < 0)
2666 return; /* XXX: death, no report */
2667 }
2668 if (row_buf[row].l >= 0)
2669 if (write (fd, r1, 1) <= 0)
2670 return; /* XXX: death, no report */
2671 }
2672} 2671}
2673#endif 2672#endif
2674 2673
2675/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2676 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2678void 2677void
2679rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2680{ 2679{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2680 if (!selection.op)
2684 return; 2681 return;
2685 2682
2686 pos.row = pos.col = 0;
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2686 || (check_more == 1
2691 && current_screen == selection.screen 2687 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694 || (check_more == 2
2695 && ROWCOL_IS_BEFORE (selection.beg, pos)
2696 && ROWCOL_IS_AFTER (selection.end, pos))
2697 || (check_more == 3
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 4 /* screen width change */
2700 && (selection.beg.row != selection.end.row
2701 || selection.end.col > ncol)))
2702 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () noexcept
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2703} 2705}
2704 2706
2705/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2706/* 2708/*
2707 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2708 */ 2710 */
2709void 2711void
2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2711{ 2713{
2712 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2713 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2714 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2715 data[i] = C0_CR; 2717 data[i] = C0_CR;
2716 2718
2717 if (priv_modes & PrivMode_BracketPaste) 2719 #if ENABLE_FRILLS
2720 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2718 tt_printf ("\e[200~"); 2721 tt_printf ("\x1b[200~");
2722 #endif
2719 2723
2720 tt_write (data, len); 2724 tt_write (data, len);
2721 2725
2722 if (priv_modes & PrivMode_BracketPaste) 2726 #if ENABLE_FRILLS
2727 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2723 tt_printf ("\e[201~"); 2728 tt_printf ("\x1b[201~");
2729 #endif
2724} 2730}
2725 2731
2726void 2732void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW 2733rxvt_term::paste (char *data, unsigned int len) noexcept
2728{ 2734{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2735 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return; 2736 return;
2731 2737
2732 tt_paste (data, len); 2738 tt_paste (data, len);
2733} 2739}
2734 2740
2735/* ------------------------------------------------------------------------- */ 2741/* ------------------------------------------------------------------------- */
2736/* 2742/*
2737 * Request the current selection: 2743 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2744 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2745 * as fallback
2740 * > CUT_BUFFER0
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2746 * EXT: button 2 release
2744 */ 2747 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 rxvt_term *term = (rxvt_term *)ptr;
2750
2751 if (data)
2752 term->paste (data, len);
2753 delete rs;
2754 term->selection_req = 0;
2755}
2756
2757void 2748void
2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2749rxvt_term::selection_request (Time tm, int selnum) noexcept
2759{ 2750{
2760 if (selection.text && selnum == Sel_Primary)
2761 {
2762 /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste (str, strlen (str));
2765 free (str);
2766 return;
2767 }
2768 else if (!selection_req) 2751 if (!selection_req)
2769 { 2752 {
2770 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); 2753 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2771 selection_req->run (); 2754 selection_req->run ();
2772 } 2755 }
2773} 2756}
2774 2757
2775/* ------------------------------------------------------------------------- */ 2758/* ------------------------------------------------------------------------- */
2776/* 2759/*
2777 * Clear all selected text 2760 * Clear all selected text
2778 * EXT: SelectionClear 2761 * EXT: SelectionClear
2779 */ 2762 */
2780void 2763void
2781rxvt_term::selection_clear (bool clipboard) NOTHROW 2764rxvt_term::selection_clear (bool clipboard) noexcept
2782{ 2765{
2783 if (!clipboard) 2766 if (!clipboard)
2784 { 2767 {
2785 want_refresh = 1; 2768 want_refresh = 1;
2786 free (selection.text); 2769 free (selection.text);
… …
2871 if (*t == NOCHAR) 2854 if (*t == NOCHAR)
2872 t++; 2855 t++;
2873#if ENABLE_COMBINING 2856#if ENABLE_COMBINING
2874 else if (IS_COMPOSE (*t)) 2857 else if (IS_COMPOSE (*t))
2875 { 2858 {
2876 int len = rxvt_composite.expand (*t, 0); 2859 int len = rxvt_composite.expand (*t);
2877 2860
2878 extra -= (len - 1); 2861 extra -= (len - 1);
2879 2862
2880 if (extra < 0) 2863 if (extra < 0)
2881 { 2864 {
… …
2928 2911
2929 selection_grab (tm); 2912 selection_grab (tm);
2930} 2913}
2931 2914
2932bool 2915bool
2933rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2916rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2934{ 2917{
2935 Atom sel; 2918 Atom sel;
2936 2919
2937 if (!clipboard) 2920 if (!clipboard)
2938 { 2921 {
… …
2971/* ------------------------------------------------------------------------- */ 2954/* ------------------------------------------------------------------------- */
2972/* 2955/*
2973 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
2974 * EXT: button 1 press 2957 * EXT: button 1 press
2975 */ 2958 */
2976void 2959void ecb_cold
2977rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2960rxvt_term::selection_click (int clicks, int x, int y) noexcept
2978{ 2961{
2979 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
2980 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
2981 2964
2982 if (clicks == 2 && !selection.rect 2965 if (clicks == 2 && !selection.rect
… …
3000 2983
3001/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
3002/* 2985/*
3003 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
3004 */ 2987 */
3005void 2988void ecb_cold
3006rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2989rxvt_term::selection_start_colrow (int col, int row) noexcept
3007{ 2990{
3008 want_refresh = 1; 2991 want_refresh = 1;
3009 2992
3010 selection.mark.row = row + view_start; 2993 selection.mark.row = row + view_start;
3011 selection.mark.col = col; 2994 selection.mark.col = col;
… …
3033 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3034 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3035 */ 3018 */
3036 3019
3037/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3038#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3039 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3040#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3041 3024
3042void 3025void ecb_cold
3043rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3044{ 3027{
3045 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3046 row_col_t bound; 3029 row_col_t bound;
3047 text_t *stp; 3030 text_t *stp;
3048 rend_t *srp; 3031 rend_t *srp;
… …
3121 * EXT: button 3 press; button 1 or 3 drag 3104 * EXT: button 3 press; button 1 or 3 drag
3122 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3123 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3124 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3125 */ 3108 */
3126void 3109void ecb_cold
3127rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3110rxvt_term::selection_extend (int x, int y, int flag) noexcept
3128{ 3111{
3129 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3130 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3131 3114
3132 /* 3115 /*
… …
3157 3140
3158/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3159/* 3142/*
3160 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3161 */ 3144 */
3162void 3145void ecb_cold
3163rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3164{ 3147{
3165 row_col_t pos; 3148 row_col_t pos;
3166 enum { 3149 enum {
3167 LEFT, RIGHT 3150 LEFT, RIGHT
3168 } closeto = RIGHT; 3151 } closeto = RIGHT;
3169
3170 want_refresh = 1;
3171 3152
3172 switch (selection.op) 3153 switch (selection.op)
3173 { 3154 {
3174 case SELECTION_INIT: 3155 case SELECTION_INIT:
3175 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3355 3336
3356#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3357 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3358 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3359#endif 3340#endif
3341
3342 selection_changed ();
3360} 3343}
3361 3344
3362#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3363void 3346void ecb_cold
3364rxvt_term::selection_remove_trailing_spaces () NOTHROW 3347rxvt_term::selection_remove_trailing_spaces () noexcept
3365{ 3348{
3366 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3367 text_t *stp; 3350 text_t *stp;
3368 3351
3369 end_col = selection.end.col; 3352 end_col = selection.end.col;
… …
3406/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3407/* 3390/*
3408 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3409 * EXT: button 3 double click 3392 * EXT: button 3 double click
3410 */ 3393 */
3411void 3394void ecb_cold
3412rxvt_term::selection_rotate (int x, int y) NOTHROW 3395rxvt_term::selection_rotate (int x, int y) noexcept
3413{ 3396{
3414 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3415 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3416} 3399}
3417 3400
3418/* ------------------------------------------------------------------------- */ 3401/* ------------------------------------------------------------------------- */
3419/* 3402/*
3420 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3421 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3422 */ 3405 */
3423void 3406void ecb_cold
3424rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3425{ 3408{
3409 Atom property = rq.property == None ? rq.target : rq.property;
3426 XSelectionEvent ev; 3410 XSelectionEvent ev;
3427 3411
3428 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
3429 ev.property = None; 3413 ev.property = None;
3430 ev.display = rq.display; 3414 ev.display = rq.display;
… …
3445 *target++ = xa[XA_COMPOUND_TEXT]; 3429 *target++ = xa[XA_COMPOUND_TEXT];
3446#if X_HAVE_UTF8_STRING 3430#if X_HAVE_UTF8_STRING
3447 *target++ = xa[XA_UTF8_STRING]; 3431 *target++ = xa[XA_UTF8_STRING];
3448#endif 3432#endif
3449 3433
3450 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3434 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3451 32, PropModeReplace, 3435 32, PropModeReplace,
3452 (unsigned char *)target_list, target - target_list); 3436 (unsigned char *)target_list, target - target_list);
3453 ev.property = rq.property; 3437 ev.property = property;
3454 } 3438 }
3455#if TODO // TODO 3439#if TODO // TODO
3456 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3457 { 3441 {
3458 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3459 } 3443 }
3460#endif 3444#endif
3461 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3462 { 3446 {
3463 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, property, rq.target,
3464 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3465 ev.property = rq.property; 3449 ev.property = property;
3466 } 3450 }
3467 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3468 { 3452 {
3469 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3470 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3471 ev.property = rq.property; 3455 ev.property = property;
3472 } 3456 }
3473 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
3476 || rq.target == xa[XA_UTF8_STRING] 3460 || rq.target == xa[XA_UTF8_STRING]
… …
3520 cl = selection.clip_text; 3504 cl = selection.clip_text;
3521 selectlen = selection.clip_len; 3505 selectlen = selection.clip_len;
3522 } 3506 }
3523 else 3507 else
3524 { 3508 {
3525 cl = L""; 3509 cl = (wchar_t *)L"";
3526 selectlen = 0; 3510 selectlen = 0;
3527 } 3511 }
3528 3512
3529#if !ENABLE_MINIMAL 3513#if !ENABLE_MINIMAL
3530 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3547 ct.value = (unsigned char *)cl; 3531 ct.value = (unsigned char *)cl;
3548 ct.nitems = selectlen; 3532 ct.nitems = selectlen;
3549 ct.encoding = target; 3533 ct.encoding = target;
3550 } 3534 }
3551 3535
3552 XChangeProperty (dpy, rq.requestor, rq.property, 3536 XChangeProperty (dpy, rq.requestor, property,
3553 ct.encoding, 8, PropModeReplace, 3537 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3538 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3539 ev.property = property;
3556 3540
3557 if (freect) 3541 if (freect)
3558 XFree (ct.value); 3542 XFree (ct.value);
3559 } 3543 }
3560 3544
3561 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3562} 3546}
3563 3547
3564/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3565#ifdef USE_XIM 3549#if USE_XIM
3566void 3550void ecb_cold
3567rxvt_term::im_set_position (XPoint &pos) NOTHROW 3551rxvt_term::im_set_position (XPoint &pos) noexcept
3568{ 3552{
3569 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3570 3554
3571 XGetWindowAttributes (dpy, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3572 3556
… …
3575} 3559}
3576#endif 3560#endif
3577 3561
3578#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3579void 3563void
3580rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3581{ 3565{
3582 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3583 return; 3567 return;
3584 3568
3585 want_refresh = 1; 3569 want_refresh = 1;
… …
3630 *rp = r; 3614 *rp = r;
3631 } 3615 }
3632} 3616}
3633 3617
3634void 3618void
3635rxvt_term::scr_overlay_off () NOTHROW 3619rxvt_term::scr_overlay_off () noexcept
3636{ 3620{
3637 if (!ov.text) 3621 if (!ov.text)
3638 return; 3622 return;
3639 3623
3640 want_refresh = 1; 3624 want_refresh = 1;
… …
3648 delete [] ov.text; ov.text = 0; 3632 delete [] ov.text; ov.text = 0;
3649 delete [] ov.rend; ov.rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3650} 3634}
3651 3635
3652void 3636void
3653rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3654{ 3638{
3655 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3656 return; 3640 return;
3657 3641
3658 x++, y++; 3642 x++, y++;
… …
3660 ov.text[y][x] = text; 3644 ov.text[y][x] = text;
3661 ov.rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3662} 3646}
3663 3647
3664void 3648void
3665rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3666{ 3650{
3667 while (*s) 3651 while (*s)
3668 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3669} 3653}
3670 3654
3671void 3655void
3672rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3673{ 3657{
3674 while (*s) 3658 while (*s)
3675 { 3659 {
3676 text_t t = *s++; 3660 text_t t = *s++;
3677 int width = WCWIDTH (t); 3661 int width = WCWIDTH (t);
… …
3683 } 3667 }
3684 } 3668 }
3685} 3669}
3686 3670
3687void 3671void
3688rxvt_term::scr_swap_overlay () NOTHROW 3672rxvt_term::scr_swap_overlay () noexcept
3689{ 3673{
3690 if (!ov.text) 3674 if (!ov.text)
3691 return; 3675 return;
3692 3676
3693 // hide cursor if it is within the overlay area 3677 // hide cursor if it is within the overlay area

Diff Legend

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