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

Diff Legend

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