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.285 by root, Tue Dec 11 03:30:50 2007 UTC vs.
Revision 1.403 by sf-exg, Tue Nov 15 19:54:30 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-2006 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{
… …
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 selection_check (2); /* check for boundary cross */
541 555
542 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
543 557
544#if NSCREENS 558#if NSCREENS
545 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
546 { 560 {
547 num_scr = 0; 561 num_scr = 0;
… …
596/* 610/*
597 * Change the rendition style for following text 611 * Change the rendition style for following text
598 */ 612 */
599void 613void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 615{
602 if (set) 616 if (set)
603 rstyle |= style; 617 rstyle |= style;
604 else if (style == ~RS_None) 618 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
606 else 620 else
607 rstyle &= ~style; 621 rstyle &= ~style;
608 } 622}
609 623
610/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
611/* 625/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
624 638
625 if (count > 0 639 if (count > 0
626 && row1 == 0 640 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
629 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 646
634 // sever bottommost line 647 // sever bottommost line
635 { 648 {
636 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
637 l.is_longer (0); 650 l.is_longer (0);
638 l.touch (); 651 l.touch ();
639 } 652 }
640 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
641 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 670 for (int i = count; i--; )
643 { 671 {
644 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
645 673
646 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 675 // 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))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 677 {
650 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 679 l.l = 0;
… …
653 } 681 }
654 else 682 else
655 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
656 } 684 }
657 685
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 686 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
672 { 689 {
673 selection.beg.row -= count; 690 selection.beg.row -= count;
674 selection.end.row -= count; 691 selection.end.row -= count;
675 selection.mark.row -= count; 692 selection.mark.row -= count;
676 693
677 if (selection.beg.row < top_row 694 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 } 695 }
685 696
686 // finally move the view window, if desired 697 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 699 && view_start != 0
… …
718 } 729 }
719 730
720 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
722 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
723 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
724 743
725 min_it (count, rows); 744 min_it (count, rows);
726 745
727 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 747
729 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
730 { 749 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 751
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 754 }
736 755
737 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
739 } 765 }
740 766
741 return count; 767 return count;
742} 768}
743 769
… …
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 776{
751 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
752 return; 778 return;
753 779
754 unsigned char checksel; 780 bool checksel;
755 unicode_t c; 781 unicode_t c;
756 int ncol = this->ncol; 782 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
758 784
759 want_refresh = 1; 785 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
774 } 800 }
775 } 801 }
776 802
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 805 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 806 int row = screen.cur.row;
783 807
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 809
786 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
787 811
788 while (str < strend) 812 while (str < strend)
789 { 813 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 815
792 if (c < 0x20) 816 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 817 if (c == C0_LF)
794 { 818 {
795 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
796 820
797 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
816 { 840 {
817 scr_tab (1, true); 841 scr_tab (1, true);
818 continue; 842 continue;
819 } 843 }
820 844
845 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
849 ))
824 { 850 {
825 checksel = 0; 851 checksel = 0;
826 /* 852 /*
827 * If we wrote anywhere in the selected area, kill the selection 853 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 854 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 855 * should be a similar check.
830 */ 856 */
831 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
832 } 858 }
833 859
834 if (screen.flags & Screen_WrapNext) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 861 {
836 scr_do_wrap (); 862 scr_do_wrap ();
837 863
838 line->l = ncol; 864 line->l = ncol;
839 line->is_longer (1); 865 line->is_longer (1);
… …
841 row = screen.cur.row; 867 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
843 } 869 }
844 870
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 873 c = 0xfffd;
848 874
849 // rely on wcwidth to tell us the character width, do wcwidth before 875 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
852 // locale. 878 // locale.
853 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
854 880
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 882 {
857 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 884 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
875 } 901 }
876 } 902 }
877 903
878 if (screen.flags & Screen_Insert) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
880 906
881 if (width != 0) 907 if (width != 0)
882 { 908 {
883#if !UNICODE_3 909#if !UNICODE_3
… …
888# else 914# else
889 c = 0xfffd; 915 c = 0xfffd;
890# endif 916# endif
891#endif 917#endif
892 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
893 // nuke the character at this position, if required 935 // nuke the character at this position, if required
936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 940 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 941
925 line->touch (); 942 line->touch ();
926 943
927 do 944 do
928 { 945 {
929 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
931 948
932 if (screen.cur.col < ncol - 1) 949 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 950 screen.cur.col++;
934 else 951 else
935 { 952 {
936 line->l = ncol; 953 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
939 break; 956
957 goto end_of_line;
940 } 958 }
941 959
942 c = NOCHAR; 960 c = NOCHAR;
943 } 961 }
944 while (--width > 0); 962 while (ecb_unlikely (--width > 0));
945 963
946 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 966 {
949 line->touch (); 967 line->t[c] = ' ';
968 line->r[c] = rend;
969 }
950 970
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 971end_of_line:
972 ;
973 }
974#if ENABLE_COMBINING
975 else // width == 0
976 {
977 if (c != 0xfeff) // ignore BOM
978 {
979 // handle combining characters
980 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet.
983 line_t *linep;
984 text_t *tp;
985 rend_t *rp;
986
987 if (screen.cur.col > 0)
952 { 988 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 989 linep = line;
990 tp = line->t + screen.cur.col - 1;
991 rp = line->r + screen.cur.col - 1;
955 } 992 }
993 else if (screen.cur.row > 0
994 && ROW(screen.cur.row - 1).is_longer ())
995 {
996 linep = &ROW(screen.cur.row - 1);
997 tp = line->t + ncol - 1;
998 rp = line->r + ncol - 1;
999 }
1000 else
1001 continue;
1002
1003 linep->touch ();
1004
1005 while (*tp == NOCHAR && tp > linep->t)
1006 tp--, rp--;
1007
1008 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c);
1012
1013 *tp = n;
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1015 }
957 } 1016 }
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 1017#endif
998 }
999 } 1018 }
1000 1019
1001 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
1002 1021
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
1005#endif
1006} 1023}
1007 1024
1008/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
1009/* 1026/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1027 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1028 * XTERM_SEQ: CTRL-H
1012 */ 1029 */
1013void 1030void
1014rxvt_term::scr_backspace () NOTHROW 1031rxvt_term::scr_backspace () NOTHROW
1015{ 1032{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1033 if (screen.cur.col == 0)
1019 { 1034 {
1020 if (screen.cur.row > 0) 1035 if (screen.cur.row > 0)
1021 { 1036 {
1022#ifdef TERMCAP_HAS_BW 1037#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1038 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1039 --screen.cur.row;
1025 return; 1040
1041 want_refresh = 1;
1026#endif 1042#endif
1027 } 1043 }
1028 } 1044 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1047 else
1030 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1049}
1034 1050
1035/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
1036/* 1052/*
1037 * Process Horizontal Tab 1053 * Process Horizontal Tab
… …
1230/* 1246/*
1231 * Erase part or whole of a line 1247 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1248 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1249 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1250 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1251 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1252 */
1236void 1253void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1254rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1255{
1239 unsigned int col, num; 1256 unsigned int col, num;
… …
1248 line.touch (); 1265 line.touch ();
1249 line.is_longer (0); 1266 line.is_longer (0);
1250 1267
1251 switch (mode) 1268 switch (mode)
1252 { 1269 {
1270 case 3:
1271 if (screen.flags & Screen_WrapNext)
1272 return;
1273
1274 /* fall through */
1275
1253 case 0: /* erase to end of line */ 1276 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1277 col = screen.cur.col;
1255 num = ncol - col; 1278 num = ncol - col;
1256 min_it (line.l, col); 1279 min_it (line.l, col);
1280
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1281 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1282 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1283 CLEAR_SELECTION ();
1260 break; 1284 break;
1285
1261 case 1: /* erase to beginning of line */ 1286 case 1: /* erase to beginning of line */
1262 col = 0; 1287 col = 0;
1263 num = screen.cur.col + 1; 1288 num = screen.cur.col + 1;
1289
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1290 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1291 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1292 CLEAR_SELECTION ();
1267 break; 1293 break;
1294
1268 case 2: /* erase whole line */ 1295 case 2: /* erase whole line */
1269 col = 0; 1296 col = 0;
1270 num = ncol; 1297 num = ncol;
1271 line.l = 0; 1298 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1299 if (selection.beg.row <= screen.cur.row
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1357 if (row >= nrow) /* Out Of Bounds */
1331 return; 1358 return;
1332 1359
1333 min_it (num, nrow - row); 1360 min_it (num, nrow - row);
1334 1361
1335 if (rstyle & (RS_RVid | RS_Uline)) 1362 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1363 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1364 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1365 {
1339 ren = DEFAULT_RSTYLE; 1366 ren = DEFAULT_RSTYLE;
1340 CLEAR_ROWS (row, num); 1367
1368 if (mapped)
1369 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width,
1371 (unsigned int)Height2Pixel (num), False);
1341 } 1372 }
1342 else 1373 else
1343 { 1374 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1375 ren = rstyle & (RS_fgMask | RS_bgMask);
1376
1377 if (mapped)
1378 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1380 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1381 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start),
1383 (unsigned int)width,
1384 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1385 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 }
1350 } 1388 }
1351 1389
1352 for (; num--; row++) 1390 for (; num--; row++)
1353 { 1391 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1392 scr_blank_screen_mem (ROW(row), rstyle);
1393
1394 if (row - view_start < nrow)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1395 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1356 } 1396 }
1357} 1397}
1358 1398
1359#if !ENABLE_MINIMAL 1399#if !ENABLE_MINIMAL
1360void 1400void
… …
1434 * Insert/Delete <count> characters from the current position 1474 * Insert/Delete <count> characters from the current position
1435 */ 1475 */
1436void 1476void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1477rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1478{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1479 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1480 ZERO_SCROLLBACK ();
1444 1481
1445 if (count <= 0) 1482 if (count <= 0)
1446 return; 1483 return;
… …
1448 scr_do_wrap (); 1485 scr_do_wrap ();
1449 1486
1450 selection_check (1); 1487 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1488 min_it (count, ncol - screen.cur.col);
1452 1489
1453 row = screen.cur.row; 1490 int row = screen.cur.row;
1454 1491
1455 line_t *line = &ROW(row); 1492 line_t *line = &ROW(row);
1456 1493
1457 line->touch (); 1494 line->touch ();
1458 line->is_longer (0); 1495 line->is_longer (0);
1459 1496
1497 // nuke wide spanning the start
1498 if (line->t[screen.cur.col] == NOCHAR)
1499 scr_kill_char (*line, screen.cur.col);
1500
1460 switch (insdel) 1501 switch (insdel)
1461 { 1502 {
1462 case INSERT: 1503 case INSERT:
1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1504 line->l = min (line->l + count, ncol);
1505
1506 if (line->t[screen.cur.col] == NOCHAR)
1507 scr_kill_char (*line, screen.cur.col);
1508
1509 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1464 { 1510 {
1465 line->t[col] = line->t[col - count]; 1511 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1512 line->r[col] = line->r[col - count];
1467 } 1513 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1514
1471 if (selection.op && current_screen == selection.screen 1515 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1516 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1517 {
1474 if (selection.end.row != screen.cur.row 1518 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1533 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1534 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1535 selection_check (1);
1492 screen.cur.col -= count; 1536 screen.cur.col -= count;
1493 1537
1494 line->l = max (line->l - count, 0); 1538 // nuke wide char after the end
1539 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1540 scr_kill_char (*line, screen.cur.col + count);
1541
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1542 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1543 break;
1497 1544
1498 case DELETE: 1545 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1546 line->l = max (line->l - count, 0);
1500 1547
1548 // nuke wide char spanning the end
1549 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1550 scr_kill_char (*line, screen.cur.col + count);
1551
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1552 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1553 {
1503 line->t[col] = line->t[col + count]; 1554 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1555 line->r[col] = line->r[col + count];
1505 } 1556 }
1506 1557
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1558 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1559
1510 if (selection.op && current_screen == selection.screen 1560 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1561 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1562 {
1513 if (selection.end.row != screen.cur.row 1563 if (selection.end.row != screen.cur.row
… …
1649 { 1699 {
1650 rvideo_state = on; 1700 rvideo_state = on;
1651 1701
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1703#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1655#endif 1705#endif
1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1657 1707
1658 XGCValues gcvalue; 1708 XGCValues gcvalue;
1659 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1853 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1854 {
1805 min_it (rc[i].col, ncol - 1); 1855 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1856 min_it (rc[i].row, nrow - 1);
1807 } 1857 }
1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1858
1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1859 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); 1860 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1861
1812 num_scr_allow = 0; 1862 num_scr_allow = 0;
1813 1863
… …
1872void 1922void
1873rxvt_term::bell_cb (ev::timer &w, int revents) 1923rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1924{
1875 rvideo_bell = false; 1925 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1926 scr_rvideo_mode (rvideo_mode);
1927 refresh_check ();
1877} 1928}
1878#endif 1929#endif
1879 1930
1880/* ------------------------------------------------------------------------- */ 1931/* ------------------------------------------------------------------------- */
1881void 1932void
… …
1885 1936
1886# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1888 if (option (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1889# endif 1940# endif
1890 XMapWindow (dpy, parent[0]); 1941 XMapWindow (dpy, parent);
1891# endif 1942# endif
1892 1943
1893# if ENABLE_FRILLS 1944# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1945 if (option (Opt_urgentOnBell))
1895 { 1946 set_urgency (1);
1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints (dpy, parent[0], h);
1900 }
1901 }
1902# endif 1947# endif
1903 1948
1904 if (option (Opt_visualBell)) 1949 if (option (Opt_visualBell))
1905 { 1950 {
1906 rvideo_bell = true; 1951 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1952 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1953 flush ();
1909 1954
1910 bell_ev.start (VISUAL_BELL_DURATION); 1955 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1956 }
1912 else 1957 else
1913 XBell (dpy, 0); 1958 XBell (dpy, 0);
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1914#endif 1960#endif
1915} 1961}
1916 1962
1917/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1918/* ARGSUSED */
1919void 1964void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1966{
1922#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1923 int nrows, row_start; 1968 int nrows, row_start;
1924 FILE *fd; 1969 FILE *fd = popen_printer ();
1925 1970
1926 if ((fd = popen_printer ()) == NULL) 1971 if (!fd)
1927 return; 1972 return;
1928 1973
1929 if (fullhist) 1974 if (fullhist)
1930 { 1975 {
1931 nrows = nrow - top_row; 1976 nrows = nrow - top_row;
… …
1937 row_start = view_start; 1982 row_start = view_start;
1938 } 1983 }
1939 1984
1940 wctomb (0, 0); 1985 wctomb (0, 0);
1941 1986
1942 for (int r1 = 0; r1 < nrows; r1++) 1987 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1943 { 1988 {
1944 text_t *tp = ROW(r1).t; 1989 text_t *tp = ROW(r1).t;
1945 int len = ROW(r1).l; 1990 int len = ROW(r1).l;
1946 1991
1947 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1992 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1976 * screen.text/screen.rend contain what the screen will change to. 2021 * screen.text/screen.rend contain what the screen will change to.
1977 */ 2022 */
1978void 2023void
1979rxvt_term::scr_refresh () NOTHROW 2024rxvt_term::scr_refresh () NOTHROW
1980{ 2025{
1981 unsigned char have_bg,
1982 showcursor; /* show the cursor */
1983 int16_t col, row, /* column/row we're processing */ 2026 int16_t col, row, /* column/row we're processing */
1984 ocrow; /* old cursor row */ 2027 ocrow; /* old cursor row */
1985 int i; /* tmp */ 2028 int i; /* tmp */
1986#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1987 rend_t cc1; /* store colours at cursor position (s) */ 2030 rend_t cc1; /* store colours at cursor position (s) */
… …
1996 return; 2039 return;
1997 2040
1998 /* 2041 /*
1999 * A: set up vars 2042 * A: set up vars
2000 */ 2043 */
2001 have_bg = 0;
2002 refresh_count = 0; 2044 refresh_count = 0;
2003 2045
2046 unsigned int old_screen_flags = screen.flags;
2047 char have_bg = 0;
2004#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2049 have_bg = bg_pixmap != None;
2006#endif 2050#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2052
2009 /* 2053 /*
2010 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
2011 */ 2055 */
2012 scr_reverse_selection (); 2056 scr_reverse_selection ();
2013 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY
2060 scr_swap_overlay ();
2061#endif
2062
2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2064
2014 /* 2065 /*
2015 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2016 */ 2067 */
2017 { 2068 {
2018 unsigned char setoldcursor; 2069 bool setoldcursor;
2019 2070
2020 showcursor = (screen.flags & Screen_VisibleCursor);
2021#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2022 if (hidden_cursor) 2072 if (hidden_cursor)
2023 showcursor = 0; 2073 showcursor = 0;
2024#endif 2074#endif
2025 2075
… …
2053 ccol2 = bgcolor_of (rstyle); 2103 ccol2 = bgcolor_of (rstyle);
2054#else 2104#else
2055 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2056#endif 2106#endif
2057 2107
2058 if (showcursor && focus) 2108 if (focus)
2059 { 2109 {
2060 if (option (Opt_cursorUnderline)) 2110 if (option (Opt_cursorUnderline))
2061 *crp ^= RS_Uline; 2111 *crp ^= RS_Uline;
2062 else 2112 else
2063 { 2113 {
… …
2098 oldcursor.col = screen.cur.col; 2148 oldcursor.col = screen.cur.col;
2099 } 2149 }
2100 } 2150 }
2101 } 2151 }
2102 2152
2103 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2104#if ENABLE_OVERLAY
2105 scr_swap_overlay ();
2106#endif
2107
2108#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2109 /* 2154 /*
2110 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2111 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2112 */ 2157 */
… …
2201 continue; 2246 continue;
2202 2247
2203 // redraw one or more characters 2248 // redraw one or more characters
2204 2249
2205 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2207 --col; 2252 --col;
2208 2253
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2210 text_t *text = stp + col; 2255 text_t *text = stp + col;
2211 int count = 1; 2256 int count = 1;
2212 2257
2213 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2214 drp[col] = rend; 2259 drp[col] = rend;
… …
2218 for (i = 0; ++col < ncol; ) 2263 for (i = 0; ++col < ncol; )
2219 { 2264 {
2220 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2221 { 2266 {
2222 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2223 drp[col] = rend; 2268 drp[col] = srp[col];
2269
2224 count++; 2270 count++;
2225 i++; 2271 i++;
2226 2272
2227 continue; 2273 continue;
2228 } 2274 }
… …
2248 2294
2249 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2251 2297
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2254 count++, i--; 2300 count++, i--;
2255 2301
2256 /* 2302 /*
2257 * Determine the attributes for the string 2303 * Determine the attributes for the string
2258 */ 2304 */
2259 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2261 2307
2262 // only do special processing if any attributes are set, which is unlikely 2308 // only do special processing if any attributes are set, which is unlikely
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2309 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2264 { 2310 {
2265 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2266 2312
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
2270 { 2315 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2316 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2317 fore = Color_BD;
2273# if !ENABLE_STYLES 2318# if !ENABLE_STYLES
2274 else 2319 else
2275 invert = !invert; 2320 invert = !invert;
2276# endif 2321# endif
2277 } 2322 }
2278 2323
2279 if (rend & RS_Italic 2324 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2325 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2326 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2327 fore = Color_IT;
2284# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2285 else 2329 else
… …
2289 2333
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2334 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2335 fore = Color_UL;
2292#endif 2336#endif
2293 2337
2338#ifdef OPTION_HC
2339 if (rend & RS_Sel)
2340 {
2341 /* invert the column if no highlightColor is set or it is the
2342 * current cursor column */
2343 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2344 && ISSET_PIXCOLOR (Color_HC))
2345 {
2346 if (ISSET_PIXCOLOR (Color_HTC))
2347 fore = Color_HTC;
2348 // if invert is 0 reverse video is set so we use bg color as fg color
2349 else if (!invert)
2350 fore = back;
2351
2352 back = Color_HC;
2353 invert = 0;
2354 }
2355 }
2356#endif
2357
2294 if (invert) 2358 if (invert)
2295 { 2359 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2360 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2361
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2362#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2363 if (fore == back)
2314 { 2364 {
2315 fore = Color_bg; 2365 fore = Color_bg;
2316 back = Color_fg; 2366 back = Color_fg;
2317 } 2367 }
… …
2319 } 2369 }
2320 2370
2321#ifdef TEXT_BLINK 2371#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2372 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2373 {
2324 if (!ev_is_active (&text_blink_ev)) 2374 if (!text_blink_ev.is_active ())
2325 { 2375 {
2326 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2376 text_blink_ev.again ();
2327 hidden_text = 0; 2377 hidden_text = 0;
2328 } 2378 }
2329 else if (hidden_text) 2379 else if (hidden_text)
2330 fore = back; 2380 fore = back;
2331 } 2381 }
… …
2353 /* 2403 /*
2354 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2355 */ 2405 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2407
2358 if (have_bg && back == Color_bg) 2408 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2409 {
2360 // this is very ugly, maybe push it into ->draw? 2410 // this is very ugly, maybe push it into ->draw?
2361 2411
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2413 if (text[i] != ' ')
… …
2370 did_clear: ; 2420 did_clear: ;
2371 } 2421 }
2372 else 2422 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2424
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2426 {
2377#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2430 else
2381#endif 2431#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2432 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2433
2384 XDrawLine (dpy, drawBuffer, gc, 2434 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2435 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2437 }
2388 } /* for (col....) */ 2438 } /* for (col....) */
2389 } /* for (row....) */ 2439 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2440
2396 /* 2441 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2443 */
2399 if (showcursor) 2444 if (showcursor)
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2472 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2473 else
2429#endif 2474#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2475 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2476
2432 XDrawRectangle (dpy, drawBuffer, gc, 2477 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2478 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2479 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2480 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2482 }
2438 } 2483 }
2439 2484
2440 /* 2485 /*
2441 * H: cleanup selection 2486 * H: cleanup selection
2442 */ 2487 */
2488#if ENABLE_OVERLAY
2489 scr_swap_overlay ();
2490#endif
2491 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2492
2443 scr_reverse_selection (); 2493 scr_reverse_selection ();
2444 2494
2495 screen.flags = old_screen_flags;
2445 num_scr = 0; 2496 num_scr = 0;
2446 num_scr_allow = 1; 2497 num_scr_allow = 1;
2447} 2498}
2448 2499
2449void 2500void
… …
2470 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2471 } 2522 }
2472} 2523}
2473 2524
2474void 2525void
2475rxvt_term::scr_recolour () NOTHROW 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2527{
2528 bool transparent = false;
2529
2477#ifdef HAVE_BG_PIXMAP 2530#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2531 if (bg_pixmap != None)
2479#else 2532 {
2533# ifdef ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT)
2535 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538
2539 transparent = true;
2540 }
2541 else
2542# endif
2543 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2546 }
2547 }
2548 else
2549#endif
2550 {
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2553 }
2554
2555 XClearWindow (dpy, parent);
2556
2484 if (scrollBar.win) 2557 if (scrollBar.win)
2485 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2563 scrollBar.state = SB_STATE_IDLE;
2488 scrollbar_show (0); 2564 scrollBar.show (0);
2489 } 2565 }
2490# endif 2566
2567 if (refresh)
2568 {
2491 scr_clear (); 2569 scr_clear ();
2492 scr_touch (true); 2570 scr_touch (true);
2571 }
2493 want_refresh = 1; 2572 want_refresh = 1;
2494#endif
2495
2496} 2573}
2497 2574
2498/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2499void 2576void
2500rxvt_term::scr_clear (bool really) NOTHROW 2577rxvt_term::scr_clear (bool really) NOTHROW
… …
2567 { 2644 {
2568#if !ENABLE_MINIMAL 2645#if !ENABLE_MINIMAL
2569 if (selection.rect) 2646 if (selection.rect)
2570 scr_xor_rect (selection.beg.row, selection.beg.col, 2647 scr_xor_rect (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2648 selection.end.row, selection.end.col,
2572 RS_RVid, RS_RVid | RS_Uline); 2649 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2573 else 2650 else
2574#endif 2651#endif
2575 scr_xor_span (selection.beg.row, selection.beg.col, 2652 scr_xor_span (selection.beg.row, selection.beg.col,
2576 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2577 RS_RVid); 2654 RS_Sel | RS_RVid);
2578 } 2655 }
2579} 2656}
2580 2657
2581/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2582/* 2659/*
… …
2587void 2664void
2588rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) NOTHROW
2589{ 2666{
2590 int row, wrote; 2667 int row, wrote;
2591 unsigned int width, towrite; 2668 unsigned int width, towrite;
2592 char r1[] = "\n"; 2669 const char r1[] = "\n";
2593 2670
2594 for (row = saveLines - nsaved; 2671 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2596 { 2673 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2675 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2676 for (towrite = width; towrite; towrite -= wrote)
… …
2614 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2615 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2616void 2693void
2617rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2618{ 2695{
2619 row_col_t pos;
2620
2621 if (!selection.op) 2696 if (!selection.op)
2622 return; 2697 return;
2623 2698
2699 row_col_t pos;
2624 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2625 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2626 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2627 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2628 || (check_more == 1 2705 || (check_more == 1
2629 && current_screen == selection.screen 2706 && current_screen == selection.screen
… …
2631 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2632 || (check_more == 2 2709 || (check_more == 2
2633 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2634 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2635 || (check_more == 3 2712 || (check_more == 3
2636 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2637 || (check_more == 4 /* screen width change */
2638 && (selection.beg.row != selection.end.row
2639 || selection.end.col > ncol)))
2640 CLEAR_SELECTION (); 2714 CLEAR_ALL_SELECTION ();
2641} 2715}
2642 2716
2643/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2644/* 2718/*
2645 * Paste a selection direct to the command fd 2719 * Paste a selection direct to the command fd
2646 */ 2720 */
2647void 2721void
2648rxvt_term::paste (char *data, unsigned int len) NOTHROW 2722rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2649{ 2723{
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2724 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2725 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2726 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2727 data[i] = C0_CR;
2654 2728
2729 if (priv_modes & PrivMode_BracketPaste)
2730 tt_printf ("\e[200~");
2731
2655 tt_write (data, len); 2732 tt_write (data, len);
2656}
2657 2733
2658/* ------------------------------------------------------------------------- */ 2734 if (priv_modes & PrivMode_BracketPaste)
2659/* 2735 tt_printf ("\e[201~");
2660 * Respond to a notification that a primary selection has been sent
2661 * EXT: SelectionNotify
2662 */
2663void
2664rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2665{
2666 if (prop == None) /* check for failed XConvertSelection */
2667 {
2668 if ((selection_type & Sel_CompoundText))
2669 {
2670 int selnum = selection_type & Sel_whereMask;
2671
2672 selection_type = 0;
2673 if (selnum != Sel_direct)
2674 selection_request_other (XA_STRING, selnum);
2675 }
2676
2677 if ((selection_type & Sel_UTF8String))
2678 {
2679 int selnum = selection_type & Sel_whereMask;
2680
2681 selection_type = Sel_CompoundText;
2682 if (selnum != Sel_direct)
2683 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2684 else
2685 selection_type = 0;
2686 }
2687
2688 return;
2689 }
2690
2691 unsigned long bytes_after;
2692 XTextProperty ct;
2693
2694 if (XGetWindowProperty (dpy, win, prop,
2695 0, PROP_SIZE / 4,
2696 delete_prop, AnyPropertyType,
2697 &ct.encoding, &ct.format,
2698 &ct.nitems, &bytes_after,
2699 &ct.value) != Success)
2700 {
2701 ct.value = 0;
2702 goto bailout;
2703 }
2704
2705 if (ct.encoding == None)
2706 goto bailout;
2707
2708 if (bytes_after)
2709 {
2710 // fetch and append remaining data
2711 XTextProperty ct2;
2712
2713 if (XGetWindowProperty (dpy, win, prop,
2714 ct.nitems / 4, (bytes_after + 3) / 4,
2715 delete_prop, AnyPropertyType,
2716 &ct2.encoding, &ct2.format,
2717 &ct2.nitems, &bytes_after,
2718 &ct2.value) != Success)
2719 goto bailout;
2720
2721 // realloc should be compatible to XFree, here, and elsewhere, too
2722 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2723 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2724 ct.nitems += ct2.nitems;
2725
2726 XFree (ct2.value);
2727 }
2728
2729 if (ct.value == 0)
2730 goto bailout;
2731
2732 if (ct.encoding == xa[XA_INCR])
2733 {
2734 // INCR selection, start handshake
2735 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop);
2737
2738 selection_wait = Sel_incr;
2739 incr_buf_fill = 0;
2740 incr_ev.start (10);
2741
2742 goto bailout;
2743 }
2744
2745 if (ct.nitems == 0)
2746 {
2747 if (selection_wait == Sel_incr)
2748 {
2749 XFree (ct.value);
2750
2751 // finally complete, now paste the whole thing
2752 selection_wait = Sel_normal;
2753 ct.value = (unsigned char *)incr_buf;
2754 ct.nitems = incr_buf_fill;
2755 incr_buf = 0;
2756 incr_buf_size = 0;
2757 incr_ev.stop ();
2758 }
2759 else
2760 {
2761 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 {
2764 /*
2765 * pass through again trying CUT_BUFFER0 if we've come from
2766 * XConvertSelection () but nothing was presented
2767 */
2768 selection_paste (display->root, XA_CUT_BUFFER0, False);
2769 }
2770
2771 goto bailout;
2772 }
2773 }
2774 else if (selection_wait == Sel_incr)
2775 {
2776 incr_ev.start (10);
2777
2778 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 {
2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2782 }
2783
2784 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2785 incr_buf_fill += ct.nitems;
2786
2787 goto bailout;
2788 }
2789
2790 char **cl;
2791 int cr;
2792
2793#if !ENABLE_MINIMAL
2794 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2795 // so recode it manually
2796 if (ct.encoding == xa[XA_UTF8_STRING])
2797 {
2798 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2799 char *s = rxvt_wcstombs (w);
2800 free (w);
2801 // TODO: strlen == only the first element will be converted. well...
2802 paste (s, strlen (s));
2803 free (s);
2804 }
2805 else
2806#endif
2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2808 && cl)
2809 {
2810 for (int i = 0; i < cr; i++)
2811 paste (cl[i], strlen (cl[i]));
2812
2813 XFreeStringList (cl);
2814 }
2815 else
2816 paste ((char *)ct.value, ct.nitems); // paste raw
2817
2818bailout:
2819 XFree (ct.value);
2820
2821 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none;
2823} 2736}
2824 2737
2825void 2738void
2826rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2739rxvt_term::paste (char *data, unsigned int len) NOTHROW
2827{ 2740{
2828 selection_wait = Sel_none; 2741 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2829
2830 incr_buf_size = 0;
2831 free (incr_buf);
2832
2833 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2834}
2835
2836void
2837rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2838{
2839 if (prop == None || selection_wait != Sel_incr)
2840 return; 2742 return;
2841 2743
2842 selection_paste (win, prop, true); 2744 tt_paste (data, len);
2843} 2745}
2844 2746
2845/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2846/* 2748/*
2847 * Request the current selection: 2749 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2848 * Order: > internal selection if available 2750 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2751 * as fallback
2850 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0
2853 * EXT: button 2 release 2752 * EXT: button 2 release
2854 */ 2753 */
2855void 2754void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2755rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2756{
2858 if (selection.text && selnum == Sel_Primary) 2757 if (!selection_req)
2859 {
2860 /* internal selection */
2861 char *str = rxvt_wcstombs (selection.text, selection.len);
2862 paste (str, strlen (str));
2863 free (str);
2864 return;
2865 } 2758 {
2866 else 2759 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2760 selection_req->run ();
2867 { 2761 }
2868 selection_request_time = tm;
2869 selection_wait = Sel_normal;
2870
2871#if X_HAVE_UTF8_STRING
2872 selection_type = Sel_UTF8String;
2873 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2874 return;
2875#else
2876 selection_type = Sel_CompoundText;
2877 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2878 return;
2879#endif
2880 }
2881
2882 selection_wait = Sel_none; /* don't loop in selection_paste () */
2883 selection_paste (display->root, XA_CUT_BUFFER0, false);
2884}
2885
2886int
2887rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2888{
2889 Atom sel;
2890
2891 selection_type |= selnum;
2892
2893 if (selnum == Sel_Primary)
2894 sel = XA_PRIMARY;
2895 else if (selnum == Sel_Secondary)
2896 sel = XA_SECONDARY;
2897 else
2898 sel = xa[XA_CLIPBOARD];
2899
2900 if (XGetSelectionOwner (dpy, sel) != None)
2901 {
2902 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2903 vt, selection_request_time);
2904 return 1;
2905 }
2906
2907 return 0;
2908} 2762}
2909 2763
2910/* ------------------------------------------------------------------------- */ 2764/* ------------------------------------------------------------------------- */
2911/* 2765/*
2912 * Clear all selected text 2766 * Clear all selected text
2913 * EXT: SelectionClear 2767 * EXT: SelectionClear
2914 */ 2768 */
2915void 2769void
2916rxvt_term::selection_clear () NOTHROW 2770rxvt_term::selection_clear (bool clipboard) NOTHROW
2917{ 2771{
2772 if (!clipboard)
2773 {
2918 want_refresh = 1; 2774 want_refresh = 1;
2919 free (selection.text); 2775 free (selection.text);
2920 selection.text = NULL; 2776 selection.text = NULL;
2921 selection.len = 0; 2777 selection.len = 0;
2922 CLEAR_SELECTION (); 2778 CLEAR_SELECTION ();
2923 2779
2924 if (display->selection_owner == this) 2780 if (display->selection_owner == this)
2925 display->selection_owner = 0; 2781 display->selection_owner = 0;
2782 }
2783 else
2784 {
2785 free (selection.clip_text);
2786 selection.clip_text = NULL;
2787 selection.clip_len = 0;
2788
2789 if (display->clipboard_owner == this)
2790 display->clipboard_owner = 0;
2791 }
2926} 2792}
2927 2793
2928/* ------------------------------------------------------------------------- */ 2794/* ------------------------------------------------------------------------- */
2929/* 2795/*
2930 * Copy a selection into the cut buffer 2796 * Copy a selection into the cut buffer
2931 * EXT: button 1 or 3 release 2797 * EXT: button 1 or 3 release
2932 */ 2798 */
2933void 2799void
2934rxvt_term::selection_make (Time tm) 2800rxvt_term::selection_make (Time tm)
2935{ 2801{
2936 int i; 2802 int size;
2937 wchar_t *new_selection_text; 2803 wchar_t *new_selection_text;
2938 text_t *t; 2804 text_t *t;
2939 2805
2940 switch (selection.op) 2806 switch (selection.op)
2941 { 2807 {
… …
2957 return; /* nothing selected, go away */ 2823 return; /* nothing selected, go away */
2958 2824
2959 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2825 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2960 return; 2826 return;
2961 2827
2962 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2828 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2963 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2829 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2964 2830
2965 int ofs = 0; 2831 int ofs = 0;
2966 int extra = 0; 2832 int extra = 0;
2967 2833
2968 int col = selection.beg.col; 2834 int col = selection.beg.col;
… …
2974 { 2840 {
2975#if !ENABLE_MINIMAL 2841#if !ENABLE_MINIMAL
2976 if (selection.rect) 2842 if (selection.rect)
2977 { 2843 {
2978 col = selection.beg.col; 2844 col = selection.beg.col;
2979 end_col = ncol + 1; 2845 end_col = selection.end.col;
2980 } 2846 }
2981 else 2847 else
2982#endif 2848#endif
2983 end_col = ROW(row).l; 2849 end_col = ROW(row).l;
2984 2850
2985 col = max (col, 0); 2851 col = max (col, 0);
2986 2852
2987 if (row == selection.end.row 2853 if (row == selection.end.row)
2988#if !ENABLE_MINIMAL
2989 || selection.rect
2990#endif
2991 )
2992 min_it (end_col, selection.end.col); 2854 min_it (end_col, selection.end.col);
2993 2855
2994 t = ROW(row).t + col; 2856 t = ROW(row).t + col;
2995 2857
2996 for (; col < end_col; col++) 2858 for (; col < end_col; col++)
… …
3004 2866
3005 extra -= (len - 1); 2867 extra -= (len - 1);
3006 2868
3007 if (extra < 0) 2869 if (extra < 0)
3008 { 2870 {
3009 extra += i; 2871 extra += size;
3010 i += i; 2872 size += size;
3011 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2873 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3012 } 2874 }
3013 2875
3014 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2876 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3015 } 2877 }
3016#endif 2878#endif
… …
3028 2890
3029 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3030 } 2892 }
3031 else 2893 else
3032#endif 2894#endif
3033 if (!ROW(row).is_longer () && row != selection.end.row) 2895 if (!ROW(row).is_longer ()
2896 && (row != selection.end.row || end_col != selection.end.col)
2897 && (row != selection.beg.row || selection.beg.col < ncol))
3034 new_selection_text[ofs++] = C0_LF; 2898 new_selection_text[ofs++] = C0_LF;
3035 } 2899 }
3036
3037 if (end_col != selection.end.col)
3038 new_selection_text[ofs++] = C0_LF;
3039 2900
3040 new_selection_text[ofs] = 0; 2901 new_selection_text[ofs] = 0;
3041 2902
3042 if (ofs == 0) 2903 if (ofs == 0)
3043 { 2904 {
… …
3056 2917
3057 selection_grab (tm); 2918 selection_grab (tm);
3058} 2919}
3059 2920
3060bool 2921bool
3061rxvt_term::selection_grab (Time tm) NOTHROW 2922rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3062{ 2923{
2924 Atom sel;
2925
2926 if (!clipboard)
2927 {
3063 selection_time = tm; 2928 selection_time = tm;
2929 sel = XA_PRIMARY;
2930 }
2931 else
2932 {
2933 clipboard_time = tm;
2934 sel = xa[XA_CLIPBOARD];
2935 }
3064 2936
3065 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2937 XSetSelectionOwner (dpy, sel, vt, tm);
3066 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2938 if (XGetSelectionOwner (dpy, sel) == vt)
3067 { 2939 {
3068 display->set_selection_owner (this); 2940 display->set_selection_owner (this, clipboard);
3069 return true; 2941 return true;
3070 } 2942 }
3071 else 2943 else
3072 { 2944 {
3073 selection_clear (); 2945 selection_clear (clipboard);
3074 return false; 2946 return false;
3075 } 2947 }
3076 2948
3077#if 0 2949#if 0
3078 XTextProperty ct; 2950 XTextProperty ct;
… …
3538 * EXT: SelectionRequest 3410 * EXT: SelectionRequest
3539 */ 3411 */
3540void 3412void
3541rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3413rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3542{ 3414{
3415 Atom property = rq.property == None ? rq.target : rq.property;
3543 XSelectionEvent ev; 3416 XSelectionEvent ev;
3544 3417
3545 ev.type = SelectionNotify; 3418 ev.type = SelectionNotify;
3546 ev.property = None; 3419 ev.property = None;
3547 ev.display = rq.display; 3420 ev.display = rq.display;
… …
3562 *target++ = xa[XA_COMPOUND_TEXT]; 3435 *target++ = xa[XA_COMPOUND_TEXT];
3563#if X_HAVE_UTF8_STRING 3436#if X_HAVE_UTF8_STRING
3564 *target++ = xa[XA_UTF8_STRING]; 3437 *target++ = xa[XA_UTF8_STRING];
3565#endif 3438#endif
3566 3439
3567 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3440 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3568 32, PropModeReplace, 3441 32, PropModeReplace,
3569 (unsigned char *)target_list, target - target_list); 3442 (unsigned char *)target_list, target - target_list);
3570 ev.property = rq.property; 3443 ev.property = property;
3571 } 3444 }
3572#if TODO // TODO 3445#if TODO // TODO
3573 else if (rq.target == xa[XA_MULTIPLE]) 3446 else if (rq.target == xa[XA_MULTIPLE])
3574 { 3447 {
3575 /* TODO: Handle MULTIPLE */ 3448 /* TODO: Handle MULTIPLE */
3576 } 3449 }
3577#endif 3450#endif
3578 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3579 { 3452 {
3580 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3581 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3454 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3582 ev.property = rq.property; 3455 ev.property = property;
3456 }
3457 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3458 {
3459 XChangeProperty (dpy, rq.requestor, property, rq.target,
3460 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3461 ev.property = property;
3583 } 3462 }
3584 else if (rq.target == XA_STRING 3463 else if (rq.target == XA_STRING
3585 || rq.target == xa[XA_TEXT] 3464 || rq.target == xa[XA_TEXT]
3586 || rq.target == xa[XA_COMPOUND_TEXT] 3465 || rq.target == xa[XA_COMPOUND_TEXT]
3587 || rq.target == xa[XA_UTF8_STRING] 3466 || rq.target == xa[XA_UTF8_STRING]
… …
3619 { 3498 {
3620 target = xa[XA_COMPOUND_TEXT]; 3499 target = xa[XA_COMPOUND_TEXT];
3621 style = enc_compound_text; 3500 style = enc_compound_text;
3622 } 3501 }
3623 3502
3624 if (selection.text) 3503 if (rq.selection == XA_PRIMARY && selection.text)
3625 { 3504 {
3626 cl = selection.text; 3505 cl = selection.text;
3627 selectlen = selection.len; 3506 selectlen = selection.len;
3507 }
3508 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3509 {
3510 cl = selection.clip_text;
3511 selectlen = selection.clip_len;
3628 } 3512 }
3629 else 3513 else
3630 { 3514 {
3631 cl = L""; 3515 cl = L"";
3632 selectlen = 0; 3516 selectlen = 0;
… …
3653 ct.value = (unsigned char *)cl; 3537 ct.value = (unsigned char *)cl;
3654 ct.nitems = selectlen; 3538 ct.nitems = selectlen;
3655 ct.encoding = target; 3539 ct.encoding = target;
3656 } 3540 }
3657 3541
3658 XChangeProperty (dpy, rq.requestor, rq.property, 3542 XChangeProperty (dpy, rq.requestor, property,
3659 ct.encoding, 8, PropModeReplace, 3543 ct.encoding, 8, PropModeReplace,
3660 ct.value, (int)ct.nitems); 3544 ct.value, (int)ct.nitems);
3661 ev.property = rq.property; 3545 ev.property = property;
3662 3546
3663 if (freect) 3547 if (freect)
3664 XFree (ct.value); 3548 XFree (ct.value);
3665 } 3549 }
3666 3550
… …
3700 h += 2; min_it (h, nrow); 3584 h += 2; min_it (h, nrow);
3701 3585
3702 x -= 1; clamp_it (x, 0, ncol - w); 3586 x -= 1; clamp_it (x, 0, ncol - w);
3703 y -= 1; clamp_it (y, 0, nrow - h); 3587 y -= 1; clamp_it (y, 0, nrow - h);
3704 3588
3705 ov_x = x; ov_y = y; 3589 ov.x = x; ov.y = y;
3706 ov_w = w; ov_h = h; 3590 ov.w = w; ov.h = h;
3707 3591
3708 ov_text = new text_t *[h]; 3592 ov.text = new text_t *[h];
3709 ov_rend = new rend_t *[h]; 3593 ov.rend = new rend_t *[h];
3710 3594
3711 for (y = 0; y < h; y++) 3595 for (y = 0; y < h; y++)
3712 { 3596 {
3713 text_t *tp = ov_text[y] = new text_t[w]; 3597 text_t *tp = ov.text[y] = new text_t[w];
3714 rend_t *rp = ov_rend[y] = new rend_t[w]; 3598 rend_t *rp = ov.rend[y] = new rend_t[w];
3715 3599
3716 text_t t0, t1, t2; 3600 text_t t0, t1, t2;
3717 rend_t r = OVERLAY_RSTYLE; 3601 rend_t r = OVERLAY_RSTYLE;
3718 3602
3719 if (y == 0) 3603 if (y == 0)
… …
3738} 3622}
3739 3623
3740void 3624void
3741rxvt_term::scr_overlay_off () NOTHROW 3625rxvt_term::scr_overlay_off () NOTHROW
3742{ 3626{
3743 if (!ov_text) 3627 if (!ov.text)
3744 return; 3628 return;
3745 3629
3746 want_refresh = 1; 3630 want_refresh = 1;
3747 3631
3748 for (int y = 0; y < ov_h; y++) 3632 for (int y = 0; y < ov.h; y++)
3749 { 3633 {
3750 delete [] ov_text[y]; 3634 delete [] ov.text[y];
3751 delete [] ov_rend[y]; 3635 delete [] ov.rend[y];
3752 } 3636 }
3753 3637
3754 delete [] ov_text; ov_text = 0; 3638 delete [] ov.text; ov.text = 0;
3755 delete [] ov_rend; ov_rend = 0; 3639 delete [] ov.rend; ov.rend = 0;
3756} 3640}
3757 3641
3758void 3642void
3759rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3643rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3760{ 3644{
3761 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3645 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3762 return; 3646 return;
3763 3647
3764 x++, y++; 3648 x++, y++;
3765 3649
3766 ov_text[y][x] = text; 3650 ov.text[y][x] = text;
3767 ov_rend[y][x] = rend; 3651 ov.rend[y][x] = rend;
3768} 3652}
3769 3653
3770void 3654void
3771rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3655rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3772{ 3656{
… …
3791} 3675}
3792 3676
3793void 3677void
3794rxvt_term::scr_swap_overlay () NOTHROW 3678rxvt_term::scr_swap_overlay () NOTHROW
3795{ 3679{
3796 if (!ov_text) 3680 if (!ov.text)
3797 return; 3681 return;
3798 3682
3683 // hide cursor if it is within the overlay area
3684 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3685 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3686 screen.flags &= ~Screen_VisibleCursor;
3687
3799 // swap screen mem with overlay 3688 // swap screen mem with overlay
3800 for (int y = ov_h; y--; ) 3689 for (int y = ov.h; y--; )
3801 { 3690 {
3802 text_t *t1 = ov_text[y]; 3691 text_t *t1 = ov.text[y];
3803 rend_t *r1 = ov_rend[y]; 3692 rend_t *r1 = ov.rend[y];
3804 3693
3805 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3694 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3806 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3695 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3807 3696
3808 for (int x = ov_w; x--; ) 3697 for (int x = ov.w; x--; )
3809 { 3698 {
3810 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3699 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3811 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3700 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3812 } 3701 }
3813 } 3702 }

Diff Legend

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