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.297 by root, Wed Jan 9 01:14:29 2008 UTC vs.
Revision 1.409 by sf-exg, Mon Nov 21 18:35:52 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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 <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 88 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 90 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 94
112/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
115 98
… …
148 131
149 l.l = 0; 132 l.l = 0;
150 l.f = 0; 133 l.f = 0;
151} 134}
152 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
… …
159{ 163{
160#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
161 scr_overlay_off (); 165 scr_overlay_off ();
162#endif 166#endif
163 167
164 rvideo_mode = false;
165 view_start = 0; 168 view_start = 0;
166 num_scr = 0; 169 num_scr = 0;
167 170
168 if (ncol == 0) 171 if (ncol == 0)
169 ncol = 80; 172 ncol = 80;
… …
171 if (nrow == 0) 174 if (nrow == 0)
172 nrow = 24; 175 nrow = 24;
173 176
174 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 178 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 179
180 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
182 { 182 {
183 //TODO//FIXME 183 //TODO//FIXME
… …
203 term_start = 0; 203 term_start = 0;
204 204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207 207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , 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)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 211
212 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
213 { 213 {
… …
236 selection.text = NULL; 236 selection.text = NULL;
237 selection.len = 0; 237 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
240 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 277 }
276 278
277 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279 281
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (top_row) 286 if (top_row)
285 { 287 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
288 291
289 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 294
292 do 295 do
293 { 296 {
294 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 299 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 301
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 303 {
… …
396 delete old_ta; 397 delete old_ta;
397 delete old_ra; 398 delete old_ra;
398 399
399 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
401 403
402 free (tabs); 404 free (tabs);
403 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
408 prev_ncol = ncol; 413 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 414
418 tt_winch (); 415 tt_winch ();
419 416
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 418}
… …
433 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
434 431
435 free (row_buf); 432 free (row_buf);
436 free (swap_buf); 433 free (swap_buf);
437 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
438 free (tabs); 437 free (tabs);
439 438 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 439 }
442} 440}
443 441
444/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
445/* 443/*
446 * Hard reset 444 * Hard/Soft reset
447 */ 445 */
448void 446void
449rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
450{ 448{
451 scr_release (); 449 scr_release ();
452 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
453 scr_reset (); 453 scr_reset ();
454 454
455 scr_clear (true); 455 scr_clear (true);
456 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
457} 473}
458 474
459/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
499 } 515 }
500 516
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
507#endif
508} 522}
509 523
510void 524void
511rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
512{ 526{
… …
535 return; 549 return;
536 550
537 want_refresh = 1; 551 want_refresh = 1;
538 view_start = 0; 552 view_start = 0;
539 553
540 selection_check (2); /* check for boundary cross */ 554 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
541 560
542 int i = current_screen; current_screen = scrn; scrn = i; 561 current_screen = scrn;
543 562
544#if NSCREENS 563#if NSCREENS
545 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
546 { 565 {
547 num_scr = 0; 566 num_scr = 0;
… …
624 643
625 if (count > 0 644 if (count > 0
626 && row1 == 0 645 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
629 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 651
634 // sever bottommost line 652 // sever bottommost line
635 { 653 {
636 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
637 l.is_longer (0); 655 l.is_longer (0);
638 l.touch (); 656 l.touch ();
639 } 657 }
640 658
659 // scroll everything up 'count' lines
660 term_start = (term_start + count) % total_rows;
661
662 // now copy lines below the scroll region bottom to the
663 // bottom of the screen again, so they look as if they
664 // hadn't moved.
665 for (int i = nrow; --i > row2; )
666 {
667 line_t &l1 = ROW(i - count);
668 line_t &l2 = ROW(i);
669
670 ::swap (l1, l2);
671 l2.touch ();
672 }
673
641 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 675 for (int i = count; i--; )
643 { 676 {
644 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
645 678
646 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 680 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 682 {
650 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 684 l.l = 0;
… …
653 } 686 }
654 else 687 else
655 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
656 } 689 }
657 690
658 // now copy lines below the scroll region bottom to the
659 // bottom of the screen again, so they look as if they
660 // hadn't moved.
661 for (int i = nrow; --i > row2; )
662 {
663 line_t &l1 = ROW(i - count);
664 line_t &l2 = ROW(i);
665
666 ::swap (l1, l2);
667 l2.touch ();
668 }
669
670 // move and/or clear selection, if any 691 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
672 { 694 {
673 selection.beg.row -= count; 695 selection.beg.row -= count;
674 selection.end.row -= count; 696 selection.end.row -= count;
675 selection.mark.row -= count; 697 selection.mark.row -= count;
676 698
677 if (selection.beg.row < top_row 699 selection_check (0);
678 || selection.end.row < top_row
679 || selection.mark.row < top_row)
680 {
681 CLEAR_ALL_SELECTION ();
682 selection.op = SELECTION_CLEAR;
683 }
684 } 700 }
685 701
686 // finally move the view window, if desired 702 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 704 && view_start != 0
… …
718 } 734 }
719 735
720 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
722 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
723 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
724 748
725 min_it (count, rows); 749 min_it (count, rows);
726 750
727 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 752
729 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
730 { 754 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 756
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 759 }
736 760
737 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2);
767 l.is_longer (0);
768 l.touch ();
769 }
739 } 770 }
740 771
741 return count; 772 return count;
742} 773}
743 774
… …
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 781{
751 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
752 return; 783 return;
753 784
754 unsigned char checksel; 785 bool checksel;
755 unicode_t c; 786 unicode_t c;
756 int ncol = this->ncol; 787 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
758 789
759 want_refresh = 1; 790 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
774 } 805 }
775 } 806 }
776 807
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 811 int row = screen.cur.row;
783 812
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 814
786 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
787 816
788 while (str < strend) 817 while (str < strend)
789 { 818 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 820
792 if (c < 0x20) 821 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 822 if (c == C0_LF)
794 { 823 {
795 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
796 825
797 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
816 { 845 {
817 scr_tab (1, true); 846 scr_tab (1, true);
818 continue; 847 continue;
819 } 848 }
820 849
850 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
854 ))
824 { 855 {
825 checksel = 0; 856 checksel = 0;
826 /* 857 /*
827 * If we wrote anywhere in the selected area, kill the selection 858 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 859 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 860 * should be a similar check.
830 */ 861 */
831 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
832 } 863 }
833 864
834 if (screen.flags & Screen_WrapNext) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 866 {
836 scr_do_wrap (); 867 scr_do_wrap ();
837 868
838 line->l = ncol; 869 line->l = ncol;
839 line->is_longer (1); 870 line->is_longer (1);
… …
841 row = screen.cur.row; 872 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
843 } 874 }
844 875
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 878 c = 0xfffd;
848 879
849 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
852 // locale. 883 // locale.
853 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
854 885
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 887 {
857 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 889 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
875 } 906 }
876 } 907 }
877 908
878 if (screen.flags & Screen_Insert) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
880 911
881 if (width != 0) 912 if (width != 0)
882 { 913 {
883#if !UNICODE_3 914#if !UNICODE_3
… …
888# else 919# else
889 c = 0xfffd; 920 c = 0xfffd;
890# endif 921# endif
891#endif 922#endif
892 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
893 // nuke the character at this position, if required 940 // nuke the character at this position, if required
941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 945 scr_kill_char (*line, screen.cur.col);
896 && line->t[screen.cur.col + 1] == NOCHAR))
897 {
898 int col = screen.cur.col;
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' ';
921 // and try the same character next loop iteration
922 --str;
923 }
924 946
925 line->touch (); 947 line->touch ();
926 948
927 do 949 do
928 { 950 {
929 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
931 953
932 if (screen.cur.col < ncol - 1) 954 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 955 screen.cur.col++;
934 else 956 else
935 { 957 {
936 line->l = ncol; 958 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
939 break; 961
962 goto end_of_line;
940 } 963 }
941 964
942 c = NOCHAR; 965 c = NOCHAR;
943 } 966 }
944 while (--width > 0); 967 while (ecb_unlikely (--width > 0));
945 968
946 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 971 {
949 line->touch (); 972 line->t[c] = ' ';
973 line->r[c] = rend;
974 }
950 975
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 976end_of_line:
977 ;
978 }
979#if ENABLE_COMBINING
980 else // width == 0
981 {
982 if (c != 0xfeff) // ignore BOM
983 {
984 // handle combining characters
985 // we just tag the accent on the previous on-screen character.
986 // this is arguably not correct, but also arguably not wrong.
987 // we don't handle double-width characters nicely yet.
988 line_t *linep;
989 text_t *tp;
990 rend_t *rp;
991
992 if (screen.cur.col > 0)
952 { 993 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 994 linep = line;
995 tp = line->t + screen.cur.col - 1;
996 rp = line->r + screen.cur.col - 1;
955 } 997 }
998 else if (screen.cur.row > 0
999 && ROW(screen.cur.row - 1).is_longer ())
1000 {
1001 linep = &ROW(screen.cur.row - 1);
1002 tp = line->t + ncol - 1;
1003 rp = line->r + ncol - 1;
1004 }
1005 else
1006 continue;
1007
1008 linep->touch ();
1009
1010 while (*tp == NOCHAR && tp > linep->t)
1011 tp--, rp--;
1012
1013 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c);
1017
1018 *tp = n;
1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1020 }
957 } 1021 }
958 else // width == 0
959 {
960#if ENABLE_COMBINING
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 {
971 linep = line;
972 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1;
974 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 1022#endif
998 }
999 } 1023 }
1000 1024
1001 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
1002 1026
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1005#endif
1006} 1028}
1007 1029
1008/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1009/* 1031/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1032 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1023 1045
1024 want_refresh = 1; 1046 want_refresh = 1;
1025#endif 1047#endif
1026 } 1048 }
1027 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1028 else 1052 else
1029 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1030} 1054}
1031 1055
1032/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1227/* 1251/*
1228 * Erase part or whole of a line 1252 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1253 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1254 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1255 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1256 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1257 */
1233void 1258void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1259rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1260{
1236 unsigned int col, num; 1261 unsigned int col, num;
… …
1245 line.touch (); 1270 line.touch ();
1246 line.is_longer (0); 1271 line.is_longer (0);
1247 1272
1248 switch (mode) 1273 switch (mode)
1249 { 1274 {
1275 case 3:
1276 if (screen.flags & Screen_WrapNext)
1277 return;
1278
1279 /* fall through */
1280
1250 case 0: /* erase to end of line */ 1281 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1282 col = screen.cur.col;
1252 num = ncol - col; 1283 num = ncol - col;
1253 min_it (line.l, col); 1284 min_it (line.l, col);
1285
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1286 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1287 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1288 CLEAR_SELECTION ();
1257 break; 1289 break;
1290
1258 case 1: /* erase to beginning of line */ 1291 case 1: /* erase to beginning of line */
1259 col = 0; 1292 col = 0;
1260 num = screen.cur.col + 1; 1293 num = screen.cur.col + 1;
1294
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1295 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1297 CLEAR_SELECTION ();
1264 break; 1298 break;
1299
1265 case 2: /* erase whole line */ 1300 case 2: /* erase whole line */
1266 col = 0; 1301 col = 0;
1267 num = ncol; 1302 num = ncol;
1268 line.l = 0; 1303 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1304 if (selection.beg.row <= screen.cur.row
… …
1277 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1278} 1313}
1279 1314
1280/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1281/* 1316/*
1282 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1286 */ 1321 */
1287void 1322void
… …
1296 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1297 1332
1298 switch (mode) 1333 switch (mode)
1299 { 1334 {
1300 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1301 selection_check (1);
1302 scr_erase_line (0); 1336 scr_erase_line (0);
1303 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1304 num = nrow - row; 1338 num = nrow - row;
1305 break; 1339 break;
1306 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1307 selection_check (3);
1308 scr_erase_line (1); 1341 scr_erase_line (1);
1309 row = 0; 1342 row = 0;
1310 num = screen.cur.row; 1343 num = screen.cur.row;
1311 break; 1344 break;
1312 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1313 selection_check (3);
1314 row = 0; 1346 row = 0;
1315 num = nrow; 1347 num = nrow;
1316 break; 1348 break;
1317 default: 1349 default:
1318 return; 1350 return;
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1328 return; 1360 return;
1329 1361
1330 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1331 1363
1332 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1367 {
1336 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1369
1370 if (mapped)
1371 XClearArea (dpy, vt, 0,
1372 Row2Pixel (row - view_start), (unsigned int)width,
1373 (unsigned int)Height2Pixel (num), False);
1338 } 1374 }
1339 else 1375 else
1340 { 1376 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1378
1379 if (mapped)
1380 {
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1383 XFillRectangle (dpy, vt, gc,
1384 0, Row2Pixel (row - view_start),
1385 (unsigned int)width,
1386 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1389 }
1347 } 1390 }
1348 1391
1349 for (; num--; row++) 1392 for (; num--; row++)
1350 { 1393 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1395
1396 if (row - view_start < nrow)
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1353 } 1398 }
1354} 1399}
1355 1400
1356#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1357void 1402void
… …
1376 1421
1377 want_refresh = 1; 1422 want_refresh = 1;
1378 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1379 1424
1380 num_scr_allow = 0; 1425 num_scr_allow = 0;
1381 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1382 1431
1383 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1384 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1385 { 1434 {
1386 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1431 * Insert/Delete <count> characters from the current position 1480 * Insert/Delete <count> characters from the current position
1432 */ 1481 */
1433void 1482void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1483rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1484{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1485 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1486 ZERO_SCROLLBACK ();
1441 1487
1442 if (count <= 0) 1488 if (count <= 0)
1443 return; 1489 return;
… …
1445 scr_do_wrap (); 1491 scr_do_wrap ();
1446 1492
1447 selection_check (1); 1493 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1494 min_it (count, ncol - screen.cur.col);
1449 1495
1450 row = screen.cur.row; 1496 int row = screen.cur.row;
1451 1497
1452 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1453 1499
1454 line->touch (); 1500 line->touch ();
1455 line->is_longer (0); 1501 line->is_longer (0);
1456 1502
1503 // nuke wide spanning the start
1504 if (line->t[screen.cur.col] == NOCHAR)
1505 scr_kill_char (*line, screen.cur.col);
1506
1457 switch (insdel) 1507 switch (insdel)
1458 { 1508 {
1459 case INSERT: 1509 case INSERT:
1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1510 line->l = min (line->l + count, ncol);
1511
1512 if (line->t[screen.cur.col] == NOCHAR)
1513 scr_kill_char (*line, screen.cur.col);
1514
1515 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1461 { 1516 {
1462 line->t[col] = line->t[col - count]; 1517 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1518 line->r[col] = line->r[col - count];
1464 } 1519 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1520
1468 if (selection.op && current_screen == selection.screen 1521 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1523 {
1471 if (selection.end.row != screen.cur.row 1524 if (selection.end.row != screen.cur.row
… …
1486 case ERASE: 1539 case ERASE:
1487 screen.cur.col += count; /* don't worry if > ncol */ 1540 screen.cur.col += count; /* don't worry if > ncol */
1488 selection_check (1); 1541 selection_check (1);
1489 screen.cur.col -= count; 1542 screen.cur.col -= count;
1490 1543
1491 line->l = max (line->l - count, 0); 1544 // nuke wide char after the end
1545 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1546 scr_kill_char (*line, screen.cur.col + count);
1547
1492 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1493 break; 1549 break;
1494 1550
1495 case DELETE: 1551 case DELETE:
1496 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1552 line->l = max (line->l - count, 0);
1497 1553
1554 // nuke wide char spanning the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1557
1498 for (col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1499 { 1559 {
1500 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1501 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1502 } 1562 }
1503 1563
1504 line->l = max (line->l - count, 0);
1505 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1506 1565
1507 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1568 {
1510 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1646 { 1705 {
1647 rvideo_state = on; 1706 rvideo_state = on;
1648 1707
1649 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1650#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1651 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1652#endif 1711#endif
1653 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1654 1713
1655 XGCValues gcvalue; 1714 XGCValues gcvalue;
1656 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1800 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1801 { 1860 {
1802 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1803 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1804 } 1863 }
1805// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1806 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1865 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1807 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1866 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1808 1867
1809 num_scr_allow = 0; 1868 num_scr_allow = 0;
1810 1869
… …
1883 1942
1884# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1887# endif 1946# endif
1888 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1889# endif 1948# endif
1890 1949
1891# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1893 { 1952 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1953# endif
1901 1954
1902 if (option (Opt_visualBell)) 1955 if (option (Opt_visualBell))
1903 { 1956 {
1904 rvideo_bell = true; 1957 rvideo_bell = true;
… …
1907 1960
1908 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1962 }
1910 else 1963 else
1911 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1966#endif
1913} 1967}
1914 1968
1915/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */
1917void 1970void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1972{
1920#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1921 int nrows, row_start; 1974 int nrows, row_start;
1922 FILE *fd; 1975 FILE *fd = popen_printer ();
1923 1976
1924 if ((fd = popen_printer ()) == NULL) 1977 if (!fd)
1925 return; 1978 return;
1926 1979
1927 if (fullhist) 1980 if (fullhist)
1928 { 1981 {
1929 nrows = nrow - top_row; 1982 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1988 row_start = view_start;
1936 } 1989 }
1937 1990
1938 wctomb (0, 0); 1991 wctomb (0, 0);
1939 1992
1940 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1994 {
1942 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1944 1997
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1998 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2028 */
1976void 2029void
1977rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
1978{ 2031{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2034 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2045 return;
1995 2046
1996 /* 2047 /*
1997 * A: set up vars 2048 * A: set up vars
1998 */ 2049 */
1999 have_bg = 0;
2000 refresh_count = 0; 2050 refresh_count = 0;
2001 2051
2052 unsigned int old_screen_flags = screen.flags;
2053 bool have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2004#endif 2056#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2058
2007 /* 2059 /*
2008 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2009 */ 2061 */
2010 scr_reverse_selection (); 2062 scr_reverse_selection ();
2011 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2070
2012 /* 2071 /*
2013 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2014 */ 2073 */
2015 { 2074 {
2016 unsigned char setoldcursor; 2075 bool setoldcursor;
2017 2076
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2078 if (hidden_cursor)
2021 showcursor = 0; 2079 showcursor = 0;
2022#endif 2080#endif
2023 2081
… …
2051 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2052#else 2110#else
2053 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2054#endif 2112#endif
2055 2113
2056 if (showcursor && focus) 2114 if (focus)
2057 { 2115 {
2058 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2060 else 2118 else
2061 { 2119 {
… …
2096 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2097 } 2155 }
2098 } 2156 }
2099 } 2157 }
2100 2158
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2160 /*
2108 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2110 */ 2163 */
… …
2199 continue; 2252 continue;
2200 2253
2201 // redraw one or more characters 2254 // redraw one or more characters
2202 2255
2203 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2205 --col; 2258 --col;
2206 2259
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2261 text_t *text = stp + col;
2209 int count = 1; 2262 int count = 1;
2210 2263
2211 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2212 drp[col] = rend; 2265 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2217 { 2270 {
2218 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2219 { 2272 {
2220 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2221 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2222 count++; 2276 count++;
2223 i++; 2277 i++;
2224 2278
2225 continue; 2279 continue;
2226 } 2280 }
… …
2246 2300
2247 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2249 2303
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2252 count++, i--; 2306 count++, i--;
2253 2307
2254 /* 2308 /*
2255 * Determine the attributes for the string 2309 * Determine the attributes for the string
2256 */ 2310 */
2257 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2259 2313
2260 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2316 {
2263 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2264 2318
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2285 2339
2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2287 fore = Color_UL; 2341 fore = Color_UL;
2288#endif 2342#endif
2289 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2290 if (invert) 2364 if (invert)
2291 { 2365 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2298 ::swap (fore, back); 2366 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2303 2367
2304#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2306 if (ISSET_PIXCOLOR (Color_RV))
2307 back = Color_RV;
2308# endif
2309 if (fore == back) 2369 if (fore == back)
2310 { 2370 {
2311 fore = Color_bg; 2371 fore = Color_bg;
2312 back = Color_fg; 2372 back = Color_fg;
2313 } 2373 }
… …
2349 /* 2409 /*
2350 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2351 */ 2411 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2413
2354 if (have_bg && back == Color_bg) 2414 if (ecb_likely (have_bg && back == Color_bg))
2355 { 2415 {
2356 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2357 2417
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2366 did_clear: ; 2426 did_clear: ;
2367 } 2427 }
2368 else 2428 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2430
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2432 {
2373#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2436 else
2377#endif 2437#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2438 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2439
2380 XDrawLine (dpy, drawBuffer, gc, 2440 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2443 }
2384 } /* for (col....) */ 2444 } /* for (col....) */
2385 } /* for (row....) */ 2445 } /* for (row....) */
2386
2387#if ENABLE_OVERLAY
2388 scr_swap_overlay ();
2389#endif
2390 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2391 2446
2392 /* 2447 /*
2393 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2394 */ 2449 */
2395 if (showcursor) 2450 if (showcursor)
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2478 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2479 else
2425#endif 2480#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2481 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2482
2428 XDrawRectangle (dpy, drawBuffer, gc, 2483 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2484 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2488 }
2434 } 2489 }
2435 2490
2436 /* 2491 /*
2437 * H: cleanup selection 2492 * H: cleanup selection
2438 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2439 scr_reverse_selection (); 2499 scr_reverse_selection ();
2440 2500
2501 screen.flags = old_screen_flags;
2441 num_scr = 0; 2502 num_scr = 0;
2442 num_scr_allow = 1; 2503 num_scr_allow = 1;
2443} 2504}
2444 2505
2445void 2506void
… …
2466 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2467 } 2528 }
2468} 2529}
2469 2530
2470void 2531void
2471rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2472{ 2533{
2534 bool transparent = false;
2535
2473#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2474 bgPixmap.apply (); 2537 if (bg_pixmap != None)
2475#else 2538 {
2539# ifdef ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2476 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2552 }
2553 }
2554 else
2555#endif
2556 {
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2480 2560
2481# if HAVE_SCROLLBARS 2561 XClearWindow (dpy, parent);
2562
2482 if (scrollBar.win) 2563 if (scrollBar.win)
2483 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2569 scrollBar.state = SB_STATE_IDLE;
2486 scrollbar_show (0); 2570 scrollBar.show (0);
2487 } 2571 }
2488# endif
2489 2572
2573 if (refresh)
2574 {
2490 scr_clear (); 2575 scr_clear ();
2491 scr_touch (true); 2576 scr_touch (true);
2577 }
2492 want_refresh = 1; 2578 want_refresh = 1;
2493
2494#endif
2495} 2579}
2496 2580
2497/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2498void 2582void
2499rxvt_term::scr_clear (bool really) NOTHROW 2583rxvt_term::scr_clear (bool really) NOTHROW
… …
2566 { 2650 {
2567#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2568 if (selection.rect) 2652 if (selection.rect)
2569 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2570 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2571 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2572 else 2656 else
2573#endif 2657#endif
2574 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2575 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2576 RS_RVid); 2660 RS_Sel | RS_RVid);
2577 } 2661 }
2578} 2662}
2579 2663
2580/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2581/* 2665/*
… …
2584 */ 2668 */
2585#if 0 2669#if 0
2586void 2670void
2587rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2588{ 2672{
2589 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2590 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2591 char r1[] = "\n";
2592
2593 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++)
2595 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote)
2599 {
2600 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite);
2602 if (wrote < 0)
2603 return; /* XXX: death, no report */
2604 }
2605 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */
2608 }
2609} 2675}
2610#endif 2676#endif
2611 2677
2612/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2615void 2681void
2616rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2617{ 2683{
2618 row_col_t pos;
2619
2620 if (!selection.op) 2684 if (!selection.op)
2621 return; 2685 return;
2622 2686
2623 pos.row = pos.col = 0;
2624 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2625 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2626 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2627 || (check_more == 1 2690 || (check_more == 1
2628 && current_screen == selection.screen 2691 && current_screen == selection.screen
2629 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2630 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2631 || (check_more == 2
2632 && ROWCOL_IS_BEFORE (selection.beg, pos)
2633 && ROWCOL_IS_AFTER (selection.end, pos))
2634 || (check_more == 3
2635 && ROWCOL_IS_AFTER (selection.end, pos))
2636 || (check_more == 4 /* screen width change */
2637 && (selection.beg.row != selection.end.row
2638 || selection.end.col > ncol)))
2639 CLEAR_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2640} 2695}
2641 2696
2642/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2643/* 2698/*
2644 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
2645 */ 2700 */
2646void 2701void
2647rxvt_term::paste (char *data, unsigned int len) NOTHROW 2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2648{ 2703{
2649 /* convert normal newline chars into common keyboard Return key sequence */ 2704 /* convert normal newline chars into common keyboard Return key sequence */
2650 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2651 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2652 data[i] = C0_CR; 2707 data[i] = C0_CR;
2653 2708
2709 if (priv_modes & PrivMode_BracketPaste)
2710 tt_printf ("\e[200~");
2711
2654 tt_write (data, len); 2712 tt_write (data, len);
2655}
2656 2713
2657/* ------------------------------------------------------------------------- */ 2714 if (priv_modes & PrivMode_BracketPaste)
2658/* 2715 tt_printf ("\e[201~");
2659 * Respond to a notification that a primary selection has been sent
2660 * EXT: SelectionNotify
2661 */
2662void
2663rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2664{
2665 if (prop == None) /* check for failed XConvertSelection */
2666 {
2667 if ((selection_type & Sel_CompoundText))
2668 {
2669 int selnum = selection_type & Sel_whereMask;
2670
2671 selection_type = 0;
2672 if (selnum != Sel_direct)
2673 selection_request_other (XA_STRING, selnum);
2674 }
2675
2676 if ((selection_type & Sel_UTF8String))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = Sel_CompoundText;
2681 if (selnum != Sel_direct)
2682 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2683 else
2684 selection_type = 0;
2685 }
2686
2687 return;
2688 }
2689
2690 unsigned long bytes_after;
2691 XTextProperty ct;
2692
2693 if (XGetWindowProperty (dpy, win, prop,
2694 0, PROP_SIZE / 4,
2695 delete_prop, AnyPropertyType,
2696 &ct.encoding, &ct.format,
2697 &ct.nitems, &bytes_after,
2698 &ct.value) != Success)
2699 {
2700 ct.value = 0;
2701 goto bailout;
2702 }
2703
2704 if (ct.encoding == None)
2705 goto bailout;
2706
2707 if (bytes_after)
2708 {
2709 // fetch and append remaining data
2710 XTextProperty ct2;
2711
2712 if (XGetWindowProperty (dpy, win, prop,
2713 ct.nitems / 4, (bytes_after + 3) / 4,
2714 delete_prop, AnyPropertyType,
2715 &ct2.encoding, &ct2.format,
2716 &ct2.nitems, &bytes_after,
2717 &ct2.value) != Success)
2718 goto bailout;
2719
2720 // realloc should be compatible to XFree, here, and elsewhere, too
2721 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2722 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2723 ct.nitems += ct2.nitems;
2724
2725 XFree (ct2.value);
2726 }
2727
2728 if (ct.value == 0)
2729 goto bailout;
2730
2731 if (ct.encoding == xa[XA_INCR])
2732 {
2733 // INCR selection, start handshake
2734 if (!delete_prop)
2735 XDeleteProperty (dpy, win, prop);
2736
2737 selection_wait = Sel_incr;
2738 incr_buf_fill = 0;
2739 incr_ev.start (10);
2740
2741 goto bailout;
2742 }
2743
2744 if (ct.nitems == 0)
2745 {
2746 if (selection_wait == Sel_incr)
2747 {
2748 XFree (ct.value);
2749
2750 // finally complete, now paste the whole thing
2751 selection_wait = Sel_normal;
2752 ct.value = (unsigned char *)incr_buf;
2753 ct.nitems = incr_buf_fill;
2754 incr_buf = 0;
2755 incr_buf_size = 0;
2756 incr_ev.stop ();
2757 }
2758 else
2759 {
2760 if (selection_wait == Sel_normal
2761 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2762 {
2763 /*
2764 * pass through again trying CUT_BUFFER0 if we've come from
2765 * XConvertSelection () but nothing was presented
2766 */
2767 selection_paste (display->root, XA_CUT_BUFFER0, False);
2768 }
2769
2770 goto bailout;
2771 }
2772 }
2773 else if (selection_wait == Sel_incr)
2774 {
2775 incr_ev.start (10);
2776
2777 while (incr_buf_fill + ct.nitems > incr_buf_size)
2778 {
2779 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2780 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2781 }
2782
2783 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2784 incr_buf_fill += ct.nitems;
2785
2786 goto bailout;
2787 }
2788
2789 char **cl;
2790 int cr;
2791
2792#if !ENABLE_MINIMAL
2793 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2794 // so recode it manually
2795 if (ct.encoding == xa[XA_UTF8_STRING])
2796 {
2797 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2798 char *s = rxvt_wcstombs (w);
2799 free (w);
2800 // TODO: strlen == only the first element will be converted. well...
2801 paste (s, strlen (s));
2802 free (s);
2803 }
2804 else
2805#endif
2806 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2807 && cl)
2808 {
2809 for (int i = 0; i < cr; i++)
2810 paste (cl[i], strlen (cl[i]));
2811
2812 XFreeStringList (cl);
2813 }
2814 else
2815 paste ((char *)ct.value, ct.nitems); // paste raw
2816
2817bailout:
2818 XFree (ct.value);
2819
2820 if (selection_wait == Sel_normal)
2821 selection_wait = Sel_none;
2822} 2716}
2823 2717
2824void 2718void
2825rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2826{ 2720{
2827 selection_wait = Sel_none; 2721 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2828
2829 incr_buf_size = 0;
2830 free (incr_buf);
2831
2832 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2833}
2834
2835void
2836rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2837{
2838 if (prop == None || selection_wait != Sel_incr)
2839 return; 2722 return;
2840 2723
2841 selection_paste (win, prop, true); 2724 tt_paste (data, len);
2842} 2725}
2843 2726
2844/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2845/* 2728/*
2846 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2847 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2848 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * as fallback
2849 * > CUT_BUFFER0
2850 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2851 * will auto fallback to CUT_BUFFER0
2852 * EXT: button 2 release 2732 * EXT: button 2 release
2853 */ 2733 */
2854void 2734void
2855rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2856{ 2736{
2857 if (selection.text && selnum == Sel_Primary) 2737 if (!selection_req)
2858 {
2859 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str));
2862 free (str);
2863 return;
2864 } 2738 {
2865 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2866 { 2741 }
2867 selection_request_time = tm;
2868 selection_wait = Sel_normal;
2869
2870#if X_HAVE_UTF8_STRING
2871 selection_type = Sel_UTF8String;
2872 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2873 return;
2874#else
2875 selection_type = Sel_CompoundText;
2876 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2877 return;
2878#endif
2879 }
2880
2881 selection_wait = Sel_none; /* don't loop in selection_paste () */
2882 selection_paste (display->root, XA_CUT_BUFFER0, false);
2883}
2884
2885int
2886rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2887{
2888 Atom sel;
2889
2890 selection_type |= selnum;
2891
2892 if (selnum == Sel_Primary)
2893 sel = XA_PRIMARY;
2894 else if (selnum == Sel_Secondary)
2895 sel = XA_SECONDARY;
2896 else
2897 sel = xa[XA_CLIPBOARD];
2898
2899 if (XGetSelectionOwner (dpy, sel) != None)
2900 {
2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2902 vt, selection_request_time);
2903 return 1;
2904 }
2905
2906 return 0;
2907} 2742}
2908 2743
2909/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2910/* 2745/*
2911 * Clear all selected text 2746 * Clear all selected text
2912 * EXT: SelectionClear 2747 * EXT: SelectionClear
2913 */ 2748 */
2914void 2749void
2915rxvt_term::selection_clear () NOTHROW 2750rxvt_term::selection_clear (bool clipboard) NOTHROW
2916{ 2751{
2752 if (!clipboard)
2753 {
2917 want_refresh = 1; 2754 want_refresh = 1;
2918 free (selection.text); 2755 free (selection.text);
2919 selection.text = NULL; 2756 selection.text = NULL;
2920 selection.len = 0; 2757 selection.len = 0;
2921 CLEAR_SELECTION (); 2758 CLEAR_SELECTION ();
2922 2759
2923 if (display->selection_owner == this) 2760 if (display->selection_owner == this)
2924 display->selection_owner = 0; 2761 display->selection_owner = 0;
2762 }
2763 else
2764 {
2765 free (selection.clip_text);
2766 selection.clip_text = NULL;
2767 selection.clip_len = 0;
2768
2769 if (display->clipboard_owner == this)
2770 display->clipboard_owner = 0;
2771 }
2925} 2772}
2926 2773
2927/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2928/* 2775/*
2929 * Copy a selection into the cut buffer 2776 * Copy a selection into the cut buffer
2930 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
2931 */ 2778 */
2932void 2779void
2933rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
2934{ 2781{
2935 int i; 2782 int size;
2936 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
2937 text_t *t; 2784 text_t *t;
2938 2785
2939 switch (selection.op) 2786 switch (selection.op)
2940 { 2787 {
… …
2956 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
2957 2804
2958 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2959 return; 2806 return;
2960 2807
2961 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2962 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2963 2810
2964 int ofs = 0; 2811 int ofs = 0;
2965 int extra = 0; 2812 int extra = 0;
2966 2813
2967 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
2973 { 2820 {
2974#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
2975 if (selection.rect) 2822 if (selection.rect)
2976 { 2823 {
2977 col = selection.beg.col; 2824 col = selection.beg.col;
2978 end_col = ncol + 1; 2825 end_col = selection.end.col;
2979 } 2826 }
2980 else 2827 else
2981#endif 2828#endif
2982 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
2983 2830
2984 col = max (col, 0); 2831 col = max (col, 0);
2985 2832
2986 if (row == selection.end.row 2833 if (row == selection.end.row)
2987#if !ENABLE_MINIMAL
2988 || selection.rect
2989#endif
2990 )
2991 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
2992 2835
2993 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
2994 2837
2995 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
3003 2846
3004 extra -= (len - 1); 2847 extra -= (len - 1);
3005 2848
3006 if (extra < 0) 2849 if (extra < 0)
3007 { 2850 {
3008 extra += i; 2851 extra += size;
3009 i += i; 2852 size += size;
3010 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3011 } 2854 }
3012 2855
3013 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3014 } 2857 }
3015#endif 2858#endif
… …
3027 2870
3028 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3029 } 2872 }
3030 else 2873 else
3031#endif 2874#endif
3032 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3033 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3034 } 2879 }
3035
3036 if (end_col != selection.end.col)
3037 new_selection_text[ofs++] = C0_LF;
3038 2880
3039 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3040 2882
3041 if (ofs == 0) 2883 if (ofs == 0)
3042 { 2884 {
… …
3055 2897
3056 selection_grab (tm); 2898 selection_grab (tm);
3057} 2899}
3058 2900
3059bool 2901bool
3060rxvt_term::selection_grab (Time tm) NOTHROW 2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3061{ 2903{
2904 Atom sel;
2905
2906 if (!clipboard)
2907 {
3062 selection_time = tm; 2908 selection_time = tm;
2909 sel = XA_PRIMARY;
2910 }
2911 else
2912 {
2913 clipboard_time = tm;
2914 sel = xa[XA_CLIPBOARD];
2915 }
3063 2916
3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2917 XSetSelectionOwner (dpy, sel, vt, tm);
3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2918 if (XGetSelectionOwner (dpy, sel) == vt)
3066 { 2919 {
3067 display->set_selection_owner (this); 2920 display->set_selection_owner (this, clipboard);
3068 return true; 2921 return true;
3069 } 2922 }
3070 else 2923 else
3071 { 2924 {
3072 selection_clear (); 2925 selection_clear (clipboard);
3073 return false; 2926 return false;
3074 } 2927 }
3075 2928
3076#if 0 2929#if 0
3077 XTextProperty ct; 2930 XTextProperty ct;
… …
3537 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3538 */ 3391 */
3539void 3392void
3540rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3541{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3542 XSelectionEvent ev; 3396 XSelectionEvent ev;
3543 3397
3544 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3545 ev.property = None; 3399 ev.property = None;
3546 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3561 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3562#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3563 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3564#endif 3418#endif
3565 3419
3566 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3567 32, PropModeReplace, 3421 32, PropModeReplace,
3568 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3569 ev.property = rq.property; 3423 ev.property = property;
3570 } 3424 }
3571#if TODO // TODO 3425#if TODO // TODO
3572 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3573 { 3427 {
3574 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3575 } 3429 }
3576#endif 3430#endif
3577 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3578 { 3432 {
3579 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3580 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3581 ev.property = rq.property; 3435 ev.property = property;
3436 }
3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3438 {
3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3441 ev.property = property;
3582 } 3442 }
3583 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3584 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3585 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3586 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3618 { 3478 {
3619 target = xa[XA_COMPOUND_TEXT]; 3479 target = xa[XA_COMPOUND_TEXT];
3620 style = enc_compound_text; 3480 style = enc_compound_text;
3621 } 3481 }
3622 3482
3623 if (selection.text) 3483 if (rq.selection == XA_PRIMARY && selection.text)
3624 { 3484 {
3625 cl = selection.text; 3485 cl = selection.text;
3626 selectlen = selection.len; 3486 selectlen = selection.len;
3487 }
3488 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3489 {
3490 cl = selection.clip_text;
3491 selectlen = selection.clip_len;
3627 } 3492 }
3628 else 3493 else
3629 { 3494 {
3630 cl = L""; 3495 cl = L"";
3631 selectlen = 0; 3496 selectlen = 0;
… …
3652 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3653 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3654 ct.encoding = target; 3519 ct.encoding = target;
3655 } 3520 }
3656 3521
3657 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3658 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3659 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3660 ev.property = rq.property; 3525 ev.property = property;
3661 3526
3662 if (freect) 3527 if (freect)
3663 XFree (ct.value); 3528 XFree (ct.value);
3664 } 3529 }
3665 3530
… …
3699 h += 2; min_it (h, nrow); 3564 h += 2; min_it (h, nrow);
3700 3565
3701 x -= 1; clamp_it (x, 0, ncol - w); 3566 x -= 1; clamp_it (x, 0, ncol - w);
3702 y -= 1; clamp_it (y, 0, nrow - h); 3567 y -= 1; clamp_it (y, 0, nrow - h);
3703 3568
3704 ov_x = x; ov_y = y; 3569 ov.x = x; ov.y = y;
3705 ov_w = w; ov_h = h; 3570 ov.w = w; ov.h = h;
3706 3571
3707 ov_text = new text_t *[h]; 3572 ov.text = new text_t *[h];
3708 ov_rend = new rend_t *[h]; 3573 ov.rend = new rend_t *[h];
3709 3574
3710 for (y = 0; y < h; y++) 3575 for (y = 0; y < h; y++)
3711 { 3576 {
3712 text_t *tp = ov_text[y] = new text_t[w]; 3577 text_t *tp = ov.text[y] = new text_t[w];
3713 rend_t *rp = ov_rend[y] = new rend_t[w]; 3578 rend_t *rp = ov.rend[y] = new rend_t[w];
3714 3579
3715 text_t t0, t1, t2; 3580 text_t t0, t1, t2;
3716 rend_t r = OVERLAY_RSTYLE; 3581 rend_t r = OVERLAY_RSTYLE;
3717 3582
3718 if (y == 0) 3583 if (y == 0)
… …
3737} 3602}
3738 3603
3739void 3604void
3740rxvt_term::scr_overlay_off () NOTHROW 3605rxvt_term::scr_overlay_off () NOTHROW
3741{ 3606{
3742 if (!ov_text) 3607 if (!ov.text)
3743 return; 3608 return;
3744 3609
3745 want_refresh = 1; 3610 want_refresh = 1;
3746 3611
3747 for (int y = 0; y < ov_h; y++) 3612 for (int y = 0; y < ov.h; y++)
3748 { 3613 {
3749 delete [] ov_text[y]; 3614 delete [] ov.text[y];
3750 delete [] ov_rend[y]; 3615 delete [] ov.rend[y];
3751 } 3616 }
3752 3617
3753 delete [] ov_text; ov_text = 0; 3618 delete [] ov.text; ov.text = 0;
3754 delete [] ov_rend; ov_rend = 0; 3619 delete [] ov.rend; ov.rend = 0;
3755} 3620}
3756 3621
3757void 3622void
3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759{ 3624{
3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761 return; 3626 return;
3762 3627
3763 x++, y++; 3628 x++, y++;
3764 3629
3765 ov_text[y][x] = text; 3630 ov.text[y][x] = text;
3766 ov_rend[y][x] = rend; 3631 ov.rend[y][x] = rend;
3767} 3632}
3768 3633
3769void 3634void
3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771{ 3636{
… …
3790} 3655}
3791 3656
3792void 3657void
3793rxvt_term::scr_swap_overlay () NOTHROW 3658rxvt_term::scr_swap_overlay () NOTHROW
3794{ 3659{
3795 if (!ov_text) 3660 if (!ov.text)
3796 return; 3661 return;
3797 3662
3663 // hide cursor if it is within the overlay area
3664 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3665 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3666 screen.flags &= ~Screen_VisibleCursor;
3667
3798 // swap screen mem with overlay 3668 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3669 for (int y = ov.h; y--; )
3800 { 3670 {
3801 text_t *t1 = ov_text[y]; 3671 text_t *t1 = ov.text[y];
3802 rend_t *r1 = ov_rend[y]; 3672 rend_t *r1 = ov.rend[y];
3803 3673
3804 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3674 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3805 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3675 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806 3676
3807 for (int x = ov_w; x--; ) 3677 for (int x = ov.w; x--; )
3808 { 3678 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3679 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811 } 3681 }
3812 } 3682 }

Diff Legend

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