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.304 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.414 by sf-exg, Tue Jan 24 17:05:05 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 CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 90 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 91 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
103 94
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
113 98
114/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
… …
146 131
147 l.l = 0; 132 l.l = 0;
148 l.f = 0; 133 l.f = 0;
149} 134}
150 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
151/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
154 160
155void 161void
… …
157{ 163{
158#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
159 scr_overlay_off (); 165 scr_overlay_off ();
160#endif 166#endif
161 167
162 rvideo_mode = false;
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
169 if (nrow == 0) 174 if (nrow == 0)
170 nrow = 24; 175 nrow = 24;
171 176
172 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 178 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
… …
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 211
210 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
211 { 213 {
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
239 } 243 }
240 else 244 else
241 { 245 {
242 /* 246 /*
243 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
271 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);
272 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);
273 } 277 }
274 278
275 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 281
278 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
279 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
281 285
282 if (top_row) 286 if (top_row)
283 { 287 {
284 // 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
285 // 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
286 291
287 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 294
290 do 295 do
291 { 296 {
292 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 299 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 301
299 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 ())
300 { 303 {
… …
394 delete old_ta; 397 delete old_ta;
395 delete old_ra; 398 delete old_ra;
396 399
397 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
399 403
400 free (tabs); 404 free (tabs);
401 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
402 409
403 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
404 411
405 prev_nrow = nrow; 412 prev_nrow = nrow;
406 prev_ncol = ncol; 413 prev_ncol = ncol;
407
408 tabs = (char *)rxvt_malloc (ncol);
409
410 for (int col = ncol; --col; )
411 tabs [col] = col % TABSIZE == 0;
412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415 414
416 tt_winch (); 415 tt_winch ();
417 416
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419} 418}
… …
431 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
432 431
433 free (row_buf); 432 free (row_buf);
434 free (swap_buf); 433 free (swap_buf);
435 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
436 free (tabs); 437 free (tabs);
437 438 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439 } 439 }
440} 440}
441 441
442/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
443/* 443/*
444 * Hard reset 444 * Hard/Soft reset
445 */ 445 */
446void 446void
447rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
448{ 448{
449 scr_release (); 449 scr_release ();
450 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
451 scr_reset (); 453 scr_reset ();
452 454
453 scr_clear (true); 455 scr_clear (true);
454 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset () NOTHROW
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);
455} 473}
456 474
457/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
497 } 515 }
498 516
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
505#endif
506} 522}
507 523
508void 524void
509rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen () NOTHROW
510{ 526{
511 if (!option (Opt_secondaryScreen)) 527 if (!option (Opt_secondaryScreen))
512 return; 528 return;
513 529
514 for (int i = prev_nrow; i--; ) 530 for (int i = prev_nrow; i--; )
… …
533 return; 549 return;
534 550
535 want_refresh = 1; 551 want_refresh = 1;
536 view_start = 0; 552 view_start = 0;
537 553
538 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 ();
539 560
540 int i = current_screen; current_screen = scrn; scrn = i; 561 current_screen = scrn;
541 562
542#if NSCREENS 563#if NSCREENS
543 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
544 { 565 {
545 num_scr = 0; 566 num_scr = 0;
… …
622 643
623 if (count > 0 644 if (count > 0
624 && row1 == 0 645 && row1 == 0
625 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
626 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
627 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
628
629 // scroll everything up 'count' lines
630 term_start = (term_start + count) % total_rows;
631 651
632 // sever bottommost line 652 // sever bottommost line
633 { 653 {
634 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
635 l.is_longer (0); 655 l.is_longer (0);
636 l.touch (); 656 l.touch ();
637 } 657 }
638 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
639 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
640 for (int i = count; i--; ) 675 for (int i = count; i--; )
641 { 676 {
642 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
643 678
644 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
645 // could be rolled into scr_blank_screen_mem 680 // could be rolled into scr_blank_screen_mem
646 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)))
647 { 682 {
648 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
649 l.l = 0; 684 l.l = 0;
… …
651 } 686 }
652 else 687 else
653 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
654 } 689 }
655 690
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any 691 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
670 { 694 {
671 selection.beg.row -= count; 695 selection.beg.row -= count;
672 selection.end.row -= count; 696 selection.end.row -= count;
673 selection.mark.row -= count; 697 selection.mark.row -= count;
674 698
675 if (selection.beg.row < top_row 699 selection_check (0);
676 || selection.end.row < top_row
677 || selection.mark.row < top_row)
678 {
679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR;
681 }
682 } 700 }
683 701
684 // finally move the view window, if desired 702 // finally move the view window, if desired
685 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 704 && view_start != 0
… …
716 } 734 }
717 735
718 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
719 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
720 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
721 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
722 748
723 min_it (count, rows); 749 min_it (count, rows);
724 750
725 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
726 752
727 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
728 { 754 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
730 756
… …
732 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
733 } 759 }
734 760
735 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
736 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 }
737 } 770 }
738 771
739 return count; 772 return count;
740} 773}
741 774
… …
747rxvt_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
748{ 781{
749 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
750 return; 783 return;
751 784
752 unsigned char checksel; 785 bool checksel;
753 unicode_t c; 786 unicode_t c;
754 int ncol = this->ncol; 787 int ncol = this->ncol;
755 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
756 789
757 want_refresh = 1; 790 want_refresh = 1;
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
772 } 805 }
773 } 806 }
774 807
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 811 int row = screen.cur.row;
781 812
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 814
784 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
785 816
786 while (str < strend) 817 while (str < strend)
787 { 818 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 820
790 if (c < 0x20) 821 if (ecb_unlikely (c < 0x20))
791 if (c == C0_LF) 822 if (c == C0_LF)
792 { 823 {
793 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
794 825
795 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
814 { 845 {
815 scr_tab (1, true); 846 scr_tab (1, true);
816 continue; 847 continue;
817 } 848 }
818 849
850 if (ecb_unlikely (
819 if (checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
854 ))
822 { 855 {
823 checksel = 0; 856 checksel = 0;
824 /* 857 /*
825 * If we wrote anywhere in the selected area, kill the selection 858 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 859 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 860 * should be a similar check.
828 */ 861 */
829 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
830 } 863 }
831 864
832 if (screen.flags & Screen_WrapNext) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
833 { 866 {
834 scr_do_wrap (); 867 scr_do_wrap ();
835 868
836 line->l = ncol; 869 line->l = ncol;
837 line->is_longer (1); 870 line->is_longer (1);
… …
839 row = screen.cur.row; 872 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
841 } 874 }
842 875
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 878 c = 0xfffd;
846 879
847 // 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
848 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
850 // locale. 883 // locale.
851 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
852 885
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 887 {
855 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 889 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
873 } 906 }
874 } 907 }
875 908
876 if (screen.flags & Screen_Insert) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
878 911
879 if (width != 0) 912 if (width != 0)
880 { 913 {
881#if !UNICODE_3 914#if !UNICODE_3
… …
886# else 919# else
887 c = 0xfffd; 920 c = 0xfffd;
888# endif 921# endif
889#endif 922#endif
890 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
891 // 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.
892 if (line->t[screen.cur.col] == NOCHAR 944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 945 scr_kill_char (*line, screen.cur.col);
894 && line->t[screen.cur.col + 1] == NOCHAR))
895 {
896 int col = screen.cur.col;
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922 946
923 line->touch (); 947 line->touch ();
924 948
925 do 949 do
926 { 950 {
927 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
929 953
930 if (screen.cur.col < ncol - 1) 954 if (ecb_likely (screen.cur.col < ncol - 1))
931 screen.cur.col++; 955 screen.cur.col++;
932 else 956 else
933 { 957 {
934 line->l = ncol; 958 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
937 break; 961
962 goto end_of_line;
938 } 963 }
939 964
940 c = NOCHAR; 965 c = NOCHAR;
941 } 966 }
942 while (--width > 0); 967 while (ecb_unlikely (--width > 0));
943 968
944 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946 { 971 {
947 line->touch (); 972 line->t[c] = ' ';
973 line->r[c] = rend;
974 }
948 975
949 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)
950 { 993 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 994 linep = line;
995 tp = line->t + screen.cur.col - 1;
996 rp = line->r + screen.cur.col - 1;
953 } 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));
954 } 1020 }
955 } 1021 }
956 else // width == 0
957 {
958#if ENABLE_COMBINING
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
969 linep = line;
970 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1022#endif
996 }
997 } 1023 }
998 1024
999 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
1000 1026
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1003#endif
1004} 1028}
1005 1029
1006/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1007/* 1031/*
1008 * 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
… …
1021 1045
1022 want_refresh = 1; 1046 want_refresh = 1;
1023#endif 1047#endif
1024 } 1048 }
1025 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1026 else 1052 else
1027 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1028} 1054}
1029 1055
1030/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1225/* 1251/*
1226 * Erase part or whole of a line 1252 * Erase part or whole of a line
1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1253 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1254 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1229 * 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
1230 */ 1257 */
1231void 1258void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1259rxvt_term::scr_erase_line (int mode) NOTHROW
1233{ 1260{
1234 unsigned int col, num; 1261 unsigned int col, num;
… …
1243 line.touch (); 1270 line.touch ();
1244 line.is_longer (0); 1271 line.is_longer (0);
1245 1272
1246 switch (mode) 1273 switch (mode)
1247 { 1274 {
1275 case 3:
1276 if (screen.flags & Screen_WrapNext)
1277 return;
1278
1279 /* fall through */
1280
1248 case 0: /* erase to end of line */ 1281 case 0: /* erase to end of line */
1249 col = screen.cur.col; 1282 col = screen.cur.col;
1250 num = ncol - col; 1283 num = ncol - col;
1251 min_it (line.l, col); 1284 min_it (line.l, col);
1285
1252 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1286 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1287 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1288 CLEAR_SELECTION ();
1255 break; 1289 break;
1290
1256 case 1: /* erase to beginning of line */ 1291 case 1: /* erase to beginning of line */
1257 col = 0; 1292 col = 0;
1258 num = screen.cur.col + 1; 1293 num = screen.cur.col + 1;
1294
1259 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1295 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261 CLEAR_SELECTION (); 1297 CLEAR_SELECTION ();
1262 break; 1298 break;
1299
1263 case 2: /* erase whole line */ 1300 case 2: /* erase whole line */
1264 col = 0; 1301 col = 0;
1265 num = ncol; 1302 num = ncol;
1266 line.l = 0; 1303 line.l = 0;
1267 if (selection.beg.row <= screen.cur.row 1304 if (selection.beg.row <= screen.cur.row
… …
1275 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1276} 1313}
1277 1314
1278/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1279/* 1316/*
1280 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1281 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1282 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1283 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1284 */ 1321 */
1285void 1322void
… …
1294 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1295 1332
1296 switch (mode) 1333 switch (mode)
1297 { 1334 {
1298 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1299 selection_check (1);
1300 scr_erase_line (0); 1336 scr_erase_line (0);
1301 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1302 num = nrow - row; 1338 num = nrow - row;
1303 break; 1339 break;
1304 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1305 selection_check (3);
1306 scr_erase_line (1); 1341 scr_erase_line (1);
1307 row = 0; 1342 row = 0;
1308 num = screen.cur.row; 1343 num = screen.cur.row;
1309 break; 1344 break;
1310 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1311 selection_check (3);
1312 row = 0; 1346 row = 0;
1313 num = nrow; 1347 num = nrow;
1314 break; 1348 break;
1315 default: 1349 default:
1316 return; 1350 return;
… …
1325 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1326 return; 1360 return;
1327 1361
1328 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1329 1363
1330 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1332 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1333 { 1367 {
1334 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1335 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);
1336 } 1374 }
1337 else 1375 else
1338 { 1376 {
1339 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1378
1379 if (mapped)
1380 {
1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342 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));
1343 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1389 }
1345 } 1390 }
1346 1391
1347 for (; num--; row++) 1392 for (; num--; row++)
1348 { 1393 {
1349 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1395
1396 if (row - view_start < nrow)
1350 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1351 } 1398 }
1352} 1399}
1353 1400
1354#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1355void 1402void
… …
1374 1421
1375 want_refresh = 1; 1422 want_refresh = 1;
1376 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1377 1424
1378 num_scr_allow = 0; 1425 num_scr_allow = 0;
1379 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 ();
1380 1431
1381 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1382 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1383 { 1434 {
1384 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1429 * Insert/Delete <count> characters from the current position 1480 * Insert/Delete <count> characters from the current position
1430 */ 1481 */
1431void 1482void
1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1483rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433{ 1484{
1434 int col, row;
1435 rend_t tr;
1436
1437 want_refresh = 1; 1485 want_refresh = 1;
1438 ZERO_SCROLLBACK (); 1486 ZERO_SCROLLBACK ();
1439 1487
1440 if (count <= 0) 1488 if (count <= 0)
1441 return; 1489 return;
… …
1443 scr_do_wrap (); 1491 scr_do_wrap ();
1444 1492
1445 selection_check (1); 1493 selection_check (1);
1446 min_it (count, ncol - screen.cur.col); 1494 min_it (count, ncol - screen.cur.col);
1447 1495
1448 row = screen.cur.row; 1496 int row = screen.cur.row;
1449 1497
1450 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1451 1499
1452 line->touch (); 1500 line->touch ();
1453 line->is_longer (0); 1501 line->is_longer (0);
1454 1502
1503 // nuke wide spanning the start
1504 if (line->t[screen.cur.col] == NOCHAR)
1505 scr_kill_char (*line, screen.cur.col);
1506
1455 switch (insdel) 1507 switch (insdel)
1456 { 1508 {
1457 case INSERT: 1509 case INSERT:
1458 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--)
1459 { 1516 {
1460 line->t[col] = line->t[col - count]; 1517 line->t[col] = line->t[col - count];
1461 line->r[col] = line->r[col - count]; 1518 line->r[col] = line->r[col - count];
1462 } 1519 }
1463
1464 line->l = min (line->l + count, ncol);
1465 1520
1466 if (selection.op && current_screen == selection.screen 1521 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1523 {
1469 if (selection.end.row != screen.cur.row 1524 if (selection.end.row != screen.cur.row
… …
1484 case ERASE: 1539 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1540 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1541 selection_check (1);
1487 screen.cur.col -= count; 1542 screen.cur.col -= count;
1488 1543
1489 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
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1549 break;
1492 1550
1493 case DELETE: 1551 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1552 line->l = max (line->l - count, 0);
1495 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
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1559 {
1498 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1500 } 1562 }
1501 1563
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1565
1505 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1568 {
1508 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1644 { 1705 {
1645 rvideo_state = on; 1706 rvideo_state = on;
1646 1707
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1650#endif 1711#endif
1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1652 1713
1653 XGCValues gcvalue; 1714 XGCValues gcvalue;
1654 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1798 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1799 { 1860 {
1800 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1801 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1802 } 1863 }
1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1804 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++)
1805 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);
1806 1867
1807 num_scr_allow = 0; 1868 num_scr_allow = 0;
1808 1869
… …
1815 * Refresh the entire screen 1876 * Refresh the entire screen
1816 */ 1877 */
1817void 1878void
1818rxvt_term::scr_touch (bool refresh) NOTHROW 1879rxvt_term::scr_touch (bool refresh) NOTHROW
1819{ 1880{
1820 scr_expose (0, 0, width, height, refresh); 1881 scr_expose (0, 0, vt_width, vt_height, refresh);
1821} 1882}
1822 1883
1823/* ------------------------------------------------------------------------- */ 1884/* ------------------------------------------------------------------------- */
1824/* 1885/*
1825 * 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
… …
1881 1942
1882# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1883# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1884 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1885# endif 1946# endif
1886 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1887# endif 1948# endif
1888 1949
1889# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1891 { 1952 set_urgency (1);
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif 1953# endif
1899 1954
1900 if (option (Opt_visualBell)) 1955 if (option (Opt_visualBell))
1901 { 1956 {
1902 rvideo_bell = true; 1957 rvideo_bell = true;
… …
1905 1960
1906 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1907 } 1962 }
1908 else 1963 else
1909 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910#endif 1966#endif
1911} 1967}
1912 1968
1913/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1914/* ARGSUSED */
1915void 1970void
1916rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917{ 1972{
1918#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1919 int nrows, row_start; 1974 int nrows, row_start;
1920 FILE *fd; 1975 FILE *fd = popen_printer ();
1921 1976
1922 if ((fd = popen_printer ()) == NULL) 1977 if (!fd)
1923 return; 1978 return;
1924 1979
1925 if (fullhist) 1980 if (fullhist)
1926 { 1981 {
1927 nrows = nrow - top_row; 1982 nrows = nrow - top_row;
… …
1933 row_start = view_start; 1988 row_start = view_start;
1934 } 1989 }
1935 1990
1936 wctomb (0, 0); 1991 wctomb (0, 0);
1937 1992
1938 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939 { 1994 {
1940 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1941 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1942 1997
1943 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
… …
1972 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1973 */ 2028 */
1974void 2029void
1975rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
1976{ 2031{
1977 unsigned char have_bg,
1978 showcursor; /* show the cursor */
1979 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1980 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1981 int i; /* tmp */ 2034 int i; /* tmp */
1982#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
1983 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 /* 2047 /*
1995 * A: set up vars 2048 * A: set up vars
1996 */ 2049 */
1997 refresh_count = 0; 2050 refresh_count = 0;
1998 2051
2052 unsigned int old_screen_flags = screen.flags;
1999 have_bg = 0; 2053 bool have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2001 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2002#endif 2056#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2058
2005 /* 2059 /*
2006 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2007 */ 2061 */
2008 scr_reverse_selection (); 2062 scr_reverse_selection ();
2009 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
2010 /* 2071 /*
2011 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2012 */ 2073 */
2013 { 2074 {
2014 unsigned char setoldcursor; 2075 bool setoldcursor;
2015 2076
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2078 if (hidden_cursor)
2019 showcursor = 0; 2079 showcursor = 0;
2020#endif 2080#endif
2021 2081
… …
2049 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2050#else 2110#else
2051 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2052#endif 2112#endif
2053 2113
2054 if (showcursor && focus) 2114 if (focus)
2055 { 2115 {
2056 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2058 else 2118 else
2059 { 2119 {
… …
2094 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2095 } 2155 }
2096 } 2156 }
2097 } 2157 }
2098 2158
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103
2104#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2160 /*
2106 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2108 */ 2163 */
… …
2112 { 2167 {
2113 int16_t nits; 2168 int16_t nits;
2114 int i = num_scr; 2169 int i = num_scr;
2115 int j; 2170 int j;
2116 int len, wlen; 2171 int len, wlen;
2117 dLocal (int, num_scr);
2118 2172
2119 j = nrow; 2173 j = nrow;
2120 wlen = len = -1; 2174 wlen = len = -1;
2121 row = i > 0 ? 0 : j - 1; 2175 row = i > 0 ? 0 : j - 1;
2122 2176
… …
2197 continue; 2251 continue;
2198 2252
2199 // redraw one or more characters 2253 // redraw one or more characters
2200 2254
2201 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2203 --col; 2257 --col;
2204 2258
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2260 text_t *text = stp + col;
2207 int count = 1; 2261 int count = 1;
2208 2262
2209 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2210 drp[col] = rend; 2264 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2215 { 2269 {
2216 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2217 { 2271 {
2218 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2219 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2220 count++; 2275 count++;
2221 i++; 2276 i++;
2222 2277
2223 continue; 2278 continue;
2224 } 2279 }
… …
2244 2299
2245 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2247 2302
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2250 count++, i--; 2305 count++, i--;
2251 2306
2252 /* 2307 /*
2253 * Determine the attributes for the string 2308 * Determine the attributes for the string
2254 */ 2309 */
2255 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2257 2312
2258 // 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
2259 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)))
2260 { 2315 {
2261 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2262 2317
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2283 2338
2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2340 fore = Color_UL;
2286#endif 2341#endif
2287 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
2288 if (invert) 2363 if (invert)
2289 { 2364 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2296 ::swap (fore, back); 2365 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2301 2366
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV;
2306# endif
2307 if (fore == back) 2368 if (fore == back)
2308 { 2369 {
2309 fore = Color_bg; 2370 fore = Color_bg;
2310 back = Color_fg; 2371 back = Color_fg;
2311 } 2372 }
… …
2347 /* 2408 /*
2348 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2349 */ 2410 */
2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351 2412
2352 if (have_bg && back == Color_bg) 2413 if (ecb_likely (have_bg && back == Color_bg))
2353 { 2414 {
2354 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2355 2416
2356 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2357 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2364 did_clear: ; 2425 did_clear: ;
2365 } 2426 }
2366 else 2427 else
2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368 2429
2369 if (rend & RS_Uline && font->descent > 1 && fore != back) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2370 { 2431 {
2371#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2372 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2373 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374 else 2435 else
… …
2379 xpixel, ypixel + font->ascent + 1, 2440 xpixel, ypixel + font->ascent + 1,
2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2441 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381 } 2442 }
2382 } /* for (col....) */ 2443 } /* for (col....) */
2383 } /* for (row....) */ 2444 } /* for (row....) */
2384
2385#if ENABLE_OVERLAY
2386 scr_swap_overlay ();
2387#endif
2388 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389 2445
2390 /* 2446 /*
2391 * G: cleanup cursor and display outline cursor if necessary 2447 * G: cleanup cursor and display outline cursor if necessary
2392 */ 2448 */
2393 if (showcursor) 2449 if (showcursor)
… …
2425 2481
2426 XDrawRectangle (dpy, vt, gc, 2482 XDrawRectangle (dpy, vt, gc,
2427 Col2Pixel (col), 2483 Col2Pixel (col),
2428 Row2Pixel (oldcursor.row), 2484 Row2Pixel (oldcursor.row),
2429 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2485 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2486 (unsigned int) (Height2Pixel (1) - 1));
2431 } 2487 }
2432 } 2488 }
2433 2489
2434 /* 2490 /*
2435 * H: cleanup selection 2491 * H: cleanup selection
2436 */ 2492 */
2493#if ENABLE_OVERLAY
2494 scr_swap_overlay ();
2495#endif
2496 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2497
2437 scr_reverse_selection (); 2498 scr_reverse_selection ();
2438 2499
2500 screen.flags = old_screen_flags;
2439 num_scr = 0; 2501 num_scr = 0;
2440 num_scr_allow = 1; 2502 num_scr_allow = 1;
2441} 2503}
2442 2504
2443void 2505void
… …
2464 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2465 } 2527 }
2466} 2528}
2467 2529
2468void 2530void
2469rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2470{ 2532{
2533 bool transparent = false;
2534
2471#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2472 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2473#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);
2474 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 {
2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2476 XClearWindow (dpy, parent[0]);
2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2478 2561
2479 if (scrollBar.win) 2562 if (scrollBar.win)
2480 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2483 scrollBar.show (0); 2569 scrollBar.show (0);
2484 } 2570 }
2485 2571
2486#endif 2572 if (refresh)
2487 2573 {
2488 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2574 scr_clear ();
2490 scr_touch (true); 2575 scr_touch (true);
2576 }
2491 want_refresh = 1; 2577 want_refresh = 1;
2492} 2578}
2493 2579
2494/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2495void 2581void
… …
2563 { 2649 {
2564#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2565 if (selection.rect) 2651 if (selection.rect)
2566 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2567 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2568 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2569 else 2655 else
2570#endif 2656#endif
2571 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2572 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2573 RS_RVid); 2659 RS_Sel | RS_RVid);
2574 } 2660 }
2575} 2661}
2576 2662
2577/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2578/* 2664/*
… …
2581 */ 2667 */
2582#if 0 2668#if 0
2583void 2669void
2584rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2585{ 2671{
2586 int row, wrote; 2672 // if this method is needed, it can be implemented by factoring the
2587 unsigned int width, towrite; 2673 // relevant code in scr_printscreen
2588 char r1[] = "\n";
2589
2590 for (row = saveLines - nsaved;
2591 row < saveLines + nrow - 1; row++)
2592 {
2593 width = row_buf[row].l >= 0 ? row_buf[row].l
2594 : ncol;
2595 for (towrite = width; towrite; towrite -= wrote)
2596 {
2597 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2598 towrite);
2599 if (wrote < 0)
2600 return; /* XXX: death, no report */
2601 }
2602 if (row_buf[row].l >= 0)
2603 if (write (fd, r1, 1) <= 0)
2604 return; /* XXX: death, no report */
2605 }
2606} 2674}
2607#endif 2675#endif
2608 2676
2609/* ------------------------------------------------------------------------- * 2677/* ------------------------------------------------------------------------- *
2610 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2611 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2612void 2680void
2613rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2614{ 2682{
2615 row_col_t pos;
2616
2617 if (!selection.op) 2683 if (!selection.op)
2618 return; 2684 return;
2619 2685
2620 pos.row = pos.col = 0;
2621 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2686 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2622 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2623 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2624 || (check_more == 1 2689 || (check_more == 1
2625 && current_screen == selection.screen 2690 && current_screen == selection.screen
2626 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2627 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2628 || (check_more == 2
2629 && ROWCOL_IS_BEFORE (selection.beg, pos)
2630 && ROWCOL_IS_AFTER (selection.end, pos))
2631 || (check_more == 3
2632 && ROWCOL_IS_AFTER (selection.end, pos))
2633 || (check_more == 4 /* screen width change */
2634 && (selection.beg.row != selection.end.row
2635 || selection.end.col > ncol)))
2636 CLEAR_SELECTION (); 2693 CLEAR_ALL_SELECTION ();
2637} 2694}
2638 2695
2639/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2640/* 2697/*
2641 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
2642 */ 2699 */
2643void 2700void
2644rxvt_term::paste (char *data, unsigned int len) NOTHROW 2701rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2645{ 2702{
2646 /* convert normal newline chars into common keyboard Return key sequence */ 2703 /* convert normal newline chars into common keyboard Return key sequence */
2647 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2648 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2649 data[i] = C0_CR; 2706 data[i] = C0_CR;
2650 2707
2651 if (priv_modes & PrivMode_BracketPaste) 2708 if (priv_modes & PrivMode_BracketPaste)
2652 tt_printf ("\e[200~"); 2709 tt_printf ("\x1b[200~");
2653 2710
2654 tt_write (data, len); 2711 tt_write (data, len);
2655 2712
2656 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2657 tt_printf ("\e[201~"); 2714 tt_printf ("\x1b[201~");
2658} 2715}
2659 2716
2660/* ------------------------------------------------------------------------- */
2661/*
2662 * Respond to a notification that a primary selection has been sent
2663 * EXT: SelectionNotify
2664 */
2665void 2717void
2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2667{ 2719{
2668 if (prop == None) /* check for failed XConvertSelection */ 2720 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
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}
2826
2827void
2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2829{
2830 selection_wait = Sel_none;
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