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.430 by root, Sun Jan 13 20:16:40 2013 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 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 {
… …
150 l.r[col] = rend; 151 l.r[col] = rend;
151 col++; 152 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
160rxvt_term::scr_alloc () NOTHROW 171rxvt_term::scr_alloc () noexcept
161{ 172{
162 int tsize = sizeof (text_t) * ncol; 173 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 174 int rsize = sizeof (rend_t) * ncol;
164 175
165 // we assume that rend_t size is a sufficient alignment 176 // we assume that rend_t size is a sufficient alignment
… …
188 drawn_buf = (line_t *)chunk; 199 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 200 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 201 row_buf = swap_buf + nrow;
191} 202}
192 203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
193void ecb_cold 214void ecb_cold
194rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
195{ 216{
196#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
197 scr_overlay_off (); 218 scr_overlay_off ();
… …
230 size_t prev_chunk_size = chunk_size; 251 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf; 252 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf; 253 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf; 254 line_t *prev_row_buf = row_buf;
234 255
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc (); 256 scr_alloc ();
238 257
239 if (!prev_row_buf) 258 if (!prev_row_buf)
240 { 259 {
241 /*
242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
243 */
244 top_row = 0; 260 top_row = 0;
245 term_start = 0; 261 term_start = 0;
246 262
247 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
248 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
… …
273 { 289 {
274 /* 290 /*
275 * add or delete rows as appropriate 291 * add or delete rows as appropriate
276 */ 292 */
277 293
294 int common_col = min (prev_ncol, ncol);
295
278 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
279 { 297 {
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
282
283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 301
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f; 302 copy_line (swap_buf [row], prev_swap_buf [row]);
290 } 303 }
291 304
292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
293 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
294 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
295 308
296 if (top_row) 309 if ((rewrap_always || top_row) && !rewrap_never)
297 { 310 {
298 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
299 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
300 // TODO: maybe optimise when width didn't change 313 // TODO: maybe optimise when width didn't change
301 314
… …
389 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
390 { 403 {
391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
392 line_t &dst = row_buf [row]; 405 line_t &dst = row_buf [row];
393 406
394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 407 copy_line (dst, src);
395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
399 } 408 }
400 409
401 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
403 412
… …
432 441
433 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
434} 443}
435 444
436void ecb_cold 445void ecb_cold
437rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
438{ 447{
439 chunk_free (chunk, chunk_size); 448 chunk_free (chunk, chunk_size);
440 chunk = 0; 449 chunk = 0;
441 row_buf = 0; 450 row_buf = 0;
442 451
… …
461 scr_clear (true); 470 scr_clear (true);
462 scr_refresh (); 471 scr_refresh ();
463} 472}
464 473
465void ecb_cold 474void ecb_cold
466rxvt_term::scr_soft_reset () NOTHROW 475rxvt_term::scr_soft_reset () noexcept
467{ 476{
468 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
469#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
470 scr_overlay_off (); 479 scr_overlay_off ();
471#endif 480#endif
… …
485 * Save and Restore cursor 494 * Save and Restore cursor
486 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
487 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
488 */ 497 */
489void 498void
490rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
491{ 500{
492 screen_t *s; 501 screen_t *s;
493 502
494#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
495 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
526 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
528} 537}
529 538
530void 539void
531rxvt_term::scr_swap_screen () NOTHROW 540rxvt_term::scr_swap_screen () noexcept
532{ 541{
533 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
534 return; 543 return;
535 544
536 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
584 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
585} 594}
586 595
587// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
588void 597void
589rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
590{ 599{
591 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
592 return; 601 return;
593 602
594 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
604/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
605/* 614/*
606 * Change the colour for following text 615 * Change the colour for following text
607 */ 616 */
608void 617void
609rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
610{ 619{
611 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
612 color = fgbg; 621 color = fgbg;
613 622
614 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
615 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
616 else 625 else
… …
620/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
621/* 630/*
622 * Change the rendition style for following text 631 * Change the rendition style for following text
623 */ 632 */
624void 633void
625rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
626{ 635{
627 if (set) 636 if (set)
628 rstyle |= style; 637 rstyle |= style;
629 else if (style == ~RS_None) 638 else if (style == ~RS_None)
630 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
637 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
638 * count positive ==> scroll up 647 * count positive ==> scroll up
639 * count negative ==> scroll down 648 * count negative ==> scroll down
640 */ 649 */
641int ecb_hot 650int ecb_hot
642rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
643{ 652{
644 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
645 return 0; 654 return 0;
646 655
647 want_refresh = 1; 656 want_refresh = 1;
… …
707 716
708 // finally move the view window, if desired 717 // finally move the view window, if desired
709 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
710 && view_start != 0 719 && view_start != 0
711 && view_start != -saveLines) 720 && view_start != -saveLines)
712 scr_page (UP, count); 721 scr_page (count);
713 722
714 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
715 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
716 } 725 }
717 else 726 else
… …
781/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
782/* 791/*
783 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
784 */ 793 */
785void ecb_hot 794void ecb_hot
786rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
787{ 796{
788 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
789 return; 798 return;
790 799
791 bool checksel; 800 bool checksel;
… …
1003 } 1012 }
1004 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1005 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1006 { 1015 {
1007 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1008 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1009 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1010 } 1019 }
1011 else 1020 else
1012 continue; 1021 continue;
1013 1022
1014 linep->touch (); 1023 linep->touch ();
… …
1037/* 1046/*
1038 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
1039 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1040 */ 1049 */
1041void 1050void
1042rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1043{ 1052{
1044 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1045 { 1054 {
1046 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1047 { 1056 {
… …
1064 * Process Horizontal Tab 1073 * Process Horizontal Tab
1065 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1066 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1067 */ 1076 */
1068void 1077void
1069rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1070{ 1079{
1071 int i, x; 1080 int i, x;
1072 1081
1073 want_refresh = 1; 1082 want_refresh = 1;
1074 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1141 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1142 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1143 */ 1152 */
1144#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1145void ecb_cold 1154void ecb_cold
1146rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1147{ 1156{
1148 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1150 else 1159 else
1151 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1158 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1159 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1160 */ 1169 */
1161#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1162void ecb_cold 1171void ecb_cold
1163rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1164{ 1173{
1165 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1166 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1167 else 1176 else
1168 { 1177 {
… …
1181/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1182/* 1191/*
1183 * Goto Row/Column 1192 * Goto Row/Column
1184 */ 1193 */
1185void 1194void
1186rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1187{ 1196{
1188 want_refresh = 1; 1197 want_refresh = 1;
1189 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1190 1199
1191 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1230/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1231/* 1240/*
1232 * direction should be UP or DN 1241 * direction should be UP or DN
1233 */ 1242 */
1234void 1243void
1235rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1236{ 1245{
1237 int dirn;
1238
1239 want_refresh = 1; 1246 want_refresh = 1;
1240 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1241 1248
1242 dirn = ((direction == UP) ? 1 : -1);
1243
1244 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1245 1250
1246 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1247 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1248 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1249 else 1254 else
1250 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1251 1256
1252 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1253 selection_check (0); 1258 selection_check (0);
1254} 1259}
1255 1260
… …
1260 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1261 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1262 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1263 */ 1268 */
1264void 1269void
1265rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1266{ 1271{
1267 unsigned int col, num; 1272 unsigned int col, num;
1268 1273
1269 want_refresh = 1; 1274 want_refresh = 1;
1270 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1324 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1325 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1327 */ 1332 */
1328void 1333void
1329rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1330{ 1335{
1331 int num; 1336 int num;
1332 int32_t row; 1337 int32_t row;
1333 rend_t ren; 1338 rend_t ren;
1334 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1404 } 1409 }
1405} 1410}
1406 1411
1407#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1408void 1413void
1409rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1410{ 1415{
1411 want_refresh = 1; 1416 want_refresh = 1;
1412 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1413 1418
1414 top_row = 0; 1419 top_row = 0;
… …
1419/* 1424/*
1420 * Fill the screen with `E's 1425 * Fill the screen with `E's
1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1422 */ 1427 */
1423void ecb_cold 1428void ecb_cold
1424rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1425{ 1430{
1426 rend_t fs; 1431 rend_t fs;
1427 1432
1428 want_refresh = 1; 1433 want_refresh = 1;
1429 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
… …
1454/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1455/* 1460/*
1456 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1457 */ 1462 */
1458void 1463void
1459rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1460{ 1465{
1461 int end; 1466 int end;
1462 1467
1463 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1464 1469
… …
1484/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1485/* 1490/*
1486 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1487 */ 1492 */
1488void 1493void
1489rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1490{ 1495{
1491 want_refresh = 1; 1496 want_refresh = 1;
1492 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1493 1498
1494 if (count <= 0) 1499 if (count <= 0)
… …
1593/* 1598/*
1594 * Set the scrolling region 1599 * Set the scrolling region
1595 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1596 */ 1601 */
1597void ecb_cold 1602void ecb_cold
1598rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1599{ 1604{
1600 max_it (top, 0); 1605 max_it (top, 0);
1601 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1602 1607
1603 if (top > bot) 1608 if (top > bot)
… …
1613 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1614 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1615 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1616 */ 1621 */
1617void ecb_cold 1622void ecb_cold
1618rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1619{ 1624{
1620 want_refresh = 1; 1625 want_refresh = 1;
1621 1626
1622 if (mode) 1627 if (mode)
1623 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1630 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1631 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1632 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1633 */ 1638 */
1634void ecb_cold 1639void ecb_cold
1635rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1636{ 1641{
1637 if (mode) 1642 if (mode)
1638 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1639 else 1644 else
1640 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1649 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1650 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1651 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1652 */ 1657 */
1653void ecb_cold 1658void ecb_cold
1654rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1655{ 1660{
1656 if (mode) 1661 if (mode)
1657 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1658 else 1663 else
1659 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1666 * Set insert/replace mode 1671 * Set insert/replace mode
1667 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1668 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1669 */ 1674 */
1670void ecb_cold 1675void ecb_cold
1671rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1672{ 1677{
1673 if (mode) 1678 if (mode)
1674 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1675 else 1680 else
1676 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1682 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1683 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1684 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1685 */ 1690 */
1686void ecb_cold 1691void ecb_cold
1687rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1688{ 1693{
1689 if (mode < 0) 1694 if (mode < 0)
1690 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1691 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1692 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1697 * Set reverse/normal video 1702 * Set reverse/normal video
1698 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1699 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1700 */ 1705 */
1701void 1706void
1702rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1703{ 1708{
1704 rvideo_mode = on; 1709 rvideo_mode = on;
1705 1710
1706#ifndef NO_BELL 1711#ifndef NO_BELL
1707 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1709 1714
1710 if (rvideo_state != on) 1715 if (rvideo_state != on)
1711 { 1716 {
1712 rvideo_state = on; 1717 rvideo_state = on;
1713 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1715#ifdef HAVE_IMG 1728#ifdef HAVE_IMG
1716 if (bg_img == 0) 1729 if (bg_img == 0)
1717#endif 1730#endif
1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1731/* 1744/*
1732 * Report current cursor position 1745 * Report current cursor position
1733 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1734 */ 1747 */
1735void ecb_cold 1748void ecb_cold
1736rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1737{ 1750{
1738 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1739} 1752}
1740 1753
1741/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1744 1757
1745/* 1758/*
1746 * Set font style 1759 * Set font style
1747 */ 1760 */
1748void ecb_cold 1761void ecb_cold
1749rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1750{ 1763{
1751#if 0 1764#if 0
1752 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1753 { 1766 {
1754 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1776 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1777 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1778 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1779 */ 1792 */
1780void ecb_cold 1793void ecb_cold
1781rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1782{ 1795{
1783 screen.charset = set; 1796 screen.charset = set;
1784 set_font_style (); 1797 set_font_style ();
1785} 1798}
1786 1799
… …
1792 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1793 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1794 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1795 */ 1808 */
1796void 1809void
1797rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1798{ 1811{
1799 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1800 set_font_style (); 1813 set_font_style ();
1801} 1814}
1802 1815
… …
1807 1820
1808/* 1821/*
1809 * refresh matching text. 1822 * refresh matching text.
1810 */ 1823 */
1811bool ecb_cold 1824bool ecb_cold
1812rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1813{ 1826{
1814 bool found = false; 1827 bool found = false;
1815 1828
1816 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1817 { 1830 {
… …
1836 PART_END, 1849 PART_END,
1837 RC_COUNT 1850 RC_COUNT
1838}; 1851};
1839 1852
1840void ecb_hot 1853void ecb_hot
1841rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1842{ 1855{
1843 int i; 1856 int i;
1844 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1845 1858
1846 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1880/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1881/* 1894/*
1882 * Refresh the entire screen 1895 * Refresh the entire screen
1883 */ 1896 */
1884void 1897void
1885rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1886{ 1899{
1887 scr_expose (0, 0, vt_width, vt_height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1888} 1901}
1889 1902
1890/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1891/* 1904/*
1892 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1893 * the top of the screen 1906 * the top of the screen
1894 */ 1907 */
1895void 1908void
1896rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1897{ 1910{
1898 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1899} 1913}
1900 1914
1901/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1902/* 1916/*
1903 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1904 * direction should be UP or DN 1918 * direction should be UP or DN
1905 */ 1919 */
1906bool 1920bool
1907rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1908{ 1922{
1909 int new_view_start =
1910 direction == UP ? view_start - nlines
1911 : view_start + nlines;
1912
1913 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1914} 1924}
1915 1925
1916bool 1926bool
1917rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1918{ 1928{
1919 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1920 1930
1921 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1922 return false; 1932 return false;
… …
1940} 1950}
1941#endif 1951#endif
1942 1952
1943/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1944void 1954void
1945rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1946{ 1956{
1947#ifndef NO_BELL 1957#ifndef NO_BELL
1948 1958
1949# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1950# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
… …
1972#endif 1982#endif
1973} 1983}
1974 1984
1975/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1976void ecb_cold 1986void ecb_cold
1977rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1978{ 1988{
1979#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1980 int nrows, row_start; 1990 int nrows, row_start;
1981 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1982 1992
… …
2031 * Refresh the screen 2041 * Refresh the screen
2032 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2033 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2034 */ 2044 */
2035void ecb_hot 2045void ecb_hot
2036rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2037{ 2047{
2038 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2039 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2040 int i; /* tmp */ 2050 int i; /* tmp */
2041#ifndef NO_CURSORCOLOR
2042 rend_t cc1; /* store colours at cursor position (s) */
2043#endif
2044 rend_t *crp; // cursor rendition pointer
2045 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2046 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2047 2056
2048 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2049 2058
2050 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 2060 return;
… …
2076 2085
2077 /* 2086 /*
2078 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2079 */ 2088 */
2080 { 2089 {
2081 bool setoldcursor;
2082
2083#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2084 if (hidden_cursor) 2091 if (hidden_cursor)
2085 showcursor = 0; 2092 showcursor = 0;
2086#endif 2093#endif
2087 2094
… …
2090 int col = screen.cur.col; 2097 int col = screen.cur.col;
2091 2098
2092 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2093 col--; 2100 col--;
2094 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2095 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2096 2109
2097#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2098 cc1 = *crp & (RS_fgMask | RS_bgMask);
2099 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2100 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2101 else 2113 else
2102#endif 2114#endif
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2115 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2116#else 2128#else
2117 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2118#endif 2130#endif
2119 2131
2120 if (focus) 2132 if (focus && cursor_type == 0)
2121 { 2133 {
2122 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2123 *crp ^= RS_Uline; 2135
2124 else
2125 {
2126 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2127 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2128 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2129 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2130 } 2141 }
2131 } 2142 }
2132 2143
2133 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2134 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2135 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2136 { 2153 {
2137 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2138 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2139 {
2140 if (ocrow < nrow
2141 && oldcursor.col < ncol)
2142 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2143
2144 if (focus || !showcursor)
2145 oldcursor.row = -1;
2146 else
2147 setoldcursor = 1;
2148 }
2149 } 2156 }
2150 else if (!focus) 2157 else
2151 setoldcursor = 1;
2152
2153 if (setoldcursor)
2154 {
2155 if (screen.cur.row - view_start >= nrow)
2156 oldcursor.row = -1; 2158 oldcursor.row = -1;
2157 else
2158 {
2159 oldcursor.row = screen.cur.row - view_start;
2160 oldcursor.col = screen.cur.col;
2161 }
2162 }
2163 } 2159 }
2164 2160
2165#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2166 /* 2162 /*
2167 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2248 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2249 2245
2250 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2251 { 2247 {
2252 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2253 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2254 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2255 || (stp[col] == ' ' /* space w/ no background change */
2256 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2257 continue; 2250 continue;
2258 2251
2259 // redraw one or more characters 2252 // redraw one or more characters
2260 2253
2261 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2433 else 2426 else
2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2435 2428
2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2437 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2438#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2439 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2440 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2441 else 2438 else
2442#endif 2439#endif
… …
2454 */ 2451 */
2455 if (showcursor) 2452 if (showcursor)
2456 { 2453 {
2457 if (focus) 2454 if (focus)
2458 { 2455 {
2459 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2460 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2461 else 2458 else if (oldcursor.row >= 0)
2462 { 2459 {
2463 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2464#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2465 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2466#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2467 } 2473 }
2468 } 2474 }
2469 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2470 { 2476 {
2471 int cursorwidth = 1;
2472 int col = oldcursor.col;
2473
2474 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2475 col--;
2476
2477 while (col + cursorwidth < ncol
2478 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2479 cursorwidth++;
2480
2481#ifndef NO_CURSORCOLOR
2482 if (ISSET_PIXCOLOR (Color_cursor))
2483 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2484 else
2485#endif
2486 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2487 2478
2488 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2489 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2490 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2491 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2492 (unsigned int) (Height2Pixel (1) - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2493 } 2484 }
2494 } 2485 }
… …
2507 num_scr = 0; 2498 num_scr = 0;
2508 num_scr_allow = 1; 2499 num_scr_allow = 1;
2509} 2500}
2510 2501
2511void ecb_cold 2502void ecb_cold
2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2513{ 2504{
2514 if (!l.valid ()) 2505 if (!l.valid ())
2515 return; 2506 return;
2516 2507
2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2519 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2521} 2512}
2522 2513
2523void ecb_cold 2514void ecb_cold
2524rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2525{ 2516{
2526 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2527 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2528 2519
2529 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2532 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2533 } 2524 }
2534} 2525}
2535 2526
2536void ecb_cold 2527void ecb_cold
2537rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2538{ 2529{
2539 bool transparent = false; 2530 bool transparent = false;
2540 2531
2541#ifdef HAVE_IMG 2532#ifdef HAVE_IMG
2542 if (bg_img != 0) 2533 if (bg_img != 0)
… …
2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 } 2555 }
2565 2556
2566 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2567 2558
2568 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2569 { 2560 {
2570 if (transparent) 2561 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else 2563 else
2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2583 want_refresh = 1; 2574 want_refresh = 1;
2584} 2575}
2585 2576
2586/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2587void 2578void
2588rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2589{ 2580{
2590 if (!mapped) 2581 if (!mapped)
2591 return; 2582 return;
2592 2583
2593 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2596 if (really) 2587 if (really)
2597 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2598} 2589}
2599 2590
2600void 2591void
2601rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2602{ 2593{
2603 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2604 int row, col; 2595 int row, col;
2605 2596
2606 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2618 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2619 } 2610 }
2620} 2611}
2621 2612
2622void 2613void
2623rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2624{ 2615{
2625 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2626 int row, col; 2617 int row, col;
2627 2618
2628 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2645 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2646} 2637}
2647 2638
2648/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2649void ecb_hot 2640void ecb_hot
2650rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2651{ 2642{
2652 if (selection.op 2643 if (selection.op
2653 && current_screen == selection.screen 2644 && current_screen == selection.screen
2654 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2655 { 2646 {
… …
2671 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2672 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2673 */ 2664 */
2674#if 0 2665#if 0
2675void 2666void
2676rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2677{ 2668{
2678 // if this method is needed, it can be implemented by factoring the 2669 // if this method is needed, it can be implemented by factoring the
2679 // relevant code in scr_printscreen 2670 // relevant code in scr_printscreen
2680} 2671}
2681#endif 2672#endif
2682 2673
2683/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2684 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2685 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2686void 2677void
2687rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2688{ 2679{
2689 if (!selection.op) 2680 if (!selection.op)
2690 return; 2681 return;
2691 2682
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 CLEAR_ALL_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2700} 2691}
2701 2692
2693void
2694rxvt_term::selection_changed () noexcept
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2705}
2706
2702/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2703/* 2708/*
2704 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2705 */ 2710 */
2706void 2711void
2707rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2708{ 2713{
2709 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2710 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2711 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2712 data[i] = C0_CR; 2717 data[i] = C0_CR;
2713 2718
2714 if (priv_modes & PrivMode_BracketPaste) 2719 #if ENABLE_FRILLS
2720 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2715 tt_printf ("\x1b[200~"); 2721 tt_printf ("\x1b[200~");
2722 #endif
2716 2723
2717 tt_write (data, len); 2724 tt_write (data, len);
2718 2725
2719 if (priv_modes & PrivMode_BracketPaste) 2726 #if ENABLE_FRILLS
2727 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2720 tt_printf ("\x1b[201~"); 2728 tt_printf ("\x1b[201~");
2729 #endif
2721} 2730}
2722 2731
2723void 2732void
2724rxvt_term::paste (char *data, unsigned int len) NOTHROW 2733rxvt_term::paste (char *data, unsigned int len) noexcept
2725{ 2734{
2726 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2735 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2727 return; 2736 return;
2728 2737
2729 tt_paste (data, len); 2738 tt_paste (data, len);
… …
2735 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2744 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2736 * as fallback 2745 * as fallback
2737 * EXT: button 2 release 2746 * EXT: button 2 release
2738 */ 2747 */
2739void 2748void
2740rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2749rxvt_term::selection_request (Time tm, int selnum) noexcept
2741{ 2750{
2742 if (!selection_req) 2751 if (!selection_req)
2743 { 2752 {
2744 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2753 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2745 selection_req->run (); 2754 selection_req->run ();
… …
2750/* 2759/*
2751 * Clear all selected text 2760 * Clear all selected text
2752 * EXT: SelectionClear 2761 * EXT: SelectionClear
2753 */ 2762 */
2754void 2763void
2755rxvt_term::selection_clear (bool clipboard) NOTHROW 2764rxvt_term::selection_clear (bool clipboard) noexcept
2756{ 2765{
2757 if (!clipboard) 2766 if (!clipboard)
2758 { 2767 {
2759 want_refresh = 1; 2768 want_refresh = 1;
2760 free (selection.text); 2769 free (selection.text);
… …
2845 if (*t == NOCHAR) 2854 if (*t == NOCHAR)
2846 t++; 2855 t++;
2847#if ENABLE_COMBINING 2856#if ENABLE_COMBINING
2848 else if (IS_COMPOSE (*t)) 2857 else if (IS_COMPOSE (*t))
2849 { 2858 {
2850 int len = rxvt_composite.expand (*t, 0); 2859 int len = rxvt_composite.expand (*t);
2851 2860
2852 extra -= (len - 1); 2861 extra -= (len - 1);
2853 2862
2854 if (extra < 0) 2863 if (extra < 0)
2855 { 2864 {
… …
2902 2911
2903 selection_grab (tm); 2912 selection_grab (tm);
2904} 2913}
2905 2914
2906bool 2915bool
2907rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2916rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2908{ 2917{
2909 Atom sel; 2918 Atom sel;
2910 2919
2911 if (!clipboard) 2920 if (!clipboard)
2912 { 2921 {
… …
2946/* 2955/*
2947 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
2948 * EXT: button 1 press 2957 * EXT: button 1 press
2949 */ 2958 */
2950void ecb_cold 2959void ecb_cold
2951rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2960rxvt_term::selection_click (int clicks, int x, int y) noexcept
2952{ 2961{
2953 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
2954 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
2955 2964
2956 if (clicks == 2 && !selection.rect 2965 if (clicks == 2 && !selection.rect
… …
2975/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
2976/* 2985/*
2977 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
2978 */ 2987 */
2979void ecb_cold 2988void ecb_cold
2980rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2989rxvt_term::selection_start_colrow (int col, int row) noexcept
2981{ 2990{
2982 want_refresh = 1; 2991 want_refresh = 1;
2983 2992
2984 selection.mark.row = row + view_start; 2993 selection.mark.row = row + view_start;
2985 selection.mark.col = col; 2994 selection.mark.col = col;
… …
3007 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3008 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3009 */ 3018 */
3010 3019
3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3012#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3014#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3015 3024
3016void ecb_cold 3025void ecb_cold
3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3018{ 3027{
3019 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3020 row_col_t bound; 3029 row_col_t bound;
3021 text_t *stp; 3030 text_t *stp;
3022 rend_t *srp; 3031 rend_t *srp;
… …
3096 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3097 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3098 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3099 */ 3108 */
3100void ecb_cold 3109void ecb_cold
3101rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3110rxvt_term::selection_extend (int x, int y, int flag) noexcept
3102{ 3111{
3103 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3104 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3105 3114
3106 /* 3115 /*
… …
3132/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3133/* 3142/*
3134 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3135 */ 3144 */
3136void ecb_cold 3145void ecb_cold
3137rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3138{ 3147{
3139 row_col_t pos; 3148 row_col_t pos;
3140 enum { 3149 enum {
3141 LEFT, RIGHT 3150 LEFT, RIGHT
3142 } closeto = RIGHT; 3151 } closeto = RIGHT;
3143
3144 want_refresh = 1;
3145 3152
3146 switch (selection.op) 3153 switch (selection.op)
3147 { 3154 {
3148 case SELECTION_INIT: 3155 case SELECTION_INIT:
3149 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3329 3336
3330#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3331 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3332 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3333#endif 3340#endif
3341
3342 selection_changed ();
3334} 3343}
3335 3344
3336#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3337void ecb_cold 3346void ecb_cold
3338rxvt_term::selection_remove_trailing_spaces () NOTHROW 3347rxvt_term::selection_remove_trailing_spaces () noexcept
3339{ 3348{
3340 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3341 text_t *stp; 3350 text_t *stp;
3342 3351
3343 end_col = selection.end.col; 3352 end_col = selection.end.col;
… …
3381/* 3390/*
3382 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3383 * EXT: button 3 double click 3392 * EXT: button 3 double click
3384 */ 3393 */
3385void ecb_cold 3394void ecb_cold
3386rxvt_term::selection_rotate (int x, int y) NOTHROW 3395rxvt_term::selection_rotate (int x, int y) noexcept
3387{ 3396{
3388 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3389 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3390} 3399}
3391 3400
… …
3393/* 3402/*
3394 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3395 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3396 */ 3405 */
3397void ecb_cold 3406void ecb_cold
3398rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3399{ 3408{
3400 Atom property = rq.property == None ? rq.target : rq.property; 3409 Atom property = rq.property == None ? rq.target : rq.property;
3401 XSelectionEvent ev; 3410 XSelectionEvent ev;
3402 3411
3403 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
… …
3495 cl = selection.clip_text; 3504 cl = selection.clip_text;
3496 selectlen = selection.clip_len; 3505 selectlen = selection.clip_len;
3497 } 3506 }
3498 else 3507 else
3499 { 3508 {
3500 cl = L""; 3509 cl = (wchar_t *)L"";
3501 selectlen = 0; 3510 selectlen = 0;
3502 } 3511 }
3503 3512
3504#if !ENABLE_MINIMAL 3513#if !ENABLE_MINIMAL
3505 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3537} 3546}
3538 3547
3539/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3540#if USE_XIM 3549#if USE_XIM
3541void ecb_cold 3550void ecb_cold
3542rxvt_term::im_set_position (XPoint &pos) NOTHROW 3551rxvt_term::im_set_position (XPoint &pos) noexcept
3543{ 3552{
3544 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3545 3554
3546 XGetWindowAttributes (dpy, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3547 3556
… …
3550} 3559}
3551#endif 3560#endif
3552 3561
3553#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3554void 3563void
3555rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3556{ 3565{
3557 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3558 return; 3567 return;
3559 3568
3560 want_refresh = 1; 3569 want_refresh = 1;
… …
3605 *rp = r; 3614 *rp = r;
3606 } 3615 }
3607} 3616}
3608 3617
3609void 3618void
3610rxvt_term::scr_overlay_off () NOTHROW 3619rxvt_term::scr_overlay_off () noexcept
3611{ 3620{
3612 if (!ov.text) 3621 if (!ov.text)
3613 return; 3622 return;
3614 3623
3615 want_refresh = 1; 3624 want_refresh = 1;
… …
3623 delete [] ov.text; ov.text = 0; 3632 delete [] ov.text; ov.text = 0;
3624 delete [] ov.rend; ov.rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3625} 3634}
3626 3635
3627void 3636void
3628rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3629{ 3638{
3630 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3631 return; 3640 return;
3632 3641
3633 x++, y++; 3642 x++, y++;
… …
3635 ov.text[y][x] = text; 3644 ov.text[y][x] = text;
3636 ov.rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3637} 3646}
3638 3647
3639void 3648void
3640rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3641{ 3650{
3642 while (*s) 3651 while (*s)
3643 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3644} 3653}
3645 3654
3646void 3655void
3647rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3648{ 3657{
3649 while (*s) 3658 while (*s)
3650 { 3659 {
3651 text_t t = *s++; 3660 text_t t = *s++;
3652 int width = WCWIDTH (t); 3661 int width = WCWIDTH (t);
… …
3658 } 3667 }
3659 } 3668 }
3660} 3669}
3661 3670
3662void 3671void
3663rxvt_term::scr_swap_overlay () NOTHROW 3672rxvt_term::scr_swap_overlay () noexcept
3664{ 3673{
3665 if (!ov.text) 3674 if (!ov.text)
3666 return; 3675 return;
3667 3676
3668 // hide cursor if it is within the overlay area 3677 // hide cursor if it is within the overlay area

Diff Legend

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