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.422 by root, Thu Jun 28 15:19:15 2012 UTC vs.
Revision 1.472 by root, Mon Aug 8 10:33:14 2022 UTC

… …
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
94 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
95 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
96 97
97/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
98void 99void
99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
100{ 101{
101 if (!l.valid ()) 102 if (!l.valid ())
102 { 103 {
103 l.alloc (); 104 l.alloc ();
104 col = 0; 105 col = 0;
… …
106 } 107 }
107 108
108 l.touch (); 109 l.touch ();
109 110
110 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
111 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
112 113
113 text_t *et = l.t + col; 114 text_t *et = l.t + col;
114 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
115 116
116 while (width--) 117 while (width--)
… …
121} 122}
122 123
123/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
124/* Fill a full line with blanks - make sure it is allocated first */ 125/* Fill a full line with blanks - make sure it is allocated first */
125void 126void
126rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW 127rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
127{ 128{
128 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
129 130
130 l.l = 0; 131 l.l = 0;
131 l.f = 0; 132 l.f = 0;
132} 133}
133 134
134// nuke a single wide character at the given column 135// nuke a single wide character at the given column
135void 136void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
137{ 138{
138 // find begin 139 // find begin
139 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
140 col--; 141 col--;
141 142
142 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
144 145
145 l.touch (); 146 l.touch ();
146 147
147 // found start, nuke 148 // found start, nuke
148 do { 149 do {
… …
150 l.r[col] = rend; 151 l.r[col] = rend;
151 col++; 152 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
160rxvt_term::scr_alloc () NOTHROW 171rxvt_term::scr_alloc () noexcept
161{ 172{
162 int tsize = sizeof (text_t) * ncol; 173 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 174 int rsize = sizeof (rend_t) * ncol;
164 175
165 // we assume that rend_t size is a sufficient alignment 176 // we assume that rend_t size is a sufficient alignment
… …
188 drawn_buf = (line_t *)chunk; 199 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 200 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 201 row_buf = swap_buf + nrow;
191} 202}
192 203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
193void ecb_cold 214void ecb_cold
194rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
195{ 216{
196#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
197 scr_overlay_off (); 218 scr_overlay_off ();
… …
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
296 // resize swap_buf, blank drawn_buf
277 for (int row = min (nrow, prev_nrow); row--; ) 297 for (int row = min (nrow, prev_nrow); row--; )
278 { 298 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 299 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); 300 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); 301 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); 302
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 303 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 304 }
287 305
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 306 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 307 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 308 int q = total_rows; // rewrapped row
291 309
292 if (top_row) 310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
293 { 312 {
294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
295 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change 315 // TODO: maybe optimise when width didn't change
297 316
… …
368 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 387 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
369 qline->is_longer (0); 388 qline->is_longer (0);
370 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 389 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
371 } 390 }
372 while (p != pend && q > 0); 391 while (p != pend && q > 0);
373
374 term_start = total_rows - nrow;
375 top_row = q - term_start;
376
377 // make sure all terminal lines exist
378 while (top_row > 0)
379 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
380 } 392 }
381 else 393 else
394#endif
395 {
396 // wing, instead of wrap
397 screen.cur.row += nrow - prev_nrow;
398
382 { 399 do
383 // if no scrollback exists (yet), wing, instead of wrap
384
385 for (int row = min (nrow, prev_nrow); row--; )
386 { 400 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 401 p = MOD (p - 1, prev_total_rows);
388 line_t &dst = row_buf [row]; 402 q--;
389 403
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 404 copy_line (row_buf [q], prev_row_buf [p]);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 405 }
406 while (p != pend && q > 0);
407 }
395 408
396 for (int row = prev_nrow; row < nrow; row++) 409 term_start = total_rows - nrow;
410 top_row = q - term_start;
411
412 // make sure all terminal lines exist
413 while (top_row > 0)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 414 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
398
399 term_start = 0;
400 }
401 415
402 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
404 } 418 }
405 419
420 // ensure drawn_buf, swap_buf and terminal rows are all initialized
406 for (int row = nrow; row--; ) 421 for (int row = nrow; row--; )
407 { 422 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 423 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 424 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 425 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 426 }
412 427
413 free (prev_chunk); 428 chunk_free (prev_chunk, prev_chunk_size);
414 429
415 free (tabs); 430 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 431 tabs = (char *)rxvt_malloc (ncol);
417 432
418 for (int col = ncol; col--; ) 433 for (int col = ncol; col--; )
… …
427 442
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 443 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 444}
430 445
431void ecb_cold 446void ecb_cold
432rxvt_term::scr_release () NOTHROW 447rxvt_term::scr_release () noexcept
433{ 448{
434 chunk_free (chunk, chunk_size); 449 chunk_free (chunk, chunk_size);
435 chunk = 0; 450 chunk = 0;
436 row_buf = 0; 451 row_buf = 0;
437 452
… …
456 scr_clear (true); 471 scr_clear (true);
457 scr_refresh (); 472 scr_refresh ();
458} 473}
459 474
460void ecb_cold 475void ecb_cold
461rxvt_term::scr_soft_reset () NOTHROW 476rxvt_term::scr_soft_reset () noexcept
462{ 477{
463 /* only affects modes, nothing drastic such as clearing the screen */ 478 /* only affects modes, nothing drastic such as clearing the screen */
464#if ENABLE_OVERLAY 479#if ENABLE_OVERLAY
465 scr_overlay_off (); 480 scr_overlay_off ();
466#endif 481#endif
… …
480 * Save and Restore cursor 495 * Save and Restore cursor
481 * XTERM_SEQ: Save cursor : ESC 7 496 * XTERM_SEQ: Save cursor : ESC 7
482 * XTERM_SEQ: Restore cursor: ESC 8 497 * XTERM_SEQ: Restore cursor: ESC 8
483 */ 498 */
484void 499void
485rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 500rxvt_term::scr_cursor (cursor_mode mode) noexcept
486{ 501{
487 screen_t *s; 502 screen_t *s;
488 503
489#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 504#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
490 if (current_screen == SECONDARY) 505 if (current_screen == SECONDARY)
… …
521 assert (s->cur.row >= 0); 536 assert (s->cur.row >= 0);
522 assert (s->cur.col >= 0); 537 assert (s->cur.col >= 0);
523} 538}
524 539
525void 540void
526rxvt_term::scr_swap_screen () NOTHROW 541rxvt_term::scr_swap_screen () noexcept
527{ 542{
528 if (!option (Opt_secondaryScreen)) 543 if (!option (Opt_secondaryScreen))
529 return; 544 return;
530 545
531 for (int i = prev_nrow; i--; ) 546 for (int i = prev_nrow; i--; )
… …
579 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 594 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
580} 595}
581 596
582// clear WrapNext indicator, solidifying position on next line 597// clear WrapNext indicator, solidifying position on next line
583void 598void
584rxvt_term::scr_do_wrap () NOTHROW 599rxvt_term::scr_do_wrap () noexcept
585{ 600{
586 if (!(screen.flags & Screen_WrapNext)) 601 if (!(screen.flags & Screen_WrapNext))
587 return; 602 return;
588 603
589 screen.flags &= ~Screen_WrapNext; 604 screen.flags &= ~Screen_WrapNext;
… …
599/* ------------------------------------------------------------------------- */ 614/* ------------------------------------------------------------------------- */
600/* 615/*
601 * Change the colour for following text 616 * Change the colour for following text
602 */ 617 */
603void 618void
604rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 619rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
605{ 620{
606 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 621 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
607 color = fgbg; 622 color = fgbg;
608 623
609 if (fgbg == Color_fg) 624 if (fgbg == Color_fg)
610 rstyle = SET_FGCOLOR (rstyle, color); 625 rstyle = SET_FGCOLOR (rstyle, color);
611 else 626 else
… …
615/* ------------------------------------------------------------------------- */ 630/* ------------------------------------------------------------------------- */
616/* 631/*
617 * Change the rendition style for following text 632 * Change the rendition style for following text
618 */ 633 */
619void 634void
620rxvt_term::scr_rendition (int set, int style) NOTHROW 635rxvt_term::scr_rendition (int set, int style) noexcept
621{ 636{
622 if (set) 637 if (set)
623 rstyle |= style; 638 rstyle |= style;
624 else if (style == ~RS_None) 639 else if (style == ~RS_None)
625 rstyle = DEFAULT_RSTYLE; 640 rstyle = DEFAULT_RSTYLE;
… …
632 * Scroll text between <row1> and <row2> inclusive, by <count> lines 647 * Scroll text between <row1> and <row2> inclusive, by <count> lines
633 * count positive ==> scroll up 648 * count positive ==> scroll up
634 * count negative ==> scroll down 649 * count negative ==> scroll down
635 */ 650 */
636int ecb_hot 651int ecb_hot
637rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 652rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
638{ 653{
639 if (count == 0 || (row1 > row2)) 654 if (count == 0 || (row1 > row2))
640 return 0; 655 return 0;
641 656
642 want_refresh = 1; 657 want_refresh = 1;
… …
702 717
703 // finally move the view window, if desired 718 // finally move the view window, if desired
704 if (option (Opt_scrollWithBuffer) 719 if (option (Opt_scrollWithBuffer)
705 && view_start != 0 720 && view_start != 0
706 && view_start != -saveLines) 721 && view_start != -saveLines)
707 scr_page (UP, count); 722 scr_page (count);
708 723
709 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 724 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
710 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 725 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
711 } 726 }
712 else 727 else
… …
776/* ------------------------------------------------------------------------- */ 791/* ------------------------------------------------------------------------- */
777/* 792/*
778 * Add text given in <str> of length <len> to screen struct 793 * Add text given in <str> of length <len> to screen struct
779 */ 794 */
780void ecb_hot 795void ecb_hot
781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 796rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
782{ 797{
783 if (len <= 0) /* sanity */ 798 if (len <= 0) /* sanity */
784 return; 799 return;
785 800
786 bool checksel; 801 bool checksel;
… …
998 } 1013 }
999 else if (screen.cur.row > 0 1014 else if (screen.cur.row > 0
1000 && ROW(screen.cur.row - 1).is_longer ()) 1015 && ROW(screen.cur.row - 1).is_longer ())
1001 { 1016 {
1002 linep = &ROW(screen.cur.row - 1); 1017 linep = &ROW(screen.cur.row - 1);
1003 tp = line->t + ncol - 1; 1018 tp = linep->t + ncol - 1;
1004 rp = line->r + ncol - 1; 1019 rp = linep->r + ncol - 1;
1005 } 1020 }
1006 else 1021 else
1007 continue; 1022 continue;
1008 1023
1009 linep->touch (); 1024 linep->touch ();
… …
1032/* 1047/*
1033 * Process Backspace. Move back the cursor back a position, wrap if have to 1048 * Process Backspace. Move back the cursor back a position, wrap if have to
1034 * XTERM_SEQ: CTRL-H 1049 * XTERM_SEQ: CTRL-H
1035 */ 1050 */
1036void 1051void
1037rxvt_term::scr_backspace () NOTHROW 1052rxvt_term::scr_backspace () noexcept
1038{ 1053{
1039 if (screen.cur.col == 0) 1054 if (screen.cur.col == 0)
1040 { 1055 {
1041 if (screen.cur.row > 0) 1056 if (screen.cur.row > 0)
1042 { 1057 {
… …
1059 * Process Horizontal Tab 1074 * Process Horizontal Tab
1060 * count: +ve = forward; -ve = backwards 1075 * count: +ve = forward; -ve = backwards
1061 * XTERM_SEQ: CTRL-I 1076 * XTERM_SEQ: CTRL-I
1062 */ 1077 */
1063void 1078void
1064rxvt_term::scr_tab (int count, bool ht) NOTHROW 1079rxvt_term::scr_tab (int count, bool ht) noexcept
1065{ 1080{
1066 int i, x; 1081 int i, x;
1067 1082
1068 want_refresh = 1; 1083 want_refresh = 1;
1069 i = x = screen.cur.col; 1084 i = x = screen.cur.col;
… …
1136 * Move cursor left in row. If we're at the left boundary, shift everything 1151 * Move cursor left in row. If we're at the left boundary, shift everything
1137 * in that row right. Clear left column. 1152 * in that row right. Clear left column.
1138 */ 1153 */
1139#if !ENABLE_MINIMAL 1154#if !ENABLE_MINIMAL
1140void ecb_cold 1155void ecb_cold
1141rxvt_term::scr_backindex () NOTHROW 1156rxvt_term::scr_backindex () noexcept
1142{ 1157{
1143 if (screen.cur.col > 0) 1158 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1159 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1160 else
1146 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
… …
1153 * Move cursor right in row. If we're at the right boundary, shift everything 1168 * Move cursor right in row. If we're at the right boundary, shift everything
1154 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1155 */ 1170 */
1156#if !ENABLE_MINIMAL 1171#if !ENABLE_MINIMAL
1157void ecb_cold 1172void ecb_cold
1158rxvt_term::scr_forwardindex () NOTHROW 1173rxvt_term::scr_forwardindex () noexcept
1159{ 1174{
1160 if (screen.cur.col < ncol - 1) 1175 if (screen.cur.col < ncol - 1)
1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1176 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1162 else 1177 else
1163 { 1178 {
… …
1176/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1177/* 1192/*
1178 * Goto Row/Column 1193 * Goto Row/Column
1179 */ 1194 */
1180void 1195void
1181rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1196rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1182{ 1197{
1183 want_refresh = 1; 1198 want_refresh = 1;
1184 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1185 1200
1186 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1225/* ------------------------------------------------------------------------- */ 1240/* ------------------------------------------------------------------------- */
1226/* 1241/*
1227 * direction should be UP or DN 1242 * direction should be UP or DN
1228 */ 1243 */
1229void 1244void
1230rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1245rxvt_term::scr_index (enum page_dirn direction) noexcept
1231{ 1246{
1232 int dirn;
1233
1234 want_refresh = 1; 1247 want_refresh = 1;
1235 ZERO_SCROLLBACK (); 1248 ZERO_SCROLLBACK ();
1236 1249
1237 dirn = ((direction == UP) ? 1 : -1);
1238
1239 screen.flags &= ~Screen_WrapNext; 1250 screen.flags &= ~Screen_WrapNext;
1240 1251
1241 if ((screen.cur.row == screen.bscroll && direction == UP) 1252 if ((screen.cur.row == screen.bscroll && direction == UP)
1242 || (screen.cur.row == screen.tscroll && direction == DN)) 1253 || (screen.cur.row == screen.tscroll && direction == DN))
1243 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1254 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1244 else 1255 else
1245 screen.cur.row += dirn; 1256 screen.cur.row += direction;
1246 1257
1247 clamp_it (screen.cur.row, 0, nrow - 1); 1258 clamp_it (screen.cur.row, 0, nrow - 1);
1248 selection_check (0); 1259 selection_check (0);
1249} 1260}
1250 1261
… …
1255 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1256 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1257 * extension: clear to right unless wrapped: ESC [ 3 K 1268 * extension: clear to right unless wrapped: ESC [ 3 K
1258 */ 1269 */
1259void 1270void
1260rxvt_term::scr_erase_line (int mode) NOTHROW 1271rxvt_term::scr_erase_line (int mode) noexcept
1261{ 1272{
1262 unsigned int col, num; 1273 unsigned int col, num;
1263 1274
1264 want_refresh = 1; 1275 want_refresh = 1;
1265 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
… …
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1333 */
1323void 1334void
1324rxvt_term::scr_erase_screen (int mode) NOTHROW 1335rxvt_term::scr_erase_screen (int mode) noexcept
1325{ 1336{
1326 int num; 1337 int num;
1327 int32_t row; 1338 int32_t row;
1328 rend_t ren; 1339 rend_t ren;
1329 XGCValues gcvalue; 1340 XGCValues gcvalue;
… …
1399 } 1410 }
1400} 1411}
1401 1412
1402#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1403void 1414void
1404rxvt_term::scr_erase_savelines () NOTHROW 1415rxvt_term::scr_erase_savelines () noexcept
1405{ 1416{
1406 want_refresh = 1; 1417 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1408 1419
1409 top_row = 0; 1420 top_row = 0;
… …
1414/* 1425/*
1415 * Fill the screen with `E's 1426 * Fill the screen with `E's
1416 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1417 */ 1428 */
1418void ecb_cold 1429void ecb_cold
1419rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () noexcept
1420{ 1431{
1421 rend_t fs; 1432 rend_t fs;
1422 1433
1423 want_refresh = 1; 1434 want_refresh = 1;
1424 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
… …
1449/* ------------------------------------------------------------------------- */ 1460/* ------------------------------------------------------------------------- */
1450/* 1461/*
1451 * Insert/Delete <count> lines 1462 * Insert/Delete <count> lines
1452 */ 1463 */
1453void 1464void
1454rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1455{ 1466{
1456 int end; 1467 int end;
1457 1468
1458 ZERO_SCROLLBACK (); 1469 ZERO_SCROLLBACK ();
1459 1470
… …
1479/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
1480/* 1491/*
1481 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1482 */ 1493 */
1483void 1494void
1484rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1485{ 1496{
1486 want_refresh = 1; 1497 want_refresh = 1;
1487 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1488 1499
1489 if (count <= 0) 1500 if (count <= 0)
… …
1588/* 1599/*
1589 * Set the scrolling region 1600 * Set the scrolling region
1590 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1591 */ 1602 */
1592void ecb_cold 1603void ecb_cold
1593rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) noexcept
1594{ 1605{
1595 max_it (top, 0); 1606 max_it (top, 0);
1596 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1597 1608
1598 if (top > bot) 1609 if (top > bot)
… …
1608 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1609 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1610 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1611 */ 1622 */
1612void ecb_cold 1623void ecb_cold
1613rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) noexcept
1614{ 1625{
1615 want_refresh = 1; 1626 want_refresh = 1;
1616 1627
1617 if (mode) 1628 if (mode)
1618 screen.flags |= Screen_VisibleCursor; 1629 screen.flags |= Screen_VisibleCursor;
… …
1625 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1626 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1627 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1628 */ 1639 */
1629void ecb_cold 1640void ecb_cold
1630rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) noexcept
1631{ 1642{
1632 if (mode) 1643 if (mode)
1633 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1634 else 1645 else
1635 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1646 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1644 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1645 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1646 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1647 */ 1658 */
1648void ecb_cold 1659void ecb_cold
1649rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) noexcept
1650{ 1661{
1651 if (mode) 1662 if (mode)
1652 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1653 else 1664 else
1654 screen.flags &= ~Screen_Relative; 1665 screen.flags &= ~Screen_Relative;
… …
1661 * Set insert/replace mode 1672 * Set insert/replace mode
1662 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1663 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1664 */ 1675 */
1665void ecb_cold 1676void ecb_cold
1666rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) noexcept
1667{ 1678{
1668 if (mode) 1679 if (mode)
1669 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1670 else 1681 else
1671 screen.flags &= ~Screen_Insert; 1682 screen.flags &= ~Screen_Insert;
… …
1677 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1678 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1679 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1680 */ 1691 */
1681void ecb_cold 1692void ecb_cold
1682rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) noexcept
1683{ 1694{
1684 if (mode < 0) 1695 if (mode < 0)
1685 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1686 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
1687 tabs [screen.cur.col] = !!mode; 1698 tabs [screen.cur.col] = !!mode;
… …
1692 * Set reverse/normal video 1703 * Set reverse/normal video
1693 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1704 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1694 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1705 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1695 */ 1706 */
1696void 1707void
1697rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1708rxvt_term::scr_rvideo_mode (bool on) noexcept
1698{ 1709{
1699 rvideo_mode = on; 1710 rvideo_mode = on;
1700 1711
1701#ifndef NO_BELL 1712#ifndef NO_BELL
1702 on ^= rvideo_bell; 1713 on ^= rvideo_bell;
… …
1704 1715
1705 if (rvideo_state != on) 1716 if (rvideo_state != on)
1706 { 1717 {
1707 rvideo_state = on; 1718 rvideo_state = on;
1708 1719
1720#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade])
1722 {
1723 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1724 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1725 }
1726 else
1727#endif
1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1728 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1710#ifdef HAVE_BG_PIXMAP 1729#ifdef HAVE_IMG
1711 if (bg_img == 0) 1730 if (bg_img == 0)
1712#endif 1731#endif
1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1732 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1714 1733
1715 XGCValues gcvalue; 1734 XGCValues gcvalue;
… …
1726/* 1745/*
1727 * Report current cursor position 1746 * Report current cursor position
1728 * XTERM_SEQ: Report position: ESC [ 6 n 1747 * XTERM_SEQ: Report position: ESC [ 6 n
1729 */ 1748 */
1730void ecb_cold 1749void ecb_cold
1731rxvt_term::scr_report_position () NOTHROW 1750rxvt_term::scr_report_position () noexcept
1732{ 1751{
1733 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1752 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1734} 1753}
1735 1754
1736/* ------------------------------------------------------------------------- * 1755/* ------------------------------------------------------------------------- *
… …
1739 1758
1740/* 1759/*
1741 * Set font style 1760 * Set font style
1742 */ 1761 */
1743void ecb_cold 1762void ecb_cold
1744rxvt_term::set_font_style () NOTHROW 1763rxvt_term::set_font_style () noexcept
1745{ 1764{
1746#if 0 1765#if 0
1747 switch (charsets [screen.charset]) 1766 switch (charsets [screen.charset])
1748 { 1767 {
1749 case '0': /* DEC Special Character & Line Drawing Set */ 1768 case '0': /* DEC Special Character & Line Drawing Set */
… …
1771 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1790 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1772 * XTERM_SEQ: Invoke G2 character set: ESC N 1791 * XTERM_SEQ: Invoke G2 character set: ESC N
1773 * XTERM_SEQ: Invoke G3 character set: ESC O 1792 * XTERM_SEQ: Invoke G3 character set: ESC O
1774 */ 1793 */
1775void ecb_cold 1794void ecb_cold
1776rxvt_term::scr_charset_choose (int set) NOTHROW 1795rxvt_term::scr_charset_choose (int set) noexcept
1777{ 1796{
1778 screen.charset = set; 1797 screen.charset = set;
1779 set_font_style (); 1798 set_font_style ();
1780} 1799}
1781 1800
… …
1787 * XTERM_SEQ: Set G2 character set: ESC * <C> 1806 * XTERM_SEQ: Set G2 character set: ESC * <C>
1788 * XTERM_SEQ: Set G3 character set: ESC + <C> 1807 * XTERM_SEQ: Set G3 character set: ESC + <C>
1789 * See set_font_style for possible values for <C> 1808 * See set_font_style for possible values for <C>
1790 */ 1809 */
1791void 1810void
1792rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1811rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1793{ 1812{
1794 charsets[set] = (unsigned char)ch; 1813 charsets[set] = (unsigned char)ch;
1795 set_font_style (); 1814 set_font_style ();
1796} 1815}
1797 1816
… …
1802 1821
1803/* 1822/*
1804 * refresh matching text. 1823 * refresh matching text.
1805 */ 1824 */
1806bool ecb_cold 1825bool ecb_cold
1807rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1826rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1808{ 1827{
1809 bool found = false; 1828 bool found = false;
1810 1829
1811 for (int i = 0; i < nrow; i++) 1830 for (int i = 0; i < nrow; i++)
1812 { 1831 {
… …
1831 PART_END, 1850 PART_END,
1832 RC_COUNT 1851 RC_COUNT
1833}; 1852};
1834 1853
1835void ecb_hot 1854void ecb_hot
1836rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1855rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1837{ 1856{
1838 int i; 1857 int i;
1839 row_col_t rc[RC_COUNT]; 1858 row_col_t rc[RC_COUNT];
1840 1859
1841 if (!drawn_buf) /* sanity check */ 1860 if (!drawn_buf) /* sanity check */
… …
1875/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1876/* 1895/*
1877 * Refresh the entire screen 1896 * Refresh the entire screen
1878 */ 1897 */
1879void 1898void
1880rxvt_term::scr_touch (bool refresh) NOTHROW 1899rxvt_term::scr_touch (bool refresh) noexcept
1881{ 1900{
1882 scr_expose (0, 0, vt_width, vt_height, refresh); 1901 scr_expose (0, 0, vt_width, vt_height, refresh);
1883} 1902}
1884 1903
1885/* ------------------------------------------------------------------------- */ 1904/* ------------------------------------------------------------------------- */
1886/* 1905/*
1887 * Move the display so that the line represented by scrollbar value Y is at 1906 * Move the display so that the line represented by scrollbar value Y is at
1888 * the top of the screen 1907 * the top of the screen
1889 */ 1908 */
1890void 1909void
1891rxvt_term::scr_move_to (int y, int len) NOTHROW 1910rxvt_term::scr_move_to (int y, int len) noexcept
1892{ 1911{
1893 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1912 // lerp (y, 0, len, top_row, nrow - 1)
1913 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1894} 1914}
1895 1915
1896/* ------------------------------------------------------------------------- */ 1916/* ------------------------------------------------------------------------- */
1897/* 1917/*
1898 * Page the screen up/down nlines 1918 * Page the screen up/down nlines
1899 * direction should be UP or DN 1919 * direction should be UP or DN
1900 */ 1920 */
1901bool 1921bool
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1922rxvt_term::scr_page (int nlines) noexcept
1903{ 1923{
1904 int new_view_start =
1905 direction == UP ? view_start - nlines
1906 : view_start + nlines;
1907
1908 return scr_changeview (new_view_start); 1924 return scr_changeview (view_start - nlines);
1909} 1925}
1910 1926
1911bool 1927bool
1912rxvt_term::scr_changeview (int new_view_start) NOTHROW 1928rxvt_term::scr_changeview (int new_view_start) noexcept
1913{ 1929{
1914 clamp_it (new_view_start, top_row, 0); 1930 clamp_it (new_view_start, top_row, 0);
1915 1931
1916 if (new_view_start == view_start) 1932 if (new_view_start == view_start)
1917 return false; 1933 return false;
… …
1935} 1951}
1936#endif 1952#endif
1937 1953
1938/* ------------------------------------------------------------------------- */ 1954/* ------------------------------------------------------------------------- */
1939void 1955void
1940rxvt_term::scr_bell () NOTHROW 1956rxvt_term::scr_bell () noexcept
1941{ 1957{
1942#ifndef NO_BELL 1958#ifndef NO_BELL
1943 1959
1944# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1945# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
… …
1967#endif 1983#endif
1968} 1984}
1969 1985
1970/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1971void ecb_cold 1987void ecb_cold
1972rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) noexcept
1973{ 1989{
1974#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1975 int nrows, row_start; 1991 int nrows, row_start;
1976 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
1977 1993
… …
2026 * Refresh the screen 2042 * Refresh the screen
2027 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2028 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2029 */ 2045 */
2030void ecb_hot 2046void ecb_hot
2031rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () noexcept
2032{ 2048{
2033 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2035 int i; /* tmp */ 2051 int i; /* tmp */
2036#ifndef NO_CURSORCOLOR
2037 rend_t cc1; /* store colours at cursor position (s) */
2038#endif
2039 rend_t *crp; // cursor rendition pointer
2040 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
2041 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2056 int cursorwidth;
2042 2057
2043 want_refresh = 0; /* screen is current */ 2058 want_refresh = 0; /* screen is current */
2044 2059
2045 if (refresh_type == NO_REFRESH || !mapped) 2060 if (refresh_type == NO_REFRESH || !mapped)
2046 return; 2061 return;
… …
2050 */ 2065 */
2051 refresh_count = 0; 2066 refresh_count = 0;
2052 2067
2053 unsigned int old_screen_flags = screen.flags; 2068 unsigned int old_screen_flags = screen.flags;
2054 bool have_bg = 0; 2069 bool have_bg = 0;
2055#ifdef HAVE_BG_PIXMAP 2070#ifdef HAVE_IMG
2056 have_bg = bg_img != 0; 2071 have_bg = bg_img != 0;
2057#endif 2072#endif
2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2073 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059 2074
2060 /* 2075 /*
… …
2071 2086
2072 /* 2087 /*
2073 * C: set the cursor character (s) 2088 * C: set the cursor character (s)
2074 */ 2089 */
2075 { 2090 {
2076 bool setoldcursor;
2077
2078#ifdef CURSOR_BLINK 2091#ifdef CURSOR_BLINK
2079 if (hidden_cursor) 2092 if (hidden_cursor)
2080 showcursor = 0; 2093 showcursor = 0;
2081#endif 2094#endif
2082 2095
… …
2085 int col = screen.cur.col; 2098 int col = screen.cur.col;
2086 2099
2087 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2100 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2088 col--; 2101 col--;
2089 2102
2103 cursorwidth = 1;
2104 while (col + cursorwidth < ncol
2105 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2106 cursorwidth++;
2107
2090 crp = &ROW(screen.cur.row).r[col]; 2108 cur_rend = ROW(screen.cur.row).r[col];
2109 cur_col = col;
2091 2110
2092#ifndef NO_CURSORCOLOR 2111#ifndef NO_CURSORCOLOR
2093 cc1 = *crp & (RS_fgMask | RS_bgMask);
2094 if (ISSET_PIXCOLOR (Color_cursor)) 2112 if (ISSET_PIXCOLOR (Color_cursor))
2095 ccol1 = Color_cursor; 2113 ccol1 = Color_cursor;
2096 else 2114 else
2097#endif 2115#endif
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2116#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2110 ccol2 = bgcolor_of (rstyle); 2128 ccol2 = bgcolor_of (rstyle);
2111#else 2129#else
2112 ccol2 = Color_bg; 2130 ccol2 = Color_bg;
2113#endif 2131#endif
2114 2132
2115 if (focus) 2133 if (focus && cursor_type == 0)
2116 { 2134 {
2117 if (option (Opt_cursorUnderline)) 2135 rend_t rend = cur_rend;
2118 *crp ^= RS_Uline; 2136
2119 else
2120 {
2121 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2122 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2123 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2124 } 2140
2141 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2125 } 2142 }
2126 } 2143 }
2127 2144
2128 /* make sure no outline cursor is left around */ 2145 /* make sure no outline cursor is left around */
2129 setoldcursor = 0; 2146 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2130 if (ocrow != -1) 2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2148
2149 // save the current cursor coordinates if the cursor is visible
2150 // and either the window is unfocused or the cursor style is
2151 // underline or vertical bar, so as to clear the outline cursor in
2152 // the next refresh if the cursor moves or becomes invisible
2153 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2131 { 2154 {
2132 if (screen.cur.row - view_start != ocrow 2155 oldcursor.row = screen.cur.row - view_start;
2133 || screen.cur.col != oldcursor.col) 2156 oldcursor.col = screen.cur.col;
2134 {
2135 if (ocrow < nrow
2136 && oldcursor.col < ncol)
2137 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2138
2139 if (focus || !showcursor)
2140 oldcursor.row = -1;
2141 else
2142 setoldcursor = 1;
2143 }
2144 } 2157 }
2145 else if (!focus) 2158 else
2146 setoldcursor = 1;
2147
2148 if (setoldcursor)
2149 {
2150 if (screen.cur.row - view_start >= nrow)
2151 oldcursor.row = -1; 2159 oldcursor.row = -1;
2152 else
2153 {
2154 oldcursor.row = screen.cur.row - view_start;
2155 oldcursor.col = screen.cur.col;
2156 }
2157 }
2158 } 2160 }
2159 2161
2160#ifndef NO_SLOW_LINK_SUPPORT 2162#ifndef NO_SLOW_LINK_SUPPORT
2161 /* 2163 /*
2162 * D: CopyArea pass - very useful for slower links 2164 * D: CopyArea pass - very useful for slower links
… …
2243 int ypixel = (int)Row2Pixel (row); 2245 int ypixel = (int)Row2Pixel (row);
2244 2246
2245 for (col = 0; col < ncol; col++) 2247 for (col = 0; col < ncol; col++)
2246 { 2248 {
2247 /* compare new text with old - if exactly the same then continue */ 2249 /* compare new text with old - if exactly the same then continue */
2248 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2250 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2249 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2250 || (stp[col] == ' ' /* space w/ no background change */
2251 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2252 continue; 2251 continue;
2253 2252
2254 // redraw one or more characters 2253 // redraw one or more characters
2255 2254
2256 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
… …
2428 else 2427 else
2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2430 2429
2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2432 { 2431 {
2432 if (showcursor && focus && row == screen.cur.row
2433 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2434 XSetForeground (dpy, gc, pix_colors[ccol1]);
2435 else
2433#if ENABLE_FRILLS 2436#if ENABLE_FRILLS
2434 if (ISSET_PIXCOLOR (Color_underline)) 2437 if (ISSET_PIXCOLOR (Color_underline))
2435 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2438 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2436 else 2439 else
2437#endif 2440#endif
… …
2449 */ 2452 */
2450 if (showcursor) 2453 if (showcursor)
2451 { 2454 {
2452 if (focus) 2455 if (focus)
2453 { 2456 {
2454 if (option (Opt_cursorUnderline)) 2457 if (cursor_type == 0)
2455 *crp ^= RS_Uline; 2458 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 else 2459 else if (oldcursor.row >= 0)
2457 { 2460 {
2458 *crp ^= RS_RVid; 2461 XSetForeground (dpy, gc, pix_colors[ccol1]);
2459#ifndef NO_CURSORCOLOR 2462 if (cursor_type == 1)
2460 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2463 XFillRectangle (dpy, vt, gc,
2461#endif 2464 Col2Pixel (cur_col),
2465 Row2Pixel (oldcursor.row + 1) - 2,
2466 Width2Pixel (1),
2467 2);
2468 else
2469 XFillRectangle (dpy, vt, gc,
2470 Col2Pixel (cur_col),
2471 Row2Pixel (oldcursor.row),
2472 2,
2473 Height2Pixel (1));
2462 } 2474 }
2463 } 2475 }
2464 else if (oldcursor.row >= 0) 2476 else if (oldcursor.row >= 0)
2465 { 2477 {
2466 int cursorwidth = 1;
2467 int col = oldcursor.col;
2468
2469 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2470 col--;
2471
2472 while (col + cursorwidth < ncol
2473 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2474 cursorwidth++;
2475
2476#ifndef NO_CURSORCOLOR
2477 if (ISSET_PIXCOLOR (Color_cursor))
2478 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2479 else
2480#endif
2481 XSetForeground (dpy, gc, pix_colors[ccol1]); 2478 XSetForeground (dpy, gc, pix_colors[ccol1]);
2482 2479
2483 XDrawRectangle (dpy, vt, gc, 2480 XDrawRectangle (dpy, vt, gc,
2484 Col2Pixel (col), 2481 Col2Pixel (cur_col),
2485 Row2Pixel (oldcursor.row), 2482 Row2Pixel (oldcursor.row),
2486 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2483 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2487 (unsigned int) (Height2Pixel (1) - 1)); 2484 (unsigned int) (Height2Pixel (1) - 1));
2488 } 2485 }
2489 } 2486 }
… …
2502 num_scr = 0; 2499 num_scr = 0;
2503 num_scr_allow = 1; 2500 num_scr_allow = 1;
2504} 2501}
2505 2502
2506void ecb_cold 2503void ecb_cold
2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2504rxvt_term::scr_remap_chars (line_t &l) noexcept
2508{ 2505{
2509 if (!l.valid ()) 2506 if (!l.valid ())
2510 return; 2507 return;
2511 2508
2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2509 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2514 for (int i = ncol; i--; ) 2511 for (int i = ncol; i--; )
2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2512 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2516} 2513}
2517 2514
2518void ecb_cold 2515void ecb_cold
2519rxvt_term::scr_remap_chars () NOTHROW 2516rxvt_term::scr_remap_chars () noexcept
2520{ 2517{
2521 for (int i = total_rows; i--; ) 2518 for (int i = total_rows; i--; )
2522 scr_remap_chars (row_buf [i]); 2519 scr_remap_chars (row_buf [i]);
2523 2520
2524 for (int i = nrow; i--; ) 2521 for (int i = nrow; i--; )
… …
2527 scr_remap_chars (swap_buf [i]); 2524 scr_remap_chars (swap_buf [i]);
2528 } 2525 }
2529} 2526}
2530 2527
2531void ecb_cold 2528void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2529rxvt_term::scr_recolor (bool refresh) noexcept
2533{ 2530{
2534 bool transparent = false; 2531 bool transparent = false;
2535 2532
2536#ifdef HAVE_BG_PIXMAP 2533#ifdef HAVE_IMG
2537 if (bg_img != 0) 2534 if (bg_img != 0)
2538 { 2535 {
2539# if ENABLE_TRANSPARENCY 2536# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2537 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2538 {
… …
2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2555 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 } 2556 }
2560 2557
2561 XClearWindow (dpy, parent); 2558 XClearWindow (dpy, parent);
2562 2559
2563 if (scrollBar.win) 2560 if (scrollBar.state && scrollBar.win)
2564 { 2561 {
2565 if (transparent) 2562 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2563 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2564 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = SB_STATE_IDLE; 2566 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2567 scrollBar.show (0);
2571 } 2568 }
2572 2569
2573 if (refresh) 2570 if (refresh)
… …
2578 want_refresh = 1; 2575 want_refresh = 1;
2579} 2576}
2580 2577
2581/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2582void 2579void
2583rxvt_term::scr_clear (bool really) NOTHROW 2580rxvt_term::scr_clear (bool really) noexcept
2584{ 2581{
2585 if (!mapped) 2582 if (!mapped)
2586 return; 2583 return;
2587 2584
2588 num_scr_allow = 0; 2585 num_scr_allow = 0;
… …
2591 if (really) 2588 if (really)
2592 XClearWindow (dpy, vt); 2589 XClearWindow (dpy, vt);
2593} 2590}
2594 2591
2595void 2592void
2596rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2593rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2597{ 2594{
2598 int view_end = view_start + nrow; 2595 int view_end = view_start + nrow;
2599 int row, col; 2596 int row, col;
2600 2597
2601 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2598 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2613 srp[col] ^= rstyle2; 2610 srp[col] ^= rstyle2;
2614 } 2611 }
2615} 2612}
2616 2613
2617void 2614void
2618rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2615rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2619{ 2616{
2620 int view_end = view_start + nrow; 2617 int view_end = view_start + nrow;
2621 int row, col; 2618 int row, col;
2622 2619
2623 if (beg_row >= view_start) 2620 if (beg_row >= view_start)
… …
2640 srp[col] ^= rstyle; 2637 srp[col] ^= rstyle;
2641} 2638}
2642 2639
2643/* ------------------------------------------------------------------------- */ 2640/* ------------------------------------------------------------------------- */
2644void ecb_hot 2641void ecb_hot
2645rxvt_term::scr_reverse_selection () NOTHROW 2642rxvt_term::scr_reverse_selection () noexcept
2646{ 2643{
2647 if (selection.op 2644 if (selection.op
2648 && current_screen == selection.screen 2645 && current_screen == selection.screen
2649 && selection.end.row >= view_start) 2646 && selection.end.row >= view_start)
2650 { 2647 {
… …
2666 * Dump the whole scrollback and screen to the passed filedescriptor. The 2663 * Dump the whole scrollback and screen to the passed filedescriptor. The
2667 * invoking routine must close the fd. 2664 * invoking routine must close the fd.
2668 */ 2665 */
2669#if 0 2666#if 0
2670void 2667void
2671rxvt_term::scr_dump (int fd) NOTHROW 2668rxvt_term::scr_dump (int fd) noexcept
2672{ 2669{
2673 // if this method is needed, it can be implemented by factoring the 2670 // if this method is needed, it can be implemented by factoring the
2674 // relevant code in scr_printscreen 2671 // relevant code in scr_printscreen
2675} 2672}
2676#endif 2673#endif
2677 2674
2678/* ------------------------------------------------------------------------- * 2675/* ------------------------------------------------------------------------- *
2679 * CHARACTER SELECTION * 2676 * CHARACTER SELECTION *
2680 * ------------------------------------------------------------------------- */ 2677 * ------------------------------------------------------------------------- */
2681void 2678void
2682rxvt_term::selection_check (int check_more) NOTHROW 2679rxvt_term::selection_check (int check_more) noexcept
2683{ 2680{
2684 if (!selection.op) 2681 if (!selection.op)
2685 return; 2682 return;
2686 2683
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2684 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
… …
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2689 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2690 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694 CLEAR_ALL_SELECTION (); 2691 CLEAR_ALL_SELECTION ();
2695} 2692}
2696 2693
2694void
2695rxvt_term::selection_changed () noexcept
2696{
2697 line_t &r1 = ROW (selection.beg.row);
2698 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2699 ++selection.beg.col;
2700
2701 line_t &r2 = ROW (selection.end.row);
2702 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2703 ++selection.end.col;
2704
2705 want_refresh = 1;
2706}
2707
2697/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2698/* 2709/*
2699 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2700 */ 2711 */
2701void 2712void
2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2703{ 2714{
2704 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2705 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2706 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2707 data[i] = C0_CR; 2718 data[i] = C0_CR;
2708 2719
2709 if (priv_modes & PrivMode_BracketPaste) 2720 #if ENABLE_FRILLS
2721 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2710 tt_printf ("\x1b[200~"); 2722 tt_printf ("\x1b[200~");
2723 #endif
2711 2724
2712 tt_write (data, len); 2725 tt_write (data, len);
2713 2726
2714 if (priv_modes & PrivMode_BracketPaste) 2727 #if ENABLE_FRILLS
2728 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2715 tt_printf ("\x1b[201~"); 2729 tt_printf ("\x1b[201~");
2730 #endif
2716} 2731}
2717 2732
2718void 2733void
2719rxvt_term::paste (char *data, unsigned int len) NOTHROW 2734rxvt_term::paste (char *data, unsigned int len) noexcept
2720{ 2735{
2721 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2736 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2722 return; 2737 return;
2723 2738
2724 tt_paste (data, len); 2739 tt_paste (data, len);
… …
2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2745 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2731 * as fallback 2746 * as fallback
2732 * EXT: button 2 release 2747 * EXT: button 2 release
2733 */ 2748 */
2734void 2749void
2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) noexcept
2736{ 2751{
2737 if (!selection_req) 2752 if (!selection_req)
2738 { 2753 {
2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run (); 2755 selection_req->run ();
… …
2745/* 2760/*
2746 * Clear all selected text 2761 * Clear all selected text
2747 * EXT: SelectionClear 2762 * EXT: SelectionClear
2748 */ 2763 */
2749void 2764void
2750rxvt_term::selection_clear (bool clipboard) NOTHROW 2765rxvt_term::selection_clear (bool clipboard) noexcept
2751{ 2766{
2752 if (!clipboard) 2767 if (!clipboard)
2753 { 2768 {
2754 want_refresh = 1; 2769 want_refresh = 1;
2755 free (selection.text); 2770 free (selection.text);
… …
2840 if (*t == NOCHAR) 2855 if (*t == NOCHAR)
2841 t++; 2856 t++;
2842#if ENABLE_COMBINING 2857#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 2858 else if (IS_COMPOSE (*t))
2844 { 2859 {
2845 int len = rxvt_composite.expand (*t, 0); 2860 int len = rxvt_composite.expand (*t);
2846 2861
2847 extra -= (len - 1); 2862 extra -= (len - 1);
2848 2863
2849 if (extra < 0) 2864 if (extra < 0)
2850 { 2865 {
… …
2897 2912
2898 selection_grab (tm); 2913 selection_grab (tm);
2899} 2914}
2900 2915
2901bool 2916bool
2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2903{ 2918{
2904 Atom sel; 2919 Atom sel;
2905 2920
2906 if (!clipboard) 2921 if (!clipboard)
2907 { 2922 {
… …
2941/* 2956/*
2942 * Mark or select text based upon number of clicks: 1, 2, or 3 2957 * Mark or select text based upon number of clicks: 1, 2, or 3
2943 * EXT: button 1 press 2958 * EXT: button 1 press
2944 */ 2959 */
2945void ecb_cold 2960void ecb_cold
2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2961rxvt_term::selection_click (int clicks, int x, int y) noexcept
2947{ 2962{
2948 clicks = ((clicks - 1) % 3) + 1; 2963 clicks = ((clicks - 1) % 3) + 1;
2949 selection.clicks = clicks; /* save clicks so extend will work */ 2964 selection.clicks = clicks; /* save clicks so extend will work */
2950 2965
2951 if (clicks == 2 && !selection.rect 2966 if (clicks == 2 && !selection.rect
… …
2970/* ------------------------------------------------------------------------- */ 2985/* ------------------------------------------------------------------------- */
2971/* 2986/*
2972 * Mark a selection at the specified col/row 2987 * Mark a selection at the specified col/row
2973 */ 2988 */
2974void ecb_cold 2989void ecb_cold
2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2990rxvt_term::selection_start_colrow (int col, int row) noexcept
2976{ 2991{
2977 want_refresh = 1; 2992 want_refresh = 1;
2978 2993
2979 selection.mark.row = row + view_start; 2994 selection.mark.row = row + view_start;
2980 selection.mark.col = col; 2995 selection.mark.col = col;
… …
3002 * Word select: select text for 2 clicks 3017 * Word select: select text for 2 clicks
3003 * We now only find out the boundary in one direction 3018 * We now only find out the boundary in one direction
3004 */ 3019 */
3005 3020
3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3021/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3007#define DELIMIT_TEXT(x) \ 3022#define DELIMIT_TEXT(x) \
3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3023 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3009#define DELIMIT_REND(x) 1 3024#define DELIMIT_REND(x) 1
3010 3025
3011void ecb_cold 3026void ecb_cold
3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3027rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3013{ 3028{
3014 int col, row, dirnadd, tcol, trow, w1, w2; 3029 int col, row, dirnadd, tcol, trow, w1, w2;
3015 row_col_t bound; 3030 row_col_t bound;
3016 text_t *stp; 3031 text_t *stp;
3017 rend_t *srp; 3032 rend_t *srp;
… …
3091 * flag == 0 ==> button 1 3106 * flag == 0 ==> button 1
3092 * flag == 1 ==> button 3 press 3107 * flag == 1 ==> button 3 press
3093 * flag == 2 ==> button 3 motion 3108 * flag == 2 ==> button 3 motion
3094 */ 3109 */
3095void ecb_cold 3110void ecb_cold
3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3111rxvt_term::selection_extend (int x, int y, int flag) noexcept
3097{ 3112{
3098 int col = clamp (Pixel2Col (x), 0, ncol); 3113 int col = clamp (Pixel2Col (x), 0, ncol);
3099 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3114 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3100 3115
3101 /* 3116 /*
… …
3127/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3128/* 3143/*
3129 * Extend the selection to the specified col/row 3144 * Extend the selection to the specified col/row
3130 */ 3145 */
3131void ecb_cold 3146void ecb_cold
3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3147rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3133{ 3148{
3134 row_col_t pos; 3149 row_col_t pos;
3135 enum { 3150 enum {
3136 LEFT, RIGHT 3151 LEFT, RIGHT
3137 } closeto = RIGHT; 3152 } closeto = RIGHT;
3138
3139 want_refresh = 1;
3140 3153
3141 switch (selection.op) 3154 switch (selection.op)
3142 { 3155 {
3143 case SELECTION_INIT: 3156 case SELECTION_INIT:
3144 CLEAR_SELECTION (); 3157 CLEAR_SELECTION ();
… …
3324 3337
3325#if !ENABLE_MINIMAL 3338#if !ENABLE_MINIMAL
3326 if (selection.rect && selection.beg.col > selection.end.col) 3339 if (selection.rect && selection.beg.col > selection.end.col)
3327 ::swap (selection.beg.col, selection.end.col); 3340 ::swap (selection.beg.col, selection.end.col);
3328#endif 3341#endif
3342
3343 selection_changed ();
3329} 3344}
3330 3345
3331#if !ENABLE_MINIMAL 3346#if !ENABLE_MINIMAL
3332void ecb_cold 3347void ecb_cold
3333rxvt_term::selection_remove_trailing_spaces () NOTHROW 3348rxvt_term::selection_remove_trailing_spaces () noexcept
3334{ 3349{
3335 int32_t end_col, end_row; 3350 int32_t end_col, end_row;
3336 text_t *stp; 3351 text_t *stp;
3337 3352
3338 end_col = selection.end.col; 3353 end_col = selection.end.col;
… …
3376/* 3391/*
3377 * Double click on button 3 when already selected 3392 * Double click on button 3 when already selected
3378 * EXT: button 3 double click 3393 * EXT: button 3 double click
3379 */ 3394 */
3380void ecb_cold 3395void ecb_cold
3381rxvt_term::selection_rotate (int x, int y) NOTHROW 3396rxvt_term::selection_rotate (int x, int y) noexcept
3382{ 3397{
3383 selection.clicks = selection.clicks % 3 + 1; 3398 selection.clicks = selection.clicks % 3 + 1;
3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3385} 3400}
3386 3401
… …
3388/* 3403/*
3389 * Respond to a request for our current selection 3404 * Respond to a request for our current selection
3390 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3391 */ 3406 */
3392void ecb_cold 3407void ecb_cold
3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3394{ 3409{
3395 Atom property = rq.property == None ? rq.target : rq.property; 3410 Atom property = rq.property == None ? rq.target : rq.property;
3396 XSelectionEvent ev; 3411 XSelectionEvent ev;
3397 3412
3398 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
… …
3490 cl = selection.clip_text; 3505 cl = selection.clip_text;
3491 selectlen = selection.clip_len; 3506 selectlen = selection.clip_len;
3492 } 3507 }
3493 else 3508 else
3494 { 3509 {
3495 cl = L""; 3510 cl = (wchar_t *)L"";
3496 selectlen = 0; 3511 selectlen = 0;
3497 } 3512 }
3498 3513
3499#if !ENABLE_MINIMAL 3514#if !ENABLE_MINIMAL
3500 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3515 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3532} 3547}
3533 3548
3534/* ------------------------------------------------------------------------- */ 3549/* ------------------------------------------------------------------------- */
3535#if USE_XIM 3550#if USE_XIM
3536void ecb_cold 3551void ecb_cold
3537rxvt_term::im_set_position (XPoint &pos) NOTHROW 3552rxvt_term::im_set_position (XPoint &pos) noexcept
3538{ 3553{
3539 XWindowAttributes xwa; 3554 XWindowAttributes xwa;
3540 3555
3541 XGetWindowAttributes (dpy, vt, &xwa); 3556 XGetWindowAttributes (dpy, vt, &xwa);
3542 3557
… …
3545} 3560}
3546#endif 3561#endif
3547 3562
3548#if ENABLE_OVERLAY 3563#if ENABLE_OVERLAY
3549void 3564void
3550rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3565rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3551{ 3566{
3552 if (nrow < 1 || ncol < 1) 3567 if (nrow < 1 || ncol < 1)
3553 return; 3568 return;
3554 3569
3555 want_refresh = 1; 3570 want_refresh = 1;
… …
3600 *rp = r; 3615 *rp = r;
3601 } 3616 }
3602} 3617}
3603 3618
3604void 3619void
3605rxvt_term::scr_overlay_off () NOTHROW 3620rxvt_term::scr_overlay_off () noexcept
3606{ 3621{
3607 if (!ov.text) 3622 if (!ov.text)
3608 return; 3623 return;
3609 3624
3610 want_refresh = 1; 3625 want_refresh = 1;
… …
3618 delete [] ov.text; ov.text = 0; 3633 delete [] ov.text; ov.text = 0;
3619 delete [] ov.rend; ov.rend = 0; 3634 delete [] ov.rend; ov.rend = 0;
3620} 3635}
3621 3636
3622void 3637void
3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3624{ 3639{
3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3640 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3626 return; 3641 return;
3627 3642
3628 x++, y++; 3643 x++, y++;
… …
3630 ov.text[y][x] = text; 3645 ov.text[y][x] = text;
3631 ov.rend[y][x] = rend; 3646 ov.rend[y][x] = rend;
3632} 3647}
3633 3648
3634void 3649void
3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3650rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3636{ 3651{
3637 while (*s) 3652 while (*s)
3638 scr_overlay_set (x++, y, *s++); 3653 scr_overlay_set (x++, y, *s++);
3639} 3654}
3640 3655
3641void 3656void
3642rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3657rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3643{ 3658{
3644 while (*s) 3659 while (*s)
3645 { 3660 {
3646 text_t t = *s++; 3661 text_t t = *s++;
3647 int width = WCWIDTH (t); 3662 int width = WCWIDTH (t);
… …
3653 } 3668 }
3654 } 3669 }
3655} 3670}
3656 3671
3657void 3672void
3658rxvt_term::scr_swap_overlay () NOTHROW 3673rxvt_term::scr_swap_overlay () noexcept
3659{ 3674{
3660 if (!ov.text) 3675 if (!ov.text)
3661 return; 3676 return;
3662 3677
3663 // hide cursor if it is within the overlay area 3678 // hide cursor if it is within the overlay area

Diff Legend

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