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.323 by root, Tue Nov 4 23:53:29 2008 UTC vs.
Revision 1.392 by root, Sun Jul 10 00:40:10 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163 scr_soft_reset (); 164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
164 167
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)
… …
200 term_start = 0; 203 term_start = 0;
201 204
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 207
205 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 211
209 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
210 { 213 {
… …
233 selection.text = NULL; 236 selection.text = NULL;
234 selection.len = 0; 237 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
237 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
238 } 243 }
239 else 244 else
240 { 245 {
241 /* 246 /*
242 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
270 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);
271 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);
272 } 277 }
273 278
274 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
276 281
277 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
278 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
280 285
281 if (top_row) 286 if (top_row)
282 { 287 {
283 // 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
284 // 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
285 291
286 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 294
289 do 295 do
290 { 296 {
291 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 299 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 301
298 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 ())
299 { 303 {
… …
395 399
396 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 402 }
399 403
404 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
409
400 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
401 411
402 prev_nrow = nrow; 412 prev_nrow = nrow;
403 prev_ncol = ncol; 413 prev_ncol = ncol;
404 414
… …
436void 446void
437rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
438{ 448{
439 scr_release (); 449 scr_release ();
440 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
441 scr_reset (); 453 scr_reset ();
442 454
443 scr_clear (true); 455 scr_clear (true);
444 scr_refresh (); 456 scr_refresh ();
445} 457}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 462 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 463#if ENABLE_OVERLAY
452 scr_overlay_off (); 464 scr_overlay_off ();
453#endif 465#endif
454 466
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 467 if (current_screen != PRIMARY)
458 scr_swap_screen (); 468 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465 469
466 scr_scroll_region (0, MAX_ROWS - 1); 470 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 471 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 472 scr_insert_mode (0);
469} 473}
… …
511 } 515 }
512 516
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
519#endif
520} 522}
521 523
522void 524void
523rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
524{ 526{
… …
549 want_refresh = 1; 551 want_refresh = 1;
550 view_start = 0; 552 view_start = 0;
551 553
552 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
553 555
554 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
555 557
556#if NSCREENS 558#if NSCREENS
557 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
558 { 560 {
559 num_scr = 0; 561 num_scr = 0;
… …
636 638
637 if (count > 0 639 if (count > 0
638 && row1 == 0 640 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
641 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 646
646 // sever bottommost line 647 // sever bottommost line
647 { 648 {
648 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
649 l.is_longer (0); 650 l.is_longer (0);
650 l.touch (); 651 l.touch ();
651 } 652 }
652 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
653 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 670 for (int i = count; i--; )
655 { 671 {
656 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
657 673
658 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
660 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)))
661 { 677 {
662 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 679 l.l = 0;
664 l.f = 0; 680 l.f = 0;
665 } 681 }
666 else 682 else
667 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
668 }
669
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 } 684 }
681 685
682 // move and/or clear selection, if any 686 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
684 { 688 {
… …
730 } 734 }
731 735
732 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
734 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
735 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
736 748
737 min_it (count, rows); 749 min_it (count, rows);
738 750
739 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 752
741 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
742 { 754 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 756
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 759 }
748 760
749 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
750 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 }
770
751 } 771 }
752 772
753 return count; 773 return count;
754} 774}
755 775
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 804 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 805 screen.cur.row -= minlines;
786 } 806 }
787 } 807 }
788 808
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 809 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 810 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 811 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 812 int row = screen.cur.row;
795 813
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 814 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 815
798 line_t *line = &ROW(row); 816 line_t *line = &ROW(row);
799 817
800 while (str < strend) 818 while (str < strend)
801 { 819 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 821
804 if (expect_false (c < 0x20)) 822 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 823 if (c == C0_LF)
806 { 824 {
807 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
808 826
809 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
828 { 846 {
829 scr_tab (1, true); 847 scr_tab (1, true);
830 continue; 848 continue;
831 } 849 }
832 850
833 if (expect_false ( 851 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 855 ))
838 { 856 {
… …
843 * should be a similar check. 861 * should be a similar check.
844 */ 862 */
845 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
846 } 864 }
847 865
848 if (expect_false (screen.flags & Screen_WrapNext)) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 867 {
850 scr_do_wrap (); 868 scr_do_wrap ();
851 869
852 line->l = ncol; 870 line->l = ncol;
853 line->is_longer (1); 871 line->is_longer (1);
… …
855 row = screen.cur.row; 873 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
857 } 875 }
858 876
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 879 c = 0xfffd;
862 880
863 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
866 // locale. 884 // locale.
867 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
868 886
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 888 {
871 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 890 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
889 } 907 }
890 } 908 }
891 909
892 if (expect_false (screen.flags & Screen_Insert)) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
894 912
895 if (width != 0) 913 if (width != 0)
896 { 914 {
897#if !UNICODE_3 915#if !UNICODE_3
… …
902# else 920# else
903 c = 0xfffd; 921 c = 0xfffd;
904# endif 922# endif
905#endif 923#endif
906 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
907 // nuke the character at this position, if required 941 // nuke the character at this position, if required
908 if (expect_false ( 942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
909 line->t[screen.cur.col] == NOCHAR 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
910 || (screen.cur.col < ncol - 1
911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col); 946 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 {
920 // ... artificially enlargen the previous one
921 c = NOCHAR;
922 // and try the same character next loop iteration
923 --str;
924 }
925 947
926 line->touch (); 948 line->touch ();
927 949
928 do 950 do
929 { 951 {
930 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
932 954
933 if (expect_true (screen.cur.col < ncol - 1)) 955 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 956 screen.cur.col++;
935 else 957 else
936 { 958 {
937 line->l = ncol; 959 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
940 break; 962
963 goto end_of_line;
941 } 964 }
942 965
943 c = NOCHAR; 966 c = NOCHAR;
944 } 967 }
945 while (expect_false (--width > 0)); 968 while (ecb_unlikely (--width > 0));
946 969
947 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
949 { 972 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 973 line->t[c] = ' ';
955 line->r[c] = rend; 974 line->r[c] = rend;
956 }
957 } 975 }
976
977end_of_line:
978 ;
958 } 979 }
959#if ENABLE_COMBINING 980#if ENABLE_COMBINING
960 else // width == 0 981 else // width == 0
961 { 982 {
962 if (c != 0xfeff) // ignore BOM 983 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1023#endif
1003 } 1024 }
1004 1025
1005 max_it (line->l, screen.cur.col); 1026 max_it (line->l, screen.cur.col);
1006 1027
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
1009#endif
1010} 1029}
1011 1030
1012/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1013/* 1032/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1033 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1046
1028 want_refresh = 1; 1047 want_refresh = 1;
1029#endif 1048#endif
1030 } 1049 }
1031 } 1050 }
1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1032 else 1053 else
1033 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1034} 1055}
1035 1056
1036/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1363 if (row >= nrow) /* Out Of Bounds */
1343 return; 1364 return;
1344 1365
1345 min_it (num, nrow - row); 1366 min_it (num, nrow - row);
1346 1367
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1368 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1369 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1370 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1371 {
1352 ren = DEFAULT_RSTYLE; 1372 ren = DEFAULT_RSTYLE;
1353 1373
1354 if (mapped && !view_start) 1374 if (mapped)
1355 XClearArea (dpy, vt, 0, 1375 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1376 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1377 (unsigned int)Height2Pixel (num), False);
1358 } 1378 }
1359 else 1379 else
1360 { 1380 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1381 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1382
1363 if (mapped && !view_start) 1383 if (mapped)
1364 { 1384 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1387 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1388 0, Row2Pixel (row - view_start),
… …
1374 } 1394 }
1375 1395
1376 for (; num--; row++) 1396 for (; num--; row++)
1377 { 1397 {
1378 scr_blank_screen_mem (ROW(row), rstyle); 1398 scr_blank_screen_mem (ROW(row), rstyle);
1399
1379 if (!view_start) 1400 if (row - view_start < nrow)
1380 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1401 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1381 } 1402 }
1382} 1403}
1383 1404
1384#if !ENABLE_MINIMAL 1405#if !ENABLE_MINIMAL
1385void 1406void
… …
1538 { 1559 {
1539 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1540 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1541 } 1562 }
1542 1563
1543 scr_blank_line (*line, ncol - count, count, 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1545 1565
1546 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1548 { 1568 {
1549 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1685 { 1705 {
1686 rvideo_state = on; 1706 rvideo_state = on;
1687 1707
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1691#endif 1711#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1713
1694 XGCValues gcvalue; 1714 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1860 {
1841 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1842 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1843 } 1863 }
1844// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1845 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++)
1846 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);
1847 1867
1848 num_scr_allow = 0; 1868 num_scr_allow = 0;
1849 1869
… …
1922 1942
1923# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1926# endif 1946# endif
1927 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1928# endif 1948# endif
1929 1949
1930# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1952 set_urgency (1);
… …
1940 1960
1941 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1942 } 1962 }
1943 else 1963 else
1944 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1945#endif 1966#endif
1946} 1967}
1947 1968
1948/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */
1950void 1970void
1951rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1952{ 1972{
1953#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1954 int nrows, row_start; 1974 int nrows, row_start;
… …
1968 row_start = view_start; 1988 row_start = view_start;
1969 } 1989 }
1970 1990
1971 wctomb (0, 0); 1991 wctomb (0, 0);
1972 1992
1973 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1974 { 1994 {
1975 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1976 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1977 1997
1978 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
… …
2007 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
2008 */ 2028 */
2009void 2029void
2010rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
2011{ 2031{
2012 unsigned char have_bg,
2013 showcursor; /* show the cursor */
2014 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2034 int i; /* tmp */
2017#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
2018 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
2029 /* 2047 /*
2030 * A: set up vars 2048 * A: set up vars
2031 */ 2049 */
2032 refresh_count = 0; 2050 refresh_count = 0;
2033 2051
2052 unsigned int old_screen_flags = screen.flags;
2034 have_bg = 0; 2053 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2037#endif 2056#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2058
2040 /* 2059 /*
2041 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2042 */ 2061 */
2043 scr_reverse_selection (); 2062 scr_reverse_selection ();
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 char showcursor = screen.flags & Screen_VisibleCursor;
2044 2070
2045 /* 2071 /*
2046 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2047 */ 2073 */
2048 { 2074 {
2049 unsigned char setoldcursor; 2075 unsigned char setoldcursor;
2050 2076
2051 showcursor = (screen.flags & Screen_VisibleCursor);
2052#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2053 if (hidden_cursor) 2078 if (hidden_cursor)
2054 showcursor = 0; 2079 showcursor = 0;
2055#endif 2080#endif
2056 2081
… …
2084 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2085#else 2110#else
2086 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2087#endif 2112#endif
2088 2113
2089 if (showcursor && focus) 2114 if (focus)
2090 { 2115 {
2091 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2092 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2093 else 2118 else
2094 { 2119 {
… …
2129 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2130 } 2155 }
2131 } 2156 }
2132 } 2157 }
2133 2158
2134 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2135#if ENABLE_OVERLAY
2136 scr_swap_overlay ();
2137#endif
2138
2139#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2140 /* 2160 /*
2141 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2142 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2143 */ 2163 */
… …
2232 continue; 2252 continue;
2233 2253
2234 // redraw one or more characters 2254 // redraw one or more characters
2235 2255
2236 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2237 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2238 --col; 2258 --col;
2239 2259
2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2241 text_t *text = stp + col; 2261 text_t *text = stp + col;
2242 int count = 1; 2262 int count = 1;
2243 2263
2244 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2245 drp[col] = rend; 2265 drp[col] = rend;
… …
2249 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2250 { 2270 {
2251 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2252 { 2272 {
2253 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2254 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2255 count++; 2276 count++;
2256 i++; 2277 i++;
2257 2278
2258 continue; 2279 continue;
2259 } 2280 }
… …
2279 2300
2280 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2282 2303
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2306 count++, i--;
2286 2307
2287 /* 2308 /*
2288 * Determine the attributes for the string 2309 * Determine the attributes for the string
2289 */ 2310 */
2290 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2292 2313
2293 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2316 {
2296 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2297 2318
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2318 2339
2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2320 fore = Color_UL; 2341 fore = Color_UL;
2321#endif 2342#endif
2322 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2323 if (invert) 2364 if (invert)
2324 { 2365 {
2325#ifdef OPTION_HC
2326 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 || !ISSET_PIXCOLOR (Color_HC))
2328#endif
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 ::swap (fore, back); 2366 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2336 2367
2337#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2338# ifndef OPTION_HC
2339 if (ISSET_PIXCOLOR (Color_RV))
2340 back = Color_RV;
2341# endif
2342 if (fore == back) 2369 if (fore == back)
2343 { 2370 {
2344 fore = Color_bg; 2371 fore = Color_bg;
2345 back = Color_fg; 2372 back = Color_fg;
2346 } 2373 }
… …
2382 /* 2409 /*
2383 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2384 */ 2411 */
2385 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2386 2413
2387 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2388 { 2415 {
2389 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2390 2417
2391 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2392 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2399 did_clear: ; 2426 did_clear: ;
2400 } 2427 }
2401 else 2428 else
2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2403 2430
2404 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2405 { 2432 {
2406#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2407 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2408 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2409 else 2436 else
… …
2414 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2416 } 2443 }
2417 } /* for (col....) */ 2444 } /* for (col....) */
2418 } /* for (row....) */ 2445 } /* for (row....) */
2419
2420#if ENABLE_OVERLAY
2421 scr_swap_overlay ();
2422#endif
2423 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2424 2446
2425 /* 2447 /*
2426 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2427 */ 2449 */
2428 if (showcursor) 2450 if (showcursor)
… …
2467 } 2489 }
2468 2490
2469 /* 2491 /*
2470 * H: cleanup selection 2492 * H: cleanup selection
2471 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2472 scr_reverse_selection (); 2499 scr_reverse_selection ();
2473 2500
2501 screen.flags = old_screen_flags;
2474 num_scr = 0; 2502 num_scr = 0;
2475 num_scr_allow = 1; 2503 num_scr_allow = 1;
2476} 2504}
2477 2505
2478void 2506void
… …
2499 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2500 } 2528 }
2501} 2529}
2502 2530
2503void 2531void
2504rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2505{ 2533{
2534 bool transparent = false;
2535
2506#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2507 bgPixmap.apply (); 2537 if (bg_pixmap != None)
2508#else 2538 {
2539# ifdef ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2509 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2552 }
2553 }
2554 else
2555#endif
2556 {
2510 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2511 XClearWindow (dpy, parent[0]);
2512 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2513 2562
2514 if (scrollBar.win) 2563 if (scrollBar.win)
2515 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2516 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2517 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = STATE_IDLE;
2518 scrollBar.show (0); 2570 scrollBar.show (0);
2519 } 2571 }
2520 2572
2521#endif 2573 if (refresh)
2522 2574 {
2523 /* bgPixmap.apply () does not do the following : */
2524 scr_clear (); 2575 scr_clear ();
2525 scr_touch (true); 2576 scr_touch (true);
2577 }
2526 want_refresh = 1; 2578 want_refresh = 1;
2527} 2579}
2528 2580
2529/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2530void 2582void
… …
2598 { 2650 {
2599#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2600 if (selection.rect) 2652 if (selection.rect)
2601 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2603 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2604 else 2656 else
2605#endif 2657#endif
2606 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2608 RS_RVid); 2660 RS_Sel | RS_RVid);
2609 } 2661 }
2610} 2662}
2611 2663
2612/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2613/* 2665/*
… …
2618void 2670void
2619rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2620{ 2672{
2621 int row, wrote; 2673 int row, wrote;
2622 unsigned int width, towrite; 2674 unsigned int width, towrite;
2623 char r1[] = "\n"; 2675 const char r1[] = "\n";
2624 2676
2625 for (row = saveLines + top_row; 2677 for (row = saveLines + top_row;
2626 row < saveLines + nrow - 1; row++) 2678 row < saveLines + nrow - 1; row++)
2627 { 2679 {
2628 width = row_buf[row].l >= 0 ? row_buf[row].l 2680 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2674/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2675/* 2727/*
2676 * Paste a selection direct to the command fd 2728 * Paste a selection direct to the command fd
2677 */ 2729 */
2678void 2730void
2679rxvt_term::paste (char *data, unsigned int len) NOTHROW 2731rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2680{ 2732{
2681 /* convert normal newline chars into common keyboard Return key sequence */ 2733 /* convert normal newline chars into common keyboard Return key sequence */
2682 for (unsigned int i = 0; i < len; i++) 2734 for (unsigned int i = 0; i < len; i++)
2683 if (data[i] == C0_LF) 2735 if (data[i] == C0_LF)
2684 data[i] = C0_CR; 2736 data[i] = C0_CR;
… …
2690 2742
2691 if (priv_modes & PrivMode_BracketPaste) 2743 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~"); 2744 tt_printf ("\e[201~");
2693} 2745}
2694 2746
2695/* ------------------------------------------------------------------------- */
2696/*
2697 * Respond to a notification that a primary selection has been sent
2698 * EXT: SelectionNotify
2699 */
2700void 2747void
2701rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2748rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702{ 2749{
2703 if (prop == None) /* check for failed XConvertSelection */ 2750 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2704 {
2705 if ((selection_type & Sel_CompoundText))
2706 {
2707 int selnum = selection_type & Sel_whereMask;
2708
2709 selection_type = 0;
2710 if (selnum != Sel_direct)
2711 selection_request_other (XA_STRING, selnum);
2712 }
2713
2714 if ((selection_type & Sel_UTF8String))
2715 {
2716 int selnum = selection_type & Sel_whereMask;
2717
2718 selection_type = Sel_CompoundText;
2719 if (selnum != Sel_direct)
2720 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2721 else
2722 selection_type = 0;
2723 }
2724
2725 return;
2726 }
2727
2728 unsigned long bytes_after;
2729 XTextProperty ct;
2730
2731 if (XGetWindowProperty (dpy, win, prop,
2732 0, PROP_SIZE / 4,
2733 delete_prop, AnyPropertyType,
2734 &ct.encoding, &ct.format,
2735 &ct.nitems, &bytes_after,
2736 &ct.value) != Success)
2737 {
2738 ct.value = 0;
2739 goto bailout;
2740 }
2741
2742 if (ct.encoding == None)
2743 goto bailout;
2744
2745 if (bytes_after)
2746 {
2747 // fetch and append remaining data
2748 XTextProperty ct2;
2749
2750 if (XGetWindowProperty (dpy, win, prop,
2751 ct.nitems / 4, (bytes_after + 3) / 4,
2752 delete_prop, AnyPropertyType,
2753 &ct2.encoding, &ct2.format,
2754 &ct2.nitems, &bytes_after,
2755 &ct2.value) != Success)
2756 goto bailout;
2757
2758 // realloc should be compatible to XFree, here, and elsewhere, too
2759 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2760 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2761 ct.nitems += ct2.nitems;
2762
2763 XFree (ct2.value);
2764 }
2765
2766 if (ct.value == 0)
2767 goto bailout;
2768
2769 if (ct.encoding == xa[XA_INCR])
2770 {
2771 // INCR selection, start handshake
2772 if (!delete_prop)
2773 XDeleteProperty (dpy, win, prop);
2774
2775 selection_wait = Sel_incr;
2776 incr_buf_fill = 0;
2777 incr_ev.start (10);
2778
2779 goto bailout;
2780 }
2781
2782 if (ct.nitems == 0)
2783 {
2784 if (selection_wait == Sel_incr)
2785 {
2786 XFree (ct.value);
2787
2788 // finally complete, now paste the whole thing
2789 selection_wait = Sel_normal;
2790 ct.value = (unsigned char *)incr_buf;
2791 ct.nitems = incr_buf_fill;
2792 incr_buf = 0;
2793 incr_buf_size = 0;
2794 incr_ev.stop ();
2795 }
2796 else
2797 {
2798 if (selection_wait == Sel_normal
2799 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2800 {
2801 /*
2802 * pass through again trying CUT_BUFFER0 if we've come from
2803 * XConvertSelection () but nothing was presented
2804 */
2805 selection_paste (display->root, XA_CUT_BUFFER0, False);
2806 }
2807
2808 goto bailout;
2809 }
2810 }
2811 else if (selection_wait == Sel_incr)
2812 {
2813 incr_ev.start (10);
2814
2815 while (incr_buf_fill + ct.nitems > incr_buf_size)
2816 {
2817 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2818 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2819 }
2820
2821 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2822 incr_buf_fill += ct.nitems;
2823
2824 goto bailout;
2825 }
2826
2827 char **cl;
2828 int cr;
2829
2830#if !ENABLE_MINIMAL
2831 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2832 // so recode it manually
2833 if (ct.encoding == xa[XA_UTF8_STRING])
2834 {
2835 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2836 char *s = rxvt_wcstombs (w);
2837 free (w);
2838 // TODO: strlen == only the first element will be converted. well...
2839 paste (s, strlen (s));
2840 free (s);
2841 }
2842 else
2843#endif
2844 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2845 && cl)
2846 {
2847 for (int i = 0; i < cr; i++)
2848 paste (cl[i], strlen (cl[i]));
2849
2850 XFreeStringList (cl);
2851 }
2852 else
2853 paste ((char *)ct.value, ct.nitems); // paste raw
2854
2855bailout:
2856 XFree (ct.value);
2857
2858 if (selection_wait == Sel_normal)
2859 selection_wait = Sel_none;
2860}
2861
2862void
2863rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2864{
2865 selection_wait = Sel_none;
2866
2867 incr_buf_size = 0;
2868 free (incr_buf);
2869
2870 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2871}
2872
2873void
2874rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2875{
2876 if (prop == None || selection_wait != Sel_incr)
2877 return; 2751 return;
2878 2752
2879 selection_paste (win, prop, true); 2753 tt_paste (data, len);
2880} 2754}
2881 2755
2882/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2883/* 2757/*
2884 * Request the current selection: 2758 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2885 * Order: > internal selection if available 2759 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2886 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2760 * as fallback
2887 * > CUT_BUFFER0
2888 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2889 * will auto fallback to CUT_BUFFER0
2890 * EXT: button 2 release 2761 * EXT: button 2 release
2891 */ 2762 */
2892void 2763void
2893rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2764rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2894{ 2765{
2895 if (selection.text && selnum == Sel_Primary) 2766 if (!selection_req)
2896 {
2897 /* internal selection */
2898 char *str = rxvt_wcstombs (selection.text, selection.len);
2899 paste (str, strlen (str));
2900 free (str);
2901 return;
2902 } 2767 {
2903 else 2768 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2769 selection_req->run ();
2904 { 2770 }
2905 selection_request_time = tm;
2906 selection_wait = Sel_normal;
2907
2908#if X_HAVE_UTF8_STRING
2909 selection_type = Sel_UTF8String;
2910 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2911 return;
2912#else
2913 selection_type = Sel_CompoundText;
2914 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2915 return;
2916#endif
2917 }
2918
2919 selection_wait = Sel_none; /* don't loop in selection_paste () */
2920 selection_paste (display->root, XA_CUT_BUFFER0, false);
2921}
2922
2923int
2924rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2925{
2926 Atom sel;
2927
2928 selection_type |= selnum;
2929
2930 if (selnum == Sel_Primary)
2931 sel = XA_PRIMARY;
2932 else if (selnum == Sel_Secondary)
2933 sel = XA_SECONDARY;
2934 else
2935 sel = xa[XA_CLIPBOARD];
2936
2937 if (XGetSelectionOwner (dpy, sel) != None)
2938 {
2939 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2940 vt, selection_request_time);
2941 return 1;
2942 }
2943
2944 return 0;
2945} 2771}
2946 2772
2947/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2948/* 2774/*
2949 * Clear all selected text 2775 * Clear all selected text
2950 * EXT: SelectionClear 2776 * EXT: SelectionClear
2951 */ 2777 */
2952void 2778void
2953rxvt_term::selection_clear () NOTHROW 2779rxvt_term::selection_clear (bool clipboard) NOTHROW
2954{ 2780{
2781 if (!clipboard)
2782 {
2955 want_refresh = 1; 2783 want_refresh = 1;
2956 free (selection.text); 2784 free (selection.text);
2957 selection.text = NULL; 2785 selection.text = NULL;
2958 selection.len = 0; 2786 selection.len = 0;
2959 CLEAR_SELECTION (); 2787 CLEAR_SELECTION ();
2960 2788
2961 if (display->selection_owner == this) 2789 if (display->selection_owner == this)
2962 display->selection_owner = 0; 2790 display->selection_owner = 0;
2791 }
2792 else
2793 {
2794 free (selection.clip_text);
2795 selection.clip_text = NULL;
2796 selection.clip_len = 0;
2797
2798 if (display->clipboard_owner == this)
2799 display->clipboard_owner = 0;
2800 }
2963} 2801}
2964 2802
2965/* ------------------------------------------------------------------------- */ 2803/* ------------------------------------------------------------------------- */
2966/* 2804/*
2967 * Copy a selection into the cut buffer 2805 * Copy a selection into the cut buffer
2968 * EXT: button 1 or 3 release 2806 * EXT: button 1 or 3 release
2969 */ 2807 */
2970void 2808void
2971rxvt_term::selection_make (Time tm) 2809rxvt_term::selection_make (Time tm)
2972{ 2810{
2973 int i; 2811 int size;
2974 wchar_t *new_selection_text; 2812 wchar_t *new_selection_text;
2975 text_t *t; 2813 text_t *t;
2976 2814
2977 switch (selection.op) 2815 switch (selection.op)
2978 { 2816 {
… …
2994 return; /* nothing selected, go away */ 2832 return; /* nothing selected, go away */
2995 2833
2996 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2834 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2997 return; 2835 return;
2998 2836
2999 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2837 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3000 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2838 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3001 2839
3002 int ofs = 0; 2840 int ofs = 0;
3003 int extra = 0; 2841 int extra = 0;
3004 2842
3005 int col = selection.beg.col; 2843 int col = selection.beg.col;
… …
3011 { 2849 {
3012#if !ENABLE_MINIMAL 2850#if !ENABLE_MINIMAL
3013 if (selection.rect) 2851 if (selection.rect)
3014 { 2852 {
3015 col = selection.beg.col; 2853 col = selection.beg.col;
3016 end_col = ncol + 1; 2854 end_col = selection.end.col;
3017 } 2855 }
3018 else 2856 else
3019#endif 2857#endif
3020 end_col = ROW(row).l; 2858 end_col = ROW(row).l;
3021 2859
3022 col = max (col, 0); 2860 col = max (col, 0);
3023 2861
3024 if (row == selection.end.row 2862 if (row == selection.end.row)
3025#if !ENABLE_MINIMAL
3026 || selection.rect
3027#endif
3028 )
3029 min_it (end_col, selection.end.col); 2863 min_it (end_col, selection.end.col);
3030 2864
3031 t = ROW(row).t + col; 2865 t = ROW(row).t + col;
3032 2866
3033 for (; col < end_col; col++) 2867 for (; col < end_col; col++)
… …
3041 2875
3042 extra -= (len - 1); 2876 extra -= (len - 1);
3043 2877
3044 if (extra < 0) 2878 if (extra < 0)
3045 { 2879 {
3046 extra += i; 2880 extra += size;
3047 i += i; 2881 size += size;
3048 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2882 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3049 } 2883 }
3050 2884
3051 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2885 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3052 } 2886 }
3053#endif 2887#endif
… …
3065 2899
3066 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3067 } 2901 }
3068 else 2902 else
3069#endif 2903#endif
3070 if (!ROW(row).is_longer () && row != selection.end.row) 2904 if (!ROW(row).is_longer ()
2905 && (row != selection.end.row || end_col != selection.end.col)
2906 && (row != selection.beg.row || selection.beg.col < ncol))
3071 new_selection_text[ofs++] = C0_LF; 2907 new_selection_text[ofs++] = C0_LF;
3072 } 2908 }
3073
3074 if (end_col != selection.end.col)
3075 new_selection_text[ofs++] = C0_LF;
3076 2909
3077 new_selection_text[ofs] = 0; 2910 new_selection_text[ofs] = 0;
3078 2911
3079 if (ofs == 0) 2912 if (ofs == 0)
3080 { 2913 {
… …
3093 2926
3094 selection_grab (tm); 2927 selection_grab (tm);
3095} 2928}
3096 2929
3097bool 2930bool
3098rxvt_term::selection_grab (Time tm) NOTHROW 2931rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3099{ 2932{
2933 Atom sel;
2934
2935 if (!clipboard)
2936 {
3100 selection_time = tm; 2937 selection_time = tm;
2938 sel = XA_PRIMARY;
2939 }
2940 else
2941 {
2942 clipboard_time = tm;
2943 sel = xa[XA_CLIPBOARD];
2944 }
3101 2945
3102 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2946 XSetSelectionOwner (dpy, sel, vt, tm);
3103 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2947 if (XGetSelectionOwner (dpy, sel) == vt)
3104 { 2948 {
3105 display->set_selection_owner (this); 2949 display->set_selection_owner (this, clipboard);
3106 return true; 2950 return true;
3107 } 2951 }
3108 else 2952 else
3109 { 2953 {
3110 selection_clear (); 2954 selection_clear (clipboard);
3111 return false; 2955 return false;
3112 } 2956 }
3113 2957
3114#if 0 2958#if 0
3115 XTextProperty ct; 2959 XTextProperty ct;
… …
3575 * EXT: SelectionRequest 3419 * EXT: SelectionRequest
3576 */ 3420 */
3577void 3421void
3578rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3579{ 3423{
3424 Atom property = rq.property == None ? rq.target : rq.property;
3580 XSelectionEvent ev; 3425 XSelectionEvent ev;
3581 3426
3582 ev.type = SelectionNotify; 3427 ev.type = SelectionNotify;
3583 ev.property = None; 3428 ev.property = None;
3584 ev.display = rq.display; 3429 ev.display = rq.display;
… …
3599 *target++ = xa[XA_COMPOUND_TEXT]; 3444 *target++ = xa[XA_COMPOUND_TEXT];
3600#if X_HAVE_UTF8_STRING 3445#if X_HAVE_UTF8_STRING
3601 *target++ = xa[XA_UTF8_STRING]; 3446 *target++ = xa[XA_UTF8_STRING];
3602#endif 3447#endif
3603 3448
3604 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3449 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3605 32, PropModeReplace, 3450 32, PropModeReplace,
3606 (unsigned char *)target_list, target - target_list); 3451 (unsigned char *)target_list, target - target_list);
3607 ev.property = rq.property; 3452 ev.property = property;
3608 } 3453 }
3609#if TODO // TODO 3454#if TODO // TODO
3610 else if (rq.target == xa[XA_MULTIPLE]) 3455 else if (rq.target == xa[XA_MULTIPLE])
3611 { 3456 {
3612 /* TODO: Handle MULTIPLE */ 3457 /* TODO: Handle MULTIPLE */
3613 } 3458 }
3614#endif 3459#endif
3615 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3616 { 3461 {
3617 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3462 XChangeProperty (dpy, rq.requestor, property, rq.target,
3618 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3463 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3619 ev.property = rq.property; 3464 ev.property = property;
3465 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 {
3468 XChangeProperty (dpy, rq.requestor, property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3470 ev.property = property;
3620 } 3471 }
3621 else if (rq.target == XA_STRING 3472 else if (rq.target == XA_STRING
3622 || rq.target == xa[XA_TEXT] 3473 || rq.target == xa[XA_TEXT]
3623 || rq.target == xa[XA_COMPOUND_TEXT] 3474 || rq.target == xa[XA_COMPOUND_TEXT]
3624 || rq.target == xa[XA_UTF8_STRING] 3475 || rq.target == xa[XA_UTF8_STRING]
… …
3656 { 3507 {
3657 target = xa[XA_COMPOUND_TEXT]; 3508 target = xa[XA_COMPOUND_TEXT];
3658 style = enc_compound_text; 3509 style = enc_compound_text;
3659 } 3510 }
3660 3511
3661 if (selection.text) 3512 if (rq.selection == XA_PRIMARY && selection.text)
3662 { 3513 {
3663 cl = selection.text; 3514 cl = selection.text;
3664 selectlen = selection.len; 3515 selectlen = selection.len;
3516 }
3517 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3518 {
3519 cl = selection.clip_text;
3520 selectlen = selection.clip_len;
3665 } 3521 }
3666 else 3522 else
3667 { 3523 {
3668 cl = L""; 3524 cl = L"";
3669 selectlen = 0; 3525 selectlen = 0;
… …
3690 ct.value = (unsigned char *)cl; 3546 ct.value = (unsigned char *)cl;
3691 ct.nitems = selectlen; 3547 ct.nitems = selectlen;
3692 ct.encoding = target; 3548 ct.encoding = target;
3693 } 3549 }
3694 3550
3695 XChangeProperty (dpy, rq.requestor, rq.property, 3551 XChangeProperty (dpy, rq.requestor, property,
3696 ct.encoding, 8, PropModeReplace, 3552 ct.encoding, 8, PropModeReplace,
3697 ct.value, (int)ct.nitems); 3553 ct.value, (int)ct.nitems);
3698 ev.property = rq.property; 3554 ev.property = property;
3699 3555
3700 if (freect) 3556 if (freect)
3701 XFree (ct.value); 3557 XFree (ct.value);
3702 } 3558 }
3703 3559
… …
3737 h += 2; min_it (h, nrow); 3593 h += 2; min_it (h, nrow);
3738 3594
3739 x -= 1; clamp_it (x, 0, ncol - w); 3595 x -= 1; clamp_it (x, 0, ncol - w);
3740 y -= 1; clamp_it (y, 0, nrow - h); 3596 y -= 1; clamp_it (y, 0, nrow - h);
3741 3597
3742 ov_x = x; ov_y = y; 3598 ov.x = x; ov.y = y;
3743 ov_w = w; ov_h = h; 3599 ov.w = w; ov.h = h;
3744 3600
3745 ov_text = new text_t *[h]; 3601 ov.text = new text_t *[h];
3746 ov_rend = new rend_t *[h]; 3602 ov.rend = new rend_t *[h];
3747 3603
3748 for (y = 0; y < h; y++) 3604 for (y = 0; y < h; y++)
3749 { 3605 {
3750 text_t *tp = ov_text[y] = new text_t[w]; 3606 text_t *tp = ov.text[y] = new text_t[w];
3751 rend_t *rp = ov_rend[y] = new rend_t[w]; 3607 rend_t *rp = ov.rend[y] = new rend_t[w];
3752 3608
3753 text_t t0, t1, t2; 3609 text_t t0, t1, t2;
3754 rend_t r = OVERLAY_RSTYLE; 3610 rend_t r = OVERLAY_RSTYLE;
3755 3611
3756 if (y == 0) 3612 if (y == 0)
… …
3775} 3631}
3776 3632
3777void 3633void
3778rxvt_term::scr_overlay_off () NOTHROW 3634rxvt_term::scr_overlay_off () NOTHROW
3779{ 3635{
3780 if (!ov_text) 3636 if (!ov.text)
3781 return; 3637 return;
3782 3638
3783 want_refresh = 1; 3639 want_refresh = 1;
3784 3640
3785 for (int y = 0; y < ov_h; y++) 3641 for (int y = 0; y < ov.h; y++)
3786 { 3642 {
3787 delete [] ov_text[y]; 3643 delete [] ov.text[y];
3788 delete [] ov_rend[y]; 3644 delete [] ov.rend[y];
3789 } 3645 }
3790 3646
3791 delete [] ov_text; ov_text = 0; 3647 delete [] ov.text; ov.text = 0;
3792 delete [] ov_rend; ov_rend = 0; 3648 delete [] ov.rend; ov.rend = 0;
3793} 3649}
3794 3650
3795void 3651void
3796rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3797{ 3653{
3798 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3654 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3799 return; 3655 return;
3800 3656
3801 x++, y++; 3657 x++, y++;
3802 3658
3803 ov_text[y][x] = text; 3659 ov.text[y][x] = text;
3804 ov_rend[y][x] = rend; 3660 ov.rend[y][x] = rend;
3805} 3661}
3806 3662
3807void 3663void
3808rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3664rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3809{ 3665{
… …
3828} 3684}
3829 3685
3830void 3686void
3831rxvt_term::scr_swap_overlay () NOTHROW 3687rxvt_term::scr_swap_overlay () NOTHROW
3832{ 3688{
3833 if (!ov_text) 3689 if (!ov.text)
3834 return; 3690 return;
3835 3691
3692 // hide cursor if it is within the overlay area
3693 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3694 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3695 screen.flags &= ~Screen_VisibleCursor;
3696
3836 // swap screen mem with overlay 3697 // swap screen mem with overlay
3837 for (int y = ov_h; y--; ) 3698 for (int y = ov.h; y--; )
3838 { 3699 {
3839 text_t *t1 = ov_text[y]; 3700 text_t *t1 = ov.text[y];
3840 rend_t *r1 = ov_rend[y]; 3701 rend_t *r1 = ov.rend[y];
3841 3702
3842 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3703 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3843 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3704 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3844 3705
3845 for (int x = ov_w; x--; ) 3706 for (int x = ov.w; x--; )
3846 { 3707 {
3847 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3708 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3709 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3849 } 3710 }
3850 } 3711 }

Diff Legend

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