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.431 by root, Sun Jan 13 20:19:24 2013 UTC vs.
Revision 1.472 by root, Mon Aug 8 10:33:14 2022 UTC

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

Diff Legend

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