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.420 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.460 by sf-exg, Thu May 13 19:40: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
150 l.r[col] = rend; 151 l.r[col] = rend;
151 col++; 152 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
160rxvt_term::scr_alloc () NOTHROW 171rxvt_term::scr_alloc () noexcept
161{ 172{
162 int tsize = sizeof (text_t) * ncol; 173 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 174 int rsize = sizeof (rend_t) * ncol;
164 175
165 // we assume that rend_t size is a sufficient alignment 176 // we assume that rend_t size is a sufficient alignment
169 tsize -= tsize % sizeof (rend_t); 180 tsize -= tsize % sizeof (rend_t);
170 181
171 int all_rows = total_rows + nrow + nrow; 182 int all_rows = total_rows + nrow + nrow;
172 183
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 185 chunk = chunk_alloc (chunk_size, 0);
175 186
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 188
178 for (int row = 0; row < all_rows; ++row) 189 for (int row = 0; row < all_rows; ++row)
179 { 190 {
188 drawn_buf = (line_t *)chunk; 199 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 200 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 201 row_buf = swap_buf + nrow;
191} 202}
192 203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
193void ecb_cold 214void ecb_cold
194rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
195{ 216{
196#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
197 scr_overlay_off (); 218 scr_overlay_off ();
225 246
226 screen.tscroll = 0; 247 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
228 249
229 void *prev_chunk = chunk; 250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 252 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 253 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 254 line_t *prev_row_buf = row_buf;
233 255
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 256 scr_alloc ();
237 257
238 if (!prev_row_buf) 258 if (!prev_row_buf)
239 { 259 {
240 /*
241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
242 */
243 top_row = 0; 260 top_row = 0;
244 term_start = 0; 261 term_start = 0;
245 262
246 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
247 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
272 { 289 {
273 /* 290 /*
274 * add or delete rows as appropriate 291 * add or delete rows as appropriate
275 */ 292 */
276 293
294 int common_col = min (prev_ncol, ncol);
295
277 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
278 { 297 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 301
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 302 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 303 }
287 304
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
385 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
386 { 403 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 405 line_t &dst = row_buf [row];
389 406
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 407 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 408 }
395 409
396 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 412
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 425 }
412 426
413 free (prev_chunk); 427 chunk_free (prev_chunk, prev_chunk_size);
414 428
415 free (tabs); 429 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
417 431
418 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
427 441
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 443}
430 444
431void ecb_cold 445void ecb_cold
432rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
433{ 447{
434 free (chunk); chunk = 0; row_buf = 0; 448 chunk_free (chunk, chunk_size);
435 free (tabs); tabs = 0; 449 chunk = 0;
450 row_buf = 0;
451
452 free (tabs);
453 tabs = 0;
436} 454}
437 455
438/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
439/* 457/*
440 * Hard/Soft reset 458 * Hard/Soft reset
452 scr_clear (true); 470 scr_clear (true);
453 scr_refresh (); 471 scr_refresh ();
454} 472}
455 473
456void ecb_cold 474void ecb_cold
457rxvt_term::scr_soft_reset () NOTHROW 475rxvt_term::scr_soft_reset () noexcept
458{ 476{
459 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
460#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
461 scr_overlay_off (); 479 scr_overlay_off ();
462#endif 480#endif
476 * Save and Restore cursor 494 * Save and Restore cursor
477 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
478 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
479 */ 497 */
480void 498void
481rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
482{ 500{
483 screen_t *s; 501 screen_t *s;
484 502
485#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
486 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
517 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
519} 537}
520 538
521void 539void
522rxvt_term::scr_swap_screen () NOTHROW 540rxvt_term::scr_swap_screen () noexcept
523{ 541{
524 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
525 return; 543 return;
526 544
527 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
575 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
576} 594}
577 595
578// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
579void 597void
580rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
581{ 599{
582 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
583 return; 601 return;
584 602
585 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
595/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
596/* 614/*
597 * Change the colour for following text 615 * Change the colour for following text
598 */ 616 */
599void 617void
600rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
601{ 619{
602 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
603 color = fgbg; 621 color = fgbg;
604 622
605 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
606 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
607 else 625 else
611/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
612/* 630/*
613 * Change the rendition style for following text 631 * Change the rendition style for following text
614 */ 632 */
615void 633void
616rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
617{ 635{
618 if (set) 636 if (set)
619 rstyle |= style; 637 rstyle |= style;
620 else if (style == ~RS_None) 638 else if (style == ~RS_None)
621 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
628 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
629 * count positive ==> scroll up 647 * count positive ==> scroll up
630 * count negative ==> scroll down 648 * count negative ==> scroll down
631 */ 649 */
632int ecb_hot 650int ecb_hot
633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
634{ 652{
635 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
636 return 0; 654 return 0;
637 655
638 want_refresh = 1; 656 want_refresh = 1;
698 716
699 // finally move the view window, if desired 717 // finally move the view window, if desired
700 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
701 && view_start != 0 719 && view_start != 0
702 && view_start != -saveLines) 720 && view_start != -saveLines)
703 scr_page (UP, count); 721 scr_page (count);
704 722
705 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
706 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));
707 } 725 }
708 else 726 else
772/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
773/* 791/*
774 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
775 */ 793 */
776void ecb_hot 794void ecb_hot
777rxvt_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
778{ 796{
779 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
780 return; 798 return;
781 799
782 bool checksel; 800 bool checksel;
994 } 1012 }
995 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
996 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
997 { 1015 {
998 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
999 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1000 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1001 } 1019 }
1002 else 1020 else
1003 continue; 1021 continue;
1004 1022
1005 linep->touch (); 1023 linep->touch ();
1028/* 1046/*
1029 * 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
1030 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1031 */ 1049 */
1032void 1050void
1033rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1034{ 1052{
1035 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1036 { 1054 {
1037 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1038 { 1056 {
1055 * Process Horizontal Tab 1073 * Process Horizontal Tab
1056 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1057 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1058 */ 1076 */
1059void 1077void
1060rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1061{ 1079{
1062 int i, x; 1080 int i, x;
1063 1081
1064 want_refresh = 1; 1082 want_refresh = 1;
1065 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
1132 * 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
1133 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1134 */ 1152 */
1135#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1136void ecb_cold 1154void ecb_cold
1137rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1138{ 1156{
1139 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1141 else 1159 else
1142 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
1149 * 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
1150 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1151 */ 1169 */
1152#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1153void ecb_cold 1171void ecb_cold
1154rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1155{ 1173{
1156 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1158 else 1176 else
1159 { 1177 {
1172/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1173/* 1191/*
1174 * Goto Row/Column 1192 * Goto Row/Column
1175 */ 1193 */
1176void 1194void
1177rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1178{ 1196{
1179 want_refresh = 1; 1197 want_refresh = 1;
1180 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1181 1199
1182 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1221/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1222/* 1240/*
1223 * direction should be UP or DN 1241 * direction should be UP or DN
1224 */ 1242 */
1225void 1243void
1226rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1227{ 1245{
1228 int dirn;
1229
1230 want_refresh = 1; 1246 want_refresh = 1;
1231 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1232 1248
1233 dirn = ((direction == UP) ? 1 : -1);
1234
1235 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1236 1250
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1240 else 1254 else
1241 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1242 1256
1243 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1244 selection_check (0); 1258 selection_check (0);
1245} 1259}
1246 1260
1251 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1252 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1253 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1254 */ 1268 */
1255void 1269void
1256rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1257{ 1271{
1258 unsigned int col, num; 1272 unsigned int col, num;
1259 1273
1260 want_refresh = 1; 1274 want_refresh = 1;
1261 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1318 */ 1332 */
1319void 1333void
1320rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1321{ 1335{
1322 int num; 1336 int num;
1323 int32_t row; 1337 int32_t row;
1324 rend_t ren; 1338 rend_t ren;
1325 XGCValues gcvalue; 1339 XGCValues gcvalue;
1395 } 1409 }
1396} 1410}
1397 1411
1398#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1399void 1413void
1400rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1401{ 1415{
1402 want_refresh = 1; 1416 want_refresh = 1;
1403 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1404 1418
1405 top_row = 0; 1419 top_row = 0;
1410/* 1424/*
1411 * Fill the screen with `E's 1425 * Fill the screen with `E's
1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1413 */ 1427 */
1414void ecb_cold 1428void ecb_cold
1415rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1416{ 1430{
1417 rend_t fs; 1431 rend_t fs;
1418 1432
1419 want_refresh = 1; 1433 want_refresh = 1;
1420 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1445/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1446/* 1460/*
1447 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1448 */ 1462 */
1449void 1463void
1450rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1451{ 1465{
1452 int end; 1466 int end;
1453 1467
1454 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1455 1469
1475/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1476/* 1490/*
1477 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1478 */ 1492 */
1479void 1493void
1480rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1481{ 1495{
1482 want_refresh = 1; 1496 want_refresh = 1;
1483 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1484 1498
1485 if (count <= 0) 1499 if (count <= 0)
1584/* 1598/*
1585 * Set the scrolling region 1599 * Set the scrolling region
1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1587 */ 1601 */
1588void ecb_cold 1602void ecb_cold
1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1590{ 1604{
1591 max_it (top, 0); 1605 max_it (top, 0);
1592 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1593 1607
1594 if (top > bot) 1608 if (top > bot)
1604 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1607 */ 1621 */
1608void ecb_cold 1622void ecb_cold
1609rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1610{ 1624{
1611 want_refresh = 1; 1625 want_refresh = 1;
1612 1626
1613 if (mode) 1627 if (mode)
1614 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
1621 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1624 */ 1638 */
1625void ecb_cold 1639void ecb_cold
1626rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1627{ 1641{
1628 if (mode) 1642 if (mode)
1629 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1630 else 1644 else
1631 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1640 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1643 */ 1657 */
1644void ecb_cold 1658void ecb_cold
1645rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1646{ 1660{
1647 if (mode) 1661 if (mode)
1648 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1649 else 1663 else
1650 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
1657 * Set insert/replace mode 1671 * Set insert/replace mode
1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1660 */ 1674 */
1661void ecb_cold 1675void ecb_cold
1662rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1663{ 1677{
1664 if (mode) 1678 if (mode)
1665 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1666 else 1680 else
1667 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
1673 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1676 */ 1690 */
1677void ecb_cold 1691void ecb_cold
1678rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1679{ 1693{
1680 if (mode < 0) 1694 if (mode < 0)
1681 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1682 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1683 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
1688 * Set reverse/normal video 1702 * Set reverse/normal video
1689 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1690 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1691 */ 1705 */
1692void 1706void
1693rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1694{ 1708{
1695 rvideo_mode = on; 1709 rvideo_mode = on;
1696 1710
1697#ifndef NO_BELL 1711#ifndef NO_BELL
1698 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
1700 1714
1701 if (rvideo_state != on) 1715 if (rvideo_state != on)
1702 { 1716 {
1703 rvideo_state = on; 1717 rvideo_state = on;
1704 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
1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1706#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1707 if (bg_pixmap == None) 1729 if (bg_img == 0)
1708#endif 1730#endif
1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1710 1732
1711 XGCValues gcvalue; 1733 XGCValues gcvalue;
1712 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
1722/* 1744/*
1723 * Report current cursor position 1745 * Report current cursor position
1724 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1725 */ 1747 */
1726void ecb_cold 1748void ecb_cold
1727rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1728{ 1750{
1729 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);
1730} 1752}
1731 1753
1732/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
1735 1757
1736/* 1758/*
1737 * Set font style 1759 * Set font style
1738 */ 1760 */
1739void ecb_cold 1761void ecb_cold
1740rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1741{ 1763{
1742#if 0 1764#if 0
1743 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1744 { 1766 {
1745 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1768 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1769 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1770 */ 1792 */
1771void ecb_cold 1793void ecb_cold
1772rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1773{ 1795{
1774 screen.charset = set; 1796 screen.charset = set;
1775 set_font_style (); 1797 set_font_style ();
1776} 1798}
1777 1799
1783 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1784 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1785 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1786 */ 1808 */
1787void 1809void
1788rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1789{ 1811{
1790 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1791 set_font_style (); 1813 set_font_style ();
1792} 1814}
1793 1815
1798 1820
1799/* 1821/*
1800 * refresh matching text. 1822 * refresh matching text.
1801 */ 1823 */
1802bool ecb_cold 1824bool ecb_cold
1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1804{ 1826{
1805 bool found = false; 1827 bool found = false;
1806 1828
1807 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1808 { 1830 {
1827 PART_END, 1849 PART_END,
1828 RC_COUNT 1850 RC_COUNT
1829}; 1851};
1830 1852
1831void ecb_hot 1853void ecb_hot
1832rxvt_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
1833{ 1855{
1834 int i; 1856 int i;
1835 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1836 1858
1837 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
1871/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1872/* 1894/*
1873 * Refresh the entire screen 1895 * Refresh the entire screen
1874 */ 1896 */
1875void 1897void
1876rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1877{ 1899{
1878 scr_expose (0, 0, vt_width, vt_height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1879} 1901}
1880 1902
1881/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1882/* 1904/*
1883 * 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
1884 * the top of the screen 1906 * the top of the screen
1885 */ 1907 */
1886void 1908void
1887rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1888{ 1910{
1889 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);
1890} 1913}
1891 1914
1892/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1893/* 1916/*
1894 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1895 * direction should be UP or DN 1918 * direction should be UP or DN
1896 */ 1919 */
1897bool 1920bool
1898rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1899{ 1922{
1900 int new_view_start =
1901 direction == UP ? view_start - nlines
1902 : view_start + nlines;
1903
1904 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1905} 1924}
1906 1925
1907bool 1926bool
1908rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1909{ 1928{
1910 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1911 1930
1912 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1913 return false; 1932 return false;
1931} 1950}
1932#endif 1951#endif
1933 1952
1934/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1935void 1954void
1936rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1937{ 1956{
1938#ifndef NO_BELL 1957#ifndef NO_BELL
1939 1958
1940# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1941# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1963#endif 1982#endif
1964} 1983}
1965 1984
1966/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1967void ecb_cold 1986void ecb_cold
1968rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1969{ 1988{
1970#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1971 int nrows, row_start; 1990 int nrows, row_start;
1972 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1973 1992
2022 * Refresh the screen 2041 * Refresh the screen
2023 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2024 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2025 */ 2044 */
2026void ecb_hot 2045void ecb_hot
2027rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2028{ 2047{
2029 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2030 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2031 int i; /* tmp */ 2050 int i; /* tmp */
2032#ifndef NO_CURSORCOLOR
2033 rend_t cc1; /* store colours at cursor position (s) */
2034#endif
2035 rend_t *crp; // cursor rendition pointer
2036 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2037 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2038 2056
2039 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2040 2058
2041 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2042 return; 2060 return;
2046 */ 2064 */
2047 refresh_count = 0; 2065 refresh_count = 0;
2048 2066
2049 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2050 bool have_bg = 0; 2068 bool have_bg = 0;
2051#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2052 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2053#endif 2071#endif
2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2055 2073
2056 /* 2074 /*
2057 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
2067 2085
2068 /* 2086 /*
2069 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2070 */ 2088 */
2071 { 2089 {
2072 bool setoldcursor;
2073
2074#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2075 if (hidden_cursor) 2091 if (hidden_cursor)
2076 showcursor = 0; 2092 showcursor = 0;
2077#endif 2093#endif
2078 2094
2081 int col = screen.cur.col; 2097 int col = screen.cur.col;
2082 2098
2083 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2084 col--; 2100 col--;
2085 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2086 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2087 2109
2088#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2089 cc1 = *crp & (RS_fgMask | RS_bgMask);
2090 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2091 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2092 else 2113 else
2093#endif 2114#endif
2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2106 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2107#else 2128#else
2108 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2109#endif 2130#endif
2110 2131
2111 if (focus) 2132 if (focus && cursor_type == 0)
2112 { 2133 {
2113 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2114 *crp ^= RS_Uline; 2135
2115 else
2116 {
2117 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2118 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2119 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2120 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2121 } 2141 }
2122 } 2142 }
2123 2143
2124 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2125 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2126 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)
2127 { 2153 {
2128 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2129 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2130 {
2131 if (ocrow < nrow
2132 && oldcursor.col < ncol)
2133 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2134
2135 if (focus || !showcursor)
2136 oldcursor.row = -1;
2137 else
2138 setoldcursor = 1;
2139 }
2140 } 2156 }
2141 else if (!focus) 2157 else
2142 setoldcursor = 1;
2143
2144 if (setoldcursor)
2145 {
2146 if (screen.cur.row - view_start >= nrow)
2147 oldcursor.row = -1; 2158 oldcursor.row = -1;
2148 else
2149 {
2150 oldcursor.row = screen.cur.row - view_start;
2151 oldcursor.col = screen.cur.col;
2152 }
2153 }
2154 } 2159 }
2155 2160
2156#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2157 /* 2162 /*
2158 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
2239 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2240 2245
2241 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2242 { 2247 {
2243 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2244 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2245 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2246 || (stp[col] == ' ' /* space w/ no background change */
2247 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2248 continue; 2250 continue;
2249 2251
2250 // redraw one or more characters 2252 // redraw one or more characters
2251 2253
2252 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2424 else 2426 else
2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2426 2428
2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2428 { 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
2429#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2430 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2431 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2432 else 2438 else
2433#endif 2439#endif
2445 */ 2451 */
2446 if (showcursor) 2452 if (showcursor)
2447 { 2453 {
2448 if (focus) 2454 if (focus)
2449 { 2455 {
2450 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2451 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2452 else 2458 else if (oldcursor.row >= 0)
2453 { 2459 {
2454 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2455#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2456 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2457#endif 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));
2458 } 2473 }
2459 } 2474 }
2460 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2461 { 2476 {
2462 int cursorwidth = 1;
2463 int col = oldcursor.col;
2464
2465 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2466 col--;
2467
2468 while (col + cursorwidth < ncol
2469 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2470 cursorwidth++;
2471
2472#ifndef NO_CURSORCOLOR
2473 if (ISSET_PIXCOLOR (Color_cursor))
2474 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2475 else
2476#endif
2477 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2478 2478
2479 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2480 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2481 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2482 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2483 (unsigned int) (Height2Pixel (1) - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2484 } 2484 }
2485 } 2485 }
2498 num_scr = 0; 2498 num_scr = 0;
2499 num_scr_allow = 1; 2499 num_scr_allow = 1;
2500} 2500}
2501 2501
2502void ecb_cold 2502void ecb_cold
2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2504{ 2504{
2505 if (!l.valid ()) 2505 if (!l.valid ())
2506 return; 2506 return;
2507 2507
2508 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
2510 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2511 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]));
2512} 2512}
2513 2513
2514void ecb_cold 2514void ecb_cold
2515rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2516{ 2516{
2517 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2518 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2519 2519
2520 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
2523 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2524 } 2524 }
2525} 2525}
2526 2526
2527void ecb_cold 2527void ecb_cold
2528rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2529{ 2529{
2530 bool transparent = false; 2530 bool transparent = false;
2531 2531
2532#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_IMG
2533 if (bg_pixmap != None) 2533 if (bg_img != 0)
2534 { 2534 {
2535# if ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 { 2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2540 2540
2541 transparent = true; 2541 transparent = true;
2542 } 2542 }
2543 else 2543 else
2544# endif 2544# endif
2545 { 2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 } 2548 }
2549 } 2549 }
2550 else 2550 else
2551#endif 2551#endif
2552 { 2552 {
2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 } 2555 }
2556 2556
2557 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2558 2558
2559 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2560 { 2560 {
2561 if (transparent) 2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else 2563 else
2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2565 scrollBar.state = SB_STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2566 scrollBar.show (0); 2566 scrollBar.show (0);
2567 } 2567 }
2568 2568
2569 if (refresh) 2569 if (refresh)
2574 want_refresh = 1; 2574 want_refresh = 1;
2575} 2575}
2576 2576
2577/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2578void 2578void
2579rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2580{ 2580{
2581 if (!mapped) 2581 if (!mapped)
2582 return; 2582 return;
2583 2583
2584 num_scr_allow = 0; 2584 num_scr_allow = 0;
2587 if (really) 2587 if (really)
2588 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2589} 2589}
2590 2590
2591void 2591void
2592rxvt_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
2593{ 2593{
2594 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2595 int row, col; 2595 int row, col;
2596 2596
2597 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++)
2609 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2610 } 2610 }
2611} 2611}
2612 2612
2613void 2613void
2614rxvt_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
2615{ 2615{
2616 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2617 int row, col; 2617 int row, col;
2618 2618
2619 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
2636 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2637} 2637}
2638 2638
2639/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2640void ecb_hot 2640void ecb_hot
2641rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2642{ 2642{
2643 if (selection.op 2643 if (selection.op
2644 && current_screen == selection.screen 2644 && current_screen == selection.screen
2645 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2646 { 2646 {
2662 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2663 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2664 */ 2664 */
2665#if 0 2665#if 0
2666void 2666void
2667rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2668{ 2668{
2669 // 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
2670 // relevant code in scr_printscreen 2670 // relevant code in scr_printscreen
2671} 2671}
2672#endif 2672#endif
2673 2673
2674/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2675 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2676 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2677void 2677void
2678rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2679{ 2679{
2680 if (!selection.op) 2680 if (!selection.op)
2681 return; 2681 return;
2682 2682
2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2690 CLEAR_ALL_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691} 2691}
2692 2692
2693void
2694rxvt_term::selection_changed () noexcept
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2705}
2706
2693/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2694/* 2708/*
2695 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2696 */ 2710 */
2697void 2711void
2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2699{ 2713{
2700 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2701 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2702 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2703 data[i] = C0_CR; 2717 data[i] = C0_CR;
2710 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2711 tt_printf ("\x1b[201~"); 2725 tt_printf ("\x1b[201~");
2712} 2726}
2713 2727
2714void 2728void
2715rxvt_term::paste (char *data, unsigned int len) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) noexcept
2716{ 2730{
2717 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)))
2718 return; 2732 return;
2719 2733
2720 tt_paste (data, len); 2734 tt_paste (data, len);
2726 * 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
2727 * as fallback 2741 * as fallback
2728 * EXT: button 2 release 2742 * EXT: button 2 release
2729 */ 2743 */
2730void 2744void
2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) noexcept
2732{ 2746{
2733 if (!selection_req) 2747 if (!selection_req)
2734 { 2748 {
2735 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);
2736 selection_req->run (); 2750 selection_req->run ();
2741/* 2755/*
2742 * Clear all selected text 2756 * Clear all selected text
2743 * EXT: SelectionClear 2757 * EXT: SelectionClear
2744 */ 2758 */
2745void 2759void
2746rxvt_term::selection_clear (bool clipboard) NOTHROW 2760rxvt_term::selection_clear (bool clipboard) noexcept
2747{ 2761{
2748 if (!clipboard) 2762 if (!clipboard)
2749 { 2763 {
2750 want_refresh = 1; 2764 want_refresh = 1;
2751 free (selection.text); 2765 free (selection.text);
2893 2907
2894 selection_grab (tm); 2908 selection_grab (tm);
2895} 2909}
2896 2910
2897bool 2911bool
2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2912rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2899{ 2913{
2900 Atom sel; 2914 Atom sel;
2901 2915
2902 if (!clipboard) 2916 if (!clipboard)
2903 { 2917 {
2937/* 2951/*
2938 * 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
2939 * EXT: button 1 press 2953 * EXT: button 1 press
2940 */ 2954 */
2941void ecb_cold 2955void ecb_cold
2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2956rxvt_term::selection_click (int clicks, int x, int y) noexcept
2943{ 2957{
2944 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
2945 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
2946 2960
2947 if (clicks == 2 && !selection.rect 2961 if (clicks == 2 && !selection.rect
2966/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
2967/* 2981/*
2968 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
2969 */ 2983 */
2970void ecb_cold 2984void ecb_cold
2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2985rxvt_term::selection_start_colrow (int col, int row) noexcept
2972{ 2986{
2973 want_refresh = 1; 2987 want_refresh = 1;
2974 2988
2975 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
2976 selection.mark.col = col; 2990 selection.mark.col = col;
2998 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
2999 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3000 */ 3014 */
3001 3015
3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3003#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3004 (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)))
3005#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3006 3020
3007void ecb_cold 3021void ecb_cold
3008rxvt_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
3009{ 3023{
3010 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3011 row_col_t bound; 3025 row_col_t bound;
3012 text_t *stp; 3026 text_t *stp;
3013 rend_t *srp; 3027 rend_t *srp;
3087 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3088 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3089 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3090 */ 3104 */
3091void ecb_cold 3105void ecb_cold
3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3106rxvt_term::selection_extend (int x, int y, int flag) noexcept
3093{ 3107{
3094 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3095 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3096 3110
3097 /* 3111 /*
3123/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3124/* 3138/*
3125 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3126 */ 3140 */
3127void ecb_cold 3141void ecb_cold
3128rxvt_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
3129{ 3143{
3130 row_col_t pos; 3144 row_col_t pos;
3131 enum { 3145 enum {
3132 LEFT, RIGHT 3146 LEFT, RIGHT
3133 } closeto = RIGHT; 3147 } closeto = RIGHT;
3134
3135 want_refresh = 1;
3136 3148
3137 switch (selection.op) 3149 switch (selection.op)
3138 { 3150 {
3139 case SELECTION_INIT: 3151 case SELECTION_INIT:
3140 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
3320 3332
3321#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3322 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3323 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3324#endif 3336#endif
3337
3338 selection_changed ();
3325} 3339}
3326 3340
3327#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3328void ecb_cold 3342void ecb_cold
3329rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () noexcept
3330{ 3344{
3331 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3332 text_t *stp; 3346 text_t *stp;
3333 3347
3334 end_col = selection.end.col; 3348 end_col = selection.end.col;
3372/* 3386/*
3373 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3374 * EXT: button 3 double click 3388 * EXT: button 3 double click
3375 */ 3389 */
3376void ecb_cold 3390void ecb_cold
3377rxvt_term::selection_rotate (int x, int y) NOTHROW 3391rxvt_term::selection_rotate (int x, int y) noexcept
3378{ 3392{
3379 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3381} 3395}
3382 3396
3384/* 3398/*
3385 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3386 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3387 */ 3401 */
3388void ecb_cold 3402void ecb_cold
3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3390{ 3404{
3391 Atom property = rq.property == None ? rq.target : rq.property; 3405 Atom property = rq.property == None ? rq.target : rq.property;
3392 XSelectionEvent ev; 3406 XSelectionEvent ev;
3393 3407
3394 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3486 cl = selection.clip_text; 3500 cl = selection.clip_text;
3487 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3488 } 3502 }
3489 else 3503 else
3490 { 3504 {
3491 cl = L""; 3505 cl = (wchar_t *)L"";
3492 selectlen = 0; 3506 selectlen = 0;
3493 } 3507 }
3494 3508
3495#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3496 // 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
3528} 3542}
3529 3543
3530/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3531#if USE_XIM 3545#if USE_XIM
3532void ecb_cold 3546void ecb_cold
3533rxvt_term::im_set_position (XPoint &pos) NOTHROW 3547rxvt_term::im_set_position (XPoint &pos) noexcept
3534{ 3548{
3535 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3536 3550
3537 XGetWindowAttributes (dpy, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);
3538 3552
3541} 3555}
3542#endif 3556#endif
3543 3557
3544#if ENABLE_OVERLAY 3558#if ENABLE_OVERLAY
3545void 3559void
3546rxvt_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
3547{ 3561{
3548 if (nrow < 1 || ncol < 1) 3562 if (nrow < 1 || ncol < 1)
3549 return; 3563 return;
3550 3564
3551 want_refresh = 1; 3565 want_refresh = 1;
3596 *rp = r; 3610 *rp = r;
3597 } 3611 }
3598} 3612}
3599 3613
3600void 3614void
3601rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () noexcept
3602{ 3616{
3603 if (!ov.text) 3617 if (!ov.text)
3604 return; 3618 return;
3605 3619
3606 want_refresh = 1; 3620 want_refresh = 1;
3614 delete [] ov.text; ov.text = 0; 3628 delete [] ov.text; ov.text = 0;
3615 delete [] ov.rend; ov.rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3616} 3630}
3617 3631
3618void 3632void
3619rxvt_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
3620{ 3634{
3621 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3622 return; 3636 return;
3623 3637
3624 x++, y++; 3638 x++, y++;
3626 ov.text[y][x] = text; 3640 ov.text[y][x] = text;
3627 ov.rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3628} 3642}
3629 3643
3630void 3644void
3631rxvt_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
3632{ 3646{
3633 while (*s) 3647 while (*s)
3634 scr_overlay_set (x++, y, *s++); 3648 scr_overlay_set (x++, y, *s++);
3635} 3649}
3636 3650
3637void 3651void
3638rxvt_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
3639{ 3653{
3640 while (*s) 3654 while (*s)
3641 { 3655 {
3642 text_t t = *s++; 3656 text_t t = *s++;
3643 int width = WCWIDTH (t); 3657 int width = WCWIDTH (t);
3649 } 3663 }
3650 } 3664 }
3651} 3665}
3652 3666
3653void 3667void
3654rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () noexcept
3655{ 3669{
3656 if (!ov.text) 3670 if (!ov.text)
3657 return; 3671 return;
3658 3672
3659 // 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