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.442 by sf-exg, Sat Mar 30 08:47:06 2013 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 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 {
… …
165/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
166 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
167 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
168 169
169void 170void
170rxvt_term::scr_alloc () NOTHROW 171rxvt_term::scr_alloc () noexcept
171{ 172{
172 int tsize = sizeof (text_t) * ncol; 173 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol; 174 int rsize = sizeof (rend_t) * ncol;
174 175
175 // we assume that rend_t size is a sufficient alignment 176 // we assume that rend_t size is a sufficient alignment
… …
290 * add or delete rows as appropriate 291 * add or delete rows as appropriate
291 */ 292 */
292 293
293 int common_col = min (prev_ncol, ncol); 294 int common_col = min (prev_ncol, ncol);
294 295
296 // resize swap_buf, blank drawn_buf
295 for (int row = min (nrow, prev_nrow); row--; ) 297 for (int row = min (nrow, prev_nrow); row--; )
296 { 298 {
297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 299 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
298 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);
299 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);
… …
303 305
304 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
305 int pend = MOD (term_start + top_row , prev_total_rows); 307 int pend = MOD (term_start + top_row , prev_total_rows);
306 int q = total_rows; // rewrapped row 308 int q = total_rows; // rewrapped row
307 309
308 if (top_row) 310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
309 { 312 {
310 // 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
311 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
312 // TODO: maybe optimise when width didn't change 315 // TODO: maybe optimise when width didn't change
313 316
… …
329 llen += prev_ncol; 332 llen += prev_ncol;
330 } 333 }
331 334
332 int qlines = max (0, (llen - 1) / ncol) + 1; 335 int qlines = max (0, (llen - 1) / ncol) + 1;
333 336
337 q -= qlines;
338
334 // drop partial lines completely 339 // drop partial lines completely
335 if (q < qlines) 340 if (q < 0)
336 break; 341 break;
337
338 q -= qlines;
339 342
340 int lofs = 0; 343 int lofs = 0;
341 line_t *qline; 344 line_t *qline;
342 345
343 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
… …
385 qline->is_longer (0); 388 qline->is_longer (0);
386 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 389 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
387 } 390 }
388 while (p != pend && q > 0); 391 while (p != pend && q > 0);
389 392
390 term_start = total_rows - nrow;
391 top_row = q - term_start;
392
393 // make sure all terminal lines exist 393 // make sure all terminal lines exist
394 while (top_row > 0) 394 while (top_row > 0)
395 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 395 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
396 } 396 }
397 else 397 else
398#endif
399 {
400 // wing, instead of wrap
398 { 401 do
399 // if no scrollback exists (yet), wing, instead of wrap
400
401 for (int row = min (nrow, prev_nrow); row--; )
402 { 402 {
403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 403 p = MOD (p - 1, prev_total_rows);
404 line_t &dst = row_buf [row]; 404 q--;
405 405
406 copy_line (dst, src); 406 copy_line (row_buf [q], prev_row_buf [p]);
407 } 407 }
408 while (p != pend);
408 409
409 for (int row = prev_nrow; row < nrow; row++) 410 screen.cur.row += nrow - prev_nrow;
410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
411
412 term_start = 0;
413 } 411 }
412
413 term_start = total_rows - nrow;
414 top_row = q - term_start;
414 415
415 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
416 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
417 } 418 }
418 419
420 // ensure drawn_buf, swap_buf and terminal rows are all initialized
419 for (int row = nrow; row--; ) 421 for (int row = nrow; row--; )
420 { 422 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 423 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 424 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 425 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
… …
440 442
441 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 443 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
442} 444}
443 445
444void ecb_cold 446void ecb_cold
445rxvt_term::scr_release () NOTHROW 447rxvt_term::scr_release () noexcept
446{ 448{
447 chunk_free (chunk, chunk_size); 449 chunk_free (chunk, chunk_size);
448 chunk = 0; 450 chunk = 0;
449 row_buf = 0; 451 row_buf = 0;
450 452
… …
469 scr_clear (true); 471 scr_clear (true);
470 scr_refresh (); 472 scr_refresh ();
471} 473}
472 474
473void ecb_cold 475void ecb_cold
474rxvt_term::scr_soft_reset () NOTHROW 476rxvt_term::scr_soft_reset () noexcept
475{ 477{
476 /* only affects modes, nothing drastic such as clearing the screen */ 478 /* only affects modes, nothing drastic such as clearing the screen */
477#if ENABLE_OVERLAY 479#if ENABLE_OVERLAY
478 scr_overlay_off (); 480 scr_overlay_off ();
479#endif 481#endif
… …
493 * Save and Restore cursor 495 * Save and Restore cursor
494 * XTERM_SEQ: Save cursor : ESC 7 496 * XTERM_SEQ: Save cursor : ESC 7
495 * XTERM_SEQ: Restore cursor: ESC 8 497 * XTERM_SEQ: Restore cursor: ESC 8
496 */ 498 */
497void 499void
498rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 500rxvt_term::scr_cursor (cursor_mode mode) noexcept
499{ 501{
500 screen_t *s; 502 screen_t *s;
501 503
502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 504#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
503 if (current_screen == SECONDARY) 505 if (current_screen == SECONDARY)
… …
534 assert (s->cur.row >= 0); 536 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 537 assert (s->cur.col >= 0);
536} 538}
537 539
538void 540void
539rxvt_term::scr_swap_screen () NOTHROW 541rxvt_term::scr_swap_screen () noexcept
540{ 542{
541 if (!option (Opt_secondaryScreen)) 543 if (!option (Opt_secondaryScreen))
542 return; 544 return;
543 545
544 for (int i = prev_nrow; i--; ) 546 for (int i = prev_nrow; i--; )
… …
592 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 594 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
593} 595}
594 596
595// clear WrapNext indicator, solidifying position on next line 597// clear WrapNext indicator, solidifying position on next line
596void 598void
597rxvt_term::scr_do_wrap () NOTHROW 599rxvt_term::scr_do_wrap () noexcept
598{ 600{
599 if (!(screen.flags & Screen_WrapNext)) 601 if (!(screen.flags & Screen_WrapNext))
600 return; 602 return;
601 603
602 screen.flags &= ~Screen_WrapNext; 604 screen.flags &= ~Screen_WrapNext;
… …
612/* ------------------------------------------------------------------------- */ 614/* ------------------------------------------------------------------------- */
613/* 615/*
614 * Change the colour for following text 616 * Change the colour for following text
615 */ 617 */
616void 618void
617rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 619rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
618{ 620{
619 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 621 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
620 color = fgbg; 622 color = fgbg;
621 623
622 if (fgbg == Color_fg) 624 if (fgbg == Color_fg)
623 rstyle = SET_FGCOLOR (rstyle, color); 625 rstyle = SET_FGCOLOR (rstyle, color);
624 else 626 else
… …
628/* ------------------------------------------------------------------------- */ 630/* ------------------------------------------------------------------------- */
629/* 631/*
630 * Change the rendition style for following text 632 * Change the rendition style for following text
631 */ 633 */
632void 634void
633rxvt_term::scr_rendition (int set, int style) NOTHROW 635rxvt_term::scr_rendition (int set, int style) noexcept
634{ 636{
635 if (set) 637 if (set)
636 rstyle |= style; 638 rstyle |= style;
637 else if (style == ~RS_None) 639 else if (style == ~RS_None)
638 rstyle = DEFAULT_RSTYLE; 640 rstyle = DEFAULT_RSTYLE;
… …
645 * Scroll text between <row1> and <row2> inclusive, by <count> lines 647 * Scroll text between <row1> and <row2> inclusive, by <count> lines
646 * count positive ==> scroll up 648 * count positive ==> scroll up
647 * count negative ==> scroll down 649 * count negative ==> scroll down
648 */ 650 */
649int ecb_hot 651int ecb_hot
650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 652rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
651{ 653{
652 if (count == 0 || (row1 > row2)) 654 if (count == 0 || (row1 > row2))
653 return 0; 655 return 0;
654 656
655 want_refresh = 1; 657 want_refresh = 1;
… …
789/* ------------------------------------------------------------------------- */ 791/* ------------------------------------------------------------------------- */
790/* 792/*
791 * Add text given in <str> of length <len> to screen struct 793 * Add text given in <str> of length <len> to screen struct
792 */ 794 */
793void ecb_hot 795void ecb_hot
794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 796rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
795{ 797{
796 if (len <= 0) /* sanity */ 798 if (len <= 0) /* sanity */
797 return; 799 return;
798 800
799 bool checksel; 801 bool checksel;
… …
1011 } 1013 }
1012 else if (screen.cur.row > 0 1014 else if (screen.cur.row > 0
1013 && ROW(screen.cur.row - 1).is_longer ()) 1015 && ROW(screen.cur.row - 1).is_longer ())
1014 { 1016 {
1015 linep = &ROW(screen.cur.row - 1); 1017 linep = &ROW(screen.cur.row - 1);
1016 tp = line->t + ncol - 1; 1018 tp = linep->t + ncol - 1;
1017 rp = line->r + ncol - 1; 1019 rp = linep->r + ncol - 1;
1018 } 1020 }
1019 else 1021 else
1020 continue; 1022 continue;
1021 1023
1022 linep->touch (); 1024 linep->touch ();
… …
1045/* 1047/*
1046 * Process Backspace. Move back the cursor back a position, wrap if have to 1048 * Process Backspace. Move back the cursor back a position, wrap if have to
1047 * XTERM_SEQ: CTRL-H 1049 * XTERM_SEQ: CTRL-H
1048 */ 1050 */
1049void 1051void
1050rxvt_term::scr_backspace () NOTHROW 1052rxvt_term::scr_backspace () noexcept
1051{ 1053{
1052 if (screen.cur.col == 0) 1054 if (screen.cur.col == 0)
1053 { 1055 {
1054 if (screen.cur.row > 0) 1056 if (screen.cur.row > 0)
1055 { 1057 {
… …
1072 * Process Horizontal Tab 1074 * Process Horizontal Tab
1073 * count: +ve = forward; -ve = backwards 1075 * count: +ve = forward; -ve = backwards
1074 * XTERM_SEQ: CTRL-I 1076 * XTERM_SEQ: CTRL-I
1075 */ 1077 */
1076void 1078void
1077rxvt_term::scr_tab (int count, bool ht) NOTHROW 1079rxvt_term::scr_tab (int count, bool ht) noexcept
1078{ 1080{
1079 int i, x; 1081 int i, x;
1080 1082
1081 want_refresh = 1; 1083 want_refresh = 1;
1082 i = x = screen.cur.col; 1084 i = x = screen.cur.col;
… …
1149 * Move cursor left in row. If we're at the left boundary, shift everything 1151 * Move cursor left in row. If we're at the left boundary, shift everything
1150 * in that row right. Clear left column. 1152 * in that row right. Clear left column.
1151 */ 1153 */
1152#if !ENABLE_MINIMAL 1154#if !ENABLE_MINIMAL
1153void ecb_cold 1155void ecb_cold
1154rxvt_term::scr_backindex () NOTHROW 1156rxvt_term::scr_backindex () noexcept
1155{ 1157{
1156 if (screen.cur.col > 0) 1158 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1159 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1160 else
1159 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
… …
1166 * Move cursor right in row. If we're at the right boundary, shift everything 1168 * Move cursor right in row. If we're at the right boundary, shift everything
1167 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1168 */ 1170 */
1169#if !ENABLE_MINIMAL 1171#if !ENABLE_MINIMAL
1170void ecb_cold 1172void ecb_cold
1171rxvt_term::scr_forwardindex () NOTHROW 1173rxvt_term::scr_forwardindex () noexcept
1172{ 1174{
1173 if (screen.cur.col < ncol - 1) 1175 if (screen.cur.col < ncol - 1)
1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1176 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1175 else 1177 else
1176 { 1178 {
… …
1189/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1190/* 1192/*
1191 * Goto Row/Column 1193 * Goto Row/Column
1192 */ 1194 */
1193void 1195void
1194rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1196rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1195{ 1197{
1196 want_refresh = 1; 1198 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1198 1200
1199 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1238/* ------------------------------------------------------------------------- */ 1240/* ------------------------------------------------------------------------- */
1239/* 1241/*
1240 * direction should be UP or DN 1242 * direction should be UP or DN
1241 */ 1243 */
1242void 1244void
1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1245rxvt_term::scr_index (enum page_dirn direction) noexcept
1244{ 1246{
1245 want_refresh = 1; 1247 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1248 ZERO_SCROLLBACK ();
1247 1249
1248 screen.flags &= ~Screen_WrapNext; 1250 screen.flags &= ~Screen_WrapNext;
… …
1264 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1265 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1266 * extension: clear to right unless wrapped: ESC [ 3 K 1268 * extension: clear to right unless wrapped: ESC [ 3 K
1267 */ 1269 */
1268void 1270void
1269rxvt_term::scr_erase_line (int mode) NOTHROW 1271rxvt_term::scr_erase_line (int mode) noexcept
1270{ 1272{
1271 unsigned int col, num; 1273 unsigned int col, num;
1272 1274
1273 want_refresh = 1; 1275 want_refresh = 1;
1274 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
… …
1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1331 */ 1333 */
1332void 1334void
1333rxvt_term::scr_erase_screen (int mode) NOTHROW 1335rxvt_term::scr_erase_screen (int mode) noexcept
1334{ 1336{
1335 int num; 1337 int num;
1336 int32_t row; 1338 int32_t row;
1337 rend_t ren; 1339 rend_t ren;
1338 XGCValues gcvalue; 1340 XGCValues gcvalue;
… …
1408 } 1410 }
1409} 1411}
1410 1412
1411#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1412void 1414void
1413rxvt_term::scr_erase_savelines () NOTHROW 1415rxvt_term::scr_erase_savelines () noexcept
1414{ 1416{
1415 want_refresh = 1; 1417 want_refresh = 1;
1416 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1417 1419
1418 top_row = 0; 1420 top_row = 0;
… …
1423/* 1425/*
1424 * Fill the screen with `E's 1426 * Fill the screen with `E's
1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1426 */ 1428 */
1427void ecb_cold 1429void ecb_cold
1428rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () noexcept
1429{ 1431{
1430 rend_t fs; 1432 rend_t fs;
1431 1433
1432 want_refresh = 1; 1434 want_refresh = 1;
1433 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
… …
1458/* ------------------------------------------------------------------------- */ 1460/* ------------------------------------------------------------------------- */
1459/* 1461/*
1460 * Insert/Delete <count> lines 1462 * Insert/Delete <count> lines
1461 */ 1463 */
1462void 1464void
1463rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1464{ 1466{
1465 int end; 1467 int end;
1466 1468
1467 ZERO_SCROLLBACK (); 1469 ZERO_SCROLLBACK ();
1468 1470
… …
1488/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
1489/* 1491/*
1490 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1491 */ 1493 */
1492void 1494void
1493rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1494{ 1496{
1495 want_refresh = 1; 1497 want_refresh = 1;
1496 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1497 1499
1498 if (count <= 0) 1500 if (count <= 0)
… …
1597/* 1599/*
1598 * Set the scrolling region 1600 * Set the scrolling region
1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1600 */ 1602 */
1601void ecb_cold 1603void ecb_cold
1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) noexcept
1603{ 1605{
1604 max_it (top, 0); 1606 max_it (top, 0);
1605 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1606 1608
1607 if (top > bot) 1609 if (top > bot)
… …
1617 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1620 */ 1622 */
1621void ecb_cold 1623void ecb_cold
1622rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) noexcept
1623{ 1625{
1624 want_refresh = 1; 1626 want_refresh = 1;
1625 1627
1626 if (mode) 1628 if (mode)
1627 screen.flags |= Screen_VisibleCursor; 1629 screen.flags |= Screen_VisibleCursor;
… …
1634 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1637 */ 1639 */
1638void ecb_cold 1640void ecb_cold
1639rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) noexcept
1640{ 1642{
1641 if (mode) 1643 if (mode)
1642 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1643 else 1645 else
1644 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1646 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1653 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1656 */ 1658 */
1657void ecb_cold 1659void ecb_cold
1658rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) noexcept
1659{ 1661{
1660 if (mode) 1662 if (mode)
1661 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1662 else 1664 else
1663 screen.flags &= ~Screen_Relative; 1665 screen.flags &= ~Screen_Relative;
… …
1670 * Set insert/replace mode 1672 * Set insert/replace mode
1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1673 */ 1675 */
1674void ecb_cold 1676void ecb_cold
1675rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) noexcept
1676{ 1678{
1677 if (mode) 1679 if (mode)
1678 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1679 else 1681 else
1680 screen.flags &= ~Screen_Insert; 1682 screen.flags &= ~Screen_Insert;
… …
1686 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1689 */ 1691 */
1690void ecb_cold 1692void ecb_cold
1691rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) noexcept
1692{ 1694{
1693 if (mode < 0) 1695 if (mode < 0)
1694 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1695 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
1696 tabs [screen.cur.col] = !!mode; 1698 tabs [screen.cur.col] = !!mode;
… …
1701 * Set reverse/normal video 1703 * Set reverse/normal video
1702 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1704 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1703 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1705 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1704 */ 1706 */
1705void 1707void
1706rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1708rxvt_term::scr_rvideo_mode (bool on) noexcept
1707{ 1709{
1708 rvideo_mode = on; 1710 rvideo_mode = on;
1709 1711
1710#ifndef NO_BELL 1712#ifndef NO_BELL
1711 on ^= rvideo_bell; 1713 on ^= rvideo_bell;
… …
1713 1715
1714 if (rvideo_state != on) 1716 if (rvideo_state != on)
1715 { 1717 {
1716 rvideo_state = on; 1718 rvideo_state = on;
1717 1719
1720#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade])
1722 {
1723 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1724 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1725 }
1726 else
1727#endif
1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1728 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1719#ifdef HAVE_IMG 1729#ifdef HAVE_IMG
1720 if (bg_img == 0) 1730 if (bg_img == 0)
1721#endif 1731#endif
1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1732 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1735/* 1745/*
1736 * Report current cursor position 1746 * Report current cursor position
1737 * XTERM_SEQ: Report position: ESC [ 6 n 1747 * XTERM_SEQ: Report position: ESC [ 6 n
1738 */ 1748 */
1739void ecb_cold 1749void ecb_cold
1740rxvt_term::scr_report_position () NOTHROW 1750rxvt_term::scr_report_position () noexcept
1741{ 1751{
1742 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1752 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1743} 1753}
1744 1754
1745/* ------------------------------------------------------------------------- * 1755/* ------------------------------------------------------------------------- *
… …
1748 1758
1749/* 1759/*
1750 * Set font style 1760 * Set font style
1751 */ 1761 */
1752void ecb_cold 1762void ecb_cold
1753rxvt_term::set_font_style () NOTHROW 1763rxvt_term::set_font_style () noexcept
1754{ 1764{
1755#if 0 1765#if 0
1756 switch (charsets [screen.charset]) 1766 switch (charsets [screen.charset])
1757 { 1767 {
1758 case '0': /* DEC Special Character & Line Drawing Set */ 1768 case '0': /* DEC Special Character & Line Drawing Set */
… …
1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1790 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1781 * XTERM_SEQ: Invoke G2 character set: ESC N 1791 * XTERM_SEQ: Invoke G2 character set: ESC N
1782 * XTERM_SEQ: Invoke G3 character set: ESC O 1792 * XTERM_SEQ: Invoke G3 character set: ESC O
1783 */ 1793 */
1784void ecb_cold 1794void ecb_cold
1785rxvt_term::scr_charset_choose (int set) NOTHROW 1795rxvt_term::scr_charset_choose (int set) noexcept
1786{ 1796{
1787 screen.charset = set; 1797 screen.charset = set;
1788 set_font_style (); 1798 set_font_style ();
1789} 1799}
1790 1800
… …
1796 * XTERM_SEQ: Set G2 character set: ESC * <C> 1806 * XTERM_SEQ: Set G2 character set: ESC * <C>
1797 * XTERM_SEQ: Set G3 character set: ESC + <C> 1807 * XTERM_SEQ: Set G3 character set: ESC + <C>
1798 * See set_font_style for possible values for <C> 1808 * See set_font_style for possible values for <C>
1799 */ 1809 */
1800void 1810void
1801rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1811rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1802{ 1812{
1803 charsets[set] = (unsigned char)ch; 1813 charsets[set] = (unsigned char)ch;
1804 set_font_style (); 1814 set_font_style ();
1805} 1815}
1806 1816
… …
1811 1821
1812/* 1822/*
1813 * refresh matching text. 1823 * refresh matching text.
1814 */ 1824 */
1815bool ecb_cold 1825bool ecb_cold
1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1826rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1817{ 1827{
1818 bool found = false; 1828 bool found = false;
1819 1829
1820 for (int i = 0; i < nrow; i++) 1830 for (int i = 0; i < nrow; i++)
1821 { 1831 {
… …
1840 PART_END, 1850 PART_END,
1841 RC_COUNT 1851 RC_COUNT
1842}; 1852};
1843 1853
1844void ecb_hot 1854void ecb_hot
1845rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1855rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1846{ 1856{
1847 int i; 1857 int i;
1848 row_col_t rc[RC_COUNT]; 1858 row_col_t rc[RC_COUNT];
1849 1859
1850 if (!drawn_buf) /* sanity check */ 1860 if (!drawn_buf) /* sanity check */
… …
1884/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1885/* 1895/*
1886 * Refresh the entire screen 1896 * Refresh the entire screen
1887 */ 1897 */
1888void 1898void
1889rxvt_term::scr_touch (bool refresh) NOTHROW 1899rxvt_term::scr_touch (bool refresh) noexcept
1890{ 1900{
1891 scr_expose (0, 0, vt_width, vt_height, refresh); 1901 scr_expose (0, 0, vt_width, vt_height, refresh);
1892} 1902}
1893 1903
1894/* ------------------------------------------------------------------------- */ 1904/* ------------------------------------------------------------------------- */
1895/* 1905/*
1896 * Move the display so that the line represented by scrollbar value Y is at 1906 * Move the display so that the line represented by scrollbar value Y is at
1897 * the top of the screen 1907 * the top of the screen
1898 */ 1908 */
1899void 1909void
1900rxvt_term::scr_move_to (int y, int len) NOTHROW 1910rxvt_term::scr_move_to (int y, int len) noexcept
1901{ 1911{
1902 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1912 // lerp (y, 0, len, top_row, nrow - 1)
1913 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1903} 1914}
1904 1915
1905/* ------------------------------------------------------------------------- */ 1916/* ------------------------------------------------------------------------- */
1906/* 1917/*
1907 * Page the screen up/down nlines 1918 * Page the screen up/down nlines
1908 * direction should be UP or DN 1919 * direction should be UP or DN
1909 */ 1920 */
1910bool 1921bool
1911rxvt_term::scr_page (int nlines) NOTHROW 1922rxvt_term::scr_page (int nlines) noexcept
1912{ 1923{
1913 return scr_changeview (view_start - nlines); 1924 return scr_changeview (view_start - nlines);
1914} 1925}
1915 1926
1916bool 1927bool
1917rxvt_term::scr_changeview (int new_view_start) NOTHROW 1928rxvt_term::scr_changeview (int new_view_start) noexcept
1918{ 1929{
1919 clamp_it (new_view_start, top_row, 0); 1930 clamp_it (new_view_start, top_row, 0);
1920 1931
1921 if (new_view_start == view_start) 1932 if (new_view_start == view_start)
1922 return false; 1933 return false;
… …
1940} 1951}
1941#endif 1952#endif
1942 1953
1943/* ------------------------------------------------------------------------- */ 1954/* ------------------------------------------------------------------------- */
1944void 1955void
1945rxvt_term::scr_bell () NOTHROW 1956rxvt_term::scr_bell () noexcept
1946{ 1957{
1947#ifndef NO_BELL 1958#ifndef NO_BELL
1948 1959
1949# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1950# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
… …
1972#endif 1983#endif
1973} 1984}
1974 1985
1975/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1976void ecb_cold 1987void ecb_cold
1977rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) noexcept
1978{ 1989{
1979#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1980 int nrows, row_start; 1991 int nrows, row_start;
1981 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
1982 1993
… …
2031 * Refresh the screen 2042 * Refresh the screen
2032 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2033 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2034 */ 2045 */
2035void ecb_hot 2046void ecb_hot
2036rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () noexcept
2037{ 2048{
2038 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2039 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2040 int i; /* tmp */ 2051 int i; /* tmp */
2041 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
… …
2117 ccol2 = bgcolor_of (rstyle); 2128 ccol2 = bgcolor_of (rstyle);
2118#else 2129#else
2119 ccol2 = Color_bg; 2130 ccol2 = Color_bg;
2120#endif 2131#endif
2121 2132
2122 if (focus) 2133 if (focus && cursor_type == 0)
2123 { 2134 {
2124 rend_t rend = cur_rend; 2135 rend_t rend = cur_rend;
2125 2136
2126 if (option (Opt_cursorUnderline))
2127 rend ^= RS_Uline;
2128 else
2129 {
2130 rend ^= RS_RVid; 2137 rend ^= RS_RVid;
2131 rend = SET_FGCOLOR (rend, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2132 rend = SET_BGCOLOR (rend, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2133 }
2134 2140
2135 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2141 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2136 } 2142 }
2137 } 2143 }
2138 2144
2139 /* make sure no outline cursor is left around */ 2145 /* make sure no outline cursor is left around */
2140 if (ocrow != -1) 2146 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2141 {
2142 if (screen.cur.row - view_start != ocrow
2143 || screen.cur.col != oldcursor.col)
2144 {
2145 if (ocrow < nrow
2146 && oldcursor.col < ncol)
2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2148 }
2149 }
2150 2148
2151 // save the current cursor coordinates if the cursor is visible 2149 // save the current cursor coordinates if the cursor is visible
2152 // and the window is unfocused, so as to clear the outline cursor 2150 // and either the window is unfocused or the cursor style is
2151 // underline or vertical bar, so as to clear the outline cursor in
2153 // in the next refresh if the cursor moves 2152 // the next refresh if the cursor moves or becomes invisible
2154 if (showcursor && !focus && screen.cur.row - view_start < nrow) 2153 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2155 { 2154 {
2156 oldcursor.row = screen.cur.row - view_start; 2155 oldcursor.row = screen.cur.row - view_start;
2157 oldcursor.col = screen.cur.col; 2156 oldcursor.col = screen.cur.col;
2158 } 2157 }
2159 else 2158 else
… …
2246 int ypixel = (int)Row2Pixel (row); 2245 int ypixel = (int)Row2Pixel (row);
2247 2246
2248 for (col = 0; col < ncol; col++) 2247 for (col = 0; col < ncol; col++)
2249 { 2248 {
2250 /* compare new text with old - if exactly the same then continue */ 2249 /* compare new text with old - if exactly the same then continue */
2251 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2250 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2252 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2253 || (stp[col] == ' ' /* space w/ no background change */
2254 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2255 continue; 2251 continue;
2256 2252
2257 // redraw one or more characters 2253 // redraw one or more characters
2258 2254
2259 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
… …
2455 * G: cleanup cursor and display outline cursor if necessary 2451 * G: cleanup cursor and display outline cursor if necessary
2456 */ 2452 */
2457 if (showcursor) 2453 if (showcursor)
2458 { 2454 {
2459 if (focus) 2455 if (focus)
2456 {
2457 if (cursor_type == 0)
2460 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2458 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2459 else if (oldcursor.row >= 0)
2460 {
2461 XSetForeground (dpy, gc, pix_colors[ccol1]);
2462 if (cursor_type == 1)
2463 XFillRectangle (dpy, vt, gc,
2464 Col2Pixel (cur_col),
2465 Row2Pixel (oldcursor.row + 1) - 2,
2466 Width2Pixel (1),
2467 2);
2468 else
2469 XFillRectangle (dpy, vt, gc,
2470 Col2Pixel (cur_col),
2471 Row2Pixel (oldcursor.row),
2472 2,
2473 Height2Pixel (1));
2474 }
2475 }
2461 else if (oldcursor.row >= 0) 2476 else if (oldcursor.row >= 0)
2462 { 2477 {
2463 XSetForeground (dpy, gc, pix_colors[ccol1]); 2478 XSetForeground (dpy, gc, pix_colors[ccol1]);
2464 2479
2465 XDrawRectangle (dpy, vt, gc, 2480 XDrawRectangle (dpy, vt, gc,
… …
2484 num_scr = 0; 2499 num_scr = 0;
2485 num_scr_allow = 1; 2500 num_scr_allow = 1;
2486} 2501}
2487 2502
2488void ecb_cold 2503void ecb_cold
2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2504rxvt_term::scr_remap_chars (line_t &l) noexcept
2490{ 2505{
2491 if (!l.valid ()) 2506 if (!l.valid ())
2492 return; 2507 return;
2493 2508
2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2509 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2496 for (int i = ncol; i--; ) 2511 for (int i = ncol; i--; )
2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2512 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2498} 2513}
2499 2514
2500void ecb_cold 2515void ecb_cold
2501rxvt_term::scr_remap_chars () NOTHROW 2516rxvt_term::scr_remap_chars () noexcept
2502{ 2517{
2503 for (int i = total_rows; i--; ) 2518 for (int i = total_rows; i--; )
2504 scr_remap_chars (row_buf [i]); 2519 scr_remap_chars (row_buf [i]);
2505 2520
2506 for (int i = nrow; i--; ) 2521 for (int i = nrow; i--; )
… …
2509 scr_remap_chars (swap_buf [i]); 2524 scr_remap_chars (swap_buf [i]);
2510 } 2525 }
2511} 2526}
2512 2527
2513void ecb_cold 2528void ecb_cold
2514rxvt_term::scr_recolour (bool refresh) NOTHROW 2529rxvt_term::scr_recolor (bool refresh) noexcept
2515{ 2530{
2516 bool transparent = false; 2531 bool transparent = false;
2517 2532
2518#ifdef HAVE_IMG 2533#ifdef HAVE_IMG
2519 if (bg_img != 0) 2534 if (bg_img != 0)
… …
2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2555 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 } 2556 }
2542 2557
2543 XClearWindow (dpy, parent); 2558 XClearWindow (dpy, parent);
2544 2559
2545 if (scrollBar.win) 2560 if (scrollBar.state && scrollBar.win)
2546 { 2561 {
2547 if (transparent) 2562 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2563 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else 2564 else
2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2565 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2560 want_refresh = 1; 2575 want_refresh = 1;
2561} 2576}
2562 2577
2563/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2564void 2579void
2565rxvt_term::scr_clear (bool really) NOTHROW 2580rxvt_term::scr_clear (bool really) noexcept
2566{ 2581{
2567 if (!mapped) 2582 if (!mapped)
2568 return; 2583 return;
2569 2584
2570 num_scr_allow = 0; 2585 num_scr_allow = 0;
… …
2573 if (really) 2588 if (really)
2574 XClearWindow (dpy, vt); 2589 XClearWindow (dpy, vt);
2575} 2590}
2576 2591
2577void 2592void
2578rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2593rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2579{ 2594{
2580 int view_end = view_start + nrow; 2595 int view_end = view_start + nrow;
2581 int row, col; 2596 int row, col;
2582 2597
2583 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2598 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2595 srp[col] ^= rstyle2; 2610 srp[col] ^= rstyle2;
2596 } 2611 }
2597} 2612}
2598 2613
2599void 2614void
2600rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2615rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2601{ 2616{
2602 int view_end = view_start + nrow; 2617 int view_end = view_start + nrow;
2603 int row, col; 2618 int row, col;
2604 2619
2605 if (beg_row >= view_start) 2620 if (beg_row >= view_start)
… …
2622 srp[col] ^= rstyle; 2637 srp[col] ^= rstyle;
2623} 2638}
2624 2639
2625/* ------------------------------------------------------------------------- */ 2640/* ------------------------------------------------------------------------- */
2626void ecb_hot 2641void ecb_hot
2627rxvt_term::scr_reverse_selection () NOTHROW 2642rxvt_term::scr_reverse_selection () noexcept
2628{ 2643{
2629 if (selection.op 2644 if (selection.op
2630 && current_screen == selection.screen 2645 && current_screen == selection.screen
2631 && selection.end.row >= view_start) 2646 && selection.end.row >= view_start)
2632 { 2647 {
… …
2648 * Dump the whole scrollback and screen to the passed filedescriptor. The 2663 * Dump the whole scrollback and screen to the passed filedescriptor. The
2649 * invoking routine must close the fd. 2664 * invoking routine must close the fd.
2650 */ 2665 */
2651#if 0 2666#if 0
2652void 2667void
2653rxvt_term::scr_dump (int fd) NOTHROW 2668rxvt_term::scr_dump (int fd) noexcept
2654{ 2669{
2655 // if this method is needed, it can be implemented by factoring the 2670 // if this method is needed, it can be implemented by factoring the
2656 // relevant code in scr_printscreen 2671 // relevant code in scr_printscreen
2657} 2672}
2658#endif 2673#endif
2659 2674
2660/* ------------------------------------------------------------------------- * 2675/* ------------------------------------------------------------------------- *
2661 * CHARACTER SELECTION * 2676 * CHARACTER SELECTION *
2662 * ------------------------------------------------------------------------- */ 2677 * ------------------------------------------------------------------------- */
2663void 2678void
2664rxvt_term::selection_check (int check_more) NOTHROW 2679rxvt_term::selection_check (int check_more) noexcept
2665{ 2680{
2666 if (!selection.op) 2681 if (!selection.op)
2667 return; 2682 return;
2668 2683
2669 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2684 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2675 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2690 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2676 CLEAR_ALL_SELECTION (); 2691 CLEAR_ALL_SELECTION ();
2677} 2692}
2678 2693
2679void 2694void
2680rxvt_term::selection_changed () NOTHROW 2695rxvt_term::selection_changed () noexcept
2681{ 2696{
2682 line_t &r1 = ROW (selection.beg.row); 2697 line_t &r1 = ROW (selection.beg.row);
2683 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2698 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2684 --selection.beg.col; 2699 ++selection.beg.col;
2685 2700
2686 line_t &r2 = ROW (selection.end.row); 2701 line_t &r2 = ROW (selection.end.row);
2687 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2702 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2688 ++selection.end.col; 2703 ++selection.end.col;
2689 2704
… …
2693/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2694/* 2709/*
2695 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2696 */ 2711 */
2697void 2712void
2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2699{ 2714{
2700 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2701 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2702 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2703 data[i] = C0_CR; 2718 data[i] = C0_CR;
2704 2719
2705 if (priv_modes & PrivMode_BracketPaste) 2720 #if ENABLE_FRILLS
2721 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2706 tt_printf ("\x1b[200~"); 2722 tt_printf ("\x1b[200~");
2723 #endif
2707 2724
2708 tt_write (data, len); 2725 tt_write (data, len);
2709 2726
2710 if (priv_modes & PrivMode_BracketPaste) 2727 #if ENABLE_FRILLS
2728 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2711 tt_printf ("\x1b[201~"); 2729 tt_printf ("\x1b[201~");
2730 #endif
2712} 2731}
2713 2732
2714void 2733void
2715rxvt_term::paste (char *data, unsigned int len) NOTHROW 2734rxvt_term::paste (char *data, unsigned int len) noexcept
2716{ 2735{
2717 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2736 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2718 return; 2737 return;
2719 2738
2720 tt_paste (data, len); 2739 tt_paste (data, len);
… …
2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2745 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2727 * as fallback 2746 * as fallback
2728 * EXT: button 2 release 2747 * EXT: button 2 release
2729 */ 2748 */
2730void 2749void
2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) noexcept
2732{ 2751{
2733 if (!selection_req) 2752 if (!selection_req)
2734 { 2753 {
2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2736 selection_req->run (); 2755 selection_req->run ();
… …
2741/* 2760/*
2742 * Clear all selected text 2761 * Clear all selected text
2743 * EXT: SelectionClear 2762 * EXT: SelectionClear
2744 */ 2763 */
2745void 2764void
2746rxvt_term::selection_clear (bool clipboard) NOTHROW 2765rxvt_term::selection_clear (bool clipboard) noexcept
2747{ 2766{
2748 if (!clipboard) 2767 if (!clipboard)
2749 { 2768 {
2750 want_refresh = 1; 2769 want_refresh = 1;
2751 free (selection.text); 2770 free (selection.text);
… …
2836 if (*t == NOCHAR) 2855 if (*t == NOCHAR)
2837 t++; 2856 t++;
2838#if ENABLE_COMBINING 2857#if ENABLE_COMBINING
2839 else if (IS_COMPOSE (*t)) 2858 else if (IS_COMPOSE (*t))
2840 { 2859 {
2841 int len = rxvt_composite.expand (*t, 0); 2860 int len = rxvt_composite.expand (*t);
2842 2861
2843 extra -= (len - 1); 2862 extra -= (len - 1);
2844 2863
2845 if (extra < 0) 2864 if (extra < 0)
2846 { 2865 {
… …
2893 2912
2894 selection_grab (tm); 2913 selection_grab (tm);
2895} 2914}
2896 2915
2897bool 2916bool
2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2899{ 2918{
2900 Atom sel; 2919 Atom sel;
2901 2920
2902 if (!clipboard) 2921 if (!clipboard)
2903 { 2922 {
… …
2937/* 2956/*
2938 * Mark or select text based upon number of clicks: 1, 2, or 3 2957 * Mark or select text based upon number of clicks: 1, 2, or 3
2939 * EXT: button 1 press 2958 * EXT: button 1 press
2940 */ 2959 */
2941void ecb_cold 2960void ecb_cold
2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2961rxvt_term::selection_click (int clicks, int x, int y) noexcept
2943{ 2962{
2944 clicks = ((clicks - 1) % 3) + 1; 2963 clicks = ((clicks - 1) % 3) + 1;
2945 selection.clicks = clicks; /* save clicks so extend will work */ 2964 selection.clicks = clicks; /* save clicks so extend will work */
2946 2965
2947 if (clicks == 2 && !selection.rect 2966 if (clicks == 2 && !selection.rect
… …
2966/* ------------------------------------------------------------------------- */ 2985/* ------------------------------------------------------------------------- */
2967/* 2986/*
2968 * Mark a selection at the specified col/row 2987 * Mark a selection at the specified col/row
2969 */ 2988 */
2970void ecb_cold 2989void ecb_cold
2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2990rxvt_term::selection_start_colrow (int col, int row) noexcept
2972{ 2991{
2973 want_refresh = 1; 2992 want_refresh = 1;
2974 2993
2975 selection.mark.row = row + view_start; 2994 selection.mark.row = row + view_start;
2976 selection.mark.col = col; 2995 selection.mark.col = col;
… …
3003#define DELIMIT_TEXT(x) \ 3022#define DELIMIT_TEXT(x) \
3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3023 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3005#define DELIMIT_REND(x) 1 3024#define DELIMIT_REND(x) 1
3006 3025
3007void ecb_cold 3026void ecb_cold
3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3027rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3009{ 3028{
3010 int col, row, dirnadd, tcol, trow, w1, w2; 3029 int col, row, dirnadd, tcol, trow, w1, w2;
3011 row_col_t bound; 3030 row_col_t bound;
3012 text_t *stp; 3031 text_t *stp;
3013 rend_t *srp; 3032 rend_t *srp;
… …
3072 break; 3091 break;
3073 } 3092 }
3074 3093
3075 if (dirn == DN) 3094 if (dirn == DN)
3076 col++; /* put us on one past the end */ 3095 col++; /* put us on one past the end */
3077 else
3078 {
3079 // if the delimiter on the left has width > 1 col points to the
3080 // first NOCHAR in the delimiter cell and so we must move it to the
3081 // beginning of the next cell.
3082 while (ROW(row).t[col] == NOCHAR)
3083 col++;
3084 }
3085 3096
3086 /* Poke the values back in */ 3097 /* Poke the values back in */
3087 ret->row = row; 3098 ret->row = row;
3088 ret->col = col; 3099 ret->col = col;
3089} 3100}
… …
3095 * flag == 0 ==> button 1 3106 * flag == 0 ==> button 1
3096 * flag == 1 ==> button 3 press 3107 * flag == 1 ==> button 3 press
3097 * flag == 2 ==> button 3 motion 3108 * flag == 2 ==> button 3 motion
3098 */ 3109 */
3099void ecb_cold 3110void ecb_cold
3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3111rxvt_term::selection_extend (int x, int y, int flag) noexcept
3101{ 3112{
3102 int col = clamp (Pixel2Col (x), 0, ncol); 3113 int col = clamp (Pixel2Col (x), 0, ncol);
3103 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3114 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3104 3115
3105 /* 3116 /*
… …
3131/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3132/* 3143/*
3133 * Extend the selection to the specified col/row 3144 * Extend the selection to the specified col/row
3134 */ 3145 */
3135void ecb_cold 3146void ecb_cold
3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3147rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3137{ 3148{
3138 row_col_t pos; 3149 row_col_t pos;
3139 enum { 3150 enum {
3140 LEFT, RIGHT 3151 LEFT, RIGHT
3141 } closeto = RIGHT; 3152 } closeto = RIGHT;
… …
3332 selection_changed (); 3343 selection_changed ();
3333} 3344}
3334 3345
3335#if !ENABLE_MINIMAL 3346#if !ENABLE_MINIMAL
3336void ecb_cold 3347void ecb_cold
3337rxvt_term::selection_remove_trailing_spaces () NOTHROW 3348rxvt_term::selection_remove_trailing_spaces () noexcept
3338{ 3349{
3339 int32_t end_col, end_row; 3350 int32_t end_col, end_row;
3340 text_t *stp; 3351 text_t *stp;
3341 3352
3342 end_col = selection.end.col; 3353 end_col = selection.end.col;
… …
3380/* 3391/*
3381 * Double click on button 3 when already selected 3392 * Double click on button 3 when already selected
3382 * EXT: button 3 double click 3393 * EXT: button 3 double click
3383 */ 3394 */
3384void ecb_cold 3395void ecb_cold
3385rxvt_term::selection_rotate (int x, int y) NOTHROW 3396rxvt_term::selection_rotate (int x, int y) noexcept
3386{ 3397{
3387 selection.clicks = selection.clicks % 3 + 1; 3398 selection.clicks = selection.clicks % 3 + 1;
3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3389} 3400}
3390 3401
… …
3392/* 3403/*
3393 * Respond to a request for our current selection 3404 * Respond to a request for our current selection
3394 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3395 */ 3406 */
3396void ecb_cold 3407void ecb_cold
3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3398{ 3409{
3399 Atom property = rq.property == None ? rq.target : rq.property; 3410 Atom property = rq.property == None ? rq.target : rq.property;
3400 XSelectionEvent ev; 3411 XSelectionEvent ev;
3401 3412
3402 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
… …
3494 cl = selection.clip_text; 3505 cl = selection.clip_text;
3495 selectlen = selection.clip_len; 3506 selectlen = selection.clip_len;
3496 } 3507 }
3497 else 3508 else
3498 { 3509 {
3499 cl = L""; 3510 cl = (wchar_t *)L"";
3500 selectlen = 0; 3511 selectlen = 0;
3501 } 3512 }
3502 3513
3503#if !ENABLE_MINIMAL 3514#if !ENABLE_MINIMAL
3504 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3515 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3536} 3547}
3537 3548
3538/* ------------------------------------------------------------------------- */ 3549/* ------------------------------------------------------------------------- */
3539#if USE_XIM 3550#if USE_XIM
3540void ecb_cold 3551void ecb_cold
3541rxvt_term::im_set_position (XPoint &pos) NOTHROW 3552rxvt_term::im_set_position (XPoint &pos) noexcept
3542{ 3553{
3543 XWindowAttributes xwa; 3554 XWindowAttributes xwa;
3544 3555
3545 XGetWindowAttributes (dpy, vt, &xwa); 3556 XGetWindowAttributes (dpy, vt, &xwa);
3546 3557
… …
3549} 3560}
3550#endif 3561#endif
3551 3562
3552#if ENABLE_OVERLAY 3563#if ENABLE_OVERLAY
3553void 3564void
3554rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3565rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3555{ 3566{
3556 if (nrow < 1 || ncol < 1) 3567 if (nrow < 1 || ncol < 1)
3557 return; 3568 return;
3558 3569
3559 want_refresh = 1; 3570 want_refresh = 1;
… …
3604 *rp = r; 3615 *rp = r;
3605 } 3616 }
3606} 3617}
3607 3618
3608void 3619void
3609rxvt_term::scr_overlay_off () NOTHROW 3620rxvt_term::scr_overlay_off () noexcept
3610{ 3621{
3611 if (!ov.text) 3622 if (!ov.text)
3612 return; 3623 return;
3613 3624
3614 want_refresh = 1; 3625 want_refresh = 1;
… …
3622 delete [] ov.text; ov.text = 0; 3633 delete [] ov.text; ov.text = 0;
3623 delete [] ov.rend; ov.rend = 0; 3634 delete [] ov.rend; ov.rend = 0;
3624} 3635}
3625 3636
3626void 3637void
3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3628{ 3639{
3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3640 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3630 return; 3641 return;
3631 3642
3632 x++, y++; 3643 x++, y++;
… …
3634 ov.text[y][x] = text; 3645 ov.text[y][x] = text;
3635 ov.rend[y][x] = rend; 3646 ov.rend[y][x] = rend;
3636} 3647}
3637 3648
3638void 3649void
3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3650rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3640{ 3651{
3641 while (*s) 3652 while (*s)
3642 scr_overlay_set (x++, y, *s++); 3653 scr_overlay_set (x++, y, *s++);
3643} 3654}
3644 3655
3645void 3656void
3646rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3657rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3647{ 3658{
3648 while (*s) 3659 while (*s)
3649 { 3660 {
3650 text_t t = *s++; 3661 text_t t = *s++;
3651 int width = WCWIDTH (t); 3662 int width = WCWIDTH (t);
… …
3657 } 3668 }
3658 } 3669 }
3659} 3670}
3660 3671
3661void 3672void
3662rxvt_term::scr_swap_overlay () NOTHROW 3673rxvt_term::scr_swap_overlay () noexcept
3663{ 3674{
3664 if (!ov.text) 3675 if (!ov.text)
3665 return; 3676 return;
3666 3677
3667 // hide cursor if it is within the overlay area 3678 // hide cursor if it is within the overlay area

Diff Legend

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