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.320 by root, Tue Nov 4 23:20:17 2008 UTC vs.
Revision 1.393 by root, Sun Jul 10 00:40:17 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
167
164 view_start = 0; 168 view_start = 0;
165
166 num_scr = 0; 169 num_scr = 0;
167 170
168 if (ncol == 0) 171 if (ncol == 0)
169 ncol = 80; 172 ncol = 80;
170 173
… …
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 }
751 } 770 }
752 771
753 return count; 772 return count;
754} 773}
755 774
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
786 } 805 }
787 } 806 }
788 807
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 811 int row = screen.cur.row;
795 812
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 814
798 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
799 816
800 while (str < strend) 817 while (str < strend)
801 { 818 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 820
804 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 822 if (c == C0_LF)
806 { 823 {
807 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
808 825
809 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
828 { 845 {
829 scr_tab (1, true); 846 scr_tab (1, true);
830 continue; 847 continue;
831 } 848 }
832 849
833 if (expect_false ( 850 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 854 ))
838 { 855 {
… …
843 * should be a similar check. 860 * should be a similar check.
844 */ 861 */
845 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
846 } 863 }
847 864
848 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 866 {
850 scr_do_wrap (); 867 scr_do_wrap ();
851 868
852 line->l = ncol; 869 line->l = ncol;
853 line->is_longer (1); 870 line->is_longer (1);
… …
855 row = screen.cur.row; 872 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
857 } 874 }
858 875
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 878 c = 0xfffd;
862 879
863 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
866 // locale. 883 // locale.
867 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
868 885
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 887 {
871 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 889 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
889 } 906 }
890 } 907 }
891 908
892 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
894 911
895 if (width != 0) 912 if (width != 0)
896 { 913 {
897#if !UNICODE_3 914#if !UNICODE_3
… …
902# else 919# else
903 c = 0xfffd; 920 c = 0xfffd;
904# endif 921# endif
905#endif 922#endif
906 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
907 // nuke the character at this position, if required 940 // nuke the character at this position, if required
908 if (expect_false ( 941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
909 line->t[screen.cur.col] == NOCHAR 944 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); 945 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 946
926 line->touch (); 947 line->touch ();
927 948
928 do 949 do
929 { 950 {
930 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
932 953
933 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 955 screen.cur.col++;
935 else 956 else
936 { 957 {
937 line->l = ncol; 958 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
940 break; 961
962 goto end_of_line;
941 } 963 }
942 964
943 c = NOCHAR; 965 c = NOCHAR;
944 } 966 }
945 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
946 968
947 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
949 { 971 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 972 line->t[c] = ' ';
955 line->r[c] = rend; 973 line->r[c] = rend;
956 }
957 } 974 }
975
976end_of_line:
977 ;
958 } 978 }
959#if ENABLE_COMBINING 979#if ENABLE_COMBINING
960 else // width == 0 980 else // width == 0
961 { 981 {
962 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1022#endif
1003 } 1023 }
1004 1024
1005 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
1006 1026
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1009#endif
1010} 1028}
1011 1029
1012/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1013/* 1031/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1032 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1045
1028 want_refresh = 1; 1046 want_refresh = 1;
1029#endif 1047#endif
1030 } 1048 }
1031 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1032 else 1052 else
1033 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1034} 1054}
1035 1055
1036/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1343 return; 1363 return;
1344 1364
1345 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1346 1366
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1370 {
1352 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1353 1372
1354 if (mapped) 1373 if (mapped)
1355 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1358 } 1377 }
1359 else 1378 else
1360 { 1379 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1381
1382 if (mapped)
1383 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row), 1387 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1388 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 }
1371 } 1393 }
1372 1394
1373 for (; num--; row++) 1395 for (; num--; row++)
1374 { 1396 {
1375 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1398
1399 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1401 }
1378} 1402}
1379 1403
1380#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1381void 1405void
… …
1534 { 1558 {
1535 line->t[col] = line->t[col + count]; 1559 line->t[col] = line->t[col + count];
1536 line->r[col] = line->r[col + count]; 1560 line->r[col] = line->r[col + count];
1537 } 1561 }
1538 1562
1539 scr_blank_line (*line, ncol - count, count, 1563 scr_blank_line (*line, ncol - count, count, rstyle);
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1541 1564
1542 if (selection.op && current_screen == selection.screen 1565 if (selection.op && current_screen == selection.screen
1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1566 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1544 { 1567 {
1545 if (selection.end.row != screen.cur.row 1568 if (selection.end.row != screen.cur.row
… …
1681 { 1704 {
1682 rvideo_state = on; 1705 rvideo_state = on;
1683 1706
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1707 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1708#ifdef HAVE_BG_PIXMAP
1686 if (bgPixmap.pixmap == None) 1709 if (bg_pixmap == None)
1687#endif 1710#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1711 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1712
1690 XGCValues gcvalue; 1713 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1714 gcvalue.foreground = pix_colors[Color_fg];
… …
1835 for (i = PART_BEG; i < RC_COUNT; i++) 1858 for (i = PART_BEG; i < RC_COUNT; i++)
1836 { 1859 {
1837 min_it (rc[i].col, ncol - 1); 1860 min_it (rc[i].col, ncol - 1);
1838 min_it (rc[i].row, nrow - 1); 1861 min_it (rc[i].row, nrow - 1);
1839 } 1862 }
1840// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1863
1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1864 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1865 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1843 1866
1844 num_scr_allow = 0; 1867 num_scr_allow = 0;
1845 1868
… …
1918 1941
1919# ifndef NO_MAPALERT 1942# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1943# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1944 if (option (Opt_mapAlert))
1922# endif 1945# endif
1923 XMapWindow (dpy, parent[0]); 1946 XMapWindow (dpy, parent);
1924# endif 1947# endif
1925 1948
1926# if ENABLE_FRILLS 1949# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1950 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1951 set_urgency (1);
… …
1936 1959
1937 bell_ev.start (VISUAL_BELL_DURATION); 1960 bell_ev.start (VISUAL_BELL_DURATION);
1938 } 1961 }
1939 else 1962 else
1940 XBell (dpy, 0); 1963 XBell (dpy, 0);
1964 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1965#endif
1942} 1966}
1943 1967
1944/* ------------------------------------------------------------------------- */ 1968/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */
1946void 1969void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1970rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1971{
1949#ifdef PRINTPIPE 1972#ifdef PRINTPIPE
1950 int nrows, row_start; 1973 int nrows, row_start;
… …
1964 row_start = view_start; 1987 row_start = view_start;
1965 } 1988 }
1966 1989
1967 wctomb (0, 0); 1990 wctomb (0, 0);
1968 1991
1969 for (int r1 = 0; r1 < nrows; r1++) 1992 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1970 { 1993 {
1971 text_t *tp = ROW(r1).t; 1994 text_t *tp = ROW(r1).t;
1972 int len = ROW(r1).l; 1995 int len = ROW(r1).l;
1973 1996
1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1997 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2003 * screen.text/screen.rend contain what the screen will change to. 2026 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2027 */
2005void 2028void
2006rxvt_term::scr_refresh () NOTHROW 2029rxvt_term::scr_refresh () NOTHROW
2007{ 2030{
2008 unsigned char have_bg,
2009 showcursor; /* show the cursor */
2010 int16_t col, row, /* column/row we're processing */ 2031 int16_t col, row, /* column/row we're processing */
2011 ocrow; /* old cursor row */ 2032 ocrow; /* old cursor row */
2012 int i; /* tmp */ 2033 int i; /* tmp */
2013#ifndef NO_CURSORCOLOR 2034#ifndef NO_CURSORCOLOR
2014 rend_t cc1; /* store colours at cursor position (s) */ 2035 rend_t cc1; /* store colours at cursor position (s) */
… …
2025 /* 2046 /*
2026 * A: set up vars 2047 * A: set up vars
2027 */ 2048 */
2028 refresh_count = 0; 2049 refresh_count = 0;
2029 2050
2051 unsigned int old_screen_flags = screen.flags;
2030 have_bg = 0; 2052 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2053#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2054 have_bg = bg_pixmap != None;
2033#endif 2055#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2056 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2057
2036 /* 2058 /*
2037 * B: reverse any characters which are selected 2059 * B: reverse any characters which are selected
2038 */ 2060 */
2039 scr_reverse_selection (); 2061 scr_reverse_selection ();
2062
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY
2065 scr_swap_overlay ();
2066#endif
2067
2068 char showcursor = screen.flags & Screen_VisibleCursor;
2040 2069
2041 /* 2070 /*
2042 * C: set the cursor character (s) 2071 * C: set the cursor character (s)
2043 */ 2072 */
2044 { 2073 {
2045 unsigned char setoldcursor; 2074 unsigned char setoldcursor;
2046 2075
2047 showcursor = (screen.flags & Screen_VisibleCursor);
2048#ifdef CURSOR_BLINK 2076#ifdef CURSOR_BLINK
2049 if (hidden_cursor) 2077 if (hidden_cursor)
2050 showcursor = 0; 2078 showcursor = 0;
2051#endif 2079#endif
2052 2080
… …
2080 ccol2 = bgcolor_of (rstyle); 2108 ccol2 = bgcolor_of (rstyle);
2081#else 2109#else
2082 ccol2 = Color_bg; 2110 ccol2 = Color_bg;
2083#endif 2111#endif
2084 2112
2085 if (showcursor && focus) 2113 if (focus)
2086 { 2114 {
2087 if (option (Opt_cursorUnderline)) 2115 if (option (Opt_cursorUnderline))
2088 *crp ^= RS_Uline; 2116 *crp ^= RS_Uline;
2089 else 2117 else
2090 { 2118 {
… …
2125 oldcursor.col = screen.cur.col; 2153 oldcursor.col = screen.cur.col;
2126 } 2154 }
2127 } 2155 }
2128 } 2156 }
2129 2157
2130 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2131#if ENABLE_OVERLAY
2132 scr_swap_overlay ();
2133#endif
2134
2135#ifndef NO_SLOW_LINK_SUPPORT 2158#ifndef NO_SLOW_LINK_SUPPORT
2136 /* 2159 /*
2137 * D: CopyArea pass - very useful for slower links 2160 * D: CopyArea pass - very useful for slower links
2138 * This has been deliberately kept simple. 2161 * This has been deliberately kept simple.
2139 */ 2162 */
… …
2228 continue; 2251 continue;
2229 2252
2230 // redraw one or more characters 2253 // redraw one or more characters
2231 2254
2232 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2257 --col;
2235 2258
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2260 text_t *text = stp + col;
2238 int count = 1; 2261 int count = 1;
2239 2262
2240 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2241 drp[col] = rend; 2264 drp[col] = rend;
… …
2245 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2246 { 2269 {
2247 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2248 { 2271 {
2249 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2250 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2251 count++; 2275 count++;
2252 i++; 2276 i++;
2253 2277
2254 continue; 2278 continue;
2255 } 2279 }
… …
2275 2299
2276 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2277 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2278 2302
2279 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2280 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2281 count++, i--; 2305 count++, i--;
2282 2306
2283 /* 2307 /*
2284 * Determine the attributes for the string 2308 * Determine the attributes for the string
2285 */ 2309 */
2286 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2287 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2288 2312
2289 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2290 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2291 { 2315 {
2292 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2293 2317
2294#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2295 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2314 2338
2315 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2316 fore = Color_UL; 2340 fore = Color_UL;
2317#endif 2341#endif
2318 2342
2343#ifdef OPTION_HC
2344 if (rend & RS_Sel)
2345 {
2346 /* invert the column if no highlightColor is set or it is the
2347 * current cursor column */
2348 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2349 && ISSET_PIXCOLOR (Color_HC))
2350 {
2351 if (ISSET_PIXCOLOR (Color_HTC))
2352 fore = Color_HTC;
2353 // if invert is 0 reverse video is set so we use bg color as fg color
2354 else if (!invert)
2355 fore = back;
2356
2357 back = Color_HC;
2358 invert = 0;
2359 }
2360 }
2361#endif
2362
2319 if (invert) 2363 if (invert)
2320 { 2364 {
2321#ifdef OPTION_HC
2322 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2323 || !ISSET_PIXCOLOR (Color_HC))
2324#endif
2325 /* invert the column if no highlightColor is set or it is the
2326 * current cursor column */
2327 ::swap (fore, back); 2365 ::swap (fore, back);
2328#ifdef OPTION_HC
2329 else if (ISSET_PIXCOLOR (Color_HC))
2330 back = Color_HC;
2331#endif
2332 2366
2333#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2334# ifndef OPTION_HC
2335 if (ISSET_PIXCOLOR (Color_RV))
2336 back = Color_RV;
2337# endif
2338 if (fore == back) 2368 if (fore == back)
2339 { 2369 {
2340 fore = Color_bg; 2370 fore = Color_bg;
2341 back = Color_fg; 2371 back = Color_fg;
2342 } 2372 }
… …
2378 /* 2408 /*
2379 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2380 */ 2410 */
2381 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2382 2412
2383 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2384 { 2414 {
2385 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2386 2416
2387 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2388 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2395 did_clear: ; 2425 did_clear: ;
2396 } 2426 }
2397 else 2427 else
2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2399 2429
2400 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2401 { 2431 {
2402#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2403 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2404 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2405 else 2435 else
… …
2410 xpixel, ypixel + font->ascent + 1, 2440 xpixel, ypixel + font->ascent + 1,
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2441 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2442 }
2413 } /* for (col....) */ 2443 } /* for (col....) */
2414 } /* for (row....) */ 2444 } /* for (row....) */
2415
2416#if ENABLE_OVERLAY
2417 scr_swap_overlay ();
2418#endif
2419 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2420 2445
2421 /* 2446 /*
2422 * G: cleanup cursor and display outline cursor if necessary 2447 * G: cleanup cursor and display outline cursor if necessary
2423 */ 2448 */
2424 if (showcursor) 2449 if (showcursor)
… …
2463 } 2488 }
2464 2489
2465 /* 2490 /*
2466 * H: cleanup selection 2491 * H: cleanup selection
2467 */ 2492 */
2493#if ENABLE_OVERLAY
2494 scr_swap_overlay ();
2495#endif
2496 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2497
2468 scr_reverse_selection (); 2498 scr_reverse_selection ();
2469 2499
2500 screen.flags = old_screen_flags;
2470 num_scr = 0; 2501 num_scr = 0;
2471 num_scr_allow = 1; 2502 num_scr_allow = 1;
2472} 2503}
2473 2504
2474void 2505void
… …
2495 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2496 } 2527 }
2497} 2528}
2498 2529
2499void 2530void
2500rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2501{ 2532{
2533 bool transparent = false;
2534
2502#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2503 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2504#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2505 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2507 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2509 2561
2510 if (scrollBar.win) 2562 if (scrollBar.win)
2511 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2513 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = STATE_IDLE;
2514 scrollBar.show (0); 2569 scrollBar.show (0);
2515 } 2570 }
2516 2571
2517#endif 2572 if (refresh)
2518 2573 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2574 scr_clear ();
2521 scr_touch (true); 2575 scr_touch (true);
2576 }
2522 want_refresh = 1; 2577 want_refresh = 1;
2523} 2578}
2524 2579
2525/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2526void 2581void
… …
2594 { 2649 {
2595#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2596 if (selection.rect) 2651 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2655 else
2601#endif 2656#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2604 RS_RVid); 2659 RS_Sel | RS_RVid);
2605 } 2660 }
2606} 2661}
2607 2662
2608/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2609/* 2664/*
… …
2614void 2669void
2615rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2616{ 2671{
2617 int row, wrote; 2672 int row, wrote;
2618 unsigned int width, towrite; 2673 unsigned int width, towrite;
2619 char r1[] = "\n"; 2674 const char r1[] = "\n";
2620 2675
2621 for (row = saveLines + top_row; 2676 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++) 2677 row < saveLines + nrow - 1; row++)
2623 { 2678 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l 2679 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2670/* ------------------------------------------------------------------------- */ 2725/* ------------------------------------------------------------------------- */
2671/* 2726/*
2672 * Paste a selection direct to the command fd 2727 * Paste a selection direct to the command fd
2673 */ 2728 */
2674void 2729void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2730rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2731{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2732 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2733 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2734 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2735 data[i] = C0_CR;
… …
2686 2741
2687 if (priv_modes & PrivMode_BracketPaste) 2742 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2743 tt_printf ("\e[201~");
2689} 2744}
2690 2745
2691/* ------------------------------------------------------------------------- */
2692/*
2693 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify
2695 */
2696void 2746void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2747rxvt_term::paste (char *data, unsigned int len) NOTHROW
2698{ 2748{
2699 if (prop == None) /* check for failed XConvertSelection */ 2749 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2700 {
2701 if ((selection_type & Sel_CompoundText))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = 0;
2706 if (selnum != Sel_direct)
2707 selection_request_other (XA_STRING, selnum);
2708 }
2709
2710 if ((selection_type & Sel_UTF8String))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = Sel_CompoundText;
2715 if (selnum != Sel_direct)
2716 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2717 else
2718 selection_type = 0;
2719 }
2720
2721 return;
2722 }
2723
2724 unsigned long bytes_after;
2725 XTextProperty ct;
2726
2727 if (XGetWindowProperty (dpy, win, prop,
2728 0, PROP_SIZE / 4,
2729 delete_prop, AnyPropertyType,
2730 &ct.encoding, &ct.format,
2731 &ct.nitems, &bytes_after,
2732 &ct.value) != Success)
2733 {
2734 ct.value = 0;
2735 goto bailout;
2736 }
2737
2738 if (ct.encoding == None)
2739 goto bailout;
2740
2741 if (bytes_after)
2742 {
2743 // fetch and append remaining data
2744 XTextProperty ct2;
2745
2746 if (XGetWindowProperty (dpy, win, prop,
2747 ct.nitems / 4, (bytes_after + 3) / 4,
2748 delete_prop, AnyPropertyType,
2749 &ct2.encoding, &ct2.format,
2750 &ct2.nitems, &bytes_after,
2751 &ct2.value) != Success)
2752 goto bailout;
2753
2754 // realloc should be compatible to XFree, here, and elsewhere, too
2755 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2756 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2757 ct.nitems += ct2.nitems;
2758
2759 XFree (ct2.value);
2760 }
2761
2762 if (ct.value == 0)
2763 goto bailout;
2764
2765 if (ct.encoding == xa[XA_INCR])
2766 {
2767 // INCR selection, start handshake
2768 if (!delete_prop)
2769 XDeleteProperty (dpy, win, prop);
2770
2771 selection_wait = Sel_incr;
2772 incr_buf_fill = 0;
2773 incr_ev.start (10);
2774
2775 goto bailout;
2776 }
2777
2778 if (ct.nitems == 0)
2779 {
2780 if (selection_wait == Sel_incr)
2781 {
2782 XFree (ct.value);
2783
2784 // finally complete, now paste the whole thing
2785 selection_wait = Sel_normal;
2786 ct.value = (unsigned char *)incr_buf;
2787 ct.nitems = incr_buf_fill;
2788 incr_buf = 0;
2789 incr_buf_size = 0;
2790 incr_ev.stop ();
2791 }
2792 else
2793 {
2794 if (selection_wait == Sel_normal
2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2796 {
2797 /*
2798 * pass through again trying CUT_BUFFER0 if we've come from
2799 * XConvertSelection () but nothing was presented
2800 */
2801 selection_paste (display->root, XA_CUT_BUFFER0, False);
2802 }
2803
2804 goto bailout;
2805 }
2806 }
2807 else if (selection_wait == Sel_incr)
2808 {
2809 incr_ev.start (10);
2810
2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2812 {
2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2815 }
2816
2817 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2818 incr_buf_fill += ct.nitems;
2819
2820 goto bailout;
2821 }
2822
2823 char **cl;
2824 int cr;
2825
2826#if !ENABLE_MINIMAL
2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2828 // so recode it manually
2829 if (ct.encoding == xa[XA_UTF8_STRING])
2830 {
2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2832 char *s = rxvt_wcstombs (w);
2833 free (w);
2834 // TODO: strlen == only the first element will be converted. well...
2835 paste (s, strlen (s));
2836 free (s);
2837 }
2838 else
2839#endif
2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2841 && cl)
2842 {
2843 for (int i = 0; i < cr; i++)
2844 paste (cl[i], strlen (cl[i]));
2845
2846 XFreeStringList (cl);
2847 }
2848 else
2849 paste ((char *)ct.value, ct.nitems); // paste raw
2850
2851bailout:
2852 XFree (ct.value);
2853
2854 if (selection_wait == Sel_normal)
2855 selection_wait = Sel_none;
2856}
2857
2858void
2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2860{
2861 selection_wait = Sel_none;
2862
2863 incr_buf_size = 0;
2864 free (incr_buf);
2865
2866 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2867}
2868
2869void
2870rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2871{
2872 if (prop == None || selection_wait != Sel_incr)
2873 return; 2750 return;
2874 2751
2875 selection_paste (win, prop, true); 2752 tt_paste (data, len);
2876} 2753}
2877 2754
2878/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2879/* 2756/*
2880 * Request the current selection: 2757 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2881 * Order: > internal selection if available 2758 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2759 * as fallback
2883 * > CUT_BUFFER0
2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2885 * will auto fallback to CUT_BUFFER0
2886 * EXT: button 2 release 2760 * EXT: button 2 release
2887 */ 2761 */
2888void 2762void
2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2763rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2890{ 2764{
2891 if (selection.text && selnum == Sel_Primary) 2765 if (!selection_req)
2892 {
2893 /* internal selection */
2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2895 paste (str, strlen (str));
2896 free (str);
2897 return;
2898 } 2766 {
2899 else 2767 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2768 selection_req->run ();
2900 { 2769 }
2901 selection_request_time = tm;
2902 selection_wait = Sel_normal;
2903
2904#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return;
2908#else
2909 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return;
2912#endif
2913 }
2914
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false);
2917}
2918
2919int
2920rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2921{
2922 Atom sel;
2923
2924 selection_type |= selnum;
2925
2926 if (selnum == Sel_Primary)
2927 sel = XA_PRIMARY;
2928 else if (selnum == Sel_Secondary)
2929 sel = XA_SECONDARY;
2930 else
2931 sel = xa[XA_CLIPBOARD];
2932
2933 if (XGetSelectionOwner (dpy, sel) != None)
2934 {
2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2936 vt, selection_request_time);
2937 return 1;
2938 }
2939
2940 return 0;
2941} 2770}
2942 2771
2943/* ------------------------------------------------------------------------- */ 2772/* ------------------------------------------------------------------------- */
2944/* 2773/*
2945 * Clear all selected text 2774 * Clear all selected text
2946 * EXT: SelectionClear 2775 * EXT: SelectionClear
2947 */ 2776 */
2948void 2777void
2949rxvt_term::selection_clear () NOTHROW 2778rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2779{
2780 if (!clipboard)
2781 {
2951 want_refresh = 1; 2782 want_refresh = 1;
2952 free (selection.text); 2783 free (selection.text);
2953 selection.text = NULL; 2784 selection.text = NULL;
2954 selection.len = 0; 2785 selection.len = 0;
2955 CLEAR_SELECTION (); 2786 CLEAR_SELECTION ();
2956 2787
2957 if (display->selection_owner == this) 2788 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2789 display->selection_owner = 0;
2790 }
2791 else
2792 {
2793 free (selection.clip_text);
2794 selection.clip_text = NULL;
2795 selection.clip_len = 0;
2796
2797 if (display->clipboard_owner == this)
2798 display->clipboard_owner = 0;
2799 }
2959} 2800}
2960 2801
2961/* ------------------------------------------------------------------------- */ 2802/* ------------------------------------------------------------------------- */
2962/* 2803/*
2963 * Copy a selection into the cut buffer 2804 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 2805 * EXT: button 1 or 3 release
2965 */ 2806 */
2966void 2807void
2967rxvt_term::selection_make (Time tm) 2808rxvt_term::selection_make (Time tm)
2968{ 2809{
2969 int i; 2810 int size;
2970 wchar_t *new_selection_text; 2811 wchar_t *new_selection_text;
2971 text_t *t; 2812 text_t *t;
2972 2813
2973 switch (selection.op) 2814 switch (selection.op)
2974 { 2815 {
… …
2990 return; /* nothing selected, go away */ 2831 return; /* nothing selected, go away */
2991 2832
2992 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2833 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2993 return; 2834 return;
2994 2835
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2836 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2837 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2997 2838
2998 int ofs = 0; 2839 int ofs = 0;
2999 int extra = 0; 2840 int extra = 0;
3000 2841
3001 int col = selection.beg.col; 2842 int col = selection.beg.col;
… …
3007 { 2848 {
3008#if !ENABLE_MINIMAL 2849#if !ENABLE_MINIMAL
3009 if (selection.rect) 2850 if (selection.rect)
3010 { 2851 {
3011 col = selection.beg.col; 2852 col = selection.beg.col;
3012 end_col = ncol + 1; 2853 end_col = selection.end.col;
3013 } 2854 }
3014 else 2855 else
3015#endif 2856#endif
3016 end_col = ROW(row).l; 2857 end_col = ROW(row).l;
3017 2858
3018 col = max (col, 0); 2859 col = max (col, 0);
3019 2860
3020 if (row == selection.end.row 2861 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 2862 min_it (end_col, selection.end.col);
3026 2863
3027 t = ROW(row).t + col; 2864 t = ROW(row).t + col;
3028 2865
3029 for (; col < end_col; col++) 2866 for (; col < end_col; col++)
… …
3037 2874
3038 extra -= (len - 1); 2875 extra -= (len - 1);
3039 2876
3040 if (extra < 0) 2877 if (extra < 0)
3041 { 2878 {
3042 extra += i; 2879 extra += size;
3043 i += i; 2880 size += size;
3044 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2881 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3045 } 2882 }
3046 2883
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2884 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 2885 }
3049#endif 2886#endif
… …
3061 2898
3062 new_selection_text[ofs++] = C0_LF; 2899 new_selection_text[ofs++] = C0_LF;
3063 } 2900 }
3064 else 2901 else
3065#endif 2902#endif
3066 if (!ROW(row).is_longer () && row != selection.end.row) 2903 if (!ROW(row).is_longer ()
2904 && (row != selection.end.row || end_col != selection.end.col)
2905 && (row != selection.beg.row || selection.beg.col < ncol))
3067 new_selection_text[ofs++] = C0_LF; 2906 new_selection_text[ofs++] = C0_LF;
3068 } 2907 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 2908
3073 new_selection_text[ofs] = 0; 2909 new_selection_text[ofs] = 0;
3074 2910
3075 if (ofs == 0) 2911 if (ofs == 0)
3076 { 2912 {
… …
3089 2925
3090 selection_grab (tm); 2926 selection_grab (tm);
3091} 2927}
3092 2928
3093bool 2929bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 2930rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 2931{
2932 Atom sel;
2933
2934 if (!clipboard)
2935 {
3096 selection_time = tm; 2936 selection_time = tm;
2937 sel = XA_PRIMARY;
2938 }
2939 else
2940 {
2941 clipboard_time = tm;
2942 sel = xa[XA_CLIPBOARD];
2943 }
3097 2944
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2945 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2946 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 2947 {
3101 display->set_selection_owner (this); 2948 display->set_selection_owner (this, clipboard);
3102 return true; 2949 return true;
3103 } 2950 }
3104 else 2951 else
3105 { 2952 {
3106 selection_clear (); 2953 selection_clear (clipboard);
3107 return false; 2954 return false;
3108 } 2955 }
3109 2956
3110#if 0 2957#if 0
3111 XTextProperty ct; 2958 XTextProperty ct;
… …
3571 * EXT: SelectionRequest 3418 * EXT: SelectionRequest
3572 */ 3419 */
3573void 3420void
3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3421rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3575{ 3422{
3423 Atom property = rq.property == None ? rq.target : rq.property;
3576 XSelectionEvent ev; 3424 XSelectionEvent ev;
3577 3425
3578 ev.type = SelectionNotify; 3426 ev.type = SelectionNotify;
3579 ev.property = None; 3427 ev.property = None;
3580 ev.display = rq.display; 3428 ev.display = rq.display;
… …
3595 *target++ = xa[XA_COMPOUND_TEXT]; 3443 *target++ = xa[XA_COMPOUND_TEXT];
3596#if X_HAVE_UTF8_STRING 3444#if X_HAVE_UTF8_STRING
3597 *target++ = xa[XA_UTF8_STRING]; 3445 *target++ = xa[XA_UTF8_STRING];
3598#endif 3446#endif
3599 3447
3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3448 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3601 32, PropModeReplace, 3449 32, PropModeReplace,
3602 (unsigned char *)target_list, target - target_list); 3450 (unsigned char *)target_list, target - target_list);
3603 ev.property = rq.property; 3451 ev.property = property;
3604 } 3452 }
3605#if TODO // TODO 3453#if TODO // TODO
3606 else if (rq.target == xa[XA_MULTIPLE]) 3454 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3455 {
3608 /* TODO: Handle MULTIPLE */ 3456 /* TODO: Handle MULTIPLE */
3609 } 3457 }
3610#endif 3458#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3460 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3462 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3615 ev.property = rq.property; 3463 ev.property = property;
3464 }
3465 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3466 {
3467 XChangeProperty (dpy, rq.requestor, property, rq.target,
3468 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3469 ev.property = property;
3616 } 3470 }
3617 else if (rq.target == XA_STRING 3471 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3472 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3473 || rq.target == xa[XA_COMPOUND_TEXT]
3620 || rq.target == xa[XA_UTF8_STRING] 3474 || rq.target == xa[XA_UTF8_STRING]
… …
3652 { 3506 {
3653 target = xa[XA_COMPOUND_TEXT]; 3507 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3508 style = enc_compound_text;
3655 } 3509 }
3656 3510
3657 if (selection.text) 3511 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3512 {
3659 cl = selection.text; 3513 cl = selection.text;
3660 selectlen = selection.len; 3514 selectlen = selection.len;
3515 }
3516 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3517 {
3518 cl = selection.clip_text;
3519 selectlen = selection.clip_len;
3661 } 3520 }
3662 else 3521 else
3663 { 3522 {
3664 cl = L""; 3523 cl = L"";
3665 selectlen = 0; 3524 selectlen = 0;
… …
3686 ct.value = (unsigned char *)cl; 3545 ct.value = (unsigned char *)cl;
3687 ct.nitems = selectlen; 3546 ct.nitems = selectlen;
3688 ct.encoding = target; 3547 ct.encoding = target;
3689 } 3548 }
3690 3549
3691 XChangeProperty (dpy, rq.requestor, rq.property, 3550 XChangeProperty (dpy, rq.requestor, property,
3692 ct.encoding, 8, PropModeReplace, 3551 ct.encoding, 8, PropModeReplace,
3693 ct.value, (int)ct.nitems); 3552 ct.value, (int)ct.nitems);
3694 ev.property = rq.property; 3553 ev.property = property;
3695 3554
3696 if (freect) 3555 if (freect)
3697 XFree (ct.value); 3556 XFree (ct.value);
3698 } 3557 }
3699 3558
… …
3733 h += 2; min_it (h, nrow); 3592 h += 2; min_it (h, nrow);
3734 3593
3735 x -= 1; clamp_it (x, 0, ncol - w); 3594 x -= 1; clamp_it (x, 0, ncol - w);
3736 y -= 1; clamp_it (y, 0, nrow - h); 3595 y -= 1; clamp_it (y, 0, nrow - h);
3737 3596
3738 ov_x = x; ov_y = y; 3597 ov.x = x; ov.y = y;
3739 ov_w = w; ov_h = h; 3598 ov.w = w; ov.h = h;
3740 3599
3741 ov_text = new text_t *[h]; 3600 ov.text = new text_t *[h];
3742 ov_rend = new rend_t *[h]; 3601 ov.rend = new rend_t *[h];
3743 3602
3744 for (y = 0; y < h; y++) 3603 for (y = 0; y < h; y++)
3745 { 3604 {
3746 text_t *tp = ov_text[y] = new text_t[w]; 3605 text_t *tp = ov.text[y] = new text_t[w];
3747 rend_t *rp = ov_rend[y] = new rend_t[w]; 3606 rend_t *rp = ov.rend[y] = new rend_t[w];
3748 3607
3749 text_t t0, t1, t2; 3608 text_t t0, t1, t2;
3750 rend_t r = OVERLAY_RSTYLE; 3609 rend_t r = OVERLAY_RSTYLE;
3751 3610
3752 if (y == 0) 3611 if (y == 0)
… …
3771} 3630}
3772 3631
3773void 3632void
3774rxvt_term::scr_overlay_off () NOTHROW 3633rxvt_term::scr_overlay_off () NOTHROW
3775{ 3634{
3776 if (!ov_text) 3635 if (!ov.text)
3777 return; 3636 return;
3778 3637
3779 want_refresh = 1; 3638 want_refresh = 1;
3780 3639
3781 for (int y = 0; y < ov_h; y++) 3640 for (int y = 0; y < ov.h; y++)
3782 { 3641 {
3783 delete [] ov_text[y]; 3642 delete [] ov.text[y];
3784 delete [] ov_rend[y]; 3643 delete [] ov.rend[y];
3785 } 3644 }
3786 3645
3787 delete [] ov_text; ov_text = 0; 3646 delete [] ov.text; ov.text = 0;
3788 delete [] ov_rend; ov_rend = 0; 3647 delete [] ov.rend; ov.rend = 0;
3789} 3648}
3790 3649
3791void 3650void
3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3651rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3793{ 3652{
3794 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3653 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3795 return; 3654 return;
3796 3655
3797 x++, y++; 3656 x++, y++;
3798 3657
3799 ov_text[y][x] = text; 3658 ov.text[y][x] = text;
3800 ov_rend[y][x] = rend; 3659 ov.rend[y][x] = rend;
3801} 3660}
3802 3661
3803void 3662void
3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3663rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3805{ 3664{
… …
3824} 3683}
3825 3684
3826void 3685void
3827rxvt_term::scr_swap_overlay () NOTHROW 3686rxvt_term::scr_swap_overlay () NOTHROW
3828{ 3687{
3829 if (!ov_text) 3688 if (!ov.text)
3830 return; 3689 return;
3831 3690
3691 // hide cursor if it is within the overlay area
3692 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3693 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3694 screen.flags &= ~Screen_VisibleCursor;
3695
3832 // swap screen mem with overlay 3696 // swap screen mem with overlay
3833 for (int y = ov_h; y--; ) 3697 for (int y = ov.h; y--; )
3834 { 3698 {
3835 text_t *t1 = ov_text[y]; 3699 text_t *t1 = ov.text[y];
3836 rend_t *r1 = ov_rend[y]; 3700 rend_t *r1 = ov.rend[y];
3837 3701
3838 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3702 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3839 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3703 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3840 3704
3841 for (int x = ov_w; x--; ) 3705 for (int x = ov.w; x--; )
3842 { 3706 {
3843 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3707 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3844 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3708 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3845 } 3709 }
3846 } 3710 }

Diff Legend

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