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