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.440 by root, Wed Mar 27 17:24:16 2013 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 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
… …
384 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 387 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
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
390 term_start = total_rows - nrow;
391 top_row = q - term_start;
392
393 // make sure all terminal lines exist
394 while (top_row > 0)
395 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
396 } 392 }
397 else 393 else
394#endif
395 {
396 // wing, instead of wrap
398 { 397 do
399 // if no scrollback exists (yet), wing, instead of wrap
400
401 for (int row = min (nrow, prev_nrow); row--; )
402 { 398 {
403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 399 p = MOD (p - 1, prev_total_rows);
404 line_t &dst = row_buf [row]; 400 q--;
405 401
406 copy_line (dst, src); 402 copy_line (row_buf [q], prev_row_buf [p]);
407 } 403 }
404 while (p != pend);
405 }
408 406
409 for (int row = prev_nrow; row < nrow; row++) 407 term_start = total_rows - nrow;
408 top_row = q - term_start;
409
410 // make sure all terminal lines exist
411 while (top_row > 0)
410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 412 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
411
412 term_start = 0;
413 }
414 413
415 clamp_it (screen.cur.row, 0, nrow - 1); 414 clamp_it (screen.cur.row, 0, nrow - 1);
416 clamp_it (screen.cur.col, 0, ncol - 1); 415 clamp_it (screen.cur.col, 0, ncol - 1);
417 } 416 }
418 417
… …
440 439
441 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 440 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
442} 441}
443 442
444void ecb_cold 443void ecb_cold
445rxvt_term::scr_release () NOTHROW 444rxvt_term::scr_release () noexcept
446{ 445{
447 chunk_free (chunk, chunk_size); 446 chunk_free (chunk, chunk_size);
448 chunk = 0; 447 chunk = 0;
449 row_buf = 0; 448 row_buf = 0;
450 449
… …
469 scr_clear (true); 468 scr_clear (true);
470 scr_refresh (); 469 scr_refresh ();
471} 470}
472 471
473void ecb_cold 472void ecb_cold
474rxvt_term::scr_soft_reset () NOTHROW 473rxvt_term::scr_soft_reset () noexcept
475{ 474{
476 /* only affects modes, nothing drastic such as clearing the screen */ 475 /* only affects modes, nothing drastic such as clearing the screen */
477#if ENABLE_OVERLAY 476#if ENABLE_OVERLAY
478 scr_overlay_off (); 477 scr_overlay_off ();
479#endif 478#endif
… …
493 * Save and Restore cursor 492 * Save and Restore cursor
494 * XTERM_SEQ: Save cursor : ESC 7 493 * XTERM_SEQ: Save cursor : ESC 7
495 * XTERM_SEQ: Restore cursor: ESC 8 494 * XTERM_SEQ: Restore cursor: ESC 8
496 */ 495 */
497void 496void
498rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 497rxvt_term::scr_cursor (cursor_mode mode) noexcept
499{ 498{
500 screen_t *s; 499 screen_t *s;
501 500
502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
503 if (current_screen == SECONDARY) 502 if (current_screen == SECONDARY)
… …
534 assert (s->cur.row >= 0); 533 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 534 assert (s->cur.col >= 0);
536} 535}
537 536
538void 537void
539rxvt_term::scr_swap_screen () NOTHROW 538rxvt_term::scr_swap_screen () noexcept
540{ 539{
541 if (!option (Opt_secondaryScreen)) 540 if (!option (Opt_secondaryScreen))
542 return; 541 return;
543 542
544 for (int i = prev_nrow; i--; ) 543 for (int i = prev_nrow; i--; )
… …
592 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 591 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
593} 592}
594 593
595// clear WrapNext indicator, solidifying position on next line 594// clear WrapNext indicator, solidifying position on next line
596void 595void
597rxvt_term::scr_do_wrap () NOTHROW 596rxvt_term::scr_do_wrap () noexcept
598{ 597{
599 if (!(screen.flags & Screen_WrapNext)) 598 if (!(screen.flags & Screen_WrapNext))
600 return; 599 return;
601 600
602 screen.flags &= ~Screen_WrapNext; 601 screen.flags &= ~Screen_WrapNext;
… …
612/* ------------------------------------------------------------------------- */ 611/* ------------------------------------------------------------------------- */
613/* 612/*
614 * Change the colour for following text 613 * Change the colour for following text
615 */ 614 */
616void 615void
617rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 616rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
618{ 617{
619 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 618 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
620 color = fgbg; 619 color = fgbg;
621 620
622 if (fgbg == Color_fg) 621 if (fgbg == Color_fg)
623 rstyle = SET_FGCOLOR (rstyle, color); 622 rstyle = SET_FGCOLOR (rstyle, color);
624 else 623 else
… …
628/* ------------------------------------------------------------------------- */ 627/* ------------------------------------------------------------------------- */
629/* 628/*
630 * Change the rendition style for following text 629 * Change the rendition style for following text
631 */ 630 */
632void 631void
633rxvt_term::scr_rendition (int set, int style) NOTHROW 632rxvt_term::scr_rendition (int set, int style) noexcept
634{ 633{
635 if (set) 634 if (set)
636 rstyle |= style; 635 rstyle |= style;
637 else if (style == ~RS_None) 636 else if (style == ~RS_None)
638 rstyle = DEFAULT_RSTYLE; 637 rstyle = DEFAULT_RSTYLE;
… …
645 * Scroll text between <row1> and <row2> inclusive, by <count> lines 644 * Scroll text between <row1> and <row2> inclusive, by <count> lines
646 * count positive ==> scroll up 645 * count positive ==> scroll up
647 * count negative ==> scroll down 646 * count negative ==> scroll down
648 */ 647 */
649int ecb_hot 648int ecb_hot
650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 649rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
651{ 650{
652 if (count == 0 || (row1 > row2)) 651 if (count == 0 || (row1 > row2))
653 return 0; 652 return 0;
654 653
655 want_refresh = 1; 654 want_refresh = 1;
… …
789/* ------------------------------------------------------------------------- */ 788/* ------------------------------------------------------------------------- */
790/* 789/*
791 * Add text given in <str> of length <len> to screen struct 790 * Add text given in <str> of length <len> to screen struct
792 */ 791 */
793void ecb_hot 792void ecb_hot
794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 793rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
795{ 794{
796 if (len <= 0) /* sanity */ 795 if (len <= 0) /* sanity */
797 return; 796 return;
798 797
799 bool checksel; 798 bool checksel;
… …
1011 } 1010 }
1012 else if (screen.cur.row > 0 1011 else if (screen.cur.row > 0
1013 && ROW(screen.cur.row - 1).is_longer ()) 1012 && ROW(screen.cur.row - 1).is_longer ())
1014 { 1013 {
1015 linep = &ROW(screen.cur.row - 1); 1014 linep = &ROW(screen.cur.row - 1);
1016 tp = line->t + ncol - 1; 1015 tp = linep->t + ncol - 1;
1017 rp = line->r + ncol - 1; 1016 rp = linep->r + ncol - 1;
1018 } 1017 }
1019 else 1018 else
1020 continue; 1019 continue;
1021 1020
1022 linep->touch (); 1021 linep->touch ();
… …
1045/* 1044/*
1046 * Process Backspace. Move back the cursor back a position, wrap if have to 1045 * Process Backspace. Move back the cursor back a position, wrap if have to
1047 * XTERM_SEQ: CTRL-H 1046 * XTERM_SEQ: CTRL-H
1048 */ 1047 */
1049void 1048void
1050rxvt_term::scr_backspace () NOTHROW 1049rxvt_term::scr_backspace () noexcept
1051{ 1050{
1052 if (screen.cur.col == 0) 1051 if (screen.cur.col == 0)
1053 { 1052 {
1054 if (screen.cur.row > 0) 1053 if (screen.cur.row > 0)
1055 { 1054 {
… …
1072 * Process Horizontal Tab 1071 * Process Horizontal Tab
1073 * count: +ve = forward; -ve = backwards 1072 * count: +ve = forward; -ve = backwards
1074 * XTERM_SEQ: CTRL-I 1073 * XTERM_SEQ: CTRL-I
1075 */ 1074 */
1076void 1075void
1077rxvt_term::scr_tab (int count, bool ht) NOTHROW 1076rxvt_term::scr_tab (int count, bool ht) noexcept
1078{ 1077{
1079 int i, x; 1078 int i, x;
1080 1079
1081 want_refresh = 1; 1080 want_refresh = 1;
1082 i = x = screen.cur.col; 1081 i = x = screen.cur.col;
… …
1149 * Move cursor left in row. If we're at the left boundary, shift everything 1148 * Move cursor left in row. If we're at the left boundary, shift everything
1150 * in that row right. Clear left column. 1149 * in that row right. Clear left column.
1151 */ 1150 */
1152#if !ENABLE_MINIMAL 1151#if !ENABLE_MINIMAL
1153void ecb_cold 1152void ecb_cold
1154rxvt_term::scr_backindex () NOTHROW 1153rxvt_term::scr_backindex () noexcept
1155{ 1154{
1156 if (screen.cur.col > 0) 1155 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1156 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1157 else
1159 scr_insdel_chars (1, INSERT); 1158 scr_insdel_chars (1, INSERT);
… …
1166 * Move cursor right in row. If we're at the right boundary, shift everything 1165 * Move cursor right in row. If we're at the right boundary, shift everything
1167 * in that row left. Clear right column. 1166 * in that row left. Clear right column.
1168 */ 1167 */
1169#if !ENABLE_MINIMAL 1168#if !ENABLE_MINIMAL
1170void ecb_cold 1169void ecb_cold
1171rxvt_term::scr_forwardindex () NOTHROW 1170rxvt_term::scr_forwardindex () noexcept
1172{ 1171{
1173 if (screen.cur.col < ncol - 1) 1172 if (screen.cur.col < ncol - 1)
1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1173 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1175 else 1174 else
1176 { 1175 {
… …
1189/* ------------------------------------------------------------------------- */ 1188/* ------------------------------------------------------------------------- */
1190/* 1189/*
1191 * Goto Row/Column 1190 * Goto Row/Column
1192 */ 1191 */
1193void 1192void
1194rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1193rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1195{ 1194{
1196 want_refresh = 1; 1195 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1198 1197
1199 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1198 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1238/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1239/* 1238/*
1240 * direction should be UP or DN 1239 * direction should be UP or DN
1241 */ 1240 */
1242void 1241void
1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1242rxvt_term::scr_index (enum page_dirn direction) noexcept
1244{ 1243{
1245 int dirn;
1246
1247 want_refresh = 1; 1244 want_refresh = 1;
1248 ZERO_SCROLLBACK (); 1245 ZERO_SCROLLBACK ();
1249 1246
1250 dirn = ((direction == UP) ? 1 : -1);
1251
1252 screen.flags &= ~Screen_WrapNext; 1247 screen.flags &= ~Screen_WrapNext;
1253 1248
1254 if ((screen.cur.row == screen.bscroll && direction == UP) 1249 if ((screen.cur.row == screen.bscroll && direction == UP)
1255 || (screen.cur.row == screen.tscroll && direction == DN)) 1250 || (screen.cur.row == screen.tscroll && direction == DN))
1256 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1251 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1257 else 1252 else
1258 screen.cur.row += dirn; 1253 screen.cur.row += direction;
1259 1254
1260 clamp_it (screen.cur.row, 0, nrow - 1); 1255 clamp_it (screen.cur.row, 0, nrow - 1);
1261 selection_check (0); 1256 selection_check (0);
1262} 1257}
1263 1258
… …
1268 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1263 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1269 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1264 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1270 * extension: clear to right unless wrapped: ESC [ 3 K 1265 * extension: clear to right unless wrapped: ESC [ 3 K
1271 */ 1266 */
1272void 1267void
1273rxvt_term::scr_erase_line (int mode) NOTHROW 1268rxvt_term::scr_erase_line (int mode) noexcept
1274{ 1269{
1275 unsigned int col, num; 1270 unsigned int col, num;
1276 1271
1277 want_refresh = 1; 1272 want_refresh = 1;
1278 ZERO_SCROLLBACK (); 1273 ZERO_SCROLLBACK ();
… …
1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1327 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1328 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1329 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1335 */ 1330 */
1336void 1331void
1337rxvt_term::scr_erase_screen (int mode) NOTHROW 1332rxvt_term::scr_erase_screen (int mode) noexcept
1338{ 1333{
1339 int num; 1334 int num;
1340 int32_t row; 1335 int32_t row;
1341 rend_t ren; 1336 rend_t ren;
1342 XGCValues gcvalue; 1337 XGCValues gcvalue;
… …
1412 } 1407 }
1413} 1408}
1414 1409
1415#if !ENABLE_MINIMAL 1410#if !ENABLE_MINIMAL
1416void 1411void
1417rxvt_term::scr_erase_savelines () NOTHROW 1412rxvt_term::scr_erase_savelines () noexcept
1418{ 1413{
1419 want_refresh = 1; 1414 want_refresh = 1;
1420 ZERO_SCROLLBACK (); 1415 ZERO_SCROLLBACK ();
1421 1416
1422 top_row = 0; 1417 top_row = 0;
… …
1427/* 1422/*
1428 * Fill the screen with `E's 1423 * Fill the screen with `E's
1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1424 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1430 */ 1425 */
1431void ecb_cold 1426void ecb_cold
1432rxvt_term::scr_E () NOTHROW 1427rxvt_term::scr_E () noexcept
1433{ 1428{
1434 rend_t fs; 1429 rend_t fs;
1435 1430
1436 want_refresh = 1; 1431 want_refresh = 1;
1437 ZERO_SCROLLBACK (); 1432 ZERO_SCROLLBACK ();
… …
1462/* ------------------------------------------------------------------------- */ 1457/* ------------------------------------------------------------------------- */
1463/* 1458/*
1464 * Insert/Delete <count> lines 1459 * Insert/Delete <count> lines
1465 */ 1460 */
1466void 1461void
1467rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1462rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1468{ 1463{
1469 int end; 1464 int end;
1470 1465
1471 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1472 1467
… …
1492/* ------------------------------------------------------------------------- */ 1487/* ------------------------------------------------------------------------- */
1493/* 1488/*
1494 * Insert/Delete <count> characters from the current position 1489 * Insert/Delete <count> characters from the current position
1495 */ 1490 */
1496void 1491void
1497rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1492rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1498{ 1493{
1499 want_refresh = 1; 1494 want_refresh = 1;
1500 ZERO_SCROLLBACK (); 1495 ZERO_SCROLLBACK ();
1501 1496
1502 if (count <= 0) 1497 if (count <= 0)
… …
1601/* 1596/*
1602 * Set the scrolling region 1597 * Set the scrolling region
1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1598 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1604 */ 1599 */
1605void ecb_cold 1600void ecb_cold
1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1601rxvt_term::scr_scroll_region (int top, int bot) noexcept
1607{ 1602{
1608 max_it (top, 0); 1603 max_it (top, 0);
1609 min_it (bot, nrow - 1); 1604 min_it (bot, nrow - 1);
1610 1605
1611 if (top > bot) 1606 if (top > bot)
… …
1621 * Make the cursor visible/invisible 1616 * Make the cursor visible/invisible
1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1617 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1618 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1624 */ 1619 */
1625void ecb_cold 1620void ecb_cold
1626rxvt_term::scr_cursor_visible (int mode) NOTHROW 1621rxvt_term::scr_cursor_visible (int mode) noexcept
1627{ 1622{
1628 want_refresh = 1; 1623 want_refresh = 1;
1629 1624
1630 if (mode) 1625 if (mode)
1631 screen.flags |= Screen_VisibleCursor; 1626 screen.flags |= Screen_VisibleCursor;
… …
1638 * Set/unset automatic wrapping 1633 * Set/unset automatic wrapping
1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1634 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1635 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1641 */ 1636 */
1642void ecb_cold 1637void ecb_cold
1643rxvt_term::scr_autowrap (int mode) NOTHROW 1638rxvt_term::scr_autowrap (int mode) noexcept
1644{ 1639{
1645 if (mode) 1640 if (mode)
1646 screen.flags |= Screen_Autowrap; 1641 screen.flags |= Screen_Autowrap;
1647 else 1642 else
1648 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1643 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1657 * and the cursor cannot be moved outside. 1652 * and the cursor cannot be moved outside.
1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1653 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1654 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1660 */ 1655 */
1661void ecb_cold 1656void ecb_cold
1662rxvt_term::scr_relative_origin (int mode) NOTHROW 1657rxvt_term::scr_relative_origin (int mode) noexcept
1663{ 1658{
1664 if (mode) 1659 if (mode)
1665 screen.flags |= Screen_Relative; 1660 screen.flags |= Screen_Relative;
1666 else 1661 else
1667 screen.flags &= ~Screen_Relative; 1662 screen.flags &= ~Screen_Relative;
… …
1674 * Set insert/replace mode 1669 * Set insert/replace mode
1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1670 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1671 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1677 */ 1672 */
1678void ecb_cold 1673void ecb_cold
1679rxvt_term::scr_insert_mode (int mode) NOTHROW 1674rxvt_term::scr_insert_mode (int mode) noexcept
1680{ 1675{
1681 if (mode) 1676 if (mode)
1682 screen.flags |= Screen_Insert; 1677 screen.flags |= Screen_Insert;
1683 else 1678 else
1684 screen.flags &= ~Screen_Insert; 1679 screen.flags &= ~Screen_Insert;
… …
1690 * XTERM_SEQ: Set tab at current column : ESC H 1685 * XTERM_SEQ: Set tab at current column : ESC H
1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1686 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1687 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1693 */ 1688 */
1694void ecb_cold 1689void ecb_cold
1695rxvt_term::scr_set_tab (int mode) NOTHROW 1690rxvt_term::scr_set_tab (int mode) noexcept
1696{ 1691{
1697 if (mode < 0) 1692 if (mode < 0)
1698 memset (tabs, 0, ncol); 1693 memset (tabs, 0, ncol);
1699 else if (screen.cur.col < ncol) 1694 else if (screen.cur.col < ncol)
1700 tabs [screen.cur.col] = !!mode; 1695 tabs [screen.cur.col] = !!mode;
… …
1705 * Set reverse/normal video 1700 * Set reverse/normal video
1706 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1701 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1707 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1702 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1708 */ 1703 */
1709void 1704void
1710rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1705rxvt_term::scr_rvideo_mode (bool on) noexcept
1711{ 1706{
1712 rvideo_mode = on; 1707 rvideo_mode = on;
1713 1708
1714#ifndef NO_BELL 1709#ifndef NO_BELL
1715 on ^= rvideo_bell; 1710 on ^= rvideo_bell;
… …
1717 1712
1718 if (rvideo_state != on) 1713 if (rvideo_state != on)
1719 { 1714 {
1720 rvideo_state = on; 1715 rvideo_state = on;
1721 1716
1717#if OFF_FOCUS_FADING
1718 if (rs[Rs_fade])
1719 {
1720 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1721 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1722 }
1723 else
1724#endif
1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1723#ifdef HAVE_IMG 1726#ifdef HAVE_IMG
1724 if (bg_img == 0) 1727 if (bg_img == 0)
1725#endif 1728#endif
1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1739/* 1742/*
1740 * Report current cursor position 1743 * Report current cursor position
1741 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1742 */ 1745 */
1743void ecb_cold 1746void ecb_cold
1744rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () noexcept
1745{ 1748{
1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1747} 1750}
1748 1751
1749/* ------------------------------------------------------------------------- * 1752/* ------------------------------------------------------------------------- *
… …
1752 1755
1753/* 1756/*
1754 * Set font style 1757 * Set font style
1755 */ 1758 */
1756void ecb_cold 1759void ecb_cold
1757rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () noexcept
1758{ 1761{
1759#if 0 1762#if 0
1760 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1761 { 1764 {
1762 case '0': /* DEC Special Character & Line Drawing Set */ 1765 case '0': /* DEC Special Character & Line Drawing Set */
… …
1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1785 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1786 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1787 */ 1790 */
1788void ecb_cold 1791void ecb_cold
1789rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) noexcept
1790{ 1793{
1791 screen.charset = set; 1794 screen.charset = set;
1792 set_font_style (); 1795 set_font_style ();
1793} 1796}
1794 1797
… …
1800 * XTERM_SEQ: Set G2 character set: ESC * <C> 1803 * XTERM_SEQ: Set G2 character set: ESC * <C>
1801 * XTERM_SEQ: Set G3 character set: ESC + <C> 1804 * XTERM_SEQ: Set G3 character set: ESC + <C>
1802 * See set_font_style for possible values for <C> 1805 * See set_font_style for possible values for <C>
1803 */ 1806 */
1804void 1807void
1805rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1808rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1806{ 1809{
1807 charsets[set] = (unsigned char)ch; 1810 charsets[set] = (unsigned char)ch;
1808 set_font_style (); 1811 set_font_style ();
1809} 1812}
1810 1813
… …
1815 1818
1816/* 1819/*
1817 * refresh matching text. 1820 * refresh matching text.
1818 */ 1821 */
1819bool ecb_cold 1822bool ecb_cold
1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1821{ 1824{
1822 bool found = false; 1825 bool found = false;
1823 1826
1824 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
1825 { 1828 {
… …
1844 PART_END, 1847 PART_END,
1845 RC_COUNT 1848 RC_COUNT
1846}; 1849};
1847 1850
1848void ecb_hot 1851void ecb_hot
1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1850{ 1853{
1851 int i; 1854 int i;
1852 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1853 1856
1854 if (!drawn_buf) /* sanity check */ 1857 if (!drawn_buf) /* sanity check */
… …
1888/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1889/* 1892/*
1890 * Refresh the entire screen 1893 * Refresh the entire screen
1891 */ 1894 */
1892void 1895void
1893rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) noexcept
1894{ 1897{
1895 scr_expose (0, 0, vt_width, vt_height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1896} 1899}
1897 1900
1898/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1899/* 1902/*
1900 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
1901 * the top of the screen 1904 * the top of the screen
1902 */ 1905 */
1903void 1906void
1904rxvt_term::scr_move_to (int y, int len) NOTHROW 1907rxvt_term::scr_move_to (int y, int len) noexcept
1905{ 1908{
1906 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1909 // lerp (y, 0, len, top_row, nrow - 1)
1910 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1907} 1911}
1908 1912
1909/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1910/* 1914/*
1911 * Page the screen up/down nlines 1915 * Page the screen up/down nlines
1912 * direction should be UP or DN 1916 * direction should be UP or DN
1913 */ 1917 */
1914bool 1918bool
1915rxvt_term::scr_page (int nlines) NOTHROW 1919rxvt_term::scr_page (int nlines) noexcept
1916{ 1920{
1917 return scr_changeview (view_start - nlines); 1921 return scr_changeview (view_start - nlines);
1918} 1922}
1919 1923
1920bool 1924bool
1921rxvt_term::scr_changeview (int new_view_start) NOTHROW 1925rxvt_term::scr_changeview (int new_view_start) noexcept
1922{ 1926{
1923 clamp_it (new_view_start, top_row, 0); 1927 clamp_it (new_view_start, top_row, 0);
1924 1928
1925 if (new_view_start == view_start) 1929 if (new_view_start == view_start)
1926 return false; 1930 return false;
… …
1944} 1948}
1945#endif 1949#endif
1946 1950
1947/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1948void 1952void
1949rxvt_term::scr_bell () NOTHROW 1953rxvt_term::scr_bell () noexcept
1950{ 1954{
1951#ifndef NO_BELL 1955#ifndef NO_BELL
1952 1956
1953# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1954# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
… …
1976#endif 1980#endif
1977} 1981}
1978 1982
1979/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1980void ecb_cold 1984void ecb_cold
1981rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) noexcept
1982{ 1986{
1983#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1984 int nrows, row_start; 1988 int nrows, row_start;
1985 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
1986 1990
… …
2035 * Refresh the screen 2039 * Refresh the screen
2036 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2037 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2038 */ 2042 */
2039void ecb_hot 2043void ecb_hot
2040rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () noexcept
2041{ 2045{
2042 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2043 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2044 int i; /* tmp */ 2048 int i; /* tmp */
2045 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
… …
2121 ccol2 = bgcolor_of (rstyle); 2125 ccol2 = bgcolor_of (rstyle);
2122#else 2126#else
2123 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2124#endif 2128#endif
2125 2129
2126 if (focus) 2130 if (focus && cursor_type == 0)
2127 { 2131 {
2128 rend_t rend = cur_rend; 2132 rend_t rend = cur_rend;
2129 2133
2130 if (option (Opt_cursorUnderline))
2131 rend ^= RS_Uline;
2132 else
2133 {
2134 rend ^= RS_RVid; 2134 rend ^= RS_RVid;
2135 rend = SET_FGCOLOR (rend, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2136 rend = SET_BGCOLOR (rend, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2137 }
2138 2137
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2138 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2140 } 2139 }
2141 } 2140 }
2142 2141
2143 /* make sure no outline cursor is left around */ 2142 /* make sure no outline cursor is left around */
2144 if (ocrow != -1) 2143 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2145 {
2146 if (screen.cur.row - view_start != ocrow
2147 || screen.cur.col != oldcursor.col)
2148 {
2149 if (ocrow < nrow
2150 && oldcursor.col < ncol)
2151 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2144 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2152 }
2153 }
2154 2145
2155 // save the current cursor coordinates if the cursor is visible 2146 // save the current cursor coordinates if the cursor is visible
2156 // and the window is unfocused, so as to clear the outline cursor 2147 // and either the window is unfocused or the cursor style is
2148 // underline or vertical bar, so as to clear the outline cursor in
2157 // in the next refresh if the cursor moves 2149 // the next refresh if the cursor moves or becomes invisible
2158 if (showcursor && !focus && screen.cur.row - view_start < nrow) 2150 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2159 { 2151 {
2160 oldcursor.row = screen.cur.row - view_start; 2152 oldcursor.row = screen.cur.row - view_start;
2161 oldcursor.col = screen.cur.col; 2153 oldcursor.col = screen.cur.col;
2162 } 2154 }
2163 else 2155 else
… …
2250 int ypixel = (int)Row2Pixel (row); 2242 int ypixel = (int)Row2Pixel (row);
2251 2243
2252 for (col = 0; col < ncol; col++) 2244 for (col = 0; col < ncol; col++)
2253 { 2245 {
2254 /* compare new text with old - if exactly the same then continue */ 2246 /* compare new text with old - if exactly the same then continue */
2255 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2247 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2256 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2257 || (stp[col] == ' ' /* space w/ no background change */
2258 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2259 continue; 2248 continue;
2260 2249
2261 // redraw one or more characters 2250 // redraw one or more characters
2262 2251
2263 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
… …
2459 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2460 */ 2449 */
2461 if (showcursor) 2450 if (showcursor)
2462 { 2451 {
2463 if (focus) 2452 if (focus)
2453 {
2454 if (cursor_type == 0)
2464 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2455 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 else if (oldcursor.row >= 0)
2457 {
2458 XSetForeground (dpy, gc, pix_colors[ccol1]);
2459 if (cursor_type == 1)
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row + 1) - 2,
2463 Width2Pixel (1),
2464 2);
2465 else
2466 XFillRectangle (dpy, vt, gc,
2467 Col2Pixel (cur_col),
2468 Row2Pixel (oldcursor.row),
2469 2,
2470 Height2Pixel (1));
2471 }
2472 }
2465 else if (oldcursor.row >= 0) 2473 else if (oldcursor.row >= 0)
2466 { 2474 {
2467 XSetForeground (dpy, gc, pix_colors[ccol1]); 2475 XSetForeground (dpy, gc, pix_colors[ccol1]);
2468 2476
2469 XDrawRectangle (dpy, vt, gc, 2477 XDrawRectangle (dpy, vt, gc,
… …
2488 num_scr = 0; 2496 num_scr = 0;
2489 num_scr_allow = 1; 2497 num_scr_allow = 1;
2490} 2498}
2491 2499
2492void ecb_cold 2500void ecb_cold
2493rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2501rxvt_term::scr_remap_chars (line_t &l) noexcept
2494{ 2502{
2495 if (!l.valid ()) 2503 if (!l.valid ())
2496 return; 2504 return;
2497 2505
2498 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2500 for (int i = ncol; i--; ) 2508 for (int i = ncol; i--; )
2501 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2509 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2502} 2510}
2503 2511
2504void ecb_cold 2512void ecb_cold
2505rxvt_term::scr_remap_chars () NOTHROW 2513rxvt_term::scr_remap_chars () noexcept
2506{ 2514{
2507 for (int i = total_rows; i--; ) 2515 for (int i = total_rows; i--; )
2508 scr_remap_chars (row_buf [i]); 2516 scr_remap_chars (row_buf [i]);
2509 2517
2510 for (int i = nrow; i--; ) 2518 for (int i = nrow; i--; )
… …
2513 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2514 } 2522 }
2515} 2523}
2516 2524
2517void ecb_cold 2525void ecb_cold
2518rxvt_term::scr_recolour (bool refresh) NOTHROW 2526rxvt_term::scr_recolor (bool refresh) noexcept
2519{ 2527{
2520 bool transparent = false; 2528 bool transparent = false;
2521 2529
2522#ifdef HAVE_IMG 2530#ifdef HAVE_IMG
2523 if (bg_img != 0) 2531 if (bg_img != 0)
… …
2544 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2545 } 2553 }
2546 2554
2547 XClearWindow (dpy, parent); 2555 XClearWindow (dpy, parent);
2548 2556
2549 if (scrollBar.win) 2557 if (scrollBar.state && scrollBar.win)
2550 { 2558 {
2551 if (transparent) 2559 if (transparent)
2552 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2553 else 2561 else
2554 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2564 want_refresh = 1; 2572 want_refresh = 1;
2565} 2573}
2566 2574
2567/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2568void 2576void
2569rxvt_term::scr_clear (bool really) NOTHROW 2577rxvt_term::scr_clear (bool really) noexcept
2570{ 2578{
2571 if (!mapped) 2579 if (!mapped)
2572 return; 2580 return;
2573 2581
2574 num_scr_allow = 0; 2582 num_scr_allow = 0;
… …
2577 if (really) 2585 if (really)
2578 XClearWindow (dpy, vt); 2586 XClearWindow (dpy, vt);
2579} 2587}
2580 2588
2581void 2589void
2582rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2590rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2583{ 2591{
2584 int view_end = view_start + nrow; 2592 int view_end = view_start + nrow;
2585 int row, col; 2593 int row, col;
2586 2594
2587 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2595 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2599 srp[col] ^= rstyle2; 2607 srp[col] ^= rstyle2;
2600 } 2608 }
2601} 2609}
2602 2610
2603void 2611void
2604rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2612rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2605{ 2613{
2606 int view_end = view_start + nrow; 2614 int view_end = view_start + nrow;
2607 int row, col; 2615 int row, col;
2608 2616
2609 if (beg_row >= view_start) 2617 if (beg_row >= view_start)
… …
2626 srp[col] ^= rstyle; 2634 srp[col] ^= rstyle;
2627} 2635}
2628 2636
2629/* ------------------------------------------------------------------------- */ 2637/* ------------------------------------------------------------------------- */
2630void ecb_hot 2638void ecb_hot
2631rxvt_term::scr_reverse_selection () NOTHROW 2639rxvt_term::scr_reverse_selection () noexcept
2632{ 2640{
2633 if (selection.op 2641 if (selection.op
2634 && current_screen == selection.screen 2642 && current_screen == selection.screen
2635 && selection.end.row >= view_start) 2643 && selection.end.row >= view_start)
2636 { 2644 {
… …
2652 * Dump the whole scrollback and screen to the passed filedescriptor. The 2660 * Dump the whole scrollback and screen to the passed filedescriptor. The
2653 * invoking routine must close the fd. 2661 * invoking routine must close the fd.
2654 */ 2662 */
2655#if 0 2663#if 0
2656void 2664void
2657rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) noexcept
2658{ 2666{
2659 // if this method is needed, it can be implemented by factoring the 2667 // if this method is needed, it can be implemented by factoring the
2660 // relevant code in scr_printscreen 2668 // relevant code in scr_printscreen
2661} 2669}
2662#endif 2670#endif
2663 2671
2664/* ------------------------------------------------------------------------- * 2672/* ------------------------------------------------------------------------- *
2665 * CHARACTER SELECTION * 2673 * CHARACTER SELECTION *
2666 * ------------------------------------------------------------------------- */ 2674 * ------------------------------------------------------------------------- */
2667void 2675void
2668rxvt_term::selection_check (int check_more) NOTHROW 2676rxvt_term::selection_check (int check_more) noexcept
2669{ 2677{
2670 if (!selection.op) 2678 if (!selection.op)
2671 return; 2679 return;
2672 2680
2673 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2681 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2679 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2687 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2680 CLEAR_ALL_SELECTION (); 2688 CLEAR_ALL_SELECTION ();
2681} 2689}
2682 2690
2683void 2691void
2684rxvt_term::selection_changed () NOTHROW 2692rxvt_term::selection_changed () noexcept
2685{ 2693{
2686 line_t &r1 = ROW (selection.beg.row); 2694 line_t &r1 = ROW (selection.beg.row);
2687 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2695 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2688 --selection.beg.col; 2696 ++selection.beg.col;
2689 2697
2690 line_t &r2 = ROW (selection.end.row); 2698 line_t &r2 = ROW (selection.end.row);
2691 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2699 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2692 ++selection.end.col; 2700 ++selection.end.col;
2693 2701
… …
2697/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2698/* 2706/*
2699 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2700 */ 2708 */
2701void 2709void
2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2703{ 2711{
2704 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2705 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2706 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2707 data[i] = C0_CR; 2715 data[i] = C0_CR;
2708 2716
2709 if (priv_modes & PrivMode_BracketPaste) 2717 #if ENABLE_FRILLS
2718 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2710 tt_printf ("\x1b[200~"); 2719 tt_printf ("\x1b[200~");
2720 #endif
2711 2721
2712 tt_write (data, len); 2722 tt_write (data, len);
2713 2723
2714 if (priv_modes & PrivMode_BracketPaste) 2724 #if ENABLE_FRILLS
2725 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2715 tt_printf ("\x1b[201~"); 2726 tt_printf ("\x1b[201~");
2727 #endif
2716} 2728}
2717 2729
2718void 2730void
2719rxvt_term::paste (char *data, unsigned int len) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) noexcept
2720{ 2732{
2721 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2722 return; 2734 return;
2723 2735
2724 tt_paste (data, len); 2736 tt_paste (data, len);
… …
2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2731 * as fallback 2743 * as fallback
2732 * EXT: button 2 release 2744 * EXT: button 2 release
2733 */ 2745 */
2734void 2746void
2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) noexcept
2736{ 2748{
2737 if (!selection_req) 2749 if (!selection_req)
2738 { 2750 {
2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2751 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run (); 2752 selection_req->run ();
… …
2745/* 2757/*
2746 * Clear all selected text 2758 * Clear all selected text
2747 * EXT: SelectionClear 2759 * EXT: SelectionClear
2748 */ 2760 */
2749void 2761void
2750rxvt_term::selection_clear (bool clipboard) NOTHROW 2762rxvt_term::selection_clear (bool clipboard) noexcept
2751{ 2763{
2752 if (!clipboard) 2764 if (!clipboard)
2753 { 2765 {
2754 want_refresh = 1; 2766 want_refresh = 1;
2755 free (selection.text); 2767 free (selection.text);
… …
2840 if (*t == NOCHAR) 2852 if (*t == NOCHAR)
2841 t++; 2853 t++;
2842#if ENABLE_COMBINING 2854#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 2855 else if (IS_COMPOSE (*t))
2844 { 2856 {
2845 int len = rxvt_composite.expand (*t, 0); 2857 int len = rxvt_composite.expand (*t);
2846 2858
2847 extra -= (len - 1); 2859 extra -= (len - 1);
2848 2860
2849 if (extra < 0) 2861 if (extra < 0)
2850 { 2862 {
… …
2897 2909
2898 selection_grab (tm); 2910 selection_grab (tm);
2899} 2911}
2900 2912
2901bool 2913bool
2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2914rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2903{ 2915{
2904 Atom sel; 2916 Atom sel;
2905 2917
2906 if (!clipboard) 2918 if (!clipboard)
2907 { 2919 {
… …
2941/* 2953/*
2942 * Mark or select text based upon number of clicks: 1, 2, or 3 2954 * Mark or select text based upon number of clicks: 1, 2, or 3
2943 * EXT: button 1 press 2955 * EXT: button 1 press
2944 */ 2956 */
2945void ecb_cold 2957void ecb_cold
2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2958rxvt_term::selection_click (int clicks, int x, int y) noexcept
2947{ 2959{
2948 clicks = ((clicks - 1) % 3) + 1; 2960 clicks = ((clicks - 1) % 3) + 1;
2949 selection.clicks = clicks; /* save clicks so extend will work */ 2961 selection.clicks = clicks; /* save clicks so extend will work */
2950 2962
2951 if (clicks == 2 && !selection.rect 2963 if (clicks == 2 && !selection.rect
… …
2970/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2971/* 2983/*
2972 * Mark a selection at the specified col/row 2984 * Mark a selection at the specified col/row
2973 */ 2985 */
2974void ecb_cold 2986void ecb_cold
2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2987rxvt_term::selection_start_colrow (int col, int row) noexcept
2976{ 2988{
2977 want_refresh = 1; 2989 want_refresh = 1;
2978 2990
2979 selection.mark.row = row + view_start; 2991 selection.mark.row = row + view_start;
2980 selection.mark.col = col; 2992 selection.mark.col = col;
… …
3007#define DELIMIT_TEXT(x) \ 3019#define DELIMIT_TEXT(x) \
3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3020 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3009#define DELIMIT_REND(x) 1 3021#define DELIMIT_REND(x) 1
3010 3022
3011void ecb_cold 3023void ecb_cold
3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3024rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3013{ 3025{
3014 int col, row, dirnadd, tcol, trow, w1, w2; 3026 int col, row, dirnadd, tcol, trow, w1, w2;
3015 row_col_t bound; 3027 row_col_t bound;
3016 text_t *stp; 3028 text_t *stp;
3017 rend_t *srp; 3029 rend_t *srp;
… …
3091 * flag == 0 ==> button 1 3103 * flag == 0 ==> button 1
3092 * flag == 1 ==> button 3 press 3104 * flag == 1 ==> button 3 press
3093 * flag == 2 ==> button 3 motion 3105 * flag == 2 ==> button 3 motion
3094 */ 3106 */
3095void ecb_cold 3107void ecb_cold
3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3108rxvt_term::selection_extend (int x, int y, int flag) noexcept
3097{ 3109{
3098 int col = clamp (Pixel2Col (x), 0, ncol); 3110 int col = clamp (Pixel2Col (x), 0, ncol);
3099 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3111 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3100 3112
3101 /* 3113 /*
… …
3127/* ------------------------------------------------------------------------- */ 3139/* ------------------------------------------------------------------------- */
3128/* 3140/*
3129 * Extend the selection to the specified col/row 3141 * Extend the selection to the specified col/row
3130 */ 3142 */
3131void ecb_cold 3143void ecb_cold
3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3144rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3133{ 3145{
3134 row_col_t pos; 3146 row_col_t pos;
3135 enum { 3147 enum {
3136 LEFT, RIGHT 3148 LEFT, RIGHT
3137 } closeto = RIGHT; 3149 } closeto = RIGHT;
… …
3328 selection_changed (); 3340 selection_changed ();
3329} 3341}
3330 3342
3331#if !ENABLE_MINIMAL 3343#if !ENABLE_MINIMAL
3332void ecb_cold 3344void ecb_cold
3333rxvt_term::selection_remove_trailing_spaces () NOTHROW 3345rxvt_term::selection_remove_trailing_spaces () noexcept
3334{ 3346{
3335 int32_t end_col, end_row; 3347 int32_t end_col, end_row;
3336 text_t *stp; 3348 text_t *stp;
3337 3349
3338 end_col = selection.end.col; 3350 end_col = selection.end.col;
… …
3376/* 3388/*
3377 * Double click on button 3 when already selected 3389 * Double click on button 3 when already selected
3378 * EXT: button 3 double click 3390 * EXT: button 3 double click
3379 */ 3391 */
3380void ecb_cold 3392void ecb_cold
3381rxvt_term::selection_rotate (int x, int y) NOTHROW 3393rxvt_term::selection_rotate (int x, int y) noexcept
3382{ 3394{
3383 selection.clicks = selection.clicks % 3 + 1; 3395 selection.clicks = selection.clicks % 3 + 1;
3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3396 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3385} 3397}
3386 3398
… …
3388/* 3400/*
3389 * Respond to a request for our current selection 3401 * Respond to a request for our current selection
3390 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3391 */ 3403 */
3392void ecb_cold 3404void ecb_cold
3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3394{ 3406{
3395 Atom property = rq.property == None ? rq.target : rq.property; 3407 Atom property = rq.property == None ? rq.target : rq.property;
3396 XSelectionEvent ev; 3408 XSelectionEvent ev;
3397 3409
3398 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
… …
3490 cl = selection.clip_text; 3502 cl = selection.clip_text;
3491 selectlen = selection.clip_len; 3503 selectlen = selection.clip_len;
3492 } 3504 }
3493 else 3505 else
3494 { 3506 {
3495 cl = L""; 3507 cl = (wchar_t *)L"";
3496 selectlen = 0; 3508 selectlen = 0;
3497 } 3509 }
3498 3510
3499#if !ENABLE_MINIMAL 3511#if !ENABLE_MINIMAL
3500 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3512 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3532} 3544}
3533 3545
3534/* ------------------------------------------------------------------------- */ 3546/* ------------------------------------------------------------------------- */
3535#if USE_XIM 3547#if USE_XIM
3536void ecb_cold 3548void ecb_cold
3537rxvt_term::im_set_position (XPoint &pos) NOTHROW 3549rxvt_term::im_set_position (XPoint &pos) noexcept
3538{ 3550{
3539 XWindowAttributes xwa; 3551 XWindowAttributes xwa;
3540 3552
3541 XGetWindowAttributes (dpy, vt, &xwa); 3553 XGetWindowAttributes (dpy, vt, &xwa);
3542 3554
… …
3545} 3557}
3546#endif 3558#endif
3547 3559
3548#if ENABLE_OVERLAY 3560#if ENABLE_OVERLAY
3549void 3561void
3550rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3562rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3551{ 3563{
3552 if (nrow < 1 || ncol < 1) 3564 if (nrow < 1 || ncol < 1)
3553 return; 3565 return;
3554 3566
3555 want_refresh = 1; 3567 want_refresh = 1;
… …
3600 *rp = r; 3612 *rp = r;
3601 } 3613 }
3602} 3614}
3603 3615
3604void 3616void
3605rxvt_term::scr_overlay_off () NOTHROW 3617rxvt_term::scr_overlay_off () noexcept
3606{ 3618{
3607 if (!ov.text) 3619 if (!ov.text)
3608 return; 3620 return;
3609 3621
3610 want_refresh = 1; 3622 want_refresh = 1;
… …
3618 delete [] ov.text; ov.text = 0; 3630 delete [] ov.text; ov.text = 0;
3619 delete [] ov.rend; ov.rend = 0; 3631 delete [] ov.rend; ov.rend = 0;
3620} 3632}
3621 3633
3622void 3634void
3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3624{ 3636{
3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3637 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3626 return; 3638 return;
3627 3639
3628 x++, y++; 3640 x++, y++;
… …
3630 ov.text[y][x] = text; 3642 ov.text[y][x] = text;
3631 ov.rend[y][x] = rend; 3643 ov.rend[y][x] = rend;
3632} 3644}
3633 3645
3634void 3646void
3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3647rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3636{ 3648{
3637 while (*s) 3649 while (*s)
3638 scr_overlay_set (x++, y, *s++); 3650 scr_overlay_set (x++, y, *s++);
3639} 3651}
3640 3652
3641void 3653void
3642rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3654rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3643{ 3655{
3644 while (*s) 3656 while (*s)
3645 { 3657 {
3646 text_t t = *s++; 3658 text_t t = *s++;
3647 int width = WCWIDTH (t); 3659 int width = WCWIDTH (t);
… …
3653 } 3665 }
3654 } 3666 }
3655} 3667}
3656 3668
3657void 3669void
3658rxvt_term::scr_swap_overlay () NOTHROW 3670rxvt_term::scr_swap_overlay () noexcept
3659{ 3671{
3660 if (!ov.text) 3672 if (!ov.text)
3661 return; 3673 return;
3662 3674
3663 // hide cursor if it is within the overlay area 3675 // hide cursor if it is within the overlay area

Diff Legend

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