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.399 by sf-exg, Thu Nov 3 10:42:17 2011 UTC vs.
Revision 1.461 by root, Thu Jun 17 00:49:20 2021 UTC

… …
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32
33#include "salloc.C" // HACK, should be a separate compile!
34 33
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
… …
96 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
97 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
98 97
99/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
100void 99void
101rxvt_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
102{ 101{
103 if (!l.t) 102 if (!l.valid ())
104 { 103 {
105 lalloc (l); 104 l.alloc ();
106 col = 0; 105 col = 0;
107 width = ncol; 106 width = ncol;
108 } 107 }
109 108
110 l.touch (); 109 l.touch ();
… …
123} 122}
124 123
125/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
126/* 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 */
127void 126void
128rxvt_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
129{ 128{
130 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
131 130
132 l.l = 0; 131 l.l = 0;
133 l.f = 0; 132 l.f = 0;
134} 133}
135 134
136// nuke a single wide character at the given column 135// nuke a single wide character at the given column
137void 136void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
139{ 138{
140 // find begin 139 // find begin
141 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
142 col--; 141 col--;
143 142
… …
152 l.r[col] = rend; 151 l.r[col] = rend;
153 col++; 152 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
155} 154}
156 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
157/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
160 169
161void 170void
171rxvt_term::scr_alloc () noexcept
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
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
214void ecb_cold
162rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
163{ 216{
164#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
165 scr_overlay_off (); 218 scr_overlay_off ();
166#endif 219#endif
… …
192 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
193 246
194 screen.tscroll = 0; 247 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
196 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
197 if (!row_buf) 258 if (!prev_row_buf)
198 { 259 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 260 top_row = 0;
203 term_start = 0; 261 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 262
219 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
245 { 289 {
246 /* 290 /*
247 * add or delete rows as appropriate 291 * add or delete rows as appropriate
248 */ 292 */
249 293
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266 295
267 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
268 { 297 {
269 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 301
273 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 303 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 304
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
285 308
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 317
295 do 318 do
296 { 319 {
297 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 322 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 324
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 326 {
304 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
305 328
306 plines++; 329 plines++;
307 llen += prev_ncol; 330 llen += prev_ncol;
… …
320 343
321 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
323 { 346 {
324 qline = row_buf + qrow; 347 qline = row_buf + qrow;
325 lalloc (*qline); 348 qline->alloc (); // redundant with next line
326 qline->l = ncol; 349 qline->l = ncol;
327 qline->is_longer (1); 350 qline->is_longer (1);
328 351
329 int qcol = 0; 352 int qcol = 0;
330 353
… …
345 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
346 // least. 369 // least.
347 if (prow == ocur.row) 370 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
349 372
350 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
351 374
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 376
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 399 {
377 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
378 401
379 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
380 { 403 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
383 406
384 qline = pline; 407 copy_line (dst, src);
385 lresize (qline);
386 } 408 }
387 409
388 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 412
393 term_start = 0; 413 term_start = 0;
394 } 414 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 415
400 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 418 }
403 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
404 free (tabs); 429 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
406 431
407 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 440 tt_winch ();
416 441
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 443}
419 444
420/* ------------------------------------------------------------------------- */ 445void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
426{ 447{
427 if (row_buf) 448 chunk_free (chunk, chunk_size);
428 { 449 chunk = 0;
429 delete talloc; talloc = 0; 450 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 451
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 452 free (tabs);
438 tabs = 0; 453 tabs = 0;
439 }
440} 454}
441 455
442/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
443/* 457/*
444 * Hard/Soft reset 458 * Hard/Soft reset
445 */ 459 */
446void 460void ecb_cold
447rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
448{ 462{
449 scr_release (); 463 scr_release ();
464
450 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 466 rvideo_mode = false;
452 scr_soft_reset (); 467 scr_soft_reset ();
453 scr_reset (); 468 scr_reset ();
454 469
455 scr_clear (true); 470 scr_clear (true);
456 scr_refresh (); 471 scr_refresh ();
457} 472}
458 473
459void 474void ecb_cold
460rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () noexcept
461{ 476{
462 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
464 scr_overlay_off (); 479 scr_overlay_off ();
465#endif 480#endif
… …
479 * Save and Restore cursor 494 * Save and Restore cursor
480 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
481 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
482 */ 497 */
483void 498void
484rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
485{ 500{
486 screen_t *s; 501 screen_t *s;
487 502
488#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
489 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
520 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
522} 537}
523 538
524void 539void
525rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () noexcept
526{ 541{
527 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
528 return; 543 return;
529 544
530 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
549 return; 564 return;
550 565
551 want_refresh = 1; 566 want_refresh = 1;
552 view_start = 0; 567 view_start = 0;
553 568
554 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
555 575
556 current_screen = scrn; 576 current_screen = scrn;
557 577
558#if NSCREENS 578#if NSCREENS
559 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
573 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574} 594}
575 595
576// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
577void 597void
578rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
579{ 599{
580 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
581 return; 601 return;
582 602
583 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
593/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
594/* 614/*
595 * Change the colour for following text 615 * Change the colour for following text
596 */ 616 */
597void 617void
598rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
599{ 619{
600 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
601 color = fgbg; 621 color = fgbg;
602 622
603 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
604 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
605 else 625 else
… …
609/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
610/* 630/*
611 * Change the rendition style for following text 631 * Change the rendition style for following text
612 */ 632 */
613void 633void
614rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
615{ 635{
616 if (set) 636 if (set)
617 rstyle |= style; 637 rstyle |= style;
618 else if (style == ~RS_None) 638 else if (style == ~RS_None)
619 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
625/* 645/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 647 * count positive ==> scroll up
628 * count negative ==> scroll down 648 * count negative ==> scroll down
629 */ 649 */
630int 650int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
632{ 652{
633 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
634 return 0; 654 return 0;
635 655
636 want_refresh = 1; 656 want_refresh = 1;
… …
681 } 701 }
682 else 702 else
683 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
684 } 704 }
685 705
706 // move and/or clear selection, if any
707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
709 {
710 selection.beg.row -= count;
711 selection.end.row -= count;
712 selection.mark.row -= count;
713
714 selection_check (0);
715 }
716
686 // finally move the view window, if desired 717 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 719 && view_start != 0
689 && view_start != -saveLines) 720 && view_start != -saveLines)
690 scr_page (UP, count); 721 scr_page (count);
691 722
692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693 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));
694 } 725 }
695 else 726 else
696 { 727 {
728 if (selection.op && current_screen == selection.screen)
729 {
730 if ((selection.beg.row < row1 && selection.end.row > row1)
731 || (selection.beg.row < row2 && selection.end.row > row2)
732 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
733 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
734 || (selection.end.row - count < row1 && selection.end.row >= row1)
735 || (selection.end.row - count > row2 && selection.end.row <= row2))
736 {
737 CLEAR_ALL_SELECTION ();
738 selection.op = SELECTION_CLEAR;
739 }
740 else if (selection.end.row >= row1 && selection.end.row <= row2)
741 {
742 /* move selected region too */
743 selection.beg.row -= count;
744 selection.end.row -= count;
745 selection.mark.row -= count;
746
747 selection_check (0);
748 }
749 }
750
697 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
699 753
700 // sever line above scroll region 754 // sever line above scroll region
701 if (row1) 755 if (row1)
… …
728 l.is_longer (0); 782 l.is_longer (0);
729 l.touch (); 783 l.touch ();
730 } 784 }
731 } 785 }
732 786
733 // move and/or clear selection, if any
734 if (selection.op && current_screen == selection.screen)
735 {
736 if ((selection.beg.row < row1 && selection.end.row > row1)
737 || (selection.beg.row < row2 && selection.end.row > row2)
738 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
739 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
740 || (selection.end.row - count < row1 && selection.end.row >= row1)
741 || (selection.end.row - count > row2 && selection.end.row <= row2))
742 CLEAR_ALL_SELECTION ();
743 else if (selection.end.row >= row1 && selection.end.row <= row2)
744 {
745 /* move selected region too */
746 selection.beg.row -= count;
747 selection.end.row -= count;
748 selection.mark.row -= count;
749
750 selection_check (0);
751 }
752 }
753
754 return count; 787 return count;
755} 788}
756 789
757/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
758/* 791/*
759 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
760 */ 793 */
761void 794void ecb_hot
762rxvt_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
763{ 796{
764 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
765 return; 798 return;
766 799
767 unsigned char checksel; 800 bool checksel;
768 unicode_t c; 801 unicode_t c;
769 int ncol = this->ncol; 802 int ncol = this->ncol;
770 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
771 804
772 want_refresh = 1; 805 want_refresh = 1;
… …
979 } 1012 }
980 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
981 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
982 { 1015 {
983 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
984 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
985 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
986 } 1019 }
987 else 1020 else
988 continue; 1021 continue;
989 1022
990 linep->touch (); 1023 linep->touch ();
… …
1013/* 1046/*
1014 * 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
1015 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1016 */ 1049 */
1017void 1050void
1018rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1019{ 1052{
1020 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1021 { 1054 {
1022 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1023 { 1056 {
… …
1040 * Process Horizontal Tab 1073 * Process Horizontal Tab
1041 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1042 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1043 */ 1076 */
1044void 1077void
1045rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1046{ 1079{
1047 int i, x; 1080 int i, x;
1048 1081
1049 want_refresh = 1; 1082 want_refresh = 1;
1050 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1116 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1117 * 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
1118 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1119 */ 1152 */
1120#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1121void 1154void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1123{ 1156{
1124 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1159 else
1127 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1133 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1134 * 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
1135 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1136 */ 1169 */
1137#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1138void 1171void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1140{ 1173{
1141 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1176 else
1144 { 1177 {
… …
1157/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1158/* 1191/*
1159 * Goto Row/Column 1192 * Goto Row/Column
1160 */ 1193 */
1161void 1194void
1162rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1163{ 1196{
1164 want_refresh = 1; 1197 want_refresh = 1;
1165 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1166 1199
1167 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1206/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1207/* 1240/*
1208 * direction should be UP or DN 1241 * direction should be UP or DN
1209 */ 1242 */
1210void 1243void
1211rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1212{ 1245{
1213 int dirn;
1214
1215 want_refresh = 1; 1246 want_refresh = 1;
1216 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1217 1248
1218 dirn = ((direction == UP) ? 1 : -1);
1219
1220 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1221 1250
1222 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1223 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1224 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1225 else 1254 else
1226 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1227 1256
1228 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1229 selection_check (0); 1258 selection_check (0);
1230} 1259}
1231 1260
… …
1236 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1237 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1238 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1239 */ 1268 */
1240void 1269void
1241rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1242{ 1271{
1243 unsigned int col, num; 1272 unsigned int col, num;
1244 1273
1245 want_refresh = 1; 1274 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1294 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1295} 1324}
1296 1325
1297/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1298/* 1327/*
1299 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1332 */
1304void 1333void
1305rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1306{ 1335{
1307 int num; 1336 int num;
1308 int32_t row; 1337 int32_t row;
1309 rend_t ren; 1338 rend_t ren;
1310 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1313 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1314 1343
1315 switch (mode) 1344 switch (mode)
1316 { 1345 {
1317 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1347 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1349 num = nrow - row;
1322 break; 1350 break;
1323 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1352 scr_erase_line (1);
1326 row = 0; 1353 row = 0;
1327 num = screen.cur.row; 1354 num = screen.cur.row;
1328 break; 1355 break;
1329 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1357 row = 0;
1332 num = nrow; 1358 num = nrow;
1333 break; 1359 break;
1334 default: 1360 default:
1335 return; 1361 return;
… …
1352 { 1378 {
1353 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1354 1380
1355 if (mapped) 1381 if (mapped)
1356 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1359 } 1385 }
1360 else 1386 else
1361 { 1387 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1365 { 1391 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1396 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1400 }
1375 } 1401 }
… …
1383 } 1409 }
1384} 1410}
1385 1411
1386#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1387void 1413void
1388rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1389{ 1415{
1390 want_refresh = 1; 1416 want_refresh = 1;
1391 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1392 1418
1393 top_row = 0; 1419 top_row = 0;
… …
1397/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1398/* 1424/*
1399 * Fill the screen with `E's 1425 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1427 */
1402void 1428void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1404{ 1430{
1405 rend_t fs; 1431 rend_t fs;
1406 1432
1407 want_refresh = 1; 1433 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1409 1435
1410 num_scr_allow = 0; 1436 num_scr_allow = 0;
1411 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1412 1442
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1415 { 1445 {
1416 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1429/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1430/* 1460/*
1431 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1432 */ 1462 */
1433void 1463void
1434rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1435{ 1465{
1436 int end; 1466 int end;
1437 1467
1438 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1439 1469
… …
1459/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1460/* 1490/*
1461 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1462 */ 1492 */
1463void 1493void
1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1465{ 1495{
1466 want_refresh = 1; 1496 want_refresh = 1;
1467 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1468 1498
1469 if (count <= 0) 1499 if (count <= 0)
… …
1567/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1568/* 1598/*
1569 * Set the scrolling region 1599 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1601 */
1572void 1602void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1574{ 1604{
1575 max_it (top, 0); 1605 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1577 1607
1578 if (top > bot) 1608 if (top > bot)
… …
1587/* 1617/*
1588 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1621 */
1592void 1622void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1594{ 1624{
1595 want_refresh = 1; 1625 want_refresh = 1;
1596 1626
1597 if (mode) 1627 if (mode)
1598 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1604/* 1634/*
1605 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1638 */
1609void 1639void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1611{ 1641{
1612 if (mode) 1642 if (mode)
1613 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1614 else 1644 else
1615 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1623 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1624 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1657 */
1628void 1658void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1630{ 1660{
1631 if (mode) 1661 if (mode)
1632 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1633 else 1663 else
1634 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1640/* 1670/*
1641 * Set insert/replace mode 1671 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1674 */
1645void 1675void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1647{ 1677{
1648 if (mode) 1678 if (mode)
1649 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1650 else 1680 else
1651 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1656 * Set/Unset tabs 1686 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1690 */
1661void 1691void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1663{ 1693{
1664 if (mode < 0) 1694 if (mode < 0)
1665 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1667 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1672 * Set reverse/normal video 1702 * Set reverse/normal video
1673 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1674 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1675 */ 1705 */
1676void 1706void
1677rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1678{ 1708{
1679 rvideo_mode = on; 1709 rvideo_mode = on;
1680 1710
1681#ifndef NO_BELL 1711#ifndef NO_BELL
1682 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1684 1714
1685 if (rvideo_state != on) 1715 if (rvideo_state != on)
1686 { 1716 {
1687 rvideo_state = on; 1717 rvideo_state = on;
1688 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
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1691 if (bg_pixmap == None) 1729 if (bg_img == 0)
1692#endif 1730#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1732
1695 XGCValues gcvalue; 1733 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1706/* 1744/*
1707 * Report current cursor position 1745 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1747 */
1710void 1748void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1712{ 1750{
1713 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);
1714} 1752}
1715 1753
1716/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1718 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1719 1757
1720/* 1758/*
1721 * Set font style 1759 * Set font style
1722 */ 1760 */
1723void 1761void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1725{ 1763{
1726#if 0 1764#if 0
1727 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1728 { 1766 {
1729 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1792 */
1755void 1793void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1757{ 1795{
1758 screen.charset = set; 1796 screen.charset = set;
1759 set_font_style (); 1797 set_font_style ();
1760} 1798}
1761 1799
… …
1767 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1768 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1769 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1770 */ 1808 */
1771void 1809void
1772rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1773{ 1811{
1774 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1775 set_font_style (); 1813 set_font_style ();
1776} 1814}
1777 1815
… …
1781 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1782 1820
1783/* 1821/*
1784 * refresh matching text. 1822 * refresh matching text.
1785 */ 1823 */
1786bool 1824bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1788{ 1826{
1789 bool found = false; 1827 bool found = false;
1790 1828
1791 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1792 { 1830 {
… …
1810 PART_BEG = 0, 1848 PART_BEG = 0,
1811 PART_END, 1849 PART_END,
1812 RC_COUNT 1850 RC_COUNT
1813}; 1851};
1814 1852
1815void 1853void ecb_hot
1816rxvt_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
1817{ 1855{
1818 int i; 1856 int i;
1819 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1820 1858
1821 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1855/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1856/* 1894/*
1857 * Refresh the entire screen 1895 * Refresh the entire screen
1858 */ 1896 */
1859void 1897void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1861{ 1899{
1862 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1901}
1864 1902
1865/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1866/* 1904/*
1867 * 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
1868 * the top of the screen 1906 * the top of the screen
1869 */ 1907 */
1870void 1908void
1871rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1872{ 1910{
1873 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);
1874} 1913}
1875 1914
1876/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1877/* 1916/*
1878 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1879 * direction should be UP or DN 1918 * direction should be UP or DN
1880 */ 1919 */
1881bool 1920bool
1882rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1883{ 1922{
1884 int new_view_start =
1885 direction == UP ? view_start - nlines
1886 : view_start + nlines;
1887
1888 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1889} 1924}
1890 1925
1891bool 1926bool
1892rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1893{ 1928{
1894 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1895 1930
1896 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1897 return false; 1932 return false;
… …
1915} 1950}
1916#endif 1951#endif
1917 1952
1918/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1919void 1954void
1920rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1921{ 1956{
1922#ifndef NO_BELL 1957#ifndef NO_BELL
1923 1958
1924# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1982#endif
1948} 1983}
1949 1984
1950/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1951void 1986void ecb_cold
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1953{ 1988{
1954#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1955 int nrows, row_start; 1990 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1957 1992
… …
2005/* 2040/*
2006 * Refresh the screen 2041 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2044 */
2010void 2045void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2012{ 2047{
2013 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2050 int i; /* tmp */
2016#ifndef NO_CURSORCOLOR
2017 rend_t cc1; /* store colours at cursor position (s) */
2018#endif
2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2022 2056
2023 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2024 2058
2025 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2026 return; 2060 return;
… …
2029 * A: set up vars 2063 * A: set up vars
2030 */ 2064 */
2031 refresh_count = 0; 2065 refresh_count = 0;
2032 2066
2033 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2068 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2036 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2037#endif 2071#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2073
2040 /* 2074 /*
2041 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2081 scr_swap_overlay ();
2048#endif 2082#endif
2049 2083
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2085
2052 /* 2086 /*
2053 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2054 */ 2088 */
2055 { 2089 {
2056 unsigned char setoldcursor;
2057
2058#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2091 if (hidden_cursor)
2060 showcursor = 0; 2092 showcursor = 0;
2061#endif 2093#endif
2062 2094
… …
2065 int col = screen.cur.col; 2097 int col = screen.cur.col;
2066 2098
2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068 col--; 2100 col--;
2069 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2070 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2071 2109
2072#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2076 else 2113 else
2077#endif 2114#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2090 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2091#else 2128#else
2092 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2093#endif 2130#endif
2094 2131
2095 if (focus) 2132 if (focus && cursor_type == 0)
2096 { 2133 {
2097 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2098 *crp ^= RS_Uline; 2135
2099 else
2100 {
2101 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2102 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2103 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2104 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105 } 2141 }
2106 } 2142 }
2107 2143
2108 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2109 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2110 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)
2111 { 2153 {
2112 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2113 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2114 {
2115 if (ocrow < nrow
2116 && oldcursor.col < ncol)
2117 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2118
2119 if (focus || !showcursor)
2120 oldcursor.row = -1;
2121 else
2122 setoldcursor = 1;
2123 }
2124 } 2156 }
2125 else if (!focus) 2157 else
2126 setoldcursor = 1;
2127
2128 if (setoldcursor)
2129 {
2130 if (screen.cur.row - view_start >= nrow)
2131 oldcursor.row = -1; 2158 oldcursor.row = -1;
2132 else
2133 {
2134 oldcursor.row = screen.cur.row - view_start;
2135 oldcursor.col = screen.cur.col;
2136 }
2137 }
2138 } 2159 }
2139 2160
2140#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2162 /*
2142 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2148 { 2169 {
2149 int16_t nits; 2170 int16_t nits;
2150 int i = num_scr; 2171 int i = num_scr;
2151 int j; 2172 int j;
2152 int len, wlen; 2173 int len, wlen;
2153 dLocal (int, num_scr);
2154 2174
2155 j = nrow; 2175 j = nrow;
2156 wlen = len = -1; 2176 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2158 2178
… …
2224 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2225 2245
2226 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2227 { 2247 {
2228 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2229 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2230 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2231 || (stp[col] == ' ' /* space w/ no background change */
2232 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2233 continue; 2250 continue;
2234 2251
2235 // redraw one or more characters 2252 // redraw one or more characters
2236 2253
2237 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2409 else 2426 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2428
2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 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
2414#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2438 else
2418#endif 2439#endif
… …
2430 */ 2451 */
2431 if (showcursor) 2452 if (showcursor)
2432 { 2453 {
2433 if (focus) 2454 if (focus)
2434 { 2455 {
2435 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2436 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2437 else 2458 else if (oldcursor.row >= 0)
2438 { 2459 {
2439 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2441 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2442#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));
2443 } 2473 }
2444 } 2474 }
2445 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2446 { 2476 {
2447 int cursorwidth = 1;
2448 int col = oldcursor.col;
2449
2450 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2451 col--;
2452
2453 while (col + cursorwidth < ncol
2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2455 cursorwidth++;
2456
2457#ifndef NO_CURSORCOLOR
2458 if (ISSET_PIXCOLOR (Color_cursor))
2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2463 2478
2464 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2466 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2484 }
2470 } 2485 }
2471 2486
2472 /* 2487 /*
2473 * H: cleanup selection 2488 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2483 num_scr = 0; 2498 num_scr = 0;
2484 num_scr_allow = 1; 2499 num_scr_allow = 1;
2485} 2500}
2486 2501
2487void 2502void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2489{ 2504{
2490 if (!l.t) 2505 if (!l.valid ())
2491 return; 2506 return;
2492 2507
2493 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
2494 2509
2495 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2496 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]));
2497} 2512}
2498 2513
2499void 2514void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2501{ 2516{
2502 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2504 2519
2505 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2507 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2509 } 2524 }
2510} 2525}
2511 2526
2512void 2527void ecb_cold
2513rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2514{ 2529{
2515 bool transparent = false; 2530 bool transparent = false;
2516 2531
2517#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_IMG
2518 if (bg_pixmap != None) 2533 if (bg_img != 0)
2519 { 2534 {
2520# ifdef ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2537 {
2523 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2540
2526 transparent = true; 2541 transparent = true;
2527 } 2542 }
2528 else 2543 else
2529# endif 2544# endif
2530 { 2545 {
2531 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533 } 2548 }
2534 } 2549 }
2535 else 2550 else
2536#endif 2551#endif
2537 { 2552 {
… …
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 } 2555 }
2541 2556
2542 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2543 2558
2544 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2545 { 2560 {
2546 if (transparent) 2561 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else 2563 else
2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550 scrollBar.state = SB_STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2551 scrollBar.show (0); 2566 scrollBar.show (0);
2552 } 2567 }
2553 2568
2554 if (refresh) 2569 if (refresh)
… …
2559 want_refresh = 1; 2574 want_refresh = 1;
2560} 2575}
2561 2576
2562/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2563void 2578void
2564rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2565{ 2580{
2566 if (!mapped) 2581 if (!mapped)
2567 return; 2582 return;
2568 2583
2569 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2572 if (really) 2587 if (really)
2573 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2574} 2589}
2575 2590
2576void 2591void
2577rxvt_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
2578{ 2593{
2579 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2580 int row, col; 2595 int row, col;
2581 2596
2582 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++)
… …
2594 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2595 } 2610 }
2596} 2611}
2597 2612
2598void 2613void
2599rxvt_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
2600{ 2615{
2601 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2602 int row, col; 2617 int row, col;
2603 2618
2604 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2620 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2622} 2637}
2623 2638
2624/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2625void 2640void ecb_hot
2626rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2627{ 2642{
2628 if (selection.op 2643 if (selection.op
2629 && current_screen == selection.screen 2644 && current_screen == selection.screen
2630 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2631 { 2646 {
… …
2647 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2648 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2649 */ 2664 */
2650#if 0 2665#if 0
2651void 2666void
2652rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2653{ 2668{
2654 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2655 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2656 const char r1[] = "\n";
2657
2658 for (row = saveLines + top_row;
2659 row < saveLines + nrow - 1; row++)
2660 {
2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2662 : ncol;
2663 for (towrite = width; towrite; towrite -= wrote)
2664 {
2665 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2666 towrite);
2667 if (wrote < 0)
2668 return; /* XXX: death, no report */
2669 }
2670 if (row_buf[row].l >= 0)
2671 if (write (fd, r1, 1) <= 0)
2672 return; /* XXX: death, no report */
2673 }
2674} 2671}
2675#endif 2672#endif
2676 2673
2677/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2678 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2679 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2680void 2677void
2681rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2682{ 2679{
2683 if (!selection.op) 2680 if (!selection.op)
2684 return; 2681 return;
2685
2686 row_col_t pos;
2687 pos.row = pos.col = 0;
2688 2682
2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692 || (check_more == 1 2686 || (check_more == 1
2693 && current_screen == selection.screen 2687 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 || (check_more == 2
2697 && ROWCOL_IS_BEFORE (selection.beg, pos)
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 3
2700 && ROWCOL_IS_AFTER (selection.end, pos)))
2701 CLEAR_ALL_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2702} 2691}
2703 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
2704/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2705/* 2708/*
2706 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2707 */ 2710 */
2708void 2711void
2709rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2710{ 2713{
2711 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2712 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2713 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2714 data[i] = C0_CR; 2717 data[i] = C0_CR;
2715 2718
2716 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2717 tt_printf ("\e[200~"); 2720 tt_printf ("\x1b[200~");
2718 2721
2719 tt_write (data, len); 2722 tt_write (data, len);
2720 2723
2721 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[201~"); 2725 tt_printf ("\x1b[201~");
2723} 2726}
2724 2727
2725void 2728void
2726rxvt_term::paste (char *data, unsigned int len) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) noexcept
2727{ 2730{
2728 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)))
2729 return; 2732 return;
2730 2733
2731 tt_paste (data, len); 2734 tt_paste (data, len);
… …
2737 * 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
2738 * as fallback 2741 * as fallback
2739 * EXT: button 2 release 2742 * EXT: button 2 release
2740 */ 2743 */
2741void 2744void
2742rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) noexcept
2743{ 2746{
2744 if (!selection_req) 2747 if (!selection_req)
2745 { 2748 {
2746 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);
2747 selection_req->run (); 2750 selection_req->run ();
… …
2752/* 2755/*
2753 * Clear all selected text 2756 * Clear all selected text
2754 * EXT: SelectionClear 2757 * EXT: SelectionClear
2755 */ 2758 */
2756void 2759void
2757rxvt_term::selection_clear (bool clipboard) NOTHROW 2760rxvt_term::selection_clear (bool clipboard) noexcept
2758{ 2761{
2759 if (!clipboard) 2762 if (!clipboard)
2760 { 2763 {
2761 want_refresh = 1; 2764 want_refresh = 1;
2762 free (selection.text); 2765 free (selection.text);
… …
2847 if (*t == NOCHAR) 2850 if (*t == NOCHAR)
2848 t++; 2851 t++;
2849#if ENABLE_COMBINING 2852#if ENABLE_COMBINING
2850 else if (IS_COMPOSE (*t)) 2853 else if (IS_COMPOSE (*t))
2851 { 2854 {
2852 int len = rxvt_composite.expand (*t, 0); 2855 int len = rxvt_composite.expand (*t);
2853 2856
2854 extra -= (len - 1); 2857 extra -= (len - 1);
2855 2858
2856 if (extra < 0) 2859 if (extra < 0)
2857 { 2860 {
… …
2904 2907
2905 selection_grab (tm); 2908 selection_grab (tm);
2906} 2909}
2907 2910
2908bool 2911bool
2909rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2912rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2910{ 2913{
2911 Atom sel; 2914 Atom sel;
2912 2915
2913 if (!clipboard) 2916 if (!clipboard)
2914 { 2917 {
… …
2947/* ------------------------------------------------------------------------- */ 2950/* ------------------------------------------------------------------------- */
2948/* 2951/*
2949 * 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
2950 * EXT: button 1 press 2953 * EXT: button 1 press
2951 */ 2954 */
2952void 2955void ecb_cold
2953rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2956rxvt_term::selection_click (int clicks, int x, int y) noexcept
2954{ 2957{
2955 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
2956 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
2957 2960
2958 if (clicks == 2 && !selection.rect 2961 if (clicks == 2 && !selection.rect
… …
2976 2979
2977/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
2978/* 2981/*
2979 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
2980 */ 2983 */
2981void 2984void ecb_cold
2982rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2985rxvt_term::selection_start_colrow (int col, int row) noexcept
2983{ 2986{
2984 want_refresh = 1; 2987 want_refresh = 1;
2985 2988
2986 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
2987 selection.mark.col = col; 2990 selection.mark.col = col;
… …
3009 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
3010 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3011 */ 3014 */
3012 3015
3013/* 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 */
3014#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3015 (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)))
3016#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3017 3020
3018void 3021void ecb_cold
3019rxvt_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
3020{ 3023{
3021 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3022 row_col_t bound; 3025 row_col_t bound;
3023 text_t *stp; 3026 text_t *stp;
3024 rend_t *srp; 3027 rend_t *srp;
… …
3097 * EXT: button 3 press; button 1 or 3 drag 3100 * EXT: button 3 press; button 1 or 3 drag
3098 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3099 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3100 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3101 */ 3104 */
3102void 3105void ecb_cold
3103rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3106rxvt_term::selection_extend (int x, int y, int flag) noexcept
3104{ 3107{
3105 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3106 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3107 3110
3108 /* 3111 /*
… …
3133 3136
3134/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3135/* 3138/*
3136 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3137 */ 3140 */
3138void 3141void ecb_cold
3139rxvt_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
3140{ 3143{
3141 row_col_t pos; 3144 row_col_t pos;
3142 enum { 3145 enum {
3143 LEFT, RIGHT 3146 LEFT, RIGHT
3144 } closeto = RIGHT; 3147 } closeto = RIGHT;
3145
3146 want_refresh = 1;
3147 3148
3148 switch (selection.op) 3149 switch (selection.op)
3149 { 3150 {
3150 case SELECTION_INIT: 3151 case SELECTION_INIT:
3151 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
… …
3331 3332
3332#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3333 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3334 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3335#endif 3336#endif
3337
3338 selection_changed ();
3336} 3339}
3337 3340
3338#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3339void 3342void ecb_cold
3340rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () noexcept
3341{ 3344{
3342 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3343 text_t *stp; 3346 text_t *stp;
3344 3347
3345 end_col = selection.end.col; 3348 end_col = selection.end.col;
… …
3382/* ------------------------------------------------------------------------- */ 3385/* ------------------------------------------------------------------------- */
3383/* 3386/*
3384 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3385 * EXT: button 3 double click 3388 * EXT: button 3 double click
3386 */ 3389 */
3387void 3390void ecb_cold
3388rxvt_term::selection_rotate (int x, int y) NOTHROW 3391rxvt_term::selection_rotate (int x, int y) noexcept
3389{ 3392{
3390 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3391 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3392} 3395}
3393 3396
3394/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3395/* 3398/*
3396 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3397 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3398 */ 3401 */
3399void 3402void ecb_cold
3400rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3401{ 3404{
3402 Atom property = rq.property == None ? rq.target : rq.property; 3405 Atom property = rq.property == None ? rq.target : rq.property;
3403 XSelectionEvent ev; 3406 XSelectionEvent ev;
3404 3407
3405 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
… …
3497 cl = selection.clip_text; 3500 cl = selection.clip_text;
3498 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3499 } 3502 }
3500 else 3503 else
3501 { 3504 {
3502 cl = L""; 3505 cl = (wchar_t *)L"";
3503 selectlen = 0; 3506 selectlen = 0;
3504 } 3507 }
3505 3508
3506#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3507 // 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
… …
3537 3540
3538 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3539} 3542}
3540 3543
3541/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3542#ifdef USE_XIM 3545#if USE_XIM
3543void 3546void ecb_cold
3544rxvt_term::im_set_position (XPoint &pos) NOTHROW 3547rxvt_term::im_set_position (XPoint &pos) noexcept
3545{ 3548{
3546 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3547 3550
3548 XGetWindowAttributes (dpy, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);
3549 3552
… …
3552} 3555}
3553#endif 3556#endif
3554 3557
3555#if ENABLE_OVERLAY 3558#if ENABLE_OVERLAY
3556void 3559void
3557rxvt_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
3558{ 3561{
3559 if (nrow < 1 || ncol < 1) 3562 if (nrow < 1 || ncol < 1)
3560 return; 3563 return;
3561 3564
3562 want_refresh = 1; 3565 want_refresh = 1;
… …
3607 *rp = r; 3610 *rp = r;
3608 } 3611 }
3609} 3612}
3610 3613
3611void 3614void
3612rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () noexcept
3613{ 3616{
3614 if (!ov.text) 3617 if (!ov.text)
3615 return; 3618 return;
3616 3619
3617 want_refresh = 1; 3620 want_refresh = 1;
… …
3625 delete [] ov.text; ov.text = 0; 3628 delete [] ov.text; ov.text = 0;
3626 delete [] ov.rend; ov.rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3627} 3630}
3628 3631
3629void 3632void
3630rxvt_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
3631{ 3634{
3632 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3633 return; 3636 return;
3634 3637
3635 x++, y++; 3638 x++, y++;
… …
3637 ov.text[y][x] = text; 3640 ov.text[y][x] = text;
3638 ov.rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3639} 3642}
3640 3643
3641void 3644void
3642rxvt_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
3643{ 3646{
3644 while (*s) 3647 while (*s)
3645 scr_overlay_set (x++, y, *s++); 3648 scr_overlay_set (x++, y, *s++);
3646} 3649}
3647 3650
3648void 3651void
3649rxvt_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
3650{ 3653{
3651 while (*s) 3654 while (*s)
3652 { 3655 {
3653 text_t t = *s++; 3656 text_t t = *s++;
3654 int width = WCWIDTH (t); 3657 int width = WCWIDTH (t);
… …
3660 } 3663 }
3661 } 3664 }
3662} 3665}
3663 3666
3664void 3667void
3665rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () noexcept
3666{ 3669{
3667 if (!ov.text) 3670 if (!ov.text)
3668 return; 3671 return;
3669 3672
3670 // 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