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.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 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;
… …
291 { 289 {
292 /* 290 /*
293 * add or delete rows as appropriate 291 * add or delete rows as appropriate
294 */ 292 */
295 293
294 int common_col = min (prev_ncol, ncol);
295
296 // resize swap_buf, blank drawn_buf
296 for (int row = min (nrow, prev_nrow); row--; ) 297 for (int row = min (nrow, prev_nrow); row--; )
297 { 298 {
298 copy_line (drawn_buf [row], prev_drawn_buf [row]); 299 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
300 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
301 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
302
299 copy_line (swap_buf [row], prev_swap_buf [row]); 303 copy_line (swap_buf [row], prev_swap_buf [row]);
300 } 304 }
301 305
302 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
303 int pend = MOD (term_start + top_row , prev_total_rows); 307 int pend = MOD (term_start + top_row , prev_total_rows);
304 int q = total_rows; // rewrapped row 308 int q = total_rows; // rewrapped row
305 309
306 if (top_row) 310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
307 { 312 {
308 // 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
309 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
310 // TODO: maybe optimise when width didn't change 315 // TODO: maybe optimise when width didn't change
311 316
… …
327 llen += prev_ncol; 332 llen += prev_ncol;
328 } 333 }
329 334
330 int qlines = max (0, (llen - 1) / ncol) + 1; 335 int qlines = max (0, (llen - 1) / ncol) + 1;
331 336
337 q -= qlines;
338
332 // drop partial lines completely 339 // drop partial lines completely
333 if (q < qlines) 340 if (q < 0)
334 break; 341 break;
335
336 q -= qlines;
337 342
338 int lofs = 0; 343 int lofs = 0;
339 line_t *qline; 344 line_t *qline;
340 345
341 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
… …
382 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 387 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
383 qline->is_longer (0); 388 qline->is_longer (0);
384 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 389 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
385 } 390 }
386 while (p != pend && q > 0); 391 while (p != pend && q > 0);
387
388 term_start = total_rows - nrow;
389 top_row = q - term_start;
390
391 // make sure all terminal lines exist
392 while (top_row > 0)
393 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
394 } 392 }
395 else 393 else
394#endif
395 {
396 // wing, instead of wrap
396 { 397 do
397 // if no scrollback exists (yet), wing, instead of wrap
398
399 for (int row = min (nrow, prev_nrow); row--; )
400 { 398 {
401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 399 p = MOD (p - 1, prev_total_rows);
402 line_t &dst = row_buf [row]; 400 q--;
403 401
404 copy_line (dst, src); 402 copy_line (row_buf [q], prev_row_buf [p]);
405 } 403 }
404 while (p != pend);
405 }
406 406
407 for (int row = prev_nrow; row < nrow; row++) 407 term_start = total_rows - nrow;
408 top_row = q - term_start;
409
410 // make sure all terminal lines exist
411 while (top_row > 0)
408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 412 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
409
410 term_start = 0;
411 }
412 413
413 clamp_it (screen.cur.row, 0, nrow - 1); 414 clamp_it (screen.cur.row, 0, nrow - 1);
414 clamp_it (screen.cur.col, 0, ncol - 1); 415 clamp_it (screen.cur.col, 0, ncol - 1);
415 } 416 }
416 417
… …
438 439
439 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 440 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440} 441}
441 442
442void ecb_cold 443void ecb_cold
443rxvt_term::scr_release () NOTHROW 444rxvt_term::scr_release () noexcept
444{ 445{
445 chunk_free (chunk, chunk_size); 446 chunk_free (chunk, chunk_size);
446 chunk = 0; 447 chunk = 0;
447 row_buf = 0; 448 row_buf = 0;
448 449
… …
467 scr_clear (true); 468 scr_clear (true);
468 scr_refresh (); 469 scr_refresh ();
469} 470}
470 471
471void ecb_cold 472void ecb_cold
472rxvt_term::scr_soft_reset () NOTHROW 473rxvt_term::scr_soft_reset () noexcept
473{ 474{
474 /* only affects modes, nothing drastic such as clearing the screen */ 475 /* only affects modes, nothing drastic such as clearing the screen */
475#if ENABLE_OVERLAY 476#if ENABLE_OVERLAY
476 scr_overlay_off (); 477 scr_overlay_off ();
477#endif 478#endif
… …
491 * Save and Restore cursor 492 * Save and Restore cursor
492 * XTERM_SEQ: Save cursor : ESC 7 493 * XTERM_SEQ: Save cursor : ESC 7
493 * XTERM_SEQ: Restore cursor: ESC 8 494 * XTERM_SEQ: Restore cursor: ESC 8
494 */ 495 */
495void 496void
496rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 497rxvt_term::scr_cursor (cursor_mode mode) noexcept
497{ 498{
498 screen_t *s; 499 screen_t *s;
499 500
500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
501 if (current_screen == SECONDARY) 502 if (current_screen == SECONDARY)
… …
532 assert (s->cur.row >= 0); 533 assert (s->cur.row >= 0);
533 assert (s->cur.col >= 0); 534 assert (s->cur.col >= 0);
534} 535}
535 536
536void 537void
537rxvt_term::scr_swap_screen () NOTHROW 538rxvt_term::scr_swap_screen () noexcept
538{ 539{
539 if (!option (Opt_secondaryScreen)) 540 if (!option (Opt_secondaryScreen))
540 return; 541 return;
541 542
542 for (int i = prev_nrow; i--; ) 543 for (int i = prev_nrow; i--; )
… …
590 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 591 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
591} 592}
592 593
593// clear WrapNext indicator, solidifying position on next line 594// clear WrapNext indicator, solidifying position on next line
594void 595void
595rxvt_term::scr_do_wrap () NOTHROW 596rxvt_term::scr_do_wrap () noexcept
596{ 597{
597 if (!(screen.flags & Screen_WrapNext)) 598 if (!(screen.flags & Screen_WrapNext))
598 return; 599 return;
599 600
600 screen.flags &= ~Screen_WrapNext; 601 screen.flags &= ~Screen_WrapNext;
… …
610/* ------------------------------------------------------------------------- */ 611/* ------------------------------------------------------------------------- */
611/* 612/*
612 * Change the colour for following text 613 * Change the colour for following text
613 */ 614 */
614void 615void
615rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 616rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
616{ 617{
617 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 618 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
618 color = fgbg; 619 color = fgbg;
619 620
620 if (fgbg == Color_fg) 621 if (fgbg == Color_fg)
621 rstyle = SET_FGCOLOR (rstyle, color); 622 rstyle = SET_FGCOLOR (rstyle, color);
622 else 623 else
… …
626/* ------------------------------------------------------------------------- */ 627/* ------------------------------------------------------------------------- */
627/* 628/*
628 * Change the rendition style for following text 629 * Change the rendition style for following text
629 */ 630 */
630void 631void
631rxvt_term::scr_rendition (int set, int style) NOTHROW 632rxvt_term::scr_rendition (int set, int style) noexcept
632{ 633{
633 if (set) 634 if (set)
634 rstyle |= style; 635 rstyle |= style;
635 else if (style == ~RS_None) 636 else if (style == ~RS_None)
636 rstyle = DEFAULT_RSTYLE; 637 rstyle = DEFAULT_RSTYLE;
… …
643 * Scroll text between <row1> and <row2> inclusive, by <count> lines 644 * Scroll text between <row1> and <row2> inclusive, by <count> lines
644 * count positive ==> scroll up 645 * count positive ==> scroll up
645 * count negative ==> scroll down 646 * count negative ==> scroll down
646 */ 647 */
647int ecb_hot 648int ecb_hot
648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 649rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
649{ 650{
650 if (count == 0 || (row1 > row2)) 651 if (count == 0 || (row1 > row2))
651 return 0; 652 return 0;
652 653
653 want_refresh = 1; 654 want_refresh = 1;
… …
713 714
714 // finally move the view window, if desired 715 // finally move the view window, if desired
715 if (option (Opt_scrollWithBuffer) 716 if (option (Opt_scrollWithBuffer)
716 && view_start != 0 717 && view_start != 0
717 && view_start != -saveLines) 718 && view_start != -saveLines)
718 scr_page (UP, count); 719 scr_page (count);
719 720
720 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 721 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
721 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 722 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
722 } 723 }
723 else 724 else
… …
787/* ------------------------------------------------------------------------- */ 788/* ------------------------------------------------------------------------- */
788/* 789/*
789 * Add text given in <str> of length <len> to screen struct 790 * Add text given in <str> of length <len> to screen struct
790 */ 791 */
791void ecb_hot 792void ecb_hot
792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 793rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
793{ 794{
794 if (len <= 0) /* sanity */ 795 if (len <= 0) /* sanity */
795 return; 796 return;
796 797
797 bool checksel; 798 bool checksel;
… …
1009 } 1010 }
1010 else if (screen.cur.row > 0 1011 else if (screen.cur.row > 0
1011 && ROW(screen.cur.row - 1).is_longer ()) 1012 && ROW(screen.cur.row - 1).is_longer ())
1012 { 1013 {
1013 linep = &ROW(screen.cur.row - 1); 1014 linep = &ROW(screen.cur.row - 1);
1014 tp = line->t + ncol - 1; 1015 tp = linep->t + ncol - 1;
1015 rp = line->r + ncol - 1; 1016 rp = linep->r + ncol - 1;
1016 } 1017 }
1017 else 1018 else
1018 continue; 1019 continue;
1019 1020
1020 linep->touch (); 1021 linep->touch ();
… …
1043/* 1044/*
1044 * Process Backspace. Move back the cursor back a position, wrap if have to 1045 * Process Backspace. Move back the cursor back a position, wrap if have to
1045 * XTERM_SEQ: CTRL-H 1046 * XTERM_SEQ: CTRL-H
1046 */ 1047 */
1047void 1048void
1048rxvt_term::scr_backspace () NOTHROW 1049rxvt_term::scr_backspace () noexcept
1049{ 1050{
1050 if (screen.cur.col == 0) 1051 if (screen.cur.col == 0)
1051 { 1052 {
1052 if (screen.cur.row > 0) 1053 if (screen.cur.row > 0)
1053 { 1054 {
… …
1070 * Process Horizontal Tab 1071 * Process Horizontal Tab
1071 * count: +ve = forward; -ve = backwards 1072 * count: +ve = forward; -ve = backwards
1072 * XTERM_SEQ: CTRL-I 1073 * XTERM_SEQ: CTRL-I
1073 */ 1074 */
1074void 1075void
1075rxvt_term::scr_tab (int count, bool ht) NOTHROW 1076rxvt_term::scr_tab (int count, bool ht) noexcept
1076{ 1077{
1077 int i, x; 1078 int i, x;
1078 1079
1079 want_refresh = 1; 1080 want_refresh = 1;
1080 i = x = screen.cur.col; 1081 i = x = screen.cur.col;
… …
1147 * Move cursor left in row. If we're at the left boundary, shift everything 1148 * Move cursor left in row. If we're at the left boundary, shift everything
1148 * in that row right. Clear left column. 1149 * in that row right. Clear left column.
1149 */ 1150 */
1150#if !ENABLE_MINIMAL 1151#if !ENABLE_MINIMAL
1151void ecb_cold 1152void ecb_cold
1152rxvt_term::scr_backindex () NOTHROW 1153rxvt_term::scr_backindex () noexcept
1153{ 1154{
1154 if (screen.cur.col > 0) 1155 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1156 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1157 else
1157 scr_insdel_chars (1, INSERT); 1158 scr_insdel_chars (1, INSERT);
… …
1164 * Move cursor right in row. If we're at the right boundary, shift everything 1165 * Move cursor right in row. If we're at the right boundary, shift everything
1165 * in that row left. Clear right column. 1166 * in that row left. Clear right column.
1166 */ 1167 */
1167#if !ENABLE_MINIMAL 1168#if !ENABLE_MINIMAL
1168void ecb_cold 1169void ecb_cold
1169rxvt_term::scr_forwardindex () NOTHROW 1170rxvt_term::scr_forwardindex () noexcept
1170{ 1171{
1171 if (screen.cur.col < ncol - 1) 1172 if (screen.cur.col < ncol - 1)
1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1173 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1173 else 1174 else
1174 { 1175 {
… …
1187/* ------------------------------------------------------------------------- */ 1188/* ------------------------------------------------------------------------- */
1188/* 1189/*
1189 * Goto Row/Column 1190 * Goto Row/Column
1190 */ 1191 */
1191void 1192void
1192rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1193rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1193{ 1194{
1194 want_refresh = 1; 1195 want_refresh = 1;
1195 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1196 1197
1197 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1198 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1236/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1237/* 1238/*
1238 * direction should be UP or DN 1239 * direction should be UP or DN
1239 */ 1240 */
1240void 1241void
1241rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1242rxvt_term::scr_index (enum page_dirn direction) noexcept
1242{ 1243{
1243 int dirn;
1244
1245 want_refresh = 1; 1244 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1245 ZERO_SCROLLBACK ();
1247 1246
1248 dirn = ((direction == UP) ? 1 : -1);
1249
1250 screen.flags &= ~Screen_WrapNext; 1247 screen.flags &= ~Screen_WrapNext;
1251 1248
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1249 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1250 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1251 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1255 else 1252 else
1256 screen.cur.row += dirn; 1253 screen.cur.row += direction;
1257 1254
1258 clamp_it (screen.cur.row, 0, nrow - 1); 1255 clamp_it (screen.cur.row, 0, nrow - 1);
1259 selection_check (0); 1256 selection_check (0);
1260} 1257}
1261 1258
… …
1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1263 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1264 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 * extension: clear to right unless wrapped: ESC [ 3 K 1265 * extension: clear to right unless wrapped: ESC [ 3 K
1269 */ 1266 */
1270void 1267void
1271rxvt_term::scr_erase_line (int mode) NOTHROW 1268rxvt_term::scr_erase_line (int mode) noexcept
1272{ 1269{
1273 unsigned int col, num; 1270 unsigned int col, num;
1274 1271
1275 want_refresh = 1; 1272 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1273 ZERO_SCROLLBACK ();
… …
1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1327 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1328 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1329 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1333 */ 1330 */
1334void 1331void
1335rxvt_term::scr_erase_screen (int mode) NOTHROW 1332rxvt_term::scr_erase_screen (int mode) noexcept
1336{ 1333{
1337 int num; 1334 int num;
1338 int32_t row; 1335 int32_t row;
1339 rend_t ren; 1336 rend_t ren;
1340 XGCValues gcvalue; 1337 XGCValues gcvalue;
… …
1410 } 1407 }
1411} 1408}
1412 1409
1413#if !ENABLE_MINIMAL 1410#if !ENABLE_MINIMAL
1414void 1411void
1415rxvt_term::scr_erase_savelines () NOTHROW 1412rxvt_term::scr_erase_savelines () noexcept
1416{ 1413{
1417 want_refresh = 1; 1414 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1415 ZERO_SCROLLBACK ();
1419 1416
1420 top_row = 0; 1417 top_row = 0;
… …
1425/* 1422/*
1426 * Fill the screen with `E's 1423 * Fill the screen with `E's
1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1424 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1428 */ 1425 */
1429void ecb_cold 1426void ecb_cold
1430rxvt_term::scr_E () NOTHROW 1427rxvt_term::scr_E () noexcept
1431{ 1428{
1432 rend_t fs; 1429 rend_t fs;
1433 1430
1434 want_refresh = 1; 1431 want_refresh = 1;
1435 ZERO_SCROLLBACK (); 1432 ZERO_SCROLLBACK ();
… …
1460/* ------------------------------------------------------------------------- */ 1457/* ------------------------------------------------------------------------- */
1461/* 1458/*
1462 * Insert/Delete <count> lines 1459 * Insert/Delete <count> lines
1463 */ 1460 */
1464void 1461void
1465rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1462rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1466{ 1463{
1467 int end; 1464 int end;
1468 1465
1469 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1470 1467
… …
1490/* ------------------------------------------------------------------------- */ 1487/* ------------------------------------------------------------------------- */
1491/* 1488/*
1492 * Insert/Delete <count> characters from the current position 1489 * Insert/Delete <count> characters from the current position
1493 */ 1490 */
1494void 1491void
1495rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1492rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1496{ 1493{
1497 want_refresh = 1; 1494 want_refresh = 1;
1498 ZERO_SCROLLBACK (); 1495 ZERO_SCROLLBACK ();
1499 1496
1500 if (count <= 0) 1497 if (count <= 0)
… …
1599/* 1596/*
1600 * Set the scrolling region 1597 * Set the scrolling region
1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1598 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1602 */ 1599 */
1603void ecb_cold 1600void ecb_cold
1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1601rxvt_term::scr_scroll_region (int top, int bot) noexcept
1605{ 1602{
1606 max_it (top, 0); 1603 max_it (top, 0);
1607 min_it (bot, nrow - 1); 1604 min_it (bot, nrow - 1);
1608 1605
1609 if (top > bot) 1606 if (top > bot)
… …
1619 * Make the cursor visible/invisible 1616 * Make the cursor visible/invisible
1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1617 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1618 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1622 */ 1619 */
1623void ecb_cold 1620void ecb_cold
1624rxvt_term::scr_cursor_visible (int mode) NOTHROW 1621rxvt_term::scr_cursor_visible (int mode) noexcept
1625{ 1622{
1626 want_refresh = 1; 1623 want_refresh = 1;
1627 1624
1628 if (mode) 1625 if (mode)
1629 screen.flags |= Screen_VisibleCursor; 1626 screen.flags |= Screen_VisibleCursor;
… …
1636 * Set/unset automatic wrapping 1633 * Set/unset automatic wrapping
1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1634 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1635 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1639 */ 1636 */
1640void ecb_cold 1637void ecb_cold
1641rxvt_term::scr_autowrap (int mode) NOTHROW 1638rxvt_term::scr_autowrap (int mode) noexcept
1642{ 1639{
1643 if (mode) 1640 if (mode)
1644 screen.flags |= Screen_Autowrap; 1641 screen.flags |= Screen_Autowrap;
1645 else 1642 else
1646 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1643 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1655 * and the cursor cannot be moved outside. 1652 * and the cursor cannot be moved outside.
1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1653 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1654 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1658 */ 1655 */
1659void ecb_cold 1656void ecb_cold
1660rxvt_term::scr_relative_origin (int mode) NOTHROW 1657rxvt_term::scr_relative_origin (int mode) noexcept
1661{ 1658{
1662 if (mode) 1659 if (mode)
1663 screen.flags |= Screen_Relative; 1660 screen.flags |= Screen_Relative;
1664 else 1661 else
1665 screen.flags &= ~Screen_Relative; 1662 screen.flags &= ~Screen_Relative;
… …
1672 * Set insert/replace mode 1669 * Set insert/replace mode
1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1670 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1671 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1675 */ 1672 */
1676void ecb_cold 1673void ecb_cold
1677rxvt_term::scr_insert_mode (int mode) NOTHROW 1674rxvt_term::scr_insert_mode (int mode) noexcept
1678{ 1675{
1679 if (mode) 1676 if (mode)
1680 screen.flags |= Screen_Insert; 1677 screen.flags |= Screen_Insert;
1681 else 1678 else
1682 screen.flags &= ~Screen_Insert; 1679 screen.flags &= ~Screen_Insert;
… …
1688 * XTERM_SEQ: Set tab at current column : ESC H 1685 * XTERM_SEQ: Set tab at current column : ESC H
1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1686 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1687 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1691 */ 1688 */
1692void ecb_cold 1689void ecb_cold
1693rxvt_term::scr_set_tab (int mode) NOTHROW 1690rxvt_term::scr_set_tab (int mode) noexcept
1694{ 1691{
1695 if (mode < 0) 1692 if (mode < 0)
1696 memset (tabs, 0, ncol); 1693 memset (tabs, 0, ncol);
1697 else if (screen.cur.col < ncol) 1694 else if (screen.cur.col < ncol)
1698 tabs [screen.cur.col] = !!mode; 1695 tabs [screen.cur.col] = !!mode;
… …
1703 * Set reverse/normal video 1700 * Set reverse/normal video
1704 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1701 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1705 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1702 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1706 */ 1703 */
1707void 1704void
1708rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1705rxvt_term::scr_rvideo_mode (bool on) noexcept
1709{ 1706{
1710 rvideo_mode = on; 1707 rvideo_mode = on;
1711 1708
1712#ifndef NO_BELL 1709#ifndef NO_BELL
1713 on ^= rvideo_bell; 1710 on ^= rvideo_bell;
… …
1715 1712
1716 if (rvideo_state != on) 1713 if (rvideo_state != on)
1717 { 1714 {
1718 rvideo_state = on; 1715 rvideo_state = on;
1719 1716
1717#if OFF_FOCUS_FADING
1718 if (rs[Rs_fade])
1719 {
1720 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1721 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1722 }
1723 else
1724#endif
1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1721#ifdef HAVE_IMG 1726#ifdef HAVE_IMG
1722 if (bg_img == 0) 1727 if (bg_img == 0)
1723#endif 1728#endif
1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1737/* 1742/*
1738 * Report current cursor position 1743 * Report current cursor position
1739 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1740 */ 1745 */
1741void ecb_cold 1746void ecb_cold
1742rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () noexcept
1743{ 1748{
1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1745} 1750}
1746 1751
1747/* ------------------------------------------------------------------------- * 1752/* ------------------------------------------------------------------------- *
… …
1750 1755
1751/* 1756/*
1752 * Set font style 1757 * Set font style
1753 */ 1758 */
1754void ecb_cold 1759void ecb_cold
1755rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () noexcept
1756{ 1761{
1757#if 0 1762#if 0
1758 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1759 { 1764 {
1760 case '0': /* DEC Special Character & Line Drawing Set */ 1765 case '0': /* DEC Special Character & Line Drawing Set */
… …
1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1783 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1784 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1785 */ 1790 */
1786void ecb_cold 1791void ecb_cold
1787rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) noexcept
1788{ 1793{
1789 screen.charset = set; 1794 screen.charset = set;
1790 set_font_style (); 1795 set_font_style ();
1791} 1796}
1792 1797
… …
1798 * XTERM_SEQ: Set G2 character set: ESC * <C> 1803 * XTERM_SEQ: Set G2 character set: ESC * <C>
1799 * XTERM_SEQ: Set G3 character set: ESC + <C> 1804 * XTERM_SEQ: Set G3 character set: ESC + <C>
1800 * See set_font_style for possible values for <C> 1805 * See set_font_style for possible values for <C>
1801 */ 1806 */
1802void 1807void
1803rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1808rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1804{ 1809{
1805 charsets[set] = (unsigned char)ch; 1810 charsets[set] = (unsigned char)ch;
1806 set_font_style (); 1811 set_font_style ();
1807} 1812}
1808 1813
… …
1813 1818
1814/* 1819/*
1815 * refresh matching text. 1820 * refresh matching text.
1816 */ 1821 */
1817bool ecb_cold 1822bool ecb_cold
1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1819{ 1824{
1820 bool found = false; 1825 bool found = false;
1821 1826
1822 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
1823 { 1828 {
… …
1842 PART_END, 1847 PART_END,
1843 RC_COUNT 1848 RC_COUNT
1844}; 1849};
1845 1850
1846void ecb_hot 1851void ecb_hot
1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1848{ 1853{
1849 int i; 1854 int i;
1850 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1851 1856
1852 if (!drawn_buf) /* sanity check */ 1857 if (!drawn_buf) /* sanity check */
… …
1886/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1887/* 1892/*
1888 * Refresh the entire screen 1893 * Refresh the entire screen
1889 */ 1894 */
1890void 1895void
1891rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) noexcept
1892{ 1897{
1893 scr_expose (0, 0, vt_width, vt_height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1894} 1899}
1895 1900
1896/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1897/* 1902/*
1898 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
1899 * the top of the screen 1904 * the top of the screen
1900 */ 1905 */
1901void 1906void
1902rxvt_term::scr_move_to (int y, int len) NOTHROW 1907rxvt_term::scr_move_to (int y, int len) noexcept
1903{ 1908{
1904 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1909 // lerp (y, 0, len, top_row, nrow - 1)
1910 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1905} 1911}
1906 1912
1907/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1908/* 1914/*
1909 * Page the screen up/down nlines 1915 * Page the screen up/down nlines
1910 * direction should be UP or DN 1916 * direction should be UP or DN
1911 */ 1917 */
1912bool 1918bool
1913rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1919rxvt_term::scr_page (int nlines) noexcept
1914{ 1920{
1915 int new_view_start =
1916 direction == UP ? view_start - nlines
1917 : view_start + nlines;
1918
1919 return scr_changeview (new_view_start); 1921 return scr_changeview (view_start - nlines);
1920} 1922}
1921 1923
1922bool 1924bool
1923rxvt_term::scr_changeview (int new_view_start) NOTHROW 1925rxvt_term::scr_changeview (int new_view_start) noexcept
1924{ 1926{
1925 clamp_it (new_view_start, top_row, 0); 1927 clamp_it (new_view_start, top_row, 0);
1926 1928
1927 if (new_view_start == view_start) 1929 if (new_view_start == view_start)
1928 return false; 1930 return false;
… …
1946} 1948}
1947#endif 1949#endif
1948 1950
1949/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1950void 1952void
1951rxvt_term::scr_bell () NOTHROW 1953rxvt_term::scr_bell () noexcept
1952{ 1954{
1953#ifndef NO_BELL 1955#ifndef NO_BELL
1954 1956
1955# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1956# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
… …
1978#endif 1980#endif
1979} 1981}
1980 1982
1981/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1982void ecb_cold 1984void ecb_cold
1983rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) noexcept
1984{ 1986{
1985#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1986 int nrows, row_start; 1988 int nrows, row_start;
1987 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
1988 1990
… …
2037 * Refresh the screen 2039 * Refresh the screen
2038 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2039 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2040 */ 2042 */
2041void ecb_hot 2043void ecb_hot
2042rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () noexcept
2043{ 2045{
2044 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2045 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2046 int i; /* tmp */ 2048 int i; /* tmp */
2047 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2048 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend; 2051 rend_t cur_rend;
2050 int cur_col; 2052 int cur_col;
2053 int cursorwidth;
2051 2054
2052 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2053 2056
2054 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2055 return; 2058 return;
… …
2080 2083
2081 /* 2084 /*
2082 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2083 */ 2086 */
2084 { 2087 {
2085 bool setoldcursor;
2086
2087#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2088 if (hidden_cursor) 2089 if (hidden_cursor)
2089 showcursor = 0; 2090 showcursor = 0;
2090#endif 2091#endif
2091 2092
… …
2093 { 2094 {
2094 int col = screen.cur.col; 2095 int col = screen.cur.col;
2095 2096
2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2097 col--; 2098 col--;
2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2098 2104
2099 cur_rend = ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col; 2106 cur_col = col;
2101 2107
2102#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
… …
2119 ccol2 = bgcolor_of (rstyle); 2125 ccol2 = bgcolor_of (rstyle);
2120#else 2126#else
2121 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2122#endif 2128#endif
2123 2129
2124 if (focus) 2130 if (focus && cursor_type == 0)
2125 { 2131 {
2126 rend_t rend = cur_rend; 2132 rend_t rend = cur_rend;
2127 2133
2128 if (option (Opt_cursorUnderline))
2129 rend ^= RS_Uline;
2130 else
2131 {
2132 rend ^= RS_RVid; 2134 rend ^= RS_RVid;
2133 rend = SET_FGCOLOR (rend, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2134 rend = SET_BGCOLOR (rend, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2135 }
2136 2137
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2138 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2138 } 2139 }
2139 } 2140 }
2140 2141
2141 /* make sure no outline cursor is left around */ 2142 /* make sure no outline cursor is left around */
2142 setoldcursor = 0; 2143 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2143 if (ocrow != -1) 2144 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2145
2146 // save the current cursor coordinates if the cursor is visible
2147 // and either the window is unfocused or the cursor style is
2148 // underline or vertical bar, so as to clear the outline cursor in
2149 // the next refresh if the cursor moves or becomes invisible
2150 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2144 { 2151 {
2145 if (screen.cur.row - view_start != ocrow 2152 oldcursor.row = screen.cur.row - view_start;
2146 || screen.cur.col != oldcursor.col) 2153 oldcursor.col = screen.cur.col;
2147 {
2148 if (ocrow < nrow
2149 && oldcursor.col < ncol)
2150 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2151
2152 if (focus || !showcursor)
2153 oldcursor.row = -1;
2154 else
2155 setoldcursor = 1;
2156 }
2157 } 2154 }
2158 else if (!focus) 2155 else
2159 setoldcursor = 1;
2160
2161 if (setoldcursor)
2162 {
2163 if (screen.cur.row - view_start >= nrow)
2164 oldcursor.row = -1; 2156 oldcursor.row = -1;
2165 else
2166 {
2167 oldcursor.row = screen.cur.row - view_start;
2168 oldcursor.col = screen.cur.col;
2169 }
2170 }
2171 } 2157 }
2172 2158
2173#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2174 /* 2160 /*
2175 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
… …
2256 int ypixel = (int)Row2Pixel (row); 2242 int ypixel = (int)Row2Pixel (row);
2257 2243
2258 for (col = 0; col < ncol; col++) 2244 for (col = 0; col < ncol; col++)
2259 { 2245 {
2260 /* compare new text with old - if exactly the same then continue */ 2246 /* compare new text with old - if exactly the same then continue */
2261 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2247 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2262 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2263 || (stp[col] == ' ' /* space w/ no background change */
2264 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2265 continue; 2248 continue;
2266 2249
2267 // redraw one or more characters 2250 // redraw one or more characters
2268 2251
2269 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
… …
2441 else 2424 else
2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2443 2426
2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2445 { 2428 {
2429 if (showcursor && focus && row == screen.cur.row
2430 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2431 XSetForeground (dpy, gc, pix_colors[ccol1]);
2432 else
2446#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2447 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2448 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2449 else 2436 else
2450#endif 2437#endif
… …
2461 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2462 */ 2449 */
2463 if (showcursor) 2450 if (showcursor)
2464 { 2451 {
2465 if (focus) 2452 if (focus)
2453 {
2454 if (cursor_type == 0)
2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2455 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 else if (oldcursor.row >= 0)
2457 {
2458 XSetForeground (dpy, gc, pix_colors[ccol1]);
2459 if (cursor_type == 1)
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row + 1) - 2,
2463 Width2Pixel (1),
2464 2);
2465 else
2466 XFillRectangle (dpy, vt, gc,
2467 Col2Pixel (cur_col),
2468 Row2Pixel (oldcursor.row),
2469 2,
2470 Height2Pixel (1));
2471 }
2472 }
2467 else if (oldcursor.row >= 0) 2473 else if (oldcursor.row >= 0)
2468 { 2474 {
2469 int cursorwidth = 1;
2470 int col = oldcursor.col;
2471
2472 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2473 col--;
2474
2475 while (col + cursorwidth < ncol
2476 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2477 cursorwidth++;
2478
2479#ifndef NO_CURSORCOLOR
2480 if (ISSET_PIXCOLOR (Color_cursor))
2481 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2482 else
2483#endif
2484 XSetForeground (dpy, gc, pix_colors[ccol1]); 2475 XSetForeground (dpy, gc, pix_colors[ccol1]);
2485 2476
2486 XDrawRectangle (dpy, vt, gc, 2477 XDrawRectangle (dpy, vt, gc,
2487 Col2Pixel (col), 2478 Col2Pixel (cur_col),
2488 Row2Pixel (oldcursor.row), 2479 Row2Pixel (oldcursor.row),
2489 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2480 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2490 (unsigned int) (Height2Pixel (1) - 1)); 2481 (unsigned int) (Height2Pixel (1) - 1));
2491 } 2482 }
2492 } 2483 }
… …
2505 num_scr = 0; 2496 num_scr = 0;
2506 num_scr_allow = 1; 2497 num_scr_allow = 1;
2507} 2498}
2508 2499
2509void ecb_cold 2500void ecb_cold
2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2501rxvt_term::scr_remap_chars (line_t &l) noexcept
2511{ 2502{
2512 if (!l.valid ()) 2503 if (!l.valid ())
2513 return; 2504 return;
2514 2505
2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2517 for (int i = ncol; i--; ) 2508 for (int i = ncol; i--; )
2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2509 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2519} 2510}
2520 2511
2521void ecb_cold 2512void ecb_cold
2522rxvt_term::scr_remap_chars () NOTHROW 2513rxvt_term::scr_remap_chars () noexcept
2523{ 2514{
2524 for (int i = total_rows; i--; ) 2515 for (int i = total_rows; i--; )
2525 scr_remap_chars (row_buf [i]); 2516 scr_remap_chars (row_buf [i]);
2526 2517
2527 for (int i = nrow; i--; ) 2518 for (int i = nrow; i--; )
… …
2530 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2531 } 2522 }
2532} 2523}
2533 2524
2534void ecb_cold 2525void ecb_cold
2535rxvt_term::scr_recolour (bool refresh) NOTHROW 2526rxvt_term::scr_recolor (bool refresh) noexcept
2536{ 2527{
2537 bool transparent = false; 2528 bool transparent = false;
2538 2529
2539#ifdef HAVE_IMG 2530#ifdef HAVE_IMG
2540 if (bg_img != 0) 2531 if (bg_img != 0)
… …
2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2562 } 2553 }
2563 2554
2564 XClearWindow (dpy, parent); 2555 XClearWindow (dpy, parent);
2565 2556
2566 if (scrollBar.win) 2557 if (scrollBar.state && scrollBar.win)
2567 { 2558 {
2568 if (transparent) 2559 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else 2561 else
2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2581 want_refresh = 1; 2572 want_refresh = 1;
2582} 2573}
2583 2574
2584/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2585void 2576void
2586rxvt_term::scr_clear (bool really) NOTHROW 2577rxvt_term::scr_clear (bool really) noexcept
2587{ 2578{
2588 if (!mapped) 2579 if (!mapped)
2589 return; 2580 return;
2590 2581
2591 num_scr_allow = 0; 2582 num_scr_allow = 0;
… …
2594 if (really) 2585 if (really)
2595 XClearWindow (dpy, vt); 2586 XClearWindow (dpy, vt);
2596} 2587}
2597 2588
2598void 2589void
2599rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2590rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2600{ 2591{
2601 int view_end = view_start + nrow; 2592 int view_end = view_start + nrow;
2602 int row, col; 2593 int row, col;
2603 2594
2604 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2595 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2616 srp[col] ^= rstyle2; 2607 srp[col] ^= rstyle2;
2617 } 2608 }
2618} 2609}
2619 2610
2620void 2611void
2621rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2612rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2622{ 2613{
2623 int view_end = view_start + nrow; 2614 int view_end = view_start + nrow;
2624 int row, col; 2615 int row, col;
2625 2616
2626 if (beg_row >= view_start) 2617 if (beg_row >= view_start)
… …
2643 srp[col] ^= rstyle; 2634 srp[col] ^= rstyle;
2644} 2635}
2645 2636
2646/* ------------------------------------------------------------------------- */ 2637/* ------------------------------------------------------------------------- */
2647void ecb_hot 2638void ecb_hot
2648rxvt_term::scr_reverse_selection () NOTHROW 2639rxvt_term::scr_reverse_selection () noexcept
2649{ 2640{
2650 if (selection.op 2641 if (selection.op
2651 && current_screen == selection.screen 2642 && current_screen == selection.screen
2652 && selection.end.row >= view_start) 2643 && selection.end.row >= view_start)
2653 { 2644 {
… …
2669 * Dump the whole scrollback and screen to the passed filedescriptor. The 2660 * Dump the whole scrollback and screen to the passed filedescriptor. The
2670 * invoking routine must close the fd. 2661 * invoking routine must close the fd.
2671 */ 2662 */
2672#if 0 2663#if 0
2673void 2664void
2674rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) noexcept
2675{ 2666{
2676 // if this method is needed, it can be implemented by factoring the 2667 // if this method is needed, it can be implemented by factoring the
2677 // relevant code in scr_printscreen 2668 // relevant code in scr_printscreen
2678} 2669}
2679#endif 2670#endif
2680 2671
2681/* ------------------------------------------------------------------------- * 2672/* ------------------------------------------------------------------------- *
2682 * CHARACTER SELECTION * 2673 * CHARACTER SELECTION *
2683 * ------------------------------------------------------------------------- */ 2674 * ------------------------------------------------------------------------- */
2684void 2675void
2685rxvt_term::selection_check (int check_more) NOTHROW 2676rxvt_term::selection_check (int check_more) noexcept
2686{ 2677{
2687 if (!selection.op) 2678 if (!selection.op)
2688 return; 2679 return;
2689 2680
2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2681 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2686 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2687 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 CLEAR_ALL_SELECTION (); 2688 CLEAR_ALL_SELECTION ();
2698} 2689}
2699 2690
2691void
2692rxvt_term::selection_changed () noexcept
2693{
2694 line_t &r1 = ROW (selection.beg.row);
2695 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2696 ++selection.beg.col;
2697
2698 line_t &r2 = ROW (selection.end.row);
2699 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2700 ++selection.end.col;
2701
2702 want_refresh = 1;
2703}
2704
2700/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2701/* 2706/*
2702 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2703 */ 2708 */
2704void 2709void
2705rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2706{ 2711{
2707 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2708 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2709 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2710 data[i] = C0_CR; 2715 data[i] = C0_CR;
2711 2716
2712 if (priv_modes & PrivMode_BracketPaste) 2717 #if ENABLE_FRILLS
2718 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2713 tt_printf ("\x1b[200~"); 2719 tt_printf ("\x1b[200~");
2720 #endif
2714 2721
2715 tt_write (data, len); 2722 tt_write (data, len);
2716 2723
2717 if (priv_modes & PrivMode_BracketPaste) 2724 #if ENABLE_FRILLS
2725 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2718 tt_printf ("\x1b[201~"); 2726 tt_printf ("\x1b[201~");
2727 #endif
2719} 2728}
2720 2729
2721void 2730void
2722rxvt_term::paste (char *data, unsigned int len) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) noexcept
2723{ 2732{
2724 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2725 return; 2734 return;
2726 2735
2727 tt_paste (data, len); 2736 tt_paste (data, len);
… …
2733 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2734 * as fallback 2743 * as fallback
2735 * EXT: button 2 release 2744 * EXT: button 2 release
2736 */ 2745 */
2737void 2746void
2738rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) noexcept
2739{ 2748{
2740 if (!selection_req) 2749 if (!selection_req)
2741 { 2750 {
2742 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2751 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2743 selection_req->run (); 2752 selection_req->run ();
… …
2748/* 2757/*
2749 * Clear all selected text 2758 * Clear all selected text
2750 * EXT: SelectionClear 2759 * EXT: SelectionClear
2751 */ 2760 */
2752void 2761void
2753rxvt_term::selection_clear (bool clipboard) NOTHROW 2762rxvt_term::selection_clear (bool clipboard) noexcept
2754{ 2763{
2755 if (!clipboard) 2764 if (!clipboard)
2756 { 2765 {
2757 want_refresh = 1; 2766 want_refresh = 1;
2758 free (selection.text); 2767 free (selection.text);
… …
2843 if (*t == NOCHAR) 2852 if (*t == NOCHAR)
2844 t++; 2853 t++;
2845#if ENABLE_COMBINING 2854#if ENABLE_COMBINING
2846 else if (IS_COMPOSE (*t)) 2855 else if (IS_COMPOSE (*t))
2847 { 2856 {
2848 int len = rxvt_composite.expand (*t, 0); 2857 int len = rxvt_composite.expand (*t);
2849 2858
2850 extra -= (len - 1); 2859 extra -= (len - 1);
2851 2860
2852 if (extra < 0) 2861 if (extra < 0)
2853 { 2862 {
… …
2900 2909
2901 selection_grab (tm); 2910 selection_grab (tm);
2902} 2911}
2903 2912
2904bool 2913bool
2905rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2914rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2906{ 2915{
2907 Atom sel; 2916 Atom sel;
2908 2917
2909 if (!clipboard) 2918 if (!clipboard)
2910 { 2919 {
… …
2944/* 2953/*
2945 * Mark or select text based upon number of clicks: 1, 2, or 3 2954 * Mark or select text based upon number of clicks: 1, 2, or 3
2946 * EXT: button 1 press 2955 * EXT: button 1 press
2947 */ 2956 */
2948void ecb_cold 2957void ecb_cold
2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2958rxvt_term::selection_click (int clicks, int x, int y) noexcept
2950{ 2959{
2951 clicks = ((clicks - 1) % 3) + 1; 2960 clicks = ((clicks - 1) % 3) + 1;
2952 selection.clicks = clicks; /* save clicks so extend will work */ 2961 selection.clicks = clicks; /* save clicks so extend will work */
2953 2962
2954 if (clicks == 2 && !selection.rect 2963 if (clicks == 2 && !selection.rect
… …
2973/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2974/* 2983/*
2975 * Mark a selection at the specified col/row 2984 * Mark a selection at the specified col/row
2976 */ 2985 */
2977void ecb_cold 2986void ecb_cold
2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2987rxvt_term::selection_start_colrow (int col, int row) noexcept
2979{ 2988{
2980 want_refresh = 1; 2989 want_refresh = 1;
2981 2990
2982 selection.mark.row = row + view_start; 2991 selection.mark.row = row + view_start;
2983 selection.mark.col = col; 2992 selection.mark.col = col;
… …
3005 * Word select: select text for 2 clicks 3014 * Word select: select text for 2 clicks
3006 * We now only find out the boundary in one direction 3015 * We now only find out the boundary in one direction
3007 */ 3016 */
3008 3017
3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3018/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3010#define DELIMIT_TEXT(x) \ 3019#define DELIMIT_TEXT(x) \
3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3020 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3012#define DELIMIT_REND(x) 1 3021#define DELIMIT_REND(x) 1
3013 3022
3014void ecb_cold 3023void ecb_cold
3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3024rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3016{ 3025{
3017 int col, row, dirnadd, tcol, trow, w1, w2; 3026 int col, row, dirnadd, tcol, trow, w1, w2;
3018 row_col_t bound; 3027 row_col_t bound;
3019 text_t *stp; 3028 text_t *stp;
3020 rend_t *srp; 3029 rend_t *srp;
… …
3094 * flag == 0 ==> button 1 3103 * flag == 0 ==> button 1
3095 * flag == 1 ==> button 3 press 3104 * flag == 1 ==> button 3 press
3096 * flag == 2 ==> button 3 motion 3105 * flag == 2 ==> button 3 motion
3097 */ 3106 */
3098void ecb_cold 3107void ecb_cold
3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3108rxvt_term::selection_extend (int x, int y, int flag) noexcept
3100{ 3109{
3101 int col = clamp (Pixel2Col (x), 0, ncol); 3110 int col = clamp (Pixel2Col (x), 0, ncol);
3102 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3111 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3103 3112
3104 /* 3113 /*
… …
3130/* ------------------------------------------------------------------------- */ 3139/* ------------------------------------------------------------------------- */
3131/* 3140/*
3132 * Extend the selection to the specified col/row 3141 * Extend the selection to the specified col/row
3133 */ 3142 */
3134void ecb_cold 3143void ecb_cold
3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3144rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3136{ 3145{
3137 row_col_t pos; 3146 row_col_t pos;
3138 enum { 3147 enum {
3139 LEFT, RIGHT 3148 LEFT, RIGHT
3140 } closeto = RIGHT; 3149 } closeto = RIGHT;
3141
3142 want_refresh = 1;
3143 3150
3144 switch (selection.op) 3151 switch (selection.op)
3145 { 3152 {
3146 case SELECTION_INIT: 3153 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3154 CLEAR_SELECTION ();
… …
3327 3334
3328#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3329 if (selection.rect && selection.beg.col > selection.end.col) 3336 if (selection.rect && selection.beg.col > selection.end.col)
3330 ::swap (selection.beg.col, selection.end.col); 3337 ::swap (selection.beg.col, selection.end.col);
3331#endif 3338#endif
3339
3340 selection_changed ();
3332} 3341}
3333 3342
3334#if !ENABLE_MINIMAL 3343#if !ENABLE_MINIMAL
3335void ecb_cold 3344void ecb_cold
3336rxvt_term::selection_remove_trailing_spaces () NOTHROW 3345rxvt_term::selection_remove_trailing_spaces () noexcept
3337{ 3346{
3338 int32_t end_col, end_row; 3347 int32_t end_col, end_row;
3339 text_t *stp; 3348 text_t *stp;
3340 3349
3341 end_col = selection.end.col; 3350 end_col = selection.end.col;
… …
3379/* 3388/*
3380 * Double click on button 3 when already selected 3389 * Double click on button 3 when already selected
3381 * EXT: button 3 double click 3390 * EXT: button 3 double click
3382 */ 3391 */
3383void ecb_cold 3392void ecb_cold
3384rxvt_term::selection_rotate (int x, int y) NOTHROW 3393rxvt_term::selection_rotate (int x, int y) noexcept
3385{ 3394{
3386 selection.clicks = selection.clicks % 3 + 1; 3395 selection.clicks = selection.clicks % 3 + 1;
3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3396 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3388} 3397}
3389 3398
… …
3391/* 3400/*
3392 * Respond to a request for our current selection 3401 * Respond to a request for our current selection
3393 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3394 */ 3403 */
3395void ecb_cold 3404void ecb_cold
3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3397{ 3406{
3398 Atom property = rq.property == None ? rq.target : rq.property; 3407 Atom property = rq.property == None ? rq.target : rq.property;
3399 XSelectionEvent ev; 3408 XSelectionEvent ev;
3400 3409
3401 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
… …
3493 cl = selection.clip_text; 3502 cl = selection.clip_text;
3494 selectlen = selection.clip_len; 3503 selectlen = selection.clip_len;
3495 } 3504 }
3496 else 3505 else
3497 { 3506 {
3498 cl = L""; 3507 cl = (wchar_t *)L"";
3499 selectlen = 0; 3508 selectlen = 0;
3500 } 3509 }
3501 3510
3502#if !ENABLE_MINIMAL 3511#if !ENABLE_MINIMAL
3503 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3512 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3535} 3544}
3536 3545
3537/* ------------------------------------------------------------------------- */ 3546/* ------------------------------------------------------------------------- */
3538#if USE_XIM 3547#if USE_XIM
3539void ecb_cold 3548void ecb_cold
3540rxvt_term::im_set_position (XPoint &pos) NOTHROW 3549rxvt_term::im_set_position (XPoint &pos) noexcept
3541{ 3550{
3542 XWindowAttributes xwa; 3551 XWindowAttributes xwa;
3543 3552
3544 XGetWindowAttributes (dpy, vt, &xwa); 3553 XGetWindowAttributes (dpy, vt, &xwa);
3545 3554
… …
3548} 3557}
3549#endif 3558#endif
3550 3559
3551#if ENABLE_OVERLAY 3560#if ENABLE_OVERLAY
3552void 3561void
3553rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3562rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3554{ 3563{
3555 if (nrow < 1 || ncol < 1) 3564 if (nrow < 1 || ncol < 1)
3556 return; 3565 return;
3557 3566
3558 want_refresh = 1; 3567 want_refresh = 1;
… …
3603 *rp = r; 3612 *rp = r;
3604 } 3613 }
3605} 3614}
3606 3615
3607void 3616void
3608rxvt_term::scr_overlay_off () NOTHROW 3617rxvt_term::scr_overlay_off () noexcept
3609{ 3618{
3610 if (!ov.text) 3619 if (!ov.text)
3611 return; 3620 return;
3612 3621
3613 want_refresh = 1; 3622 want_refresh = 1;
… …
3621 delete [] ov.text; ov.text = 0; 3630 delete [] ov.text; ov.text = 0;
3622 delete [] ov.rend; ov.rend = 0; 3631 delete [] ov.rend; ov.rend = 0;
3623} 3632}
3624 3633
3625void 3634void
3626rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3627{ 3636{
3628 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3637 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3629 return; 3638 return;
3630 3639
3631 x++, y++; 3640 x++, y++;
… …
3633 ov.text[y][x] = text; 3642 ov.text[y][x] = text;
3634 ov.rend[y][x] = rend; 3643 ov.rend[y][x] = rend;
3635} 3644}
3636 3645
3637void 3646void
3638rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3647rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3639{ 3648{
3640 while (*s) 3649 while (*s)
3641 scr_overlay_set (x++, y, *s++); 3650 scr_overlay_set (x++, y, *s++);
3642} 3651}
3643 3652
3644void 3653void
3645rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3654rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3646{ 3655{
3647 while (*s) 3656 while (*s)
3648 { 3657 {
3649 text_t t = *s++; 3658 text_t t = *s++;
3650 int width = WCWIDTH (t); 3659 int width = WCWIDTH (t);
… …
3656 } 3665 }
3657 } 3666 }
3658} 3667}
3659 3668
3660void 3669void
3661rxvt_term::scr_swap_overlay () NOTHROW 3670rxvt_term::scr_swap_overlay () noexcept
3662{ 3671{
3663 if (!ov.text) 3672 if (!ov.text)
3664 return; 3673 return;
3665 3674
3666 // hide cursor if it is within the overlay area 3675 // hide cursor if it is within the overlay area

Diff Legend

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