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

Diff Legend

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