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.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC vs.
Revision 1.468 by root, Mon Aug 8 09:47:56 2022 UTC

… …
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 <schmorp@schmorp.de> 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
… …
94 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
95 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
96 97
97/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
98void 99void
99rxvt_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
100{ 101{
101 if (!l.valid ()) 102 if (!l.valid ())
102 { 103 {
103 l.alloc (); 104 l.alloc ();
104 col = 0; 105 col = 0;
… …
106 } 107 }
107 108
108 l.touch (); 109 l.touch ();
109 110
110 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
111 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
112 113
113 text_t *et = l.t + col; 114 text_t *et = l.t + col;
114 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
115 116
116 while (width--) 117 while (width--)
… …
121} 122}
122 123
123/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
124/* 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 */
125void 126void
126rxvt_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
127{ 128{
128 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
129 130
130 l.l = 0; 131 l.l = 0;
131 l.f = 0; 132 l.f = 0;
132} 133}
133 134
134// nuke a single wide character at the given column 135// nuke a single wide character at the given column
135void 136void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
137{ 138{
138 // find begin 139 // find begin
139 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
140 col--; 141 col--;
141 142
142 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
144 145
145 l.touch (); 146 l.touch ();
146 147
147 // found start, nuke 148 // found start, nuke
148 do { 149 do {
… …
165/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
166 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
167 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
168 169
169void 170void
170rxvt_term::scr_alloc () NOTHROW 171rxvt_term::scr_alloc () noexcept
171{ 172{
172 int tsize = sizeof (text_t) * ncol; 173 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol; 174 int rsize = sizeof (rend_t) * ncol;
174 175
175 // we assume that rend_t size is a sufficient alignment 176 // we assume that rend_t size is a sufficient alignment
… …
254 255
255 scr_alloc (); 256 scr_alloc ();
256 257
257 if (!prev_row_buf) 258 if (!prev_row_buf)
258 { 259 {
259 /*
260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
261 */
262 top_row = 0; 260 top_row = 0;
263 term_start = 0; 261 term_start = 0;
264 262
265 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
266 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
… …
293 * add or delete rows as appropriate 291 * add or delete rows as appropriate
294 */ 292 */
295 293
296 int common_col = min (prev_ncol, ncol); 294 int common_col = min (prev_ncol, ncol);
297 295
296 // resize swap_buf, blank drawn_buf
298 for (int row = min (nrow, prev_nrow); row--; ) 297 for (int row = min (nrow, prev_nrow); row--; )
299 { 298 {
300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 299 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 300 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 301 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
… …
306 305
307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 306 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
308 int pend = MOD (term_start + top_row , prev_total_rows); 307 int pend = MOD (term_start + top_row , prev_total_rows);
309 int q = total_rows; // rewrapped row 308 int q = total_rows; // rewrapped row
310 309
311 if (top_row) 310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
312 { 312 {
313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
314 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
315 // TODO: maybe optimise when width didn't change 315 // TODO: maybe optimise when width didn't change
316 316
… …
396 // make sure all terminal lines exist 396 // make sure all terminal lines exist
397 while (top_row > 0) 397 while (top_row > 0)
398 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 398 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
399 } 399 }
400 else 400 else
401#endif
402 {
403 // wing, instead of wrap
401 { 404 do
402 // if no scrollback exists (yet), wing, instead of wrap
403
404 for (int row = min (nrow, prev_nrow); row--; )
405 { 405 {
406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 406 p = MOD (p - 1, prev_total_rows);
407 line_t &dst = row_buf [row]; 407 q--;
408 408
409 copy_line (dst, src); 409 copy_line (row_buf [q], prev_row_buf [p]);
410 } 410 }
411 while (p != pend);
411 412
412 for (int row = prev_nrow; row < nrow; row++) 413 screen.cur.row += nrow - prev_nrow;
413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 414 term_start = total_rows - nrow;
414
415 term_start = 0;
416 } 415 }
417 416
418 clamp_it (screen.cur.row, 0, nrow - 1); 417 clamp_it (screen.cur.row, 0, nrow - 1);
419 clamp_it (screen.cur.col, 0, ncol - 1); 418 clamp_it (screen.cur.col, 0, ncol - 1);
420 } 419 }
421 420
421 // ensure drawn_buf, swap_buf and terminal rows are all initialized
422 for (int row = nrow; row--; ) 422 for (int row = nrow; row--; )
423 { 423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
… …
443 443
444 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
445} 445}
446 446
447void ecb_cold 447void ecb_cold
448rxvt_term::scr_release () NOTHROW 448rxvt_term::scr_release () noexcept
449{ 449{
450 chunk_free (chunk, chunk_size); 450 chunk_free (chunk, chunk_size);
451 chunk = 0; 451 chunk = 0;
452 row_buf = 0; 452 row_buf = 0;
453 453
… …
472 scr_clear (true); 472 scr_clear (true);
473 scr_refresh (); 473 scr_refresh ();
474} 474}
475 475
476void ecb_cold 476void ecb_cold
477rxvt_term::scr_soft_reset () NOTHROW 477rxvt_term::scr_soft_reset () noexcept
478{ 478{
479 /* only affects modes, nothing drastic such as clearing the screen */ 479 /* only affects modes, nothing drastic such as clearing the screen */
480#if ENABLE_OVERLAY 480#if ENABLE_OVERLAY
481 scr_overlay_off (); 481 scr_overlay_off ();
482#endif 482#endif
… …
496 * Save and Restore cursor 496 * Save and Restore cursor
497 * XTERM_SEQ: Save cursor : ESC 7 497 * XTERM_SEQ: Save cursor : ESC 7
498 * XTERM_SEQ: Restore cursor: ESC 8 498 * XTERM_SEQ: Restore cursor: ESC 8
499 */ 499 */
500void 500void
501rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 501rxvt_term::scr_cursor (cursor_mode mode) noexcept
502{ 502{
503 screen_t *s; 503 screen_t *s;
504 504
505#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 505#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
506 if (current_screen == SECONDARY) 506 if (current_screen == SECONDARY)
… …
537 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
538 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
539} 539}
540 540
541void 541void
542rxvt_term::scr_swap_screen () NOTHROW 542rxvt_term::scr_swap_screen () noexcept
543{ 543{
544 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
545 return; 545 return;
546 546
547 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
595 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 595 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
596} 596}
597 597
598// clear WrapNext indicator, solidifying position on next line 598// clear WrapNext indicator, solidifying position on next line
599void 599void
600rxvt_term::scr_do_wrap () NOTHROW 600rxvt_term::scr_do_wrap () noexcept
601{ 601{
602 if (!(screen.flags & Screen_WrapNext)) 602 if (!(screen.flags & Screen_WrapNext))
603 return; 603 return;
604 604
605 screen.flags &= ~Screen_WrapNext; 605 screen.flags &= ~Screen_WrapNext;
… …
615/* ------------------------------------------------------------------------- */ 615/* ------------------------------------------------------------------------- */
616/* 616/*
617 * Change the colour for following text 617 * Change the colour for following text
618 */ 618 */
619void 619void
620rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 620rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
621{ 621{
622 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 622 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
623 color = fgbg; 623 color = fgbg;
624 624
625 if (fgbg == Color_fg) 625 if (fgbg == Color_fg)
626 rstyle = SET_FGCOLOR (rstyle, color); 626 rstyle = SET_FGCOLOR (rstyle, color);
627 else 627 else
… …
631/* ------------------------------------------------------------------------- */ 631/* ------------------------------------------------------------------------- */
632/* 632/*
633 * Change the rendition style for following text 633 * Change the rendition style for following text
634 */ 634 */
635void 635void
636rxvt_term::scr_rendition (int set, int style) NOTHROW 636rxvt_term::scr_rendition (int set, int style) noexcept
637{ 637{
638 if (set) 638 if (set)
639 rstyle |= style; 639 rstyle |= style;
640 else if (style == ~RS_None) 640 else if (style == ~RS_None)
641 rstyle = DEFAULT_RSTYLE; 641 rstyle = DEFAULT_RSTYLE;
… …
648 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
649 * count positive ==> scroll up 649 * count positive ==> scroll up
650 * count negative ==> scroll down 650 * count negative ==> scroll down
651 */ 651 */
652int ecb_hot 652int ecb_hot
653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
654{ 654{
655 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
656 return 0; 656 return 0;
657 657
658 want_refresh = 1; 658 want_refresh = 1;
… …
718 718
719 // finally move the view window, if desired 719 // finally move the view window, if desired
720 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
721 && view_start != 0 721 && view_start != 0
722 && view_start != -saveLines) 722 && view_start != -saveLines)
723 scr_page (UP, count); 723 scr_page (count);
724 724
725 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 725 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
726 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 726 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
727 } 727 }
728 else 728 else
… …
792/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
793/* 793/*
794 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
795 */ 795 */
796void ecb_hot 796void ecb_hot
797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
798{ 798{
799 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
800 return; 800 return;
801 801
802 bool checksel; 802 bool checksel;
… …
1014 } 1014 }
1015 else if (screen.cur.row > 0 1015 else if (screen.cur.row > 0
1016 && ROW(screen.cur.row - 1).is_longer ()) 1016 && ROW(screen.cur.row - 1).is_longer ())
1017 { 1017 {
1018 linep = &ROW(screen.cur.row - 1); 1018 linep = &ROW(screen.cur.row - 1);
1019 tp = line->t + ncol - 1; 1019 tp = linep->t + ncol - 1;
1020 rp = line->r + ncol - 1; 1020 rp = linep->r + ncol - 1;
1021 } 1021 }
1022 else 1022 else
1023 continue; 1023 continue;
1024 1024
1025 linep->touch (); 1025 linep->touch ();
… …
1048/* 1048/*
1049 * Process Backspace. Move back the cursor back a position, wrap if have to 1049 * Process Backspace. Move back the cursor back a position, wrap if have to
1050 * XTERM_SEQ: CTRL-H 1050 * XTERM_SEQ: CTRL-H
1051 */ 1051 */
1052void 1052void
1053rxvt_term::scr_backspace () NOTHROW 1053rxvt_term::scr_backspace () noexcept
1054{ 1054{
1055 if (screen.cur.col == 0) 1055 if (screen.cur.col == 0)
1056 { 1056 {
1057 if (screen.cur.row > 0) 1057 if (screen.cur.row > 0)
1058 { 1058 {
… …
1075 * Process Horizontal Tab 1075 * Process Horizontal Tab
1076 * count: +ve = forward; -ve = backwards 1076 * count: +ve = forward; -ve = backwards
1077 * XTERM_SEQ: CTRL-I 1077 * XTERM_SEQ: CTRL-I
1078 */ 1078 */
1079void 1079void
1080rxvt_term::scr_tab (int count, bool ht) NOTHROW 1080rxvt_term::scr_tab (int count, bool ht) noexcept
1081{ 1081{
1082 int i, x; 1082 int i, x;
1083 1083
1084 want_refresh = 1; 1084 want_refresh = 1;
1085 i = x = screen.cur.col; 1085 i = x = screen.cur.col;
… …
1152 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1153 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1154 */ 1154 */
1155#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1156void ecb_cold 1156void ecb_cold
1157rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () noexcept
1158{ 1158{
1159 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1161 else 1161 else
1162 scr_insdel_chars (1, INSERT); 1162 scr_insdel_chars (1, INSERT);
… …
1169 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1170 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1171 */ 1171 */
1172#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1173void ecb_cold 1173void ecb_cold
1174rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () noexcept
1175{ 1175{
1176 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1178 else 1178 else
1179 { 1179 {
… …
1192/* ------------------------------------------------------------------------- */ 1192/* ------------------------------------------------------------------------- */
1193/* 1193/*
1194 * Goto Row/Column 1194 * Goto Row/Column
1195 */ 1195 */
1196void 1196void
1197rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1197rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1198{ 1198{
1199 want_refresh = 1; 1199 want_refresh = 1;
1200 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
1201 1201
1202 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1202 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1241/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1242/* 1242/*
1243 * direction should be UP or DN 1243 * direction should be UP or DN
1244 */ 1244 */
1245void 1245void
1246rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1246rxvt_term::scr_index (enum page_dirn direction) noexcept
1247{ 1247{
1248 int dirn;
1249
1250 want_refresh = 1; 1248 want_refresh = 1;
1251 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1252 1250
1253 dirn = ((direction == UP) ? 1 : -1);
1254
1255 screen.flags &= ~Screen_WrapNext; 1251 screen.flags &= ~Screen_WrapNext;
1256 1252
1257 if ((screen.cur.row == screen.bscroll && direction == UP) 1253 if ((screen.cur.row == screen.bscroll && direction == UP)
1258 || (screen.cur.row == screen.tscroll && direction == DN)) 1254 || (screen.cur.row == screen.tscroll && direction == DN))
1259 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1255 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1260 else 1256 else
1261 screen.cur.row += dirn; 1257 screen.cur.row += direction;
1262 1258
1263 clamp_it (screen.cur.row, 0, nrow - 1); 1259 clamp_it (screen.cur.row, 0, nrow - 1);
1264 selection_check (0); 1260 selection_check (0);
1265} 1261}
1266 1262
… …
1271 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1272 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1273 * extension: clear to right unless wrapped: ESC [ 3 K 1269 * extension: clear to right unless wrapped: ESC [ 3 K
1274 */ 1270 */
1275void 1271void
1276rxvt_term::scr_erase_line (int mode) NOTHROW 1272rxvt_term::scr_erase_line (int mode) noexcept
1277{ 1273{
1278 unsigned int col, num; 1274 unsigned int col, num;
1279 1275
1280 want_refresh = 1; 1276 want_refresh = 1;
1281 ZERO_SCROLLBACK (); 1277 ZERO_SCROLLBACK ();
… …
1335 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1331 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1336 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1332 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1337 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1333 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1338 */ 1334 */
1339void 1335void
1340rxvt_term::scr_erase_screen (int mode) NOTHROW 1336rxvt_term::scr_erase_screen (int mode) noexcept
1341{ 1337{
1342 int num; 1338 int num;
1343 int32_t row; 1339 int32_t row;
1344 rend_t ren; 1340 rend_t ren;
1345 XGCValues gcvalue; 1341 XGCValues gcvalue;
… …
1415 } 1411 }
1416} 1412}
1417 1413
1418#if !ENABLE_MINIMAL 1414#if !ENABLE_MINIMAL
1419void 1415void
1420rxvt_term::scr_erase_savelines () NOTHROW 1416rxvt_term::scr_erase_savelines () noexcept
1421{ 1417{
1422 want_refresh = 1; 1418 want_refresh = 1;
1423 ZERO_SCROLLBACK (); 1419 ZERO_SCROLLBACK ();
1424 1420
1425 top_row = 0; 1421 top_row = 0;
… …
1430/* 1426/*
1431 * Fill the screen with `E's 1427 * Fill the screen with `E's
1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1428 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1433 */ 1429 */
1434void ecb_cold 1430void ecb_cold
1435rxvt_term::scr_E () NOTHROW 1431rxvt_term::scr_E () noexcept
1436{ 1432{
1437 rend_t fs; 1433 rend_t fs;
1438 1434
1439 want_refresh = 1; 1435 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1436 ZERO_SCROLLBACK ();
… …
1465/* ------------------------------------------------------------------------- */ 1461/* ------------------------------------------------------------------------- */
1466/* 1462/*
1467 * Insert/Delete <count> lines 1463 * Insert/Delete <count> lines
1468 */ 1464 */
1469void 1465void
1470rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1466rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1471{ 1467{
1472 int end; 1468 int end;
1473 1469
1474 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1475 1471
… …
1495/* ------------------------------------------------------------------------- */ 1491/* ------------------------------------------------------------------------- */
1496/* 1492/*
1497 * Insert/Delete <count> characters from the current position 1493 * Insert/Delete <count> characters from the current position
1498 */ 1494 */
1499void 1495void
1500rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1496rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1501{ 1497{
1502 want_refresh = 1; 1498 want_refresh = 1;
1503 ZERO_SCROLLBACK (); 1499 ZERO_SCROLLBACK ();
1504 1500
1505 if (count <= 0) 1501 if (count <= 0)
… …
1604/* 1600/*
1605 * Set the scrolling region 1601 * Set the scrolling region
1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1602 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1607 */ 1603 */
1608void ecb_cold 1604void ecb_cold
1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1605rxvt_term::scr_scroll_region (int top, int bot) noexcept
1610{ 1606{
1611 max_it (top, 0); 1607 max_it (top, 0);
1612 min_it (bot, nrow - 1); 1608 min_it (bot, nrow - 1);
1613 1609
1614 if (top > bot) 1610 if (top > bot)
… …
1624 * Make the cursor visible/invisible 1620 * Make the cursor visible/invisible
1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1621 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1622 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1627 */ 1623 */
1628void ecb_cold 1624void ecb_cold
1629rxvt_term::scr_cursor_visible (int mode) NOTHROW 1625rxvt_term::scr_cursor_visible (int mode) noexcept
1630{ 1626{
1631 want_refresh = 1; 1627 want_refresh = 1;
1632 1628
1633 if (mode) 1629 if (mode)
1634 screen.flags |= Screen_VisibleCursor; 1630 screen.flags |= Screen_VisibleCursor;
… …
1641 * Set/unset automatic wrapping 1637 * Set/unset automatic wrapping
1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1638 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1639 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1644 */ 1640 */
1645void ecb_cold 1641void ecb_cold
1646rxvt_term::scr_autowrap (int mode) NOTHROW 1642rxvt_term::scr_autowrap (int mode) noexcept
1647{ 1643{
1648 if (mode) 1644 if (mode)
1649 screen.flags |= Screen_Autowrap; 1645 screen.flags |= Screen_Autowrap;
1650 else 1646 else
1651 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1647 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1660 * and the cursor cannot be moved outside. 1656 * and the cursor cannot be moved outside.
1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1657 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1658 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1663 */ 1659 */
1664void ecb_cold 1660void ecb_cold
1665rxvt_term::scr_relative_origin (int mode) NOTHROW 1661rxvt_term::scr_relative_origin (int mode) noexcept
1666{ 1662{
1667 if (mode) 1663 if (mode)
1668 screen.flags |= Screen_Relative; 1664 screen.flags |= Screen_Relative;
1669 else 1665 else
1670 screen.flags &= ~Screen_Relative; 1666 screen.flags &= ~Screen_Relative;
… …
1677 * Set insert/replace mode 1673 * Set insert/replace mode
1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1674 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1675 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1680 */ 1676 */
1681void ecb_cold 1677void ecb_cold
1682rxvt_term::scr_insert_mode (int mode) NOTHROW 1678rxvt_term::scr_insert_mode (int mode) noexcept
1683{ 1679{
1684 if (mode) 1680 if (mode)
1685 screen.flags |= Screen_Insert; 1681 screen.flags |= Screen_Insert;
1686 else 1682 else
1687 screen.flags &= ~Screen_Insert; 1683 screen.flags &= ~Screen_Insert;
… …
1693 * XTERM_SEQ: Set tab at current column : ESC H 1689 * XTERM_SEQ: Set tab at current column : ESC H
1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1690 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1691 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1696 */ 1692 */
1697void ecb_cold 1693void ecb_cold
1698rxvt_term::scr_set_tab (int mode) NOTHROW 1694rxvt_term::scr_set_tab (int mode) noexcept
1699{ 1695{
1700 if (mode < 0) 1696 if (mode < 0)
1701 memset (tabs, 0, ncol); 1697 memset (tabs, 0, ncol);
1702 else if (screen.cur.col < ncol) 1698 else if (screen.cur.col < ncol)
1703 tabs [screen.cur.col] = !!mode; 1699 tabs [screen.cur.col] = !!mode;
… …
1708 * Set reverse/normal video 1704 * Set reverse/normal video
1709 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1705 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1710 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1706 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1711 */ 1707 */
1712void 1708void
1713rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1709rxvt_term::scr_rvideo_mode (bool on) noexcept
1714{ 1710{
1715 rvideo_mode = on; 1711 rvideo_mode = on;
1716 1712
1717#ifndef NO_BELL 1713#ifndef NO_BELL
1718 on ^= rvideo_bell; 1714 on ^= rvideo_bell;
… …
1720 1716
1721 if (rvideo_state != on) 1717 if (rvideo_state != on)
1722 { 1718 {
1723 rvideo_state = on; 1719 rvideo_state = on;
1724 1720
1721#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade])
1723 {
1724 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1725 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1726 }
1727 else
1728#endif
1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1729 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1726#ifdef HAVE_IMG 1730#ifdef HAVE_IMG
1727 if (bg_img == 0) 1731 if (bg_img == 0)
1728#endif 1732#endif
1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1733 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1742/* 1746/*
1743 * Report current cursor position 1747 * Report current cursor position
1744 * XTERM_SEQ: Report position: ESC [ 6 n 1748 * XTERM_SEQ: Report position: ESC [ 6 n
1745 */ 1749 */
1746void ecb_cold 1750void ecb_cold
1747rxvt_term::scr_report_position () NOTHROW 1751rxvt_term::scr_report_position () noexcept
1748{ 1752{
1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1753 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1750} 1754}
1751 1755
1752/* ------------------------------------------------------------------------- * 1756/* ------------------------------------------------------------------------- *
… …
1755 1759
1756/* 1760/*
1757 * Set font style 1761 * Set font style
1758 */ 1762 */
1759void ecb_cold 1763void ecb_cold
1760rxvt_term::set_font_style () NOTHROW 1764rxvt_term::set_font_style () noexcept
1761{ 1765{
1762#if 0 1766#if 0
1763 switch (charsets [screen.charset]) 1767 switch (charsets [screen.charset])
1764 { 1768 {
1765 case '0': /* DEC Special Character & Line Drawing Set */ 1769 case '0': /* DEC Special Character & Line Drawing Set */
… …
1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1791 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1788 * XTERM_SEQ: Invoke G2 character set: ESC N 1792 * XTERM_SEQ: Invoke G2 character set: ESC N
1789 * XTERM_SEQ: Invoke G3 character set: ESC O 1793 * XTERM_SEQ: Invoke G3 character set: ESC O
1790 */ 1794 */
1791void ecb_cold 1795void ecb_cold
1792rxvt_term::scr_charset_choose (int set) NOTHROW 1796rxvt_term::scr_charset_choose (int set) noexcept
1793{ 1797{
1794 screen.charset = set; 1798 screen.charset = set;
1795 set_font_style (); 1799 set_font_style ();
1796} 1800}
1797 1801
… …
1803 * XTERM_SEQ: Set G2 character set: ESC * <C> 1807 * XTERM_SEQ: Set G2 character set: ESC * <C>
1804 * XTERM_SEQ: Set G3 character set: ESC + <C> 1808 * XTERM_SEQ: Set G3 character set: ESC + <C>
1805 * See set_font_style for possible values for <C> 1809 * See set_font_style for possible values for <C>
1806 */ 1810 */
1807void 1811void
1808rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1812rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1809{ 1813{
1810 charsets[set] = (unsigned char)ch; 1814 charsets[set] = (unsigned char)ch;
1811 set_font_style (); 1815 set_font_style ();
1812} 1816}
1813 1817
… …
1818 1822
1819/* 1823/*
1820 * refresh matching text. 1824 * refresh matching text.
1821 */ 1825 */
1822bool ecb_cold 1826bool ecb_cold
1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1827rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1824{ 1828{
1825 bool found = false; 1829 bool found = false;
1826 1830
1827 for (int i = 0; i < nrow; i++) 1831 for (int i = 0; i < nrow; i++)
1828 { 1832 {
… …
1847 PART_END, 1851 PART_END,
1848 RC_COUNT 1852 RC_COUNT
1849}; 1853};
1850 1854
1851void ecb_hot 1855void ecb_hot
1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1856rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1853{ 1857{
1854 int i; 1858 int i;
1855 row_col_t rc[RC_COUNT]; 1859 row_col_t rc[RC_COUNT];
1856 1860
1857 if (!drawn_buf) /* sanity check */ 1861 if (!drawn_buf) /* sanity check */
… …
1891/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1892/* 1896/*
1893 * Refresh the entire screen 1897 * Refresh the entire screen
1894 */ 1898 */
1895void 1899void
1896rxvt_term::scr_touch (bool refresh) NOTHROW 1900rxvt_term::scr_touch (bool refresh) noexcept
1897{ 1901{
1898 scr_expose (0, 0, vt_width, vt_height, refresh); 1902 scr_expose (0, 0, vt_width, vt_height, refresh);
1899} 1903}
1900 1904
1901/* ------------------------------------------------------------------------- */ 1905/* ------------------------------------------------------------------------- */
1902/* 1906/*
1903 * Move the display so that the line represented by scrollbar value Y is at 1907 * Move the display so that the line represented by scrollbar value Y is at
1904 * the top of the screen 1908 * the top of the screen
1905 */ 1909 */
1906void 1910void
1907rxvt_term::scr_move_to (int y, int len) NOTHROW 1911rxvt_term::scr_move_to (int y, int len) noexcept
1908{ 1912{
1909 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1913 // lerp (y, 0, len, top_row, nrow - 1)
1914 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1910} 1915}
1911 1916
1912/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1913/* 1918/*
1914 * Page the screen up/down nlines 1919 * Page the screen up/down nlines
1915 * direction should be UP or DN 1920 * direction should be UP or DN
1916 */ 1921 */
1917bool 1922bool
1918rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1923rxvt_term::scr_page (int nlines) noexcept
1919{ 1924{
1920 int new_view_start =
1921 direction == UP ? view_start - nlines
1922 : view_start + nlines;
1923
1924 return scr_changeview (new_view_start); 1925 return scr_changeview (view_start - nlines);
1925} 1926}
1926 1927
1927bool 1928bool
1928rxvt_term::scr_changeview (int new_view_start) NOTHROW 1929rxvt_term::scr_changeview (int new_view_start) noexcept
1929{ 1930{
1930 clamp_it (new_view_start, top_row, 0); 1931 clamp_it (new_view_start, top_row, 0);
1931 1932
1932 if (new_view_start == view_start) 1933 if (new_view_start == view_start)
1933 return false; 1934 return false;
… …
1951} 1952}
1952#endif 1953#endif
1953 1954
1954/* ------------------------------------------------------------------------- */ 1955/* ------------------------------------------------------------------------- */
1955void 1956void
1956rxvt_term::scr_bell () NOTHROW 1957rxvt_term::scr_bell () noexcept
1957{ 1958{
1958#ifndef NO_BELL 1959#ifndef NO_BELL
1959 1960
1960# ifndef NO_MAPALERT 1961# ifndef NO_MAPALERT
1961# ifdef MAPALERT_OPTION 1962# ifdef MAPALERT_OPTION
… …
1983#endif 1984#endif
1984} 1985}
1985 1986
1986/* ------------------------------------------------------------------------- */ 1987/* ------------------------------------------------------------------------- */
1987void ecb_cold 1988void ecb_cold
1988rxvt_term::scr_printscreen (int fullhist) NOTHROW 1989rxvt_term::scr_printscreen (int fullhist) noexcept
1989{ 1990{
1990#ifdef PRINTPIPE 1991#ifdef PRINTPIPE
1991 int nrows, row_start; 1992 int nrows, row_start;
1992 FILE *fd = popen_printer (); 1993 FILE *fd = popen_printer ();
1993 1994
… …
2042 * Refresh the screen 2043 * Refresh the screen
2043 * drawn_text/drawn_rend contain the screen information before the update. 2044 * drawn_text/drawn_rend contain the screen information before the update.
2044 * screen.text/screen.rend contain what the screen will change to. 2045 * screen.text/screen.rend contain what the screen will change to.
2045 */ 2046 */
2046void ecb_hot 2047void ecb_hot
2047rxvt_term::scr_refresh () NOTHROW 2048rxvt_term::scr_refresh () noexcept
2048{ 2049{
2049 int16_t col, row, /* column/row we're processing */ 2050 int16_t col, row, /* column/row we're processing */
2050 ocrow; /* old cursor row */ 2051 ocrow; /* old cursor row */
2051 int i; /* tmp */ 2052 int i; /* tmp */
2052 rend_t ccol1, /* Cursor colour */ 2053 rend_t ccol1, /* Cursor colour */
2053 ccol2; /* Cursor colour2 */ 2054 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend; 2055 rend_t cur_rend;
2055 int cur_col; 2056 int cur_col;
2057 int cursorwidth;
2056 2058
2057 want_refresh = 0; /* screen is current */ 2059 want_refresh = 0; /* screen is current */
2058 2060
2059 if (refresh_type == NO_REFRESH || !mapped) 2061 if (refresh_type == NO_REFRESH || !mapped)
2060 return; 2062 return;
… …
2085 2087
2086 /* 2088 /*
2087 * C: set the cursor character (s) 2089 * C: set the cursor character (s)
2088 */ 2090 */
2089 { 2091 {
2090 bool setoldcursor;
2091
2092#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2093 if (hidden_cursor) 2093 if (hidden_cursor)
2094 showcursor = 0; 2094 showcursor = 0;
2095#endif 2095#endif
2096 2096
… …
2098 { 2098 {
2099 int col = screen.cur.col; 2099 int col = screen.cur.col;
2100 2100
2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2102 col--; 2102 col--;
2103
2104 cursorwidth = 1;
2105 while (col + cursorwidth < ncol
2106 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2107 cursorwidth++;
2103 2108
2104 cur_rend = ROW(screen.cur.row).r[col]; 2109 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col; 2110 cur_col = col;
2106 2111
2107#ifndef NO_CURSORCOLOR 2112#ifndef NO_CURSORCOLOR
… …
2124 ccol2 = bgcolor_of (rstyle); 2129 ccol2 = bgcolor_of (rstyle);
2125#else 2130#else
2126 ccol2 = Color_bg; 2131 ccol2 = Color_bg;
2127#endif 2132#endif
2128 2133
2129 if (focus) 2134 if (focus && cursor_type == 0)
2130 { 2135 {
2131 rend_t rend = cur_rend; 2136 rend_t rend = cur_rend;
2132 2137
2133 if (option (Opt_cursorUnderline))
2134 rend ^= RS_Uline;
2135 else
2136 {
2137 rend ^= RS_RVid; 2138 rend ^= RS_RVid;
2138 rend = SET_FGCOLOR (rend, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2139 rend = SET_BGCOLOR (rend, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2140 }
2141 2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2143 } 2143 }
2144 } 2144 }
2145 2145
2146 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2147 setoldcursor = 0; 2147 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2148 if (ocrow != -1) 2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2149
2150 // save the current cursor coordinates if the cursor is visible
2151 // and either the window is unfocused or the cursor style is
2152 // underline or vertical bar, so as to clear the outline cursor in
2153 // the next refresh if the cursor moves or becomes invisible
2154 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2149 { 2155 {
2150 if (screen.cur.row - view_start != ocrow 2156 oldcursor.row = screen.cur.row - view_start;
2151 || screen.cur.col != oldcursor.col) 2157 oldcursor.col = screen.cur.col;
2152 {
2153 if (ocrow < nrow
2154 && oldcursor.col < ncol)
2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2156
2157 if (focus || !showcursor)
2158 oldcursor.row = -1;
2159 else
2160 setoldcursor = 1;
2161 }
2162 } 2158 }
2163 else if (!focus) 2159 else
2164 setoldcursor = 1;
2165
2166 if (setoldcursor)
2167 {
2168 if (screen.cur.row - view_start >= nrow)
2169 oldcursor.row = -1; 2160 oldcursor.row = -1;
2170 else
2171 {
2172 oldcursor.row = screen.cur.row - view_start;
2173 oldcursor.col = screen.cur.col;
2174 }
2175 }
2176 } 2161 }
2177 2162
2178#ifndef NO_SLOW_LINK_SUPPORT 2163#ifndef NO_SLOW_LINK_SUPPORT
2179 /* 2164 /*
2180 * D: CopyArea pass - very useful for slower links 2165 * D: CopyArea pass - very useful for slower links
… …
2261 int ypixel = (int)Row2Pixel (row); 2246 int ypixel = (int)Row2Pixel (row);
2262 2247
2263 for (col = 0; col < ncol; col++) 2248 for (col = 0; col < ncol; col++)
2264 { 2249 {
2265 /* compare new text with old - if exactly the same then continue */ 2250 /* compare new text with old - if exactly the same then continue */
2266 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2251 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2267 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2268 || (stp[col] == ' ' /* space w/ no background change */
2269 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2270 continue; 2252 continue;
2271 2253
2272 // redraw one or more characters 2254 // redraw one or more characters
2273 2255
2274 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
… …
2446 else 2428 else
2447 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2448 2430
2449 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2450 { 2432 {
2433 if (showcursor && focus && row == screen.cur.row
2434 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2436 else
2451#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2452 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2453 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2454 else 2440 else
2455#endif 2441#endif
… …
2466 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2467 */ 2453 */
2468 if (showcursor) 2454 if (showcursor)
2469 { 2455 {
2470 if (focus) 2456 if (focus)
2457 {
2458 if (cursor_type == 0)
2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2459 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2460 else if (oldcursor.row >= 0)
2461 {
2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2463 if (cursor_type == 1)
2464 XFillRectangle (dpy, vt, gc,
2465 Col2Pixel (cur_col),
2466 Row2Pixel (oldcursor.row + 1) - 2,
2467 Width2Pixel (1),
2468 2);
2469 else
2470 XFillRectangle (dpy, vt, gc,
2471 Col2Pixel (cur_col),
2472 Row2Pixel (oldcursor.row),
2473 2,
2474 Height2Pixel (1));
2475 }
2476 }
2472 else if (oldcursor.row >= 0) 2477 else if (oldcursor.row >= 0)
2473 { 2478 {
2474 int cursorwidth = 1;
2475 int col = oldcursor.col;
2476
2477 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2478 col--;
2479
2480 while (col + cursorwidth < ncol
2481 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2482 cursorwidth++;
2483
2484#ifndef NO_CURSORCOLOR
2485 if (ISSET_PIXCOLOR (Color_cursor))
2486 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2487 else
2488#endif
2489 XSetForeground (dpy, gc, pix_colors[ccol1]); 2479 XSetForeground (dpy, gc, pix_colors[ccol1]);
2490 2480
2491 XDrawRectangle (dpy, vt, gc, 2481 XDrawRectangle (dpy, vt, gc,
2492 Col2Pixel (col), 2482 Col2Pixel (cur_col),
2493 Row2Pixel (oldcursor.row), 2483 Row2Pixel (oldcursor.row),
2494 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2484 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2495 (unsigned int) (Height2Pixel (1) - 1)); 2485 (unsigned int) (Height2Pixel (1) - 1));
2496 } 2486 }
2497 } 2487 }
… …
2510 num_scr = 0; 2500 num_scr = 0;
2511 num_scr_allow = 1; 2501 num_scr_allow = 1;
2512} 2502}
2513 2503
2514void ecb_cold 2504void ecb_cold
2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2505rxvt_term::scr_remap_chars (line_t &l) noexcept
2516{ 2506{
2517 if (!l.valid ()) 2507 if (!l.valid ())
2518 return; 2508 return;
2519 2509
2520 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2510 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2522 for (int i = ncol; i--; ) 2512 for (int i = ncol; i--; )
2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2513 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2524} 2514}
2525 2515
2526void ecb_cold 2516void ecb_cold
2527rxvt_term::scr_remap_chars () NOTHROW 2517rxvt_term::scr_remap_chars () noexcept
2528{ 2518{
2529 for (int i = total_rows; i--; ) 2519 for (int i = total_rows; i--; )
2530 scr_remap_chars (row_buf [i]); 2520 scr_remap_chars (row_buf [i]);
2531 2521
2532 for (int i = nrow; i--; ) 2522 for (int i = nrow; i--; )
… …
2535 scr_remap_chars (swap_buf [i]); 2525 scr_remap_chars (swap_buf [i]);
2536 } 2526 }
2537} 2527}
2538 2528
2539void ecb_cold 2529void ecb_cold
2540rxvt_term::scr_recolour (bool refresh) NOTHROW 2530rxvt_term::scr_recolor (bool refresh) noexcept
2541{ 2531{
2542 bool transparent = false; 2532 bool transparent = false;
2543 2533
2544#ifdef HAVE_IMG 2534#ifdef HAVE_IMG
2545 if (bg_img != 0) 2535 if (bg_img != 0)
… …
2566 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2556 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2567 } 2557 }
2568 2558
2569 XClearWindow (dpy, parent); 2559 XClearWindow (dpy, parent);
2570 2560
2571 if (scrollBar.win) 2561 if (scrollBar.state && scrollBar.win)
2572 { 2562 {
2573 if (transparent) 2563 if (transparent)
2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2564 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2575 else 2565 else
2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2566 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2586 want_refresh = 1; 2576 want_refresh = 1;
2587} 2577}
2588 2578
2589/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2590void 2580void
2591rxvt_term::scr_clear (bool really) NOTHROW 2581rxvt_term::scr_clear (bool really) noexcept
2592{ 2582{
2593 if (!mapped) 2583 if (!mapped)
2594 return; 2584 return;
2595 2585
2596 num_scr_allow = 0; 2586 num_scr_allow = 0;
… …
2599 if (really) 2589 if (really)
2600 XClearWindow (dpy, vt); 2590 XClearWindow (dpy, vt);
2601} 2591}
2602 2592
2603void 2593void
2604rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2594rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2605{ 2595{
2606 int view_end = view_start + nrow; 2596 int view_end = view_start + nrow;
2607 int row, col; 2597 int row, col;
2608 2598
2609 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2599 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2621 srp[col] ^= rstyle2; 2611 srp[col] ^= rstyle2;
2622 } 2612 }
2623} 2613}
2624 2614
2625void 2615void
2626rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2616rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2627{ 2617{
2628 int view_end = view_start + nrow; 2618 int view_end = view_start + nrow;
2629 int row, col; 2619 int row, col;
2630 2620
2631 if (beg_row >= view_start) 2621 if (beg_row >= view_start)
… …
2648 srp[col] ^= rstyle; 2638 srp[col] ^= rstyle;
2649} 2639}
2650 2640
2651/* ------------------------------------------------------------------------- */ 2641/* ------------------------------------------------------------------------- */
2652void ecb_hot 2642void ecb_hot
2653rxvt_term::scr_reverse_selection () NOTHROW 2643rxvt_term::scr_reverse_selection () noexcept
2654{ 2644{
2655 if (selection.op 2645 if (selection.op
2656 && current_screen == selection.screen 2646 && current_screen == selection.screen
2657 && selection.end.row >= view_start) 2647 && selection.end.row >= view_start)
2658 { 2648 {
… …
2674 * Dump the whole scrollback and screen to the passed filedescriptor. The 2664 * Dump the whole scrollback and screen to the passed filedescriptor. The
2675 * invoking routine must close the fd. 2665 * invoking routine must close the fd.
2676 */ 2666 */
2677#if 0 2667#if 0
2678void 2668void
2679rxvt_term::scr_dump (int fd) NOTHROW 2669rxvt_term::scr_dump (int fd) noexcept
2680{ 2670{
2681 // if this method is needed, it can be implemented by factoring the 2671 // if this method is needed, it can be implemented by factoring the
2682 // relevant code in scr_printscreen 2672 // relevant code in scr_printscreen
2683} 2673}
2684#endif 2674#endif
2685 2675
2686/* ------------------------------------------------------------------------- * 2676/* ------------------------------------------------------------------------- *
2687 * CHARACTER SELECTION * 2677 * CHARACTER SELECTION *
2688 * ------------------------------------------------------------------------- */ 2678 * ------------------------------------------------------------------------- */
2689void 2679void
2690rxvt_term::selection_check (int check_more) NOTHROW 2680rxvt_term::selection_check (int check_more) noexcept
2691{ 2681{
2692 if (!selection.op) 2682 if (!selection.op)
2693 return; 2683 return;
2694 2684
2695 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2685 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2691 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2702 CLEAR_ALL_SELECTION (); 2692 CLEAR_ALL_SELECTION ();
2703} 2693}
2704 2694
2705void 2695void
2706rxvt_term::selection_changed () NOTHROW 2696rxvt_term::selection_changed () noexcept
2707{ 2697{
2708 line_t &r1 = ROW (selection.beg.row); 2698 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2699 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col; 2700 ++selection.beg.col;
2711 2701
2712 line_t &r2 = ROW (selection.end.row); 2702 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2703 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col; 2704 ++selection.end.col;
2715 2705
… …
2719/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2720/* 2710/*
2721 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2722 */ 2712 */
2723void 2713void
2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2725{ 2715{
2726 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2727 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2728 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2729 data[i] = C0_CR; 2719 data[i] = C0_CR;
2730 2720
2731 if (priv_modes & PrivMode_BracketPaste) 2721 #if ENABLE_FRILLS
2722 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2732 tt_printf ("\x1b[200~"); 2723 tt_printf ("\x1b[200~");
2724 #endif
2733 2725
2734 tt_write (data, len); 2726 tt_write (data, len);
2735 2727
2736 if (priv_modes & PrivMode_BracketPaste) 2728 #if ENABLE_FRILLS
2729 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2737 tt_printf ("\x1b[201~"); 2730 tt_printf ("\x1b[201~");
2731 #endif
2738} 2732}
2739 2733
2740void 2734void
2741rxvt_term::paste (char *data, unsigned int len) NOTHROW 2735rxvt_term::paste (char *data, unsigned int len) noexcept
2742{ 2736{
2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2737 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2744 return; 2738 return;
2745 2739
2746 tt_paste (data, len); 2740 tt_paste (data, len);
… …
2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2746 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2753 * as fallback 2747 * as fallback
2754 * EXT: button 2 release 2748 * EXT: button 2 release
2755 */ 2749 */
2756void 2750void
2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2751rxvt_term::selection_request (Time tm, int selnum) noexcept
2758{ 2752{
2759 if (!selection_req) 2753 if (!selection_req)
2760 { 2754 {
2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2755 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run (); 2756 selection_req->run ();
… …
2767/* 2761/*
2768 * Clear all selected text 2762 * Clear all selected text
2769 * EXT: SelectionClear 2763 * EXT: SelectionClear
2770 */ 2764 */
2771void 2765void
2772rxvt_term::selection_clear (bool clipboard) NOTHROW 2766rxvt_term::selection_clear (bool clipboard) noexcept
2773{ 2767{
2774 if (!clipboard) 2768 if (!clipboard)
2775 { 2769 {
2776 want_refresh = 1; 2770 want_refresh = 1;
2777 free (selection.text); 2771 free (selection.text);
… …
2862 if (*t == NOCHAR) 2856 if (*t == NOCHAR)
2863 t++; 2857 t++;
2864#if ENABLE_COMBINING 2858#if ENABLE_COMBINING
2865 else if (IS_COMPOSE (*t)) 2859 else if (IS_COMPOSE (*t))
2866 { 2860 {
2867 int len = rxvt_composite.expand (*t, 0); 2861 int len = rxvt_composite.expand (*t);
2868 2862
2869 extra -= (len - 1); 2863 extra -= (len - 1);
2870 2864
2871 if (extra < 0) 2865 if (extra < 0)
2872 { 2866 {
… …
2919 2913
2920 selection_grab (tm); 2914 selection_grab (tm);
2921} 2915}
2922 2916
2923bool 2917bool
2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2918rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2925{ 2919{
2926 Atom sel; 2920 Atom sel;
2927 2921
2928 if (!clipboard) 2922 if (!clipboard)
2929 { 2923 {
… …
2963/* 2957/*
2964 * Mark or select text based upon number of clicks: 1, 2, or 3 2958 * Mark or select text based upon number of clicks: 1, 2, or 3
2965 * EXT: button 1 press 2959 * EXT: button 1 press
2966 */ 2960 */
2967void ecb_cold 2961void ecb_cold
2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2962rxvt_term::selection_click (int clicks, int x, int y) noexcept
2969{ 2963{
2970 clicks = ((clicks - 1) % 3) + 1; 2964 clicks = ((clicks - 1) % 3) + 1;
2971 selection.clicks = clicks; /* save clicks so extend will work */ 2965 selection.clicks = clicks; /* save clicks so extend will work */
2972 2966
2973 if (clicks == 2 && !selection.rect 2967 if (clicks == 2 && !selection.rect
… …
2992/* ------------------------------------------------------------------------- */ 2986/* ------------------------------------------------------------------------- */
2993/* 2987/*
2994 * Mark a selection at the specified col/row 2988 * Mark a selection at the specified col/row
2995 */ 2989 */
2996void ecb_cold 2990void ecb_cold
2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2991rxvt_term::selection_start_colrow (int col, int row) noexcept
2998{ 2992{
2999 want_refresh = 1; 2993 want_refresh = 1;
3000 2994
3001 selection.mark.row = row + view_start; 2995 selection.mark.row = row + view_start;
3002 selection.mark.col = col; 2996 selection.mark.col = col;
… …
3029#define DELIMIT_TEXT(x) \ 3023#define DELIMIT_TEXT(x) \
3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3024 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3031#define DELIMIT_REND(x) 1 3025#define DELIMIT_REND(x) 1
3032 3026
3033void ecb_cold 3027void ecb_cold
3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3028rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3035{ 3029{
3036 int col, row, dirnadd, tcol, trow, w1, w2; 3030 int col, row, dirnadd, tcol, trow, w1, w2;
3037 row_col_t bound; 3031 row_col_t bound;
3038 text_t *stp; 3032 text_t *stp;
3039 rend_t *srp; 3033 rend_t *srp;
… …
3113 * flag == 0 ==> button 1 3107 * flag == 0 ==> button 1
3114 * flag == 1 ==> button 3 press 3108 * flag == 1 ==> button 3 press
3115 * flag == 2 ==> button 3 motion 3109 * flag == 2 ==> button 3 motion
3116 */ 3110 */
3117void ecb_cold 3111void ecb_cold
3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3112rxvt_term::selection_extend (int x, int y, int flag) noexcept
3119{ 3113{
3120 int col = clamp (Pixel2Col (x), 0, ncol); 3114 int col = clamp (Pixel2Col (x), 0, ncol);
3121 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3115 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3122 3116
3123 /* 3117 /*
… …
3149/* ------------------------------------------------------------------------- */ 3143/* ------------------------------------------------------------------------- */
3150/* 3144/*
3151 * Extend the selection to the specified col/row 3145 * Extend the selection to the specified col/row
3152 */ 3146 */
3153void ecb_cold 3147void ecb_cold
3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3148rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3155{ 3149{
3156 row_col_t pos; 3150 row_col_t pos;
3157 enum { 3151 enum {
3158 LEFT, RIGHT 3152 LEFT, RIGHT
3159 } closeto = RIGHT; 3153 } closeto = RIGHT;
… …
3350 selection_changed (); 3344 selection_changed ();
3351} 3345}
3352 3346
3353#if !ENABLE_MINIMAL 3347#if !ENABLE_MINIMAL
3354void ecb_cold 3348void ecb_cold
3355rxvt_term::selection_remove_trailing_spaces () NOTHROW 3349rxvt_term::selection_remove_trailing_spaces () noexcept
3356{ 3350{
3357 int32_t end_col, end_row; 3351 int32_t end_col, end_row;
3358 text_t *stp; 3352 text_t *stp;
3359 3353
3360 end_col = selection.end.col; 3354 end_col = selection.end.col;
… …
3398/* 3392/*
3399 * Double click on button 3 when already selected 3393 * Double click on button 3 when already selected
3400 * EXT: button 3 double click 3394 * EXT: button 3 double click
3401 */ 3395 */
3402void ecb_cold 3396void ecb_cold
3403rxvt_term::selection_rotate (int x, int y) NOTHROW 3397rxvt_term::selection_rotate (int x, int y) noexcept
3404{ 3398{
3405 selection.clicks = selection.clicks % 3 + 1; 3399 selection.clicks = selection.clicks % 3 + 1;
3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3400 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3407} 3401}
3408 3402
… …
3410/* 3404/*
3411 * Respond to a request for our current selection 3405 * Respond to a request for our current selection
3412 * EXT: SelectionRequest 3406 * EXT: SelectionRequest
3413 */ 3407 */
3414void ecb_cold 3408void ecb_cold
3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3409rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3416{ 3410{
3417 Atom property = rq.property == None ? rq.target : rq.property; 3411 Atom property = rq.property == None ? rq.target : rq.property;
3418 XSelectionEvent ev; 3412 XSelectionEvent ev;
3419 3413
3420 ev.type = SelectionNotify; 3414 ev.type = SelectionNotify;
… …
3512 cl = selection.clip_text; 3506 cl = selection.clip_text;
3513 selectlen = selection.clip_len; 3507 selectlen = selection.clip_len;
3514 } 3508 }
3515 else 3509 else
3516 { 3510 {
3517 cl = L""; 3511 cl = (wchar_t *)L"";
3518 selectlen = 0; 3512 selectlen = 0;
3519 } 3513 }
3520 3514
3521#if !ENABLE_MINIMAL 3515#if !ENABLE_MINIMAL
3522 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3516 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3554} 3548}
3555 3549
3556/* ------------------------------------------------------------------------- */ 3550/* ------------------------------------------------------------------------- */
3557#if USE_XIM 3551#if USE_XIM
3558void ecb_cold 3552void ecb_cold
3559rxvt_term::im_set_position (XPoint &pos) NOTHROW 3553rxvt_term::im_set_position (XPoint &pos) noexcept
3560{ 3554{
3561 XWindowAttributes xwa; 3555 XWindowAttributes xwa;
3562 3556
3563 XGetWindowAttributes (dpy, vt, &xwa); 3557 XGetWindowAttributes (dpy, vt, &xwa);
3564 3558
… …
3567} 3561}
3568#endif 3562#endif
3569 3563
3570#if ENABLE_OVERLAY 3564#if ENABLE_OVERLAY
3571void 3565void
3572rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3566rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3573{ 3567{
3574 if (nrow < 1 || ncol < 1) 3568 if (nrow < 1 || ncol < 1)
3575 return; 3569 return;
3576 3570
3577 want_refresh = 1; 3571 want_refresh = 1;
… …
3622 *rp = r; 3616 *rp = r;
3623 } 3617 }
3624} 3618}
3625 3619
3626void 3620void
3627rxvt_term::scr_overlay_off () NOTHROW 3621rxvt_term::scr_overlay_off () noexcept
3628{ 3622{
3629 if (!ov.text) 3623 if (!ov.text)
3630 return; 3624 return;
3631 3625
3632 want_refresh = 1; 3626 want_refresh = 1;
… …
3640 delete [] ov.text; ov.text = 0; 3634 delete [] ov.text; ov.text = 0;
3641 delete [] ov.rend; ov.rend = 0; 3635 delete [] ov.rend; ov.rend = 0;
3642} 3636}
3643 3637
3644void 3638void
3645rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3646{ 3640{
3647 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3641 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3648 return; 3642 return;
3649 3643
3650 x++, y++; 3644 x++, y++;
… …
3652 ov.text[y][x] = text; 3646 ov.text[y][x] = text;
3653 ov.rend[y][x] = rend; 3647 ov.rend[y][x] = rend;
3654} 3648}
3655 3649
3656void 3650void
3657rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3651rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3658{ 3652{
3659 while (*s) 3653 while (*s)
3660 scr_overlay_set (x++, y, *s++); 3654 scr_overlay_set (x++, y, *s++);
3661} 3655}
3662 3656
3663void 3657void
3664rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3658rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3665{ 3659{
3666 while (*s) 3660 while (*s)
3667 { 3661 {
3668 text_t t = *s++; 3662 text_t t = *s++;
3669 int width = WCWIDTH (t); 3663 int width = WCWIDTH (t);
… …
3675 } 3669 }
3676 } 3670 }
3677} 3671}
3678 3672
3679void 3673void
3680rxvt_term::scr_swap_overlay () NOTHROW 3674rxvt_term::scr_swap_overlay () noexcept
3681{ 3675{
3682 if (!ov.text) 3676 if (!ov.text)
3683 return; 3677 return;
3684 3678
3685 // hide cursor if it is within the overlay area 3679 // hide cursor if it is within the overlay area

Diff Legend

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