ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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