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.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.412 by root, Wed Jan 18 12:26:59 2012 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
… …
1017 { 1039 {
1018 if (screen.cur.row > 0) 1040 if (screen.cur.row > 0)
1019 { 1041 {
1020#ifdef TERMCAP_HAS_BW 1042#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1043 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1044 --screen.cur.row;
1045
1023 want_refresh = 1; 1046 want_refresh = 1;
1024#endif 1047#endif
1025 } 1048 }
1026 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1027 else 1052 else
1028 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1029} 1054}
1030 1055
1031/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1226/* 1251/*
1227 * Erase part or whole of a line 1252 * Erase part or whole of a line
1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1253 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1254 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1230 * 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
1231 */ 1257 */
1232void 1258void
1233rxvt_term::scr_erase_line (int mode) NOTHROW 1259rxvt_term::scr_erase_line (int mode) NOTHROW
1234{ 1260{
1235 unsigned int col, num; 1261 unsigned int col, num;
… …
1244 line.touch (); 1270 line.touch ();
1245 line.is_longer (0); 1271 line.is_longer (0);
1246 1272
1247 switch (mode) 1273 switch (mode)
1248 { 1274 {
1275 case 3:
1276 if (screen.flags & Screen_WrapNext)
1277 return;
1278
1279 /* fall through */
1280
1249 case 0: /* erase to end of line */ 1281 case 0: /* erase to end of line */
1250 col = screen.cur.col; 1282 col = screen.cur.col;
1251 num = ncol - col; 1283 num = ncol - col;
1252 min_it (line.l, col); 1284 min_it (line.l, col);
1285
1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1286 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1287 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255 CLEAR_SELECTION (); 1288 CLEAR_SELECTION ();
1256 break; 1289 break;
1290
1257 case 1: /* erase to beginning of line */ 1291 case 1: /* erase to beginning of line */
1258 col = 0; 1292 col = 0;
1259 num = screen.cur.col + 1; 1293 num = screen.cur.col + 1;
1294
1260 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1295 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262 CLEAR_SELECTION (); 1297 CLEAR_SELECTION ();
1263 break; 1298 break;
1299
1264 case 2: /* erase whole line */ 1300 case 2: /* erase whole line */
1265 col = 0; 1301 col = 0;
1266 num = ncol; 1302 num = ncol;
1267 line.l = 0; 1303 line.l = 0;
1268 if (selection.beg.row <= screen.cur.row 1304 if (selection.beg.row <= screen.cur.row
… …
1276 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1277} 1313}
1278 1314
1279/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1280/* 1316/*
1281 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1282 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1283 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1284 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1285 */ 1321 */
1286void 1322void
… …
1295 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1296 1332
1297 switch (mode) 1333 switch (mode)
1298 { 1334 {
1299 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1300 selection_check (1);
1301 scr_erase_line (0); 1336 scr_erase_line (0);
1302 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1303 num = nrow - row; 1338 num = nrow - row;
1304 break; 1339 break;
1305 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1306 selection_check (3);
1307 scr_erase_line (1); 1341 scr_erase_line (1);
1308 row = 0; 1342 row = 0;
1309 num = screen.cur.row; 1343 num = screen.cur.row;
1310 break; 1344 break;
1311 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1312 selection_check (3);
1313 row = 0; 1346 row = 0;
1314 num = nrow; 1347 num = nrow;
1315 break; 1348 break;
1316 default: 1349 default:
1317 return; 1350 return;
… …
1326 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1327 return; 1360 return;
1328 1361
1329 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1330 1363
1331 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1332 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1333 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1334 { 1367 {
1335 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1336 CLEAR_ROWS (row, num); 1369
1370 if (mapped)
1371 XClearArea (dpy, vt, 0,
1372 Row2Pixel (row - view_start), (unsigned int)vt_width,
1373 (unsigned int)Height2Pixel (num), False);
1337 } 1374 }
1338 else 1375 else
1339 { 1376 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1378
1379 if (mapped)
1380 {
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1383 XFillRectangle (dpy, vt, gc,
1384 0, Row2Pixel (row - view_start),
1385 (unsigned int)vt_width,
1386 (unsigned int)Height2Pixel (num));
1344 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1389 }
1346 } 1390 }
1347 1391
1348 for (; num--; row++) 1392 for (; num--; row++)
1349 { 1393 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1395
1396 if (row - view_start < nrow)
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1352 } 1398 }
1353} 1399}
1354 1400
1355#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1356void 1402void
… …
1375 1421
1376 want_refresh = 1; 1422 want_refresh = 1;
1377 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1378 1424
1379 num_scr_allow = 0; 1425 num_scr_allow = 0;
1380 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 ();
1381 1431
1382 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1383 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1384 { 1434 {
1385 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1430 * Insert/Delete <count> characters from the current position 1480 * Insert/Delete <count> characters from the current position
1431 */ 1481 */
1432void 1482void
1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1483rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434{ 1484{
1435 int col, row;
1436 rend_t tr;
1437
1438 want_refresh = 1; 1485 want_refresh = 1;
1439 ZERO_SCROLLBACK (); 1486 ZERO_SCROLLBACK ();
1440 1487
1441 if (count <= 0) 1488 if (count <= 0)
1442 return; 1489 return;
… …
1444 scr_do_wrap (); 1491 scr_do_wrap ();
1445 1492
1446 selection_check (1); 1493 selection_check (1);
1447 min_it (count, ncol - screen.cur.col); 1494 min_it (count, ncol - screen.cur.col);
1448 1495
1449 row = screen.cur.row; 1496 int row = screen.cur.row;
1450 1497
1451 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1452 1499
1453 line->touch (); 1500 line->touch ();
1454 line->is_longer (0); 1501 line->is_longer (0);
1455 1502
1503 // nuke wide spanning the start
1504 if (line->t[screen.cur.col] == NOCHAR)
1505 scr_kill_char (*line, screen.cur.col);
1506
1456 switch (insdel) 1507 switch (insdel)
1457 { 1508 {
1458 case INSERT: 1509 case INSERT:
1459 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--)
1460 { 1516 {
1461 line->t[col] = line->t[col - count]; 1517 line->t[col] = line->t[col - count];
1462 line->r[col] = line->r[col - count]; 1518 line->r[col] = line->r[col - count];
1463 } 1519 }
1464
1465 line->l = min (line->l + count, ncol);
1466 1520
1467 if (selection.op && current_screen == selection.screen 1521 if (selection.op && current_screen == selection.screen
1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469 { 1523 {
1470 if (selection.end.row != screen.cur.row 1524 if (selection.end.row != screen.cur.row
… …
1485 case ERASE: 1539 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1540 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1541 selection_check (1);
1488 screen.cur.col -= count; 1542 screen.cur.col -= count;
1489 1543
1490 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
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1549 break;
1493 1550
1494 case DELETE: 1551 case DELETE:
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1552 line->l = max (line->l - count, 0);
1496 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
1497 for (col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1498 { 1559 {
1499 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1500 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1501 } 1562 }
1502 1563
1503 line->l = max (line->l - count, 0);
1504 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1505 1565
1506 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508 { 1568 {
1509 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1645 { 1705 {
1646 rvideo_state = on; 1706 rvideo_state = on;
1647 1707
1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1649#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1651#endif 1711#endif
1652 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1653 1713
1654 XGCValues gcvalue; 1714 XGCValues gcvalue;
1655 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1799 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1800 { 1860 {
1801 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1802 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1803 } 1863 }
1804// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1805 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++)
1806 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);
1807 1867
1808 num_scr_allow = 0; 1868 num_scr_allow = 0;
1809 1869
… …
1816 * Refresh the entire screen 1876 * Refresh the entire screen
1817 */ 1877 */
1818void 1878void
1819rxvt_term::scr_touch (bool refresh) NOTHROW 1879rxvt_term::scr_touch (bool refresh) NOTHROW
1820{ 1880{
1821 scr_expose (0, 0, width, height, refresh); 1881 scr_expose (0, 0, vt_width, vt_height, refresh);
1822} 1882}
1823 1883
1824/* ------------------------------------------------------------------------- */ 1884/* ------------------------------------------------------------------------- */
1825/* 1885/*
1826 * Move the display so that the line represented by scrollbar value Y is at 1886 * Move the display so that the line represented by scrollbar value Y is at
… …
1882 1942
1883# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1884# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1885 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1886# endif 1946# endif
1887 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1888# endif 1948# endif
1889 1949
1890# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1892 { 1952 set_urgency (1);
1893 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894 {
1895 h->flags |= XUrgencyHint;
1896 XSetWMHints (dpy, parent[0], h);
1897 }
1898 }
1899# endif 1953# endif
1900 1954
1901 if (option (Opt_visualBell)) 1955 if (option (Opt_visualBell))
1902 { 1956 {
1903 rvideo_bell = true; 1957 rvideo_bell = true;
… …
1906 1960
1907 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1908 } 1962 }
1909 else 1963 else
1910 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1911#endif 1966#endif
1912} 1967}
1913 1968
1914/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1915/* ARGSUSED */
1916void 1970void
1917rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1918{ 1972{
1919#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1920 int nrows, row_start; 1974 int nrows, row_start;
1921 FILE *fd; 1975 FILE *fd = popen_printer ();
1922 1976
1923 if ((fd = popen_printer ()) == NULL) 1977 if (!fd)
1924 return; 1978 return;
1925 1979
1926 if (fullhist) 1980 if (fullhist)
1927 { 1981 {
1928 nrows = nrow - top_row; 1982 nrows = nrow - top_row;
… …
1934 row_start = view_start; 1988 row_start = view_start;
1935 } 1989 }
1936 1990
1937 wctomb (0, 0); 1991 wctomb (0, 0);
1938 1992
1939 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1940 { 1994 {
1941 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1942 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1943 1997
1944 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
… …
1973 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1974 */ 2028 */
1975void 2029void
1976rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
1977{ 2031{
1978 unsigned char have_bg,
1979 showcursor; /* show the cursor */
1980 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1981 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1982 int i; /* tmp */ 2034 int i; /* tmp */
1983#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
1984 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
1993 return; 2045 return;
1994 2046
1995 /* 2047 /*
1996 * A: set up vars 2048 * A: set up vars
1997 */ 2049 */
1998 have_bg = 0;
1999 refresh_count = 0; 2050 refresh_count = 0;
2000 2051
2052 unsigned int old_screen_flags = screen.flags;
2053 bool have_bg = 0;
2001#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2002 have_bg |= bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2003#endif 2056#endif
2004 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2005 2058
2006 /* 2059 /*
2007 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2008 */ 2061 */
2009 scr_reverse_selection (); 2062 scr_reverse_selection ();
2010 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
2011 /* 2071 /*
2012 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2013 */ 2073 */
2014 { 2074 {
2015 unsigned char setoldcursor; 2075 bool setoldcursor;
2016 2076
2017 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2078 if (hidden_cursor)
2020 showcursor = 0; 2079 showcursor = 0;
2021#endif 2080#endif
2022 2081
… …
2050 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2051#else 2110#else
2052 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2053#endif 2112#endif
2054 2113
2055 if (showcursor && focus) 2114 if (focus)
2056 { 2115 {
2057 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2058 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2059 else 2118 else
2060 { 2119 {
… …
2095 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2096 } 2155 }
2097 } 2156 }
2098 } 2157 }
2099 2158
2100 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2101#if ENABLE_OVERLAY
2102 scr_swap_overlay ();
2103#endif
2104
2105#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2106 /* 2160 /*
2107 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2108 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2109 */ 2163 */
… …
2113 { 2167 {
2114 int16_t nits; 2168 int16_t nits;
2115 int i = num_scr; 2169 int i = num_scr;
2116 int j; 2170 int j;
2117 int len, wlen; 2171 int len, wlen;
2118 dLocal (int, num_scr);
2119 2172
2120 j = nrow; 2173 j = nrow;
2121 wlen = len = -1; 2174 wlen = len = -1;
2122 row = i > 0 ? 0 : j - 1; 2175 row = i > 0 ? 0 : j - 1;
2123 2176
… …
2198 continue; 2251 continue;
2199 2252
2200 // redraw one or more characters 2253 // redraw one or more characters
2201 2254
2202 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2203 while (stp[col] == NOCHAR && col > 0) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2204 --col; 2257 --col;
2205 2258
2206 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2207 text_t *text = stp + col; 2260 text_t *text = stp + col;
2208 int count = 1; 2261 int count = 1;
2209 2262
2210 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2211 drp[col] = rend; 2264 drp[col] = rend;
… …
2215 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2216 { 2269 {
2217 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2218 { 2271 {
2219 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2220 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2221 count++; 2275 count++;
2222 i++; 2276 i++;
2223 2277
2224 continue; 2278 continue;
2225 } 2279 }
… …
2245 2299
2246 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2247 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2248 2302
2249 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2250 while (i && text[count] == NOCHAR) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2251 count++, i--; 2305 count++, i--;
2252 2306
2253 /* 2307 /*
2254 * Determine the attributes for the string 2308 * Determine the attributes for the string
2255 */ 2309 */
2256 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2257 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2258 2312
2259 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2260 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2261 { 2315 {
2262 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2263 2317
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2265 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2284 2338
2285 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2286 fore = Color_UL; 2340 fore = Color_UL;
2287#endif 2341#endif
2288 2342
2343#ifdef OPTION_HC
2344 if (rend & RS_Sel)
2345 {
2346 /* invert the column if no highlightColor is set or it is the
2347 * current cursor column */
2348 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2349 && ISSET_PIXCOLOR (Color_HC))
2350 {
2351 if (ISSET_PIXCOLOR (Color_HTC))
2352 fore = Color_HTC;
2353 // if invert is 0 reverse video is set so we use bg color as fg color
2354 else if (!invert)
2355 fore = back;
2356
2357 back = Color_HC;
2358 invert = 0;
2359 }
2360 }
2361#endif
2362
2289 if (invert) 2363 if (invert)
2290 { 2364 {
2291#ifdef OPTION_HC
2292 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2293 || !ISSET_PIXCOLOR (Color_HC))
2294#endif
2295 /* invert the column if no highlightColor is set or it is the
2296 * current cursor column */
2297 ::swap (fore, back); 2365 ::swap (fore, back);
2298#ifdef OPTION_HC
2299 else if (ISSET_PIXCOLOR (Color_HC))
2300 back = Color_HC;
2301#endif
2302 2366
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2304# ifndef OPTION_HC
2305 if (ISSET_PIXCOLOR (Color_RV))
2306 back = Color_RV;
2307# endif
2308 if (fore == back) 2368 if (fore == back)
2309 { 2369 {
2310 fore = Color_bg; 2370 fore = Color_bg;
2311 back = Color_fg; 2371 back = Color_fg;
2312 } 2372 }
… …
2348 /* 2408 /*
2349 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2350 */ 2410 */
2351 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2352 2412
2353 if (have_bg && back == Color_bg) 2413 if (ecb_likely (have_bg && back == Color_bg))
2354 { 2414 {
2355 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2356 2416
2357 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2358 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2365 did_clear: ; 2425 did_clear: ;
2366 } 2426 }
2367 else 2427 else
2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2369 2429
2370 if (rend & RS_Uline && font->descent > 1 && fore != back) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2371 { 2431 {
2372#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2373 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2374 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2375 else 2435 else
2376#endif 2436#endif
2377 XSetForeground (dpy, gc, pix_colors[fore]); 2437 XSetForeground (dpy, gc, pix_colors[fore]);
2378 2438
2379 XDrawLine (dpy, drawBuffer, gc, 2439 XDrawLine (dpy, vt, gc,
2380 xpixel, ypixel + font->ascent + 1, 2440 xpixel, ypixel + font->ascent + 1,
2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2441 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2382 } 2442 }
2383 } /* for (col....) */ 2443 } /* for (col....) */
2384 } /* for (row....) */ 2444 } /* for (row....) */
2385
2386#if ENABLE_OVERLAY
2387 scr_swap_overlay ();
2388#endif
2389 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2390 2445
2391 /* 2446 /*
2392 * G: cleanup cursor and display outline cursor if necessary 2447 * G: cleanup cursor and display outline cursor if necessary
2393 */ 2448 */
2394 if (showcursor) 2449 if (showcursor)
… …
2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2477 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423 else 2478 else
2424#endif 2479#endif
2425 XSetForeground (dpy, gc, pix_colors[ccol1]); 2480 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 2481
2427 XDrawRectangle (dpy, drawBuffer, gc, 2482 XDrawRectangle (dpy, vt, gc,
2428 Col2Pixel (col), 2483 Col2Pixel (col),
2429 Row2Pixel (oldcursor.row), 2484 Row2Pixel (oldcursor.row),
2430 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2485 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2431 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2486 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2432 } 2487 }
2433 } 2488 }
2434 2489
2435 /* 2490 /*
2436 * H: cleanup selection 2491 * H: cleanup selection
2437 */ 2492 */
2493#if ENABLE_OVERLAY
2494 scr_swap_overlay ();
2495#endif
2496 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2497
2438 scr_reverse_selection (); 2498 scr_reverse_selection ();
2439 2499
2500 screen.flags = old_screen_flags;
2440 num_scr = 0; 2501 num_scr = 0;
2441 num_scr_allow = 1; 2502 num_scr_allow = 1;
2442} 2503}
2443 2504
2444void 2505void
… …
2465 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2466 } 2527 }
2467} 2528}
2468 2529
2469void 2530void
2470rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2471{ 2532{
2533 bool transparent = false;
2534
2472#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2473 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2474#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2475 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2477 XClearWindow (dpy, parent[0]);
2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2479 2559
2480# if HAVE_SCROLLBARS 2560 XClearWindow (dpy, parent);
2561
2481 if (scrollBar.win) 2562 if (scrollBar.win)
2482 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2484 scrollBar.setIdle (); 2568 scrollBar.state = SB_STATE_IDLE;
2485 scrollbar_show (0); 2569 scrollBar.show (0);
2486 } 2570 }
2487# endif
2488 2571
2572 if (refresh)
2573 {
2489 scr_clear (); 2574 scr_clear ();
2490 scr_touch (true); 2575 scr_touch (true);
2576 }
2491 want_refresh = 1; 2577 want_refresh = 1;
2492
2493#endif
2494} 2578}
2495 2579
2496/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2497void 2581void
2498rxvt_term::scr_clear (bool really) NOTHROW 2582rxvt_term::scr_clear (bool really) NOTHROW
… …
2565 { 2649 {
2566#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2567 if (selection.rect) 2651 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2655 else
2572#endif 2656#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2575 RS_RVid); 2659 RS_Sel | RS_RVid);
2576 } 2660 }
2577} 2661}
2578 2662
2579/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2580/* 2664/*
… …
2583 */ 2667 */
2584#if 0 2668#if 0
2585void 2669void
2586rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2587{ 2671{
2588 int row, wrote; 2672 // if this method is needed, it can be implemented by factoring the
2589 unsigned int width, towrite; 2673 // relevant code in scr_printscreen
2590 char r1[] = "\n";
2591
2592 for (row = saveLines - nsaved;
2593 row < saveLines + nrow - 1; row++)
2594 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote)
2598 {
2599 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2600 towrite);
2601 if (wrote < 0)
2602 return; /* XXX: death, no report */
2603 }
2604 if (row_buf[row].l >= 0)
2605 if (write (fd, r1, 1) <= 0)
2606 return; /* XXX: death, no report */
2607 }
2608} 2674}
2609#endif 2675#endif
2610 2676
2611/* ------------------------------------------------------------------------- * 2677/* ------------------------------------------------------------------------- *
2612 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2613 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2614void 2680void
2615rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2616{ 2682{
2617 row_col_t pos;
2618
2619 if (!selection.op) 2683 if (!selection.op)
2620 return; 2684 return;
2621 2685
2622 pos.row = pos.col = 0;
2623 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2686 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2624 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2625 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2626 || (check_more == 1 2689 || (check_more == 1
2627 && current_screen == selection.screen 2690 && current_screen == selection.screen
2628 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2629 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2630 || (check_more == 2
2631 && ROWCOL_IS_BEFORE (selection.beg, pos)
2632 && ROWCOL_IS_AFTER (selection.end, pos))
2633 || (check_more == 3
2634 && ROWCOL_IS_AFTER (selection.end, pos))
2635 || (check_more == 4 /* screen width change */
2636 && (selection.beg.row != selection.end.row
2637 || selection.end.col > ncol)))
2638 CLEAR_SELECTION (); 2693 CLEAR_ALL_SELECTION ();
2639} 2694}
2640 2695
2641/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2642/* 2697/*
2643 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
2644 */ 2699 */
2645void 2700void
2646rxvt_term::paste (char *data, unsigned int len) NOTHROW 2701rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2647{ 2702{
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2703 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2706 data[i] = C0_CR;
2652 2707
2708 if (priv_modes & PrivMode_BracketPaste)
2709 tt_printf ("\x1b[200~");
2710
2653 tt_write (data, len); 2711 tt_write (data, len);
2654}
2655 2712
2656/* ------------------------------------------------------------------------- */ 2713 if (priv_modes & PrivMode_BracketPaste)
2657/* 2714 tt_printf ("\x1b[201~");
2658 * Respond to a notification that a primary selection has been sent
2659 * EXT: SelectionNotify
2660 */
2661void
2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2663{
2664 if (prop == None) /* check for failed XConvertSelection */
2665 {
2666 if ((selection_type & Sel_CompoundText))
2667 {
2668 int selnum = selection_type & Sel_whereMask;
2669
2670 selection_type = 0;
2671 if (selnum != Sel_direct)
2672 selection_request_other (XA_STRING, selnum);
2673 }
2674
2675 if ((selection_type & Sel_UTF8String))
2676 {
2677 int selnum = selection_type & Sel_whereMask;
2678
2679 selection_type = Sel_CompoundText;
2680 if (selnum != Sel_direct)
2681 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2682 else
2683 selection_type = 0;
2684 }
2685
2686 return;
2687 }
2688
2689 unsigned long bytes_after;
2690 XTextProperty ct;
2691
2692 if (XGetWindowProperty (dpy, win, prop,
2693 0, PROP_SIZE / 4,
2694 delete_prop, AnyPropertyType,
2695 &ct.encoding, &ct.format,
2696 &ct.nitems, &bytes_after,
2697 &ct.value) != Success)
2698 {
2699 ct.value = 0;
2700 goto bailout;
2701 }
2702
2703 if (ct.encoding == None)
2704 goto bailout;
2705
2706 if (bytes_after)
2707 {
2708 // fetch and append remaining data
2709 XTextProperty ct2;
2710
2711 if (XGetWindowProperty (dpy, win, prop,
2712 ct.nitems / 4, (bytes_after + 3) / 4,
2713 delete_prop, AnyPropertyType,
2714 &ct2.encoding, &ct2.format,
2715 &ct2.nitems, &bytes_after,
2716 &ct2.value) != Success)
2717 goto bailout;
2718
2719 // realloc should be compatible to XFree, here, and elsewhere, too
2720 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2721 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2722 ct.nitems += ct2.nitems;
2723
2724 XFree (ct2.value);
2725 }
2726
2727 if (ct.value == 0)
2728 goto bailout;
2729
2730 if (ct.encoding == xa[XA_INCR])
2731 {
2732 // INCR selection, start handshake
2733 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop);
2735
2736 selection_wait = Sel_incr;
2737 incr_buf_fill = 0;
2738 incr_ev.start (10);
2739
2740 goto bailout;
2741 }
2742
2743 if (ct.nitems == 0)
2744 {
2745 if (selection_wait == Sel_incr)
2746 {
2747 XFree (ct.value);
2748
2749 // finally complete, now paste the whole thing
2750 selection_wait = Sel_normal;
2751 ct.value = (unsigned char *)incr_buf;
2752 ct.nitems = incr_buf_fill;
2753 incr_buf = 0;
2754 incr_buf_size = 0;
2755 incr_ev.stop ();
2756 }
2757 else
2758 {
2759 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 {
2762 /*
2763 * pass through again trying CUT_BUFFER0 if we've come from
2764 * XConvertSelection () but nothing was presented
2765 */
2766 selection_paste (display->root, XA_CUT_BUFFER0, False);
2767 }
2768
2769 goto bailout;
2770 }
2771 }
2772 else if (selection_wait == Sel_incr)
2773 {
2774 incr_ev.start (10);
2775
2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2780 }
2781
2782 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2783 incr_buf_fill += ct.nitems;
2784
2785 goto bailout;
2786 }
2787
2788 char **cl;
2789 int cr;
2790
2791#if !ENABLE_MINIMAL
2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2793 // so recode it manually
2794 if (ct.encoding == xa[XA_UTF8_STRING])
2795 {
2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2797 char *s = rxvt_wcstombs (w);
2798 free (w);
2799 // TODO: strlen == only the first element will be converted. well...
2800 paste (s, strlen (s));
2801 free (s);
2802 }
2803 else
2804#endif
2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2806 && cl)
2807 {
2808 for (int i = 0; i < cr; i++)
2809 paste (cl[i], strlen (cl[i]));
2810
2811 XFreeStringList (cl);
2812 }
2813 else
2814 paste ((char *)ct.value, ct.nitems); // paste raw
2815
2816bailout:
2817 XFree (ct.value);
2818
2819 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none;
2821} 2715}
2822 2716
2823void 2717void
2824rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2825{ 2719{
2826 selection_wait = Sel_none; 2720 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2827
2828 incr_buf_size = 0;
2829 free (incr_buf);
2830
2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2832}
2833
2834void
2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2836{
2837 if (prop == None || selection_wait != Sel_incr)
2838 return; 2721 return;
2839 2722
2840 selection_paste (win, prop, true); 2723 tt_paste (data, len);
2841} 2724}
2842 2725
2843/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2844/* 2727/*
2845 * Request the current selection: 2728 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2846 * Order: > internal selection if available 2729 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2730 * as fallback
2848 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0
2851 * EXT: button 2 release 2731 * EXT: button 2 release
2852 */ 2732 */
2853void 2733void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2734rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2735{
2856 if (selection.text && selnum == Sel_Primary) 2736 if (!selection_req)
2857 {
2858 /* internal selection */
2859 char *str = rxvt_wcstombs (selection.text, selection.len);
2860 paste (str, strlen (str));
2861 free (str);
2862 return;
2863 } 2737 {
2864 else 2738 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2739 selection_req->run ();
2865 { 2740 }
2866 selection_request_time = tm;
2867 selection_wait = Sel_normal;
2868
2869#if X_HAVE_UTF8_STRING
2870 selection_type = Sel_UTF8String;
2871 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2872 return;
2873#else
2874 selection_type = Sel_CompoundText;
2875 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2876 return;
2877#endif
2878 }
2879
2880 selection_wait = Sel_none; /* don't loop in selection_paste () */
2881 selection_paste (display->root, XA_CUT_BUFFER0, false);
2882}
2883
2884int
2885rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2886{
2887 Atom sel;
2888
2889 selection_type |= selnum;
2890
2891 if (selnum == Sel_Primary)
2892 sel = XA_PRIMARY;
2893 else if (selnum == Sel_Secondary)
2894 sel = XA_SECONDARY;
2895 else
2896 sel = xa[XA_CLIPBOARD];
2897
2898 if (XGetSelectionOwner (dpy, sel) != None)
2899 {
2900 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2901 vt, selection_request_time);
2902 return 1;
2903 }
2904
2905 return 0;
2906} 2741}
2907 2742
2908/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2909/* 2744/*
2910 * Clear all selected text 2745 * Clear all selected text
2911 * EXT: SelectionClear 2746 * EXT: SelectionClear
2912 */ 2747 */
2913void 2748void
2914rxvt_term::selection_clear () NOTHROW 2749rxvt_term::selection_clear (bool clipboard) NOTHROW
2915{ 2750{
2751 if (!clipboard)
2752 {
2916 want_refresh = 1; 2753 want_refresh = 1;
2917 free (selection.text); 2754 free (selection.text);
2918 selection.text = NULL; 2755 selection.text = NULL;
2919 selection.len = 0; 2756 selection.len = 0;
2920 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2921 2758
2922 if (display->selection_owner == this) 2759 if (display->selection_owner == this)
2923 display->selection_owner = 0; 2760 display->selection_owner = 0;
2761 }
2762 else
2763 {
2764 free (selection.clip_text);
2765 selection.clip_text = NULL;
2766 selection.clip_len = 0;
2767
2768 if (display->clipboard_owner == this)
2769 display->clipboard_owner = 0;
2770 }
2924} 2771}
2925 2772
2926/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2927/* 2774/*
2928 * Copy a selection into the cut buffer 2775 * Copy a selection into the cut buffer
2929 * EXT: button 1 or 3 release 2776 * EXT: button 1 or 3 release
2930 */ 2777 */
2931void 2778void
2932rxvt_term::selection_make (Time tm) 2779rxvt_term::selection_make (Time tm)
2933{ 2780{
2934 int i; 2781 int size;
2935 wchar_t *new_selection_text; 2782 wchar_t *new_selection_text;
2936 text_t *t; 2783 text_t *t;
2937 2784
2938 switch (selection.op) 2785 switch (selection.op)
2939 { 2786 {
… …
2955 return; /* nothing selected, go away */ 2802 return; /* nothing selected, go away */
2956 2803
2957 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2804 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2958 return; 2805 return;
2959 2806
2960 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2807 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2961 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2808 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2962 2809
2963 int ofs = 0; 2810 int ofs = 0;
2964 int extra = 0; 2811 int extra = 0;
2965 2812
2966 int col = selection.beg.col; 2813 int col = selection.beg.col;
… …
2972 { 2819 {
2973#if !ENABLE_MINIMAL 2820#if !ENABLE_MINIMAL
2974 if (selection.rect) 2821 if (selection.rect)
2975 { 2822 {
2976 col = selection.beg.col; 2823 col = selection.beg.col;
2977 end_col = ncol + 1; 2824 end_col = selection.end.col;
2978 } 2825 }
2979 else 2826 else
2980#endif 2827#endif
2981 end_col = ROW(row).l; 2828 end_col = ROW(row).l;
2982 2829
2983 col = max (col, 0); 2830 col = max (col, 0);
2984 2831
2985 if (row == selection.end.row 2832 if (row == selection.end.row)
2986#if !ENABLE_MINIMAL
2987 || selection.rect
2988#endif
2989 )
2990 min_it (end_col, selection.end.col); 2833 min_it (end_col, selection.end.col);
2991 2834
2992 t = ROW(row).t + col; 2835 t = ROW(row).t + col;
2993 2836
2994 for (; col < end_col; col++) 2837 for (; col < end_col; col++)
… …
3002 2845
3003 extra -= (len - 1); 2846 extra -= (len - 1);
3004 2847
3005 if (extra < 0) 2848 if (extra < 0)
3006 { 2849 {
3007 extra += i; 2850 extra += size;
3008 i += i; 2851 size += size;
3009 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2852 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3010 } 2853 }
3011 2854
3012 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2855 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3013 } 2856 }
3014#endif 2857#endif
… …
3026 2869
3027 new_selection_text[ofs++] = C0_LF; 2870 new_selection_text[ofs++] = C0_LF;
3028 } 2871 }
3029 else 2872 else
3030#endif 2873#endif
3031 if (!ROW(row).is_longer () && row != selection.end.row) 2874 if (!ROW(row).is_longer ()
2875 && (row != selection.end.row || end_col != selection.end.col)
2876 && (row != selection.beg.row || selection.beg.col < ncol))
3032 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3033 } 2878 }
3034
3035 if (end_col != selection.end.col)
3036 new_selection_text[ofs++] = C0_LF;
3037 2879
3038 new_selection_text[ofs] = 0; 2880 new_selection_text[ofs] = 0;
3039 2881
3040 if (ofs == 0) 2882 if (ofs == 0)
3041 { 2883 {
… …
3054 2896
3055 selection_grab (tm); 2897 selection_grab (tm);
3056} 2898}
3057 2899
3058bool 2900bool
3059rxvt_term::selection_grab (Time tm) NOTHROW 2901rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3060{ 2902{
2903 Atom sel;
2904
2905 if (!clipboard)
2906 {
3061 selection_time = tm; 2907 selection_time = tm;
2908 sel = XA_PRIMARY;
2909 }
2910 else
2911 {
2912 clipboard_time = tm;
2913 sel = xa[XA_CLIPBOARD];
2914 }
3062 2915
3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2916 XSetSelectionOwner (dpy, sel, vt, tm);
3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2917 if (XGetSelectionOwner (dpy, sel) == vt)
3065 { 2918 {
3066 display->set_selection_owner (this); 2919 display->set_selection_owner (this, clipboard);
3067 return true; 2920 return true;
3068 } 2921 }
3069 else 2922 else
3070 { 2923 {
3071 selection_clear (); 2924 selection_clear (clipboard);
3072 return false; 2925 return false;
3073 } 2926 }
3074 2927
3075#if 0 2928#if 0
3076 XTextProperty ct; 2929 XTextProperty ct;
… …
3536 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3537 */ 3390 */
3538void 3391void
3539rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3540{ 3393{
3394 Atom property = rq.property == None ? rq.target : rq.property;
3541 XSelectionEvent ev; 3395 XSelectionEvent ev;
3542 3396
3543 ev.type = SelectionNotify; 3397 ev.type = SelectionNotify;
3544 ev.property = None; 3398 ev.property = None;
3545 ev.display = rq.display; 3399 ev.display = rq.display;
… …
3560 *target++ = xa[XA_COMPOUND_TEXT]; 3414 *target++ = xa[XA_COMPOUND_TEXT];
3561#if X_HAVE_UTF8_STRING 3415#if X_HAVE_UTF8_STRING
3562 *target++ = xa[XA_UTF8_STRING]; 3416 *target++ = xa[XA_UTF8_STRING];
3563#endif 3417#endif
3564 3418
3565 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3419 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3566 32, PropModeReplace, 3420 32, PropModeReplace,
3567 (unsigned char *)target_list, target - target_list); 3421 (unsigned char *)target_list, target - target_list);
3568 ev.property = rq.property; 3422 ev.property = property;
3569 } 3423 }
3570#if TODO // TODO 3424#if TODO // TODO
3571 else if (rq.target == xa[XA_MULTIPLE]) 3425 else if (rq.target == xa[XA_MULTIPLE])
3572 { 3426 {
3573 /* TODO: Handle MULTIPLE */ 3427 /* TODO: Handle MULTIPLE */
3574 } 3428 }
3575#endif 3429#endif
3576 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3430 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3577 { 3431 {
3578 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3432 XChangeProperty (dpy, rq.requestor, property, rq.target,
3579 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3433 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3580 ev.property = rq.property; 3434 ev.property = property;
3435 }
3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3437 {
3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3439 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3440 ev.property = property;
3581 } 3441 }
3582 else if (rq.target == XA_STRING 3442 else if (rq.target == XA_STRING
3583 || rq.target == xa[XA_TEXT] 3443 || rq.target == xa[XA_TEXT]
3584 || rq.target == xa[XA_COMPOUND_TEXT] 3444 || rq.target == xa[XA_COMPOUND_TEXT]
3585 || rq.target == xa[XA_UTF8_STRING] 3445 || rq.target == xa[XA_UTF8_STRING]
… …
3617 { 3477 {
3618 target = xa[XA_COMPOUND_TEXT]; 3478 target = xa[XA_COMPOUND_TEXT];
3619 style = enc_compound_text; 3479 style = enc_compound_text;
3620 } 3480 }
3621 3481
3622 if (selection.text) 3482 if (rq.selection == XA_PRIMARY && selection.text)
3623 { 3483 {
3624 cl = selection.text; 3484 cl = selection.text;
3625 selectlen = selection.len; 3485 selectlen = selection.len;
3486 }
3487 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3488 {
3489 cl = selection.clip_text;
3490 selectlen = selection.clip_len;
3626 } 3491 }
3627 else 3492 else
3628 { 3493 {
3629 cl = L""; 3494 cl = L"";
3630 selectlen = 0; 3495 selectlen = 0;
… …
3651 ct.value = (unsigned char *)cl; 3516 ct.value = (unsigned char *)cl;
3652 ct.nitems = selectlen; 3517 ct.nitems = selectlen;
3653 ct.encoding = target; 3518 ct.encoding = target;
3654 } 3519 }
3655 3520
3656 XChangeProperty (dpy, rq.requestor, rq.property, 3521 XChangeProperty (dpy, rq.requestor, property,
3657 ct.encoding, 8, PropModeReplace, 3522 ct.encoding, 8, PropModeReplace,
3658 ct.value, (int)ct.nitems); 3523 ct.value, (int)ct.nitems);
3659 ev.property = rq.property; 3524 ev.property = property;
3660 3525
3661 if (freect) 3526 if (freect)
3662 XFree (ct.value); 3527 XFree (ct.value);
3663 } 3528 }
3664 3529
… …
3698 h += 2; min_it (h, nrow); 3563 h += 2; min_it (h, nrow);
3699 3564
3700 x -= 1; clamp_it (x, 0, ncol - w); 3565 x -= 1; clamp_it (x, 0, ncol - w);
3701 y -= 1; clamp_it (y, 0, nrow - h); 3566 y -= 1; clamp_it (y, 0, nrow - h);
3702 3567
3703 ov_x = x; ov_y = y; 3568 ov.x = x; ov.y = y;
3704 ov_w = w; ov_h = h; 3569 ov.w = w; ov.h = h;
3705 3570
3706 ov_text = new text_t *[h]; 3571 ov.text = new text_t *[h];
3707 ov_rend = new rend_t *[h]; 3572 ov.rend = new rend_t *[h];
3708 3573
3709 for (y = 0; y < h; y++) 3574 for (y = 0; y < h; y++)
3710 { 3575 {
3711 text_t *tp = ov_text[y] = new text_t[w]; 3576 text_t *tp = ov.text[y] = new text_t[w];
3712 rend_t *rp = ov_rend[y] = new rend_t[w]; 3577 rend_t *rp = ov.rend[y] = new rend_t[w];
3713 3578
3714 text_t t0, t1, t2; 3579 text_t t0, t1, t2;
3715 rend_t r = OVERLAY_RSTYLE; 3580 rend_t r = OVERLAY_RSTYLE;
3716 3581
3717 if (y == 0) 3582 if (y == 0)
… …
3736} 3601}
3737 3602
3738void 3603void
3739rxvt_term::scr_overlay_off () NOTHROW 3604rxvt_term::scr_overlay_off () NOTHROW
3740{ 3605{
3741 if (!ov_text) 3606 if (!ov.text)
3742 return; 3607 return;
3743 3608
3744 want_refresh = 1; 3609 want_refresh = 1;
3745 3610
3746 for (int y = 0; y < ov_h; y++) 3611 for (int y = 0; y < ov.h; y++)
3747 { 3612 {
3748 delete [] ov_text[y]; 3613 delete [] ov.text[y];
3749 delete [] ov_rend[y]; 3614 delete [] ov.rend[y];
3750 } 3615 }
3751 3616
3752 delete [] ov_text; ov_text = 0; 3617 delete [] ov.text; ov.text = 0;
3753 delete [] ov_rend; ov_rend = 0; 3618 delete [] ov.rend; ov.rend = 0;
3754} 3619}
3755 3620
3756void 3621void
3757rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3622rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3758{ 3623{
3759 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3624 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3760 return; 3625 return;
3761 3626
3762 x++, y++; 3627 x++, y++;
3763 3628
3764 ov_text[y][x] = text; 3629 ov.text[y][x] = text;
3765 ov_rend[y][x] = rend; 3630 ov.rend[y][x] = rend;
3766} 3631}
3767 3632
3768void 3633void
3769rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3634rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3770{ 3635{
… …
3789} 3654}
3790 3655
3791void 3656void
3792rxvt_term::scr_swap_overlay () NOTHROW 3657rxvt_term::scr_swap_overlay () NOTHROW
3793{ 3658{
3794 if (!ov_text) 3659 if (!ov.text)
3795 return; 3660 return;
3796 3661
3662 // hide cursor if it is within the overlay area
3663 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3664 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3665 screen.flags &= ~Screen_VisibleCursor;
3666
3797 // swap screen mem with overlay 3667 // swap screen mem with overlay
3798 for (int y = ov_h; y--; ) 3668 for (int y = ov.h; y--; )
3799 { 3669 {
3800 text_t *t1 = ov_text[y]; 3670 text_t *t1 = ov.text[y];
3801 rend_t *r1 = ov_rend[y]; 3671 rend_t *r1 = ov.rend[y];
3802 3672
3803 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3673 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3804 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3674 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3805 3675
3806 for (int x = ov_w; x--; ) 3676 for (int x = ov.w; x--; )
3807 { 3677 {
3808 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3678 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3809 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3679 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3810 } 3680 }
3811 } 3681 }

Diff Legend

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