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.436 by sf-exg, Sun Mar 24 10:15:27 2013 UTC vs.
Revision 1.461 by root, Thu Jun 17 00:49:20 2021 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;
… …
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
… …
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
… …
440 441
441 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
442} 443}
443 444
444void ecb_cold 445void ecb_cold
445rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
446{ 447{
447 chunk_free (chunk, chunk_size); 448 chunk_free (chunk, chunk_size);
448 chunk = 0; 449 chunk = 0;
449 row_buf = 0; 450 row_buf = 0;
450 451
… …
469 scr_clear (true); 470 scr_clear (true);
470 scr_refresh (); 471 scr_refresh ();
471} 472}
472 473
473void ecb_cold 474void ecb_cold
474rxvt_term::scr_soft_reset () NOTHROW 475rxvt_term::scr_soft_reset () noexcept
475{ 476{
476 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
477#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
478 scr_overlay_off (); 479 scr_overlay_off ();
479#endif 480#endif
… …
493 * Save and Restore cursor 494 * Save and Restore cursor
494 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
495 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
496 */ 497 */
497void 498void
498rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
499{ 500{
500 screen_t *s; 501 screen_t *s;
501 502
502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
503 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
534 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
536} 537}
537 538
538void 539void
539rxvt_term::scr_swap_screen () NOTHROW 540rxvt_term::scr_swap_screen () noexcept
540{ 541{
541 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
542 return; 543 return;
543 544
544 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
592 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
593} 594}
594 595
595// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
596void 597void
597rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
598{ 599{
599 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
600 return; 601 return;
601 602
602 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
612/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
613/* 614/*
614 * Change the colour for following text 615 * Change the colour for following text
615 */ 616 */
616void 617void
617rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
618{ 619{
619 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
620 color = fgbg; 621 color = fgbg;
621 622
622 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
623 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
624 else 625 else
… …
628/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
629/* 630/*
630 * Change the rendition style for following text 631 * Change the rendition style for following text
631 */ 632 */
632void 633void
633rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
634{ 635{
635 if (set) 636 if (set)
636 rstyle |= style; 637 rstyle |= style;
637 else if (style == ~RS_None) 638 else if (style == ~RS_None)
638 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
645 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
646 * count positive ==> scroll up 647 * count positive ==> scroll up
647 * count negative ==> scroll down 648 * count negative ==> scroll down
648 */ 649 */
649int ecb_hot 650int ecb_hot
650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
651{ 652{
652 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
653 return 0; 654 return 0;
654 655
655 want_refresh = 1; 656 want_refresh = 1;
… …
715 716
716 // finally move the view window, if desired 717 // finally move the view window, if desired
717 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
718 && view_start != 0 719 && view_start != 0
719 && view_start != -saveLines) 720 && view_start != -saveLines)
720 scr_page (UP, count); 721 scr_page (count);
721 722
722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
724 } 725 }
725 else 726 else
… …
789/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
790/* 791/*
791 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
792 */ 793 */
793void ecb_hot 794void ecb_hot
794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
795{ 796{
796 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
797 return; 798 return;
798 799
799 bool checksel; 800 bool checksel;
… …
1011 } 1012 }
1012 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1013 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1014 { 1015 {
1015 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1016 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1017 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1018 } 1019 }
1019 else 1020 else
1020 continue; 1021 continue;
1021 1022
1022 linep->touch (); 1023 linep->touch ();
… …
1045/* 1046/*
1046 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
1047 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1048 */ 1049 */
1049void 1050void
1050rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1051{ 1052{
1052 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1053 { 1054 {
1054 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1055 { 1056 {
… …
1072 * Process Horizontal Tab 1073 * Process Horizontal Tab
1073 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1074 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1075 */ 1076 */
1076void 1077void
1077rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1078{ 1079{
1079 int i, x; 1080 int i, x;
1080 1081
1081 want_refresh = 1; 1082 want_refresh = 1;
1082 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1149 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1150 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1151 */ 1152 */
1152#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1153void ecb_cold 1154void ecb_cold
1154rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1155{ 1156{
1156 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1159 else
1159 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1166 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1167 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1168 */ 1169 */
1169#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1170void ecb_cold 1171void ecb_cold
1171rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1172{ 1173{
1173 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1175 else 1176 else
1176 { 1177 {
… …
1189/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1190/* 1191/*
1191 * Goto Row/Column 1192 * Goto Row/Column
1192 */ 1193 */
1193void 1194void
1194rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1195{ 1196{
1196 want_refresh = 1; 1197 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1198 1199
1199 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1238/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1239/* 1240/*
1240 * direction should be UP or DN 1241 * direction should be UP or DN
1241 */ 1242 */
1242void 1243void
1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1244{ 1245{
1245 int dirn;
1246
1247 want_refresh = 1; 1246 want_refresh = 1;
1248 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1249 1248
1250 dirn = ((direction == UP) ? 1 : -1);
1251
1252 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1253 1250
1254 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1255 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1256 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1257 else 1254 else
1258 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1259 1256
1260 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1261 selection_check (0); 1258 selection_check (0);
1262} 1259}
1263 1260
… …
1268 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1269 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1270 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1271 */ 1268 */
1272void 1269void
1273rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1274{ 1271{
1275 unsigned int col, num; 1272 unsigned int col, num;
1276 1273
1277 want_refresh = 1; 1274 want_refresh = 1;
1278 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1335 */ 1332 */
1336void 1333void
1337rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1338{ 1335{
1339 int num; 1336 int num;
1340 int32_t row; 1337 int32_t row;
1341 rend_t ren; 1338 rend_t ren;
1342 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1412 } 1409 }
1413} 1410}
1414 1411
1415#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1416void 1413void
1417rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1418{ 1415{
1419 want_refresh = 1; 1416 want_refresh = 1;
1420 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1421 1418
1422 top_row = 0; 1419 top_row = 0;
… …
1427/* 1424/*
1428 * Fill the screen with `E's 1425 * Fill the screen with `E's
1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1430 */ 1427 */
1431void ecb_cold 1428void ecb_cold
1432rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1433{ 1430{
1434 rend_t fs; 1431 rend_t fs;
1435 1432
1436 want_refresh = 1; 1433 want_refresh = 1;
1437 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
… …
1462/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1463/* 1460/*
1464 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1465 */ 1462 */
1466void 1463void
1467rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1468{ 1465{
1469 int end; 1466 int end;
1470 1467
1471 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1472 1469
… …
1492/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1493/* 1490/*
1494 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1495 */ 1492 */
1496void 1493void
1497rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1498{ 1495{
1499 want_refresh = 1; 1496 want_refresh = 1;
1500 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1501 1498
1502 if (count <= 0) 1499 if (count <= 0)
… …
1601/* 1598/*
1602 * Set the scrolling region 1599 * Set the scrolling region
1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1604 */ 1601 */
1605void ecb_cold 1602void ecb_cold
1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1607{ 1604{
1608 max_it (top, 0); 1605 max_it (top, 0);
1609 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1610 1607
1611 if (top > bot) 1608 if (top > bot)
… …
1621 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1624 */ 1621 */
1625void ecb_cold 1622void ecb_cold
1626rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1627{ 1624{
1628 want_refresh = 1; 1625 want_refresh = 1;
1629 1626
1630 if (mode) 1627 if (mode)
1631 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1638 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1641 */ 1638 */
1642void ecb_cold 1639void ecb_cold
1643rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1644{ 1641{
1645 if (mode) 1642 if (mode)
1646 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1647 else 1644 else
1648 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1657 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1660 */ 1657 */
1661void ecb_cold 1658void ecb_cold
1662rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1663{ 1660{
1664 if (mode) 1661 if (mode)
1665 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1666 else 1663 else
1667 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1674 * Set insert/replace mode 1671 * Set insert/replace mode
1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1677 */ 1674 */
1678void ecb_cold 1675void ecb_cold
1679rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1680{ 1677{
1681 if (mode) 1678 if (mode)
1682 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1683 else 1680 else
1684 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1690 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1693 */ 1690 */
1694void ecb_cold 1691void ecb_cold
1695rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1696{ 1693{
1697 if (mode < 0) 1694 if (mode < 0)
1698 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1699 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1700 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1705 * Set reverse/normal video 1702 * Set reverse/normal video
1706 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1707 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1708 */ 1705 */
1709void 1706void
1710rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1711{ 1708{
1712 rvideo_mode = on; 1709 rvideo_mode = on;
1713 1710
1714#ifndef NO_BELL 1711#ifndef NO_BELL
1715 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1717 1714
1718 if (rvideo_state != on) 1715 if (rvideo_state != on)
1719 { 1716 {
1720 rvideo_state = on; 1717 rvideo_state = on;
1721 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1723#ifdef HAVE_IMG 1728#ifdef HAVE_IMG
1724 if (bg_img == 0) 1729 if (bg_img == 0)
1725#endif 1730#endif
1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1739/* 1744/*
1740 * Report current cursor position 1745 * Report current cursor position
1741 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1742 */ 1747 */
1743void ecb_cold 1748void ecb_cold
1744rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1745{ 1750{
1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1747} 1752}
1748 1753
1749/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1752 1757
1753/* 1758/*
1754 * Set font style 1759 * Set font style
1755 */ 1760 */
1756void ecb_cold 1761void ecb_cold
1757rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1758{ 1763{
1759#if 0 1764#if 0
1760 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1761 { 1766 {
1762 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1785 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1786 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1787 */ 1792 */
1788void ecb_cold 1793void ecb_cold
1789rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1790{ 1795{
1791 screen.charset = set; 1796 screen.charset = set;
1792 set_font_style (); 1797 set_font_style ();
1793} 1798}
1794 1799
… …
1800 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1801 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1802 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1803 */ 1808 */
1804void 1809void
1805rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1806{ 1811{
1807 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1808 set_font_style (); 1813 set_font_style ();
1809} 1814}
1810 1815
… …
1815 1820
1816/* 1821/*
1817 * refresh matching text. 1822 * refresh matching text.
1818 */ 1823 */
1819bool ecb_cold 1824bool ecb_cold
1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1821{ 1826{
1822 bool found = false; 1827 bool found = false;
1823 1828
1824 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1825 { 1830 {
… …
1844 PART_END, 1849 PART_END,
1845 RC_COUNT 1850 RC_COUNT
1846}; 1851};
1847 1852
1848void ecb_hot 1853void ecb_hot
1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1850{ 1855{
1851 int i; 1856 int i;
1852 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1853 1858
1854 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1888/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1889/* 1894/*
1890 * Refresh the entire screen 1895 * Refresh the entire screen
1891 */ 1896 */
1892void 1897void
1893rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1894{ 1899{
1895 scr_expose (0, 0, vt_width, vt_height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1896} 1901}
1897 1902
1898/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1899/* 1904/*
1900 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1901 * the top of the screen 1906 * the top of the screen
1902 */ 1907 */
1903void 1908void
1904rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1905{ 1910{
1906 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1907} 1913}
1908 1914
1909/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1910/* 1916/*
1911 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1912 * direction should be UP or DN 1918 * direction should be UP or DN
1913 */ 1919 */
1914bool 1920bool
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1916{ 1922{
1917 int new_view_start =
1918 direction == UP ? view_start - nlines
1919 : view_start + nlines;
1920
1921 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1922} 1924}
1923 1925
1924bool 1926bool
1925rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1926{ 1928{
1927 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1928 1930
1929 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1930 return false; 1932 return false;
… …
1948} 1950}
1949#endif 1951#endif
1950 1952
1951/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1952void 1954void
1953rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1954{ 1956{
1955#ifndef NO_BELL 1957#ifndef NO_BELL
1956 1958
1957# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1958# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
… …
1980#endif 1982#endif
1981} 1983}
1982 1984
1983/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1984void ecb_cold 1986void ecb_cold
1985rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1986{ 1988{
1987#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1988 int nrows, row_start; 1990 int nrows, row_start;
1989 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1990 1992
… …
2039 * Refresh the screen 2041 * Refresh the screen
2040 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2041 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2042 */ 2044 */
2043void ecb_hot 2045void ecb_hot
2044rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2045{ 2047{
2046 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2047 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2048 int i; /* tmp */ 2050 int i; /* tmp */
2049 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2050 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend; 2053 rend_t cur_rend;
2052 int cur_col; 2054 int cur_col;
2055 int cursorwidth;
2053 2056
2054 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2055 2058
2056 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2057 return; 2060 return;
… …
2082 2085
2083 /* 2086 /*
2084 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2085 */ 2088 */
2086 { 2089 {
2087 bool setoldcursor;
2088
2089#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2090 if (hidden_cursor) 2091 if (hidden_cursor)
2091 showcursor = 0; 2092 showcursor = 0;
2092#endif 2093#endif
2093 2094
… …
2095 { 2096 {
2096 int col = screen.cur.col; 2097 int col = screen.cur.col;
2097 2098
2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2099 col--; 2100 col--;
2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2100 2106
2101 cur_rend = ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col; 2108 cur_col = col;
2103 2109
2104#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
… …
2121 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2122#else 2128#else
2123 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2124#endif 2130#endif
2125 2131
2126 if (focus) 2132 if (focus && cursor_type == 0)
2127 { 2133 {
2128 rend_t rend = cur_rend; 2134 rend_t rend = cur_rend;
2129 2135
2130 if (option (Opt_cursorUnderline))
2131 rend ^= RS_Uline;
2132 else
2133 {
2134 rend ^= RS_RVid; 2136 rend ^= RS_RVid;
2135 rend = SET_FGCOLOR (rend, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2136 rend = SET_BGCOLOR (rend, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2137 }
2138 2139
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2140 } 2141 }
2141 } 2142 }
2142 2143
2143 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2144 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2145 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2146 { 2153 {
2147 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2148 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2149 {
2150 if (ocrow < nrow
2151 && oldcursor.col < ncol)
2152 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2153
2154 if (focus || !showcursor)
2155 oldcursor.row = -1;
2156 else
2157 setoldcursor = 1;
2158 }
2159 } 2156 }
2160 else if (!focus) 2157 else
2161 setoldcursor = 1;
2162
2163 if (setoldcursor)
2164 {
2165 if (screen.cur.row - view_start >= nrow)
2166 oldcursor.row = -1; 2158 oldcursor.row = -1;
2167 else
2168 {
2169 oldcursor.row = screen.cur.row - view_start;
2170 oldcursor.col = screen.cur.col;
2171 }
2172 }
2173 } 2159 }
2174 2160
2175#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2176 /* 2162 /*
2177 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2258 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2259 2245
2260 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2261 { 2247 {
2262 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2263 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2264 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2265 || (stp[col] == ' ' /* space w/ no background change */
2266 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2267 continue; 2250 continue;
2268 2251
2269 // redraw one or more characters 2252 // redraw one or more characters
2270 2253
2271 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2443 else 2426 else
2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2445 2428
2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2447 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2448#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2449 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2450 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2451 else 2438 else
2452#endif 2439#endif
… …
2463 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2464 */ 2451 */
2465 if (showcursor) 2452 if (showcursor)
2466 { 2453 {
2467 if (focus) 2454 if (focus)
2455 {
2456 if (cursor_type == 0)
2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458 else if (oldcursor.row >= 0)
2459 {
2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 if (cursor_type == 1)
2462 XFillRectangle (dpy, vt, gc,
2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2473 }
2474 }
2469 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2470 { 2476 {
2471 int cursorwidth = 1;
2472 int col = oldcursor.col;
2473
2474 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2475 col--;
2476
2477 while (col + cursorwidth < ncol
2478 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2479 cursorwidth++;
2480
2481#ifndef NO_CURSORCOLOR
2482 if (ISSET_PIXCOLOR (Color_cursor))
2483 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2484 else
2485#endif
2486 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2487 2478
2488 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2489 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2490 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2491 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2492 (unsigned int) (Height2Pixel (1) - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2493 } 2484 }
2494 } 2485 }
… …
2507 num_scr = 0; 2498 num_scr = 0;
2508 num_scr_allow = 1; 2499 num_scr_allow = 1;
2509} 2500}
2510 2501
2511void ecb_cold 2502void ecb_cold
2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2513{ 2504{
2514 if (!l.valid ()) 2505 if (!l.valid ())
2515 return; 2506 return;
2516 2507
2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2519 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2521} 2512}
2522 2513
2523void ecb_cold 2514void ecb_cold
2524rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2525{ 2516{
2526 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2527 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2528 2519
2529 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2532 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2533 } 2524 }
2534} 2525}
2535 2526
2536void ecb_cold 2527void ecb_cold
2537rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2538{ 2529{
2539 bool transparent = false; 2530 bool transparent = false;
2540 2531
2541#ifdef HAVE_IMG 2532#ifdef HAVE_IMG
2542 if (bg_img != 0) 2533 if (bg_img != 0)
… …
2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 } 2555 }
2565 2556
2566 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2567 2558
2568 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2569 { 2560 {
2570 if (transparent) 2561 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else 2563 else
2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2583 want_refresh = 1; 2574 want_refresh = 1;
2584} 2575}
2585 2576
2586/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2587void 2578void
2588rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2589{ 2580{
2590 if (!mapped) 2581 if (!mapped)
2591 return; 2582 return;
2592 2583
2593 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2596 if (really) 2587 if (really)
2597 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2598} 2589}
2599 2590
2600void 2591void
2601rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2602{ 2593{
2603 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2604 int row, col; 2595 int row, col;
2605 2596
2606 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2618 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2619 } 2610 }
2620} 2611}
2621 2612
2622void 2613void
2623rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2624{ 2615{
2625 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2626 int row, col; 2617 int row, col;
2627 2618
2628 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2645 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2646} 2637}
2647 2638
2648/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2649void ecb_hot 2640void ecb_hot
2650rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2651{ 2642{
2652 if (selection.op 2643 if (selection.op
2653 && current_screen == selection.screen 2644 && current_screen == selection.screen
2654 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2655 { 2646 {
… …
2671 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2672 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2673 */ 2664 */
2674#if 0 2665#if 0
2675void 2666void
2676rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2677{ 2668{
2678 // if this method is needed, it can be implemented by factoring the 2669 // if this method is needed, it can be implemented by factoring the
2679 // relevant code in scr_printscreen 2670 // relevant code in scr_printscreen
2680} 2671}
2681#endif 2672#endif
2682 2673
2683/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2684 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2685 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2686void 2677void
2687rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2688{ 2679{
2689 if (!selection.op) 2680 if (!selection.op)
2690 return; 2681 return;
2691 2682
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 CLEAR_ALL_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2700} 2691}
2701 2692
2702void 2693void
2703rxvt_term::selection_changed () NOTHROW 2694rxvt_term::selection_changed () noexcept
2704{ 2695{
2705 line_t &r1 = ROW (selection.beg.row); 2696 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col; 2698 ++selection.beg.col;
2708 2699
2709 line_t &r2 = ROW (selection.end.row); 2700 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col; 2702 ++selection.end.col;
2712 2703
… …
2716/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2717/* 2708/*
2718 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2719 */ 2710 */
2720void 2711void
2721rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2722{ 2713{
2723 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2724 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2725 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2726 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2733 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2734 tt_printf ("\x1b[201~"); 2725 tt_printf ("\x1b[201~");
2735} 2726}
2736 2727
2737void 2728void
2738rxvt_term::paste (char *data, unsigned int len) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) noexcept
2739{ 2730{
2740 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2741 return; 2732 return;
2742 2733
2743 tt_paste (data, len); 2734 tt_paste (data, len);
… …
2749 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2750 * as fallback 2741 * as fallback
2751 * EXT: button 2 release 2742 * EXT: button 2 release
2752 */ 2743 */
2753void 2744void
2754rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) noexcept
2755{ 2746{
2756 if (!selection_req) 2747 if (!selection_req)
2757 { 2748 {
2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2759 selection_req->run (); 2750 selection_req->run ();
… …
2764/* 2755/*
2765 * Clear all selected text 2756 * Clear all selected text
2766 * EXT: SelectionClear 2757 * EXT: SelectionClear
2767 */ 2758 */
2768void 2759void
2769rxvt_term::selection_clear (bool clipboard) NOTHROW 2760rxvt_term::selection_clear (bool clipboard) noexcept
2770{ 2761{
2771 if (!clipboard) 2762 if (!clipboard)
2772 { 2763 {
2773 want_refresh = 1; 2764 want_refresh = 1;
2774 free (selection.text); 2765 free (selection.text);
… …
2859 if (*t == NOCHAR) 2850 if (*t == NOCHAR)
2860 t++; 2851 t++;
2861#if ENABLE_COMBINING 2852#if ENABLE_COMBINING
2862 else if (IS_COMPOSE (*t)) 2853 else if (IS_COMPOSE (*t))
2863 { 2854 {
2864 int len = rxvt_composite.expand (*t, 0); 2855 int len = rxvt_composite.expand (*t);
2865 2856
2866 extra -= (len - 1); 2857 extra -= (len - 1);
2867 2858
2868 if (extra < 0) 2859 if (extra < 0)
2869 { 2860 {
… …
2916 2907
2917 selection_grab (tm); 2908 selection_grab (tm);
2918} 2909}
2919 2910
2920bool 2911bool
2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2912rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2922{ 2913{
2923 Atom sel; 2914 Atom sel;
2924 2915
2925 if (!clipboard) 2916 if (!clipboard)
2926 { 2917 {
… …
2960/* 2951/*
2961 * Mark or select text based upon number of clicks: 1, 2, or 3 2952 * Mark or select text based upon number of clicks: 1, 2, or 3
2962 * EXT: button 1 press 2953 * EXT: button 1 press
2963 */ 2954 */
2964void ecb_cold 2955void ecb_cold
2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2956rxvt_term::selection_click (int clicks, int x, int y) noexcept
2966{ 2957{
2967 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
2968 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
2969 2960
2970 if (clicks == 2 && !selection.rect 2961 if (clicks == 2 && !selection.rect
… …
2989/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
2990/* 2981/*
2991 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
2992 */ 2983 */
2993void ecb_cold 2984void ecb_cold
2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2985rxvt_term::selection_start_colrow (int col, int row) noexcept
2995{ 2986{
2996 want_refresh = 1; 2987 want_refresh = 1;
2997 2988
2998 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
2999 selection.mark.col = col; 2990 selection.mark.col = col;
… …
3026#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3028#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3029 3020
3030void ecb_cold 3021void ecb_cold
3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3032{ 3023{
3033 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3034 row_col_t bound; 3025 row_col_t bound;
3035 text_t *stp; 3026 text_t *stp;
3036 rend_t *srp; 3027 rend_t *srp;
… …
3110 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3111 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3112 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3113 */ 3104 */
3114void ecb_cold 3105void ecb_cold
3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3106rxvt_term::selection_extend (int x, int y, int flag) noexcept
3116{ 3107{
3117 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3118 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3119 3110
3120 /* 3111 /*
… …
3146/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3147/* 3138/*
3148 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3149 */ 3140 */
3150void ecb_cold 3141void ecb_cold
3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3152{ 3143{
3153 row_col_t pos; 3144 row_col_t pos;
3154 enum { 3145 enum {
3155 LEFT, RIGHT 3146 LEFT, RIGHT
3156 } closeto = RIGHT; 3147 } closeto = RIGHT;
… …
3347 selection_changed (); 3338 selection_changed ();
3348} 3339}
3349 3340
3350#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3351void ecb_cold 3342void ecb_cold
3352rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () noexcept
3353{ 3344{
3354 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3355 text_t *stp; 3346 text_t *stp;
3356 3347
3357 end_col = selection.end.col; 3348 end_col = selection.end.col;
… …
3395/* 3386/*
3396 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3397 * EXT: button 3 double click 3388 * EXT: button 3 double click
3398 */ 3389 */
3399void ecb_cold 3390void ecb_cold
3400rxvt_term::selection_rotate (int x, int y) NOTHROW 3391rxvt_term::selection_rotate (int x, int y) noexcept
3401{ 3392{
3402 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3404} 3395}
3405 3396
… …
3407/* 3398/*
3408 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3409 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3410 */ 3401 */
3411void ecb_cold 3402void ecb_cold
3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3413{ 3404{
3414 Atom property = rq.property == None ? rq.target : rq.property; 3405 Atom property = rq.property == None ? rq.target : rq.property;
3415 XSelectionEvent ev; 3406 XSelectionEvent ev;
3416 3407
3417 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
… …
3509 cl = selection.clip_text; 3500 cl = selection.clip_text;
3510 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3511 } 3502 }
3512 else 3503 else
3513 { 3504 {
3514 cl = L""; 3505 cl = (wchar_t *)L"";
3515 selectlen = 0; 3506 selectlen = 0;
3516 } 3507 }
3517 3508
3518#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3519 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3510 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3551} 3542}
3552 3543
3553/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3554#if USE_XIM 3545#if USE_XIM
3555void ecb_cold 3546void ecb_cold
3556rxvt_term::im_set_position (XPoint &pos) NOTHROW 3547rxvt_term::im_set_position (XPoint &pos) noexcept
3557{ 3548{
3558 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3559 3550
3560 XGetWindowAttributes (dpy, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);
3561 3552
… …
3564} 3555}
3565#endif 3556#endif
3566 3557
3567#if ENABLE_OVERLAY 3558#if ENABLE_OVERLAY
3568void 3559void
3569rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3560rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3570{ 3561{
3571 if (nrow < 1 || ncol < 1) 3562 if (nrow < 1 || ncol < 1)
3572 return; 3563 return;
3573 3564
3574 want_refresh = 1; 3565 want_refresh = 1;
… …
3619 *rp = r; 3610 *rp = r;
3620 } 3611 }
3621} 3612}
3622 3613
3623void 3614void
3624rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () noexcept
3625{ 3616{
3626 if (!ov.text) 3617 if (!ov.text)
3627 return; 3618 return;
3628 3619
3629 want_refresh = 1; 3620 want_refresh = 1;
… …
3637 delete [] ov.text; ov.text = 0; 3628 delete [] ov.text; ov.text = 0;
3638 delete [] ov.rend; ov.rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3639} 3630}
3640 3631
3641void 3632void
3642rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3643{ 3634{
3644 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3645 return; 3636 return;
3646 3637
3647 x++, y++; 3638 x++, y++;
… …
3649 ov.text[y][x] = text; 3640 ov.text[y][x] = text;
3650 ov.rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3651} 3642}
3652 3643
3653void 3644void
3654rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3655{ 3646{
3656 while (*s) 3647 while (*s)
3657 scr_overlay_set (x++, y, *s++); 3648 scr_overlay_set (x++, y, *s++);
3658} 3649}
3659 3650
3660void 3651void
3661rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3662{ 3653{
3663 while (*s) 3654 while (*s)
3664 { 3655 {
3665 text_t t = *s++; 3656 text_t t = *s++;
3666 int width = WCWIDTH (t); 3657 int width = WCWIDTH (t);
… …
3672 } 3663 }
3673 } 3664 }
3674} 3665}
3675 3666
3676void 3667void
3677rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () noexcept
3678{ 3669{
3679 if (!ov.text) 3670 if (!ov.text)
3680 return; 3671 return;
3681 3672
3682 // hide cursor if it is within the overlay area 3673 // hide cursor if it is within the overlay area

Diff Legend

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