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

Diff Legend

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