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.326 by root, Wed Nov 5 13:04:51 2008 UTC vs.
Revision 1.411 by sf-exg, Mon Jan 9 21:12:08 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
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{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
198 term_start = 0; 203 term_start = 0;
199 204
200 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202 207
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
208 { 213 {
… …
231 selection.text = NULL; 236 selection.text = NULL;
232 selection.len = 0; 237 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
235 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
236 } 243 }
237 else 244 else
238 { 245 {
239 /* 246 /*
240 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
268 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);
269 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);
270 } 277 }
271 278
272 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
274 281
275 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
276 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
278 285
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 294
288 do 295 do
289 { 296 {
290 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 299 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 301
297 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 ())
298 { 303 {
… …
397 } 402 }
398 403
399 free (tabs); 404 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
401 406
402 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
510 } 515 }
511 516
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
518#endif
519} 522}
520 523
521void 524void
522rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
523{ 526{
… …
546 return; 549 return;
547 550
548 want_refresh = 1; 551 want_refresh = 1;
549 view_start = 0; 552 view_start = 0;
550 553
551 selection_check (2); /* check for boundary cross */ 554 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
552 560
553 int i = current_screen; current_screen = scrn; scrn = i; 561 current_screen = scrn;
554 562
555#if NSCREENS 563#if NSCREENS
556 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
557 { 565 {
558 num_scr = 0; 566 num_scr = 0;
… …
635 643
636 if (count > 0 644 if (count > 0
637 && row1 == 0 645 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
640 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 651
645 // sever bottommost line 652 // sever bottommost line
646 { 653 {
647 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
648 l.is_longer (0); 655 l.is_longer (0);
649 l.touch (); 656 l.touch ();
650 } 657 }
651 658
659 // scroll everything up 'count' lines
660 term_start = (term_start + count) % total_rows;
661
662 // now copy lines below the scroll region bottom to the
663 // bottom of the screen again, so they look as if they
664 // hadn't moved.
665 for (int i = nrow; --i > row2; )
666 {
667 line_t &l1 = ROW(i - count);
668 line_t &l2 = ROW(i);
669
670 ::swap (l1, l2);
671 l2.touch ();
672 }
673
652 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 675 for (int i = count; i--; )
654 { 676 {
655 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
656 678
657 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 680 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 682 {
661 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 684 l.l = 0;
… …
664 } 686 }
665 else 687 else
666 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
667 } 689 }
668 690
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
681 // move and/or clear selection, if any 691 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
683 { 694 {
684 selection.beg.row -= count; 695 selection.beg.row -= count;
685 selection.end.row -= count; 696 selection.end.row -= count;
686 selection.mark.row -= count; 697 selection.mark.row -= count;
687 698
688 if (selection.beg.row < top_row 699 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 700 }
696 701
697 // finally move the view window, if desired 702 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 704 && view_start != 0
… …
729 } 734 }
730 735
731 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
733 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
734 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
735 748
736 min_it (count, rows); 749 min_it (count, rows);
737 750
738 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 752
740 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
741 { 754 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 756
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 759 }
747 760
748 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
749 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 }
750 } 770 }
751 771
752 return count; 772 return count;
753} 773}
754 774
… …
760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761{ 781{
762 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
763 return; 783 return;
764 784
765 unsigned char checksel; 785 bool checksel;
766 unicode_t c; 786 unicode_t c;
767 int ncol = this->ncol; 787 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
769 789
770 want_refresh = 1; 790 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
785 } 805 }
786 } 806 }
787 807
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 811 int row = screen.cur.row;
794 812
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 814
797 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
798 816
799 while (str < strend) 817 while (str < strend)
800 { 818 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 820
803 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 822 if (c == C0_LF)
805 { 823 {
806 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
807 825
808 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
827 { 845 {
828 scr_tab (1, true); 846 scr_tab (1, true);
829 continue; 847 continue;
830 } 848 }
831 849
832 if (expect_false ( 850 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 854 ))
837 { 855 {
… …
842 * should be a similar check. 860 * should be a similar check.
843 */ 861 */
844 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
845 } 863 }
846 864
847 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 866 {
849 scr_do_wrap (); 867 scr_do_wrap ();
850 868
851 line->l = ncol; 869 line->l = ncol;
852 line->is_longer (1); 870 line->is_longer (1);
… …
854 row = screen.cur.row; 872 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
856 } 874 }
857 875
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 878 c = 0xfffd;
861 879
862 // 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
863 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
865 // locale. 883 // locale.
866 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
867 885
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 887 {
870 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 889 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
888 } 906 }
889 } 907 }
890 908
891 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
893 911
894 if (width != 0) 912 if (width != 0)
895 { 913 {
896#if !UNICODE_3 914#if !UNICODE_3
… …
901# else 919# else
902 c = 0xfffd; 920 c = 0xfffd;
903# endif 921# endif
904#endif 922#endif
905 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
906 // nuke the character at this position, if required 940 // nuke the character at this position, if required
907 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.
908 line->t[screen.cur.col] == NOCHAR 944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 945 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 946
925 line->touch (); 947 line->touch ();
926 948
927 do 949 do
928 { 950 {
929 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
931 953
932 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 955 screen.cur.col++;
934 else 956 else
935 { 957 {
936 line->l = ncol; 958 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
939 break; 961
962 goto end_of_line;
940 } 963 }
941 964
942 c = NOCHAR; 965 c = NOCHAR;
943 } 966 }
944 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
945 968
946 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 971 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 972 line->t[c] = ' ';
954 line->r[c] = rend; 973 line->r[c] = rend;
955 }
956 } 974 }
975
976end_of_line:
977 ;
957 } 978 }
958#if ENABLE_COMBINING 979#if ENABLE_COMBINING
959 else // width == 0 980 else // width == 0
960 { 981 {
961 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1022#endif
1002 } 1023 }
1003 1024
1004 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
1005 1026
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1008#endif
1009} 1028}
1010 1029
1011/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1012/* 1031/*
1013 * 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
… …
1026 1045
1027 want_refresh = 1; 1046 want_refresh = 1;
1028#endif 1047#endif
1029 } 1048 }
1030 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1031 else 1052 else
1032 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1033} 1054}
1034 1055
1035/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1291 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1292} 1313}
1293 1314
1294/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1295/* 1316/*
1296 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1321 */
1301void 1322void
… …
1310 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1311 1332
1312 switch (mode) 1333 switch (mode)
1313 { 1334 {
1314 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1336 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1338 num = nrow - row;
1319 break; 1339 break;
1320 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1341 scr_erase_line (1);
1323 row = 0; 1342 row = 0;
1324 num = screen.cur.row; 1343 num = screen.cur.row;
1325 break; 1344 break;
1326 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1346 row = 0;
1329 num = nrow; 1347 num = nrow;
1330 break; 1348 break;
1331 default: 1349 default:
1332 return; 1350 return;
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1342 return; 1360 return;
1343 1361
1344 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1345 1363
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1367 {
1353 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1354 1369
1355 if (mapped && !view_start) 1370 if (mapped)
1356 XClearArea (dpy, vt, 0, 1371 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1372 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1373 (unsigned int)Height2Pixel (num), False);
1359 } 1374 }
1360 else 1375 else
1361 { 1376 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1378
1364 if (mapped && !view_start) 1379 if (mapped)
1365 { 1380 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1383 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1384 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1385 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1386 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1389 }
1375 } 1390 }
1376 1391
1377 for (; num--; row++) 1392 for (; num--; row++)
1378 { 1393 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1380 1395
1381 if (!view_start) 1396 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1398 }
1384} 1399}
1385 1400
1386#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1387void 1402void
… …
1406 1421
1407 want_refresh = 1; 1422 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1409 1424
1410 num_scr_allow = 0; 1425 num_scr_allow = 0;
1411 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1412 1431
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1415 { 1434 {
1416 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1686 { 1705 {
1687 rvideo_state = on; 1706 rvideo_state = on;
1688 1707
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1692#endif 1711#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1713
1695 XGCValues gcvalue; 1714 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1860 {
1842 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1844 } 1863 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1846 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++)
1847 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);
1848 1867
1849 num_scr_allow = 0; 1868 num_scr_allow = 0;
1850 1869
… …
1857 * Refresh the entire screen 1876 * Refresh the entire screen
1858 */ 1877 */
1859void 1878void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1879rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1880{
1862 scr_expose (0, 0, width, height, refresh); 1881 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1882}
1864 1883
1865/* ------------------------------------------------------------------------- */ 1884/* ------------------------------------------------------------------------- */
1866/* 1885/*
1867 * Move the display so that the line represented by scrollbar value Y is at 1886 * Move the display so that the line represented by scrollbar value Y is at
… …
1923 1942
1924# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1927# endif 1946# endif
1928 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1929# endif 1948# endif
1930 1949
1931# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1952 set_urgency (1);
… …
1941 1960
1942 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1962 }
1944 else 1963 else
1945 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1966#endif
1947} 1967}
1948 1968
1949/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1970void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1972{
1954#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1955 int nrows, row_start; 1974 int nrows, row_start;
… …
1969 row_start = view_start; 1988 row_start = view_start;
1970 } 1989 }
1971 1990
1972 wctomb (0, 0); 1991 wctomb (0, 0);
1973 1992
1974 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1994 {
1976 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1978 1997
1979 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
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2028 */
2010void 2029void
2011rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
2012{ 2031{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2034 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2047 /*
2031 * A: set up vars 2048 * A: set up vars
2032 */ 2049 */
2033 refresh_count = 0; 2050 refresh_count = 0;
2034 2051
2052 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2053 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2038#endif 2056#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2058
2041 /* 2059 /*
2042 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2043 */ 2061 */
2044 scr_reverse_selection (); 2062 scr_reverse_selection ();
2045 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2070
2046 /* 2071 /*
2047 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2048 */ 2073 */
2049 { 2074 {
2050 unsigned char setoldcursor; 2075 bool setoldcursor;
2051 2076
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2078 if (hidden_cursor)
2055 showcursor = 0; 2079 showcursor = 0;
2056#endif 2080#endif
2057 2081
… …
2085 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2086#else 2110#else
2087 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2088#endif 2112#endif
2089 2113
2090 if (showcursor && focus) 2114 if (focus)
2091 { 2115 {
2092 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2094 else 2118 else
2095 { 2119 {
… …
2130 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2131 } 2155 }
2132 } 2156 }
2133 } 2157 }
2134 2158
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2160 /*
2142 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2144 */ 2163 */
… …
2148 { 2167 {
2149 int16_t nits; 2168 int16_t nits;
2150 int i = num_scr; 2169 int i = num_scr;
2151 int j; 2170 int j;
2152 int len, wlen; 2171 int len, wlen;
2153 dLocal (int, num_scr);
2154 2172
2155 j = nrow; 2173 j = nrow;
2156 wlen = len = -1; 2174 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2175 row = i > 0 ? 0 : j - 1;
2158 2176
… …
2233 continue; 2251 continue;
2234 2252
2235 // redraw one or more characters 2253 // redraw one or more characters
2236 2254
2237 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2257 --col;
2240 2258
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2260 text_t *text = stp + col;
2243 int count = 1; 2261 int count = 1;
2244 2262
2245 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2246 drp[col] = rend; 2264 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2251 { 2269 {
2252 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2253 { 2271 {
2254 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2255 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2256 count++; 2275 count++;
2257 i++; 2276 i++;
2258 2277
2259 continue; 2278 continue;
2260 } 2279 }
… …
2280 2299
2281 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2283 2302
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2305 count++, i--;
2287 2306
2288 /* 2307 /*
2289 * Determine the attributes for the string 2308 * Determine the attributes for the string
2290 */ 2309 */
2291 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2293 2312
2294 // 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
2295 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)))
2296 { 2315 {
2297 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2298 2317
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2338
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2340 fore = Color_UL;
2322#endif 2341#endif
2323 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
2324 if (invert) 2363 if (invert)
2325 { 2364 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2365 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2366
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2368 if (fore == back)
2344 { 2369 {
2345 fore = Color_bg; 2370 fore = Color_bg;
2346 back = Color_fg; 2371 back = Color_fg;
2347 } 2372 }
… …
2383 /* 2408 /*
2384 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2385 */ 2410 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2412
2388 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2414 {
2390 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2391 2416
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2400 did_clear: ; 2425 did_clear: ;
2401 } 2426 }
2402 else 2427 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2429
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2431 {
2407#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2435 else
… …
2415 xpixel, ypixel + font->ascent + 1, 2440 xpixel, ypixel + font->ascent + 1,
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2441 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2442 }
2418 } /* for (col....) */ 2443 } /* for (col....) */
2419 } /* for (row....) */ 2444 } /* for (row....) */
2420
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425 2445
2426 /* 2446 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2447 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2448 */
2429 if (showcursor) 2449 if (showcursor)
… …
2468 } 2488 }
2469 2489
2470 /* 2490 /*
2471 * H: cleanup selection 2491 * H: cleanup selection
2472 */ 2492 */
2493#if ENABLE_OVERLAY
2494 scr_swap_overlay ();
2495#endif
2496 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2497
2473 scr_reverse_selection (); 2498 scr_reverse_selection ();
2474 2499
2500 screen.flags = old_screen_flags;
2475 num_scr = 0; 2501 num_scr = 0;
2476 num_scr_allow = 1; 2502 num_scr_allow = 1;
2477} 2503}
2478 2504
2479void 2505void
… …
2500 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2501 } 2527 }
2502} 2528}
2503 2529
2504void 2530void
2505rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2506{ 2532{
2533 bool transparent = false;
2534
2507#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2508 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2509#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);
2510 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 {
2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2512 XClearWindow (dpy, parent[0]);
2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2514 2561
2515 if (scrollBar.win) 2562 if (scrollBar.win)
2516 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2518 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2519 scrollBar.show (0); 2569 scrollBar.show (0);
2520 } 2570 }
2521 2571
2522#endif 2572 if (refresh)
2523 2573 {
2524 /* bgPixmap.apply () does not do the following : */
2525 scr_clear (); 2574 scr_clear ();
2526 scr_touch (true); 2575 scr_touch (true);
2576 }
2527 want_refresh = 1; 2577 want_refresh = 1;
2528} 2578}
2529 2579
2530/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2531void 2581void
… …
2599 { 2649 {
2600#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2601 if (selection.rect) 2651 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2655 else
2606#endif 2656#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2609 RS_RVid); 2659 RS_Sel | RS_RVid);
2610 } 2660 }
2611} 2661}
2612 2662
2613/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2614/* 2664/*
… …
2617 */ 2667 */
2618#if 0 2668#if 0
2619void 2669void
2620rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2671{
2622 int row, wrote; 2672 // if this method is needed, it can be implemented by factoring the
2623 unsigned int width, towrite; 2673 // relevant code in scr_printscreen
2624 char r1[] = "\n";
2625
2626 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++)
2628 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l
2630 : ncol;
2631 for (towrite = width; towrite; towrite -= wrote)
2632 {
2633 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2634 towrite);
2635 if (wrote < 0)
2636 return; /* XXX: death, no report */
2637 }
2638 if (row_buf[row].l >= 0)
2639 if (write (fd, r1, 1) <= 0)
2640 return; /* XXX: death, no report */
2641 }
2642} 2674}
2643#endif 2675#endif
2644 2676
2645/* ------------------------------------------------------------------------- * 2677/* ------------------------------------------------------------------------- *
2646 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2647 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2648void 2680void
2649rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2650{ 2682{
2651 row_col_t pos;
2652
2653 if (!selection.op) 2683 if (!selection.op)
2654 return; 2684 return;
2655 2685
2656 pos.row = pos.col = 0;
2657 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2686 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2658 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2660 || (check_more == 1 2689 || (check_more == 1
2661 && current_screen == selection.screen 2690 && current_screen == selection.screen
2662 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2663 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2664 || (check_more == 2
2665 && ROWCOL_IS_BEFORE (selection.beg, pos)
2666 && ROWCOL_IS_AFTER (selection.end, pos))
2667 || (check_more == 3
2668 && ROWCOL_IS_AFTER (selection.end, pos))
2669 || (check_more == 4 /* screen width change */
2670 && (selection.beg.row != selection.end.row
2671 || selection.end.col > ncol)))
2672 CLEAR_SELECTION (); 2693 CLEAR_ALL_SELECTION ();
2673} 2694}
2674 2695
2675/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2676/* 2697/*
2677 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
2678 */ 2699 */
2679void 2700void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2701rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2702{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2703 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2706 data[i] = C0_CR;
… …
2691 2712
2692 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2714 tt_printf ("\e[201~");
2694} 2715}
2695 2716
2696/* ------------------------------------------------------------------------- */
2697/*
2698 * Respond to a notification that a primary selection has been sent
2699 * EXT: SelectionNotify
2700 */
2701void 2717void
2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2703{ 2719{
2704 if (prop == None) /* check for failed XConvertSelection */ 2720 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2705 {
2706 if ((selection_type & Sel_CompoundText))
2707 {
2708 int selnum = selection_type & Sel_whereMask;
2709
2710 selection_type = 0;
2711 if (selnum != Sel_direct)
2712 selection_request_other (XA_STRING, selnum);
2713 }
2714
2715 if ((selection_type & Sel_UTF8String))
2716 {
2717 int selnum = selection_type & Sel_whereMask;
2718
2719 selection_type = Sel_CompoundText;
2720 if (selnum != Sel_direct)
2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2722 else
2723 selection_type = 0;
2724 }
2725
2726 return;
2727 }
2728
2729 unsigned long bytes_after;
2730 XTextProperty ct;
2731
2732 if (XGetWindowProperty (dpy, win, prop,
2733 0, PROP_SIZE / 4,
2734 delete_prop, AnyPropertyType,
2735 &ct.encoding, &ct.format,
2736 &ct.nitems, &bytes_after,
2737 &ct.value) != Success)
2738 {
2739 ct.value = 0;
2740 goto bailout;
2741 }
2742
2743 if (ct.encoding == None)
2744 goto bailout;
2745
2746 if (bytes_after)
2747 {
2748 // fetch and append remaining data
2749 XTextProperty ct2;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct2.encoding, &ct2.format,
2755 &ct2.nitems, &bytes_after,
2756 &ct2.value) != Success)
2757 goto bailout;
2758
2759 // realloc should be compatible to XFree, here, and elsewhere, too
2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2762 ct.nitems += ct2.nitems;
2763
2764 XFree (ct2.value);
2765 }
2766
2767 if (ct.value == 0)
2768 goto bailout;
2769
2770 if (ct.encoding == xa[XA_INCR])
2771 {
2772 // INCR selection, start handshake
2773 if (!delete_prop)
2774 XDeleteProperty (dpy, win, prop);
2775
2776 selection_wait = Sel_incr;
2777 incr_buf_fill = 0;
2778 incr_ev.start (10);
2779
2780 goto bailout;
2781 }
2782
2783 if (ct.nitems == 0)
2784 {
2785 if (selection_wait == Sel_incr)
2786 {
2787 XFree (ct.value);
2788
2789 // finally complete, now paste the whole thing
2790 selection_wait = Sel_normal;
2791 ct.value = (unsigned char *)incr_buf;
2792 ct.nitems = incr_buf_fill;
2793 incr_buf = 0;
2794 incr_buf_size = 0;
2795 incr_ev.stop ();
2796 }
2797 else
2798 {
2799 if (selection_wait == Sel_normal
2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2801 {
2802 /*
2803 * pass through again trying CUT_BUFFER0 if we've come from
2804 * XConvertSelection () but nothing was presented
2805 */
2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2807 }
2808
2809 goto bailout;
2810 }
2811 }
2812 else if (selection_wait == Sel_incr)
2813 {
2814 incr_ev.start (10);
2815
2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2817 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2820 }
2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2823 incr_buf_fill += ct.nitems;
2824
2825 goto bailout;
2826 }
2827
2828 char **cl;
2829 int cr;
2830
2831#if !ENABLE_MINIMAL
2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2833 // so recode it manually
2834 if (ct.encoding == xa[XA_UTF8_STRING])
2835 {
2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2837 char *s = rxvt_wcstombs (w);
2838 free (w);
2839 // TODO: strlen == only the first element will be converted. well...
2840 paste (s, strlen (s));
2841 free (s);
2842 }
2843 else
2844#endif
2845 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2846 && cl)
2847 {
2848 for (int i = 0; i < cr; i++)
2849 paste (cl[i], strlen (cl[i]));
2850
2851 XFreeStringList (cl);
2852 }
2853 else
2854 paste ((char *)ct.value, ct.nitems); // paste raw
2855
2856bailout:
2857 XFree (ct.value);
2858
2859 if (selection_wait == Sel_normal)
2860 selection_wait = Sel_none;
2861}
2862
2863void
2864rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2865{
2866 selection_wait = Sel_none;
2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2872}
2873
2874void
2875rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2876{
2877 if (prop == None || selection_wait != Sel_incr)
2878 return; 2721 return;
2879 2722
2880 selection_paste (win, prop, true); 2723 tt_paste (data, len);
2881} 2724}
2882 2725
2883/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2884/* 2727/*
2885 * Request the current selection: 2728 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2886 * Order: > internal selection if available 2729 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2887 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2730 * as fallback
2888 * > CUT_BUFFER0
2889 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2890 * will auto fallback to CUT_BUFFER0
2891 * EXT: button 2 release 2731 * EXT: button 2 release
2892 */ 2732 */
2893void 2733void
2894rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2734rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2895{ 2735{
2896 if (selection.text && selnum == Sel_Primary) 2736 if (!selection_req)
2897 {
2898 /* internal selection */
2899 char *str = rxvt_wcstombs (selection.text, selection.len);
2900 paste (str, strlen (str));
2901 free (str);
2902 return;
2903 } 2737 {
2904 else 2738 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2739 selection_req->run ();
2905 { 2740 }
2906 selection_request_time = tm;
2907 selection_wait = Sel_normal;
2908
2909#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return;
2913#else
2914 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return;
2917#endif
2918 }
2919
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false);
2922}
2923
2924int
2925rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2926{
2927 Atom sel;
2928
2929 selection_type |= selnum;
2930
2931 if (selnum == Sel_Primary)
2932 sel = XA_PRIMARY;
2933 else if (selnum == Sel_Secondary)
2934 sel = XA_SECONDARY;
2935 else
2936 sel = xa[XA_CLIPBOARD];
2937
2938 if (XGetSelectionOwner (dpy, sel) != None)
2939 {
2940 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2941 vt, selection_request_time);
2942 return 1;
2943 }
2944
2945 return 0;
2946} 2741}
2947 2742
2948/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2949/* 2744/*
2950 * Clear all selected text 2745 * Clear all selected text
2951 * EXT: SelectionClear 2746 * EXT: SelectionClear
2952 */ 2747 */
2953void 2748void
2954rxvt_term::selection_clear () NOTHROW 2749rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2750{
2751 if (!clipboard)
2752 {
2956 want_refresh = 1; 2753 want_refresh = 1;
2957 free (selection.text); 2754 free (selection.text);
2958 selection.text = NULL; 2755 selection.text = NULL;
2959 selection.len = 0; 2756 selection.len = 0;
2960 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2961 2758
2962 if (display->selection_owner == this) 2759 if (display->selection_owner == this)
2963 display->selection_owner = 0; 2760 display->selection_owner = 0;
2761 }
2762 else
2763 {
2764 free (selection.clip_text);
2765 selection.clip_text = NULL;
2766 selection.clip_len = 0;
2767
2768 if (display->clipboard_owner == this)
2769 display->clipboard_owner = 0;
2770 }
2964} 2771}
2965 2772
2966/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2967/* 2774/*
2968 * Copy a selection into the cut buffer 2775 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 2776 * EXT: button 1 or 3 release
2970 */ 2777 */
2971void 2778void
2972rxvt_term::selection_make (Time tm) 2779rxvt_term::selection_make (Time tm)
2973{ 2780{
2974 int i; 2781 int size;
2975 wchar_t *new_selection_text; 2782 wchar_t *new_selection_text;
2976 text_t *t; 2783 text_t *t;
2977 2784
2978 switch (selection.op) 2785 switch (selection.op)
2979 { 2786 {
… …
2995 return; /* nothing selected, go away */ 2802 return; /* nothing selected, go away */
2996 2803
2997 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2804 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2998 return; 2805 return;
2999 2806
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2807 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2808 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3002 2809
3003 int ofs = 0; 2810 int ofs = 0;
3004 int extra = 0; 2811 int extra = 0;
3005 2812
3006 int col = selection.beg.col; 2813 int col = selection.beg.col;
… …
3012 { 2819 {
3013#if !ENABLE_MINIMAL 2820#if !ENABLE_MINIMAL
3014 if (selection.rect) 2821 if (selection.rect)
3015 { 2822 {
3016 col = selection.beg.col; 2823 col = selection.beg.col;
3017 end_col = ncol + 1; 2824 end_col = selection.end.col;
3018 } 2825 }
3019 else 2826 else
3020#endif 2827#endif
3021 end_col = ROW(row).l; 2828 end_col = ROW(row).l;
3022 2829
3023 col = max (col, 0); 2830 col = max (col, 0);
3024 2831
3025 if (row == selection.end.row 2832 if (row == selection.end.row)
3026#if !ENABLE_MINIMAL
3027 || selection.rect
3028#endif
3029 )
3030 min_it (end_col, selection.end.col); 2833 min_it (end_col, selection.end.col);
3031 2834
3032 t = ROW(row).t + col; 2835 t = ROW(row).t + col;
3033 2836
3034 for (; col < end_col; col++) 2837 for (; col < end_col; col++)
… …
3042 2845
3043 extra -= (len - 1); 2846 extra -= (len - 1);
3044 2847
3045 if (extra < 0) 2848 if (extra < 0)
3046 { 2849 {
3047 extra += i; 2850 extra += size;
3048 i += i; 2851 size += size;
3049 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2852 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3050 } 2853 }
3051 2854
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2855 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 2856 }
3054#endif 2857#endif
… …
3066 2869
3067 new_selection_text[ofs++] = C0_LF; 2870 new_selection_text[ofs++] = C0_LF;
3068 } 2871 }
3069 else 2872 else
3070#endif 2873#endif
3071 if (!ROW(row).is_longer () && row != selection.end.row) 2874 if (!ROW(row).is_longer ()
2875 && (row != selection.end.row || end_col != selection.end.col)
2876 && (row != selection.beg.row || selection.beg.col < ncol))
3072 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3073 } 2878 }
3074
3075 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF;
3077 2879
3078 new_selection_text[ofs] = 0; 2880 new_selection_text[ofs] = 0;
3079 2881
3080 if (ofs == 0) 2882 if (ofs == 0)
3081 { 2883 {
… …
3094 2896
3095 selection_grab (tm); 2897 selection_grab (tm);
3096} 2898}
3097 2899
3098bool 2900bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 2901rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 2902{
2903 Atom sel;
2904
2905 if (!clipboard)
2906 {
3101 selection_time = tm; 2907 selection_time = tm;
2908 sel = XA_PRIMARY;
2909 }
2910 else
2911 {
2912 clipboard_time = tm;
2913 sel = xa[XA_CLIPBOARD];
2914 }
3102 2915
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2916 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2917 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 2918 {
3106 display->set_selection_owner (this); 2919 display->set_selection_owner (this, clipboard);
3107 return true; 2920 return true;
3108 } 2921 }
3109 else 2922 else
3110 { 2923 {
3111 selection_clear (); 2924 selection_clear (clipboard);
3112 return false; 2925 return false;
3113 } 2926 }
3114 2927
3115#if 0 2928#if 0
3116 XTextProperty ct; 2929 XTextProperty ct;
… …
3576 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3577 */ 3390 */
3578void 3391void
3579rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3580{ 3393{
3394 Atom property = rq.property == None ? rq.target : rq.property;
3581 XSelectionEvent ev; 3395 XSelectionEvent ev;
3582 3396
3583 ev.type = SelectionNotify; 3397 ev.type = SelectionNotify;
3584 ev.property = None; 3398 ev.property = None;
3585 ev.display = rq.display; 3399 ev.display = rq.display;
… …
3600 *target++ = xa[XA_COMPOUND_TEXT]; 3414 *target++ = xa[XA_COMPOUND_TEXT];
3601#if X_HAVE_UTF8_STRING 3415#if X_HAVE_UTF8_STRING
3602 *target++ = xa[XA_UTF8_STRING]; 3416 *target++ = xa[XA_UTF8_STRING];
3603#endif 3417#endif
3604 3418
3605 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3419 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3606 32, PropModeReplace, 3420 32, PropModeReplace,
3607 (unsigned char *)target_list, target - target_list); 3421 (unsigned char *)target_list, target - target_list);
3608 ev.property = rq.property; 3422 ev.property = property;
3609 } 3423 }
3610#if TODO // TODO 3424#if TODO // TODO
3611 else if (rq.target == xa[XA_MULTIPLE]) 3425 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3426 {
3613 /* TODO: Handle MULTIPLE */ 3427 /* TODO: Handle MULTIPLE */
3614 } 3428 }
3615#endif 3429#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3430 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3431 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3432 XChangeProperty (dpy, rq.requestor, property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3433 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3620 ev.property = rq.property; 3434 ev.property = property;
3435 }
3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3437 {
3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3439 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3440 ev.property = property;
3621 } 3441 }
3622 else if (rq.target == XA_STRING 3442 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3443 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3444 || rq.target == xa[XA_COMPOUND_TEXT]
3625 || rq.target == xa[XA_UTF8_STRING] 3445 || rq.target == xa[XA_UTF8_STRING]
… …
3657 { 3477 {
3658 target = xa[XA_COMPOUND_TEXT]; 3478 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3479 style = enc_compound_text;
3660 } 3480 }
3661 3481
3662 if (selection.text) 3482 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3483 {
3664 cl = selection.text; 3484 cl = selection.text;
3665 selectlen = selection.len; 3485 selectlen = selection.len;
3486 }
3487 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3488 {
3489 cl = selection.clip_text;
3490 selectlen = selection.clip_len;
3666 } 3491 }
3667 else 3492 else
3668 { 3493 {
3669 cl = L""; 3494 cl = L"";
3670 selectlen = 0; 3495 selectlen = 0;
… …
3691 ct.value = (unsigned char *)cl; 3516 ct.value = (unsigned char *)cl;
3692 ct.nitems = selectlen; 3517 ct.nitems = selectlen;
3693 ct.encoding = target; 3518 ct.encoding = target;
3694 } 3519 }
3695 3520
3696 XChangeProperty (dpy, rq.requestor, rq.property, 3521 XChangeProperty (dpy, rq.requestor, property,
3697 ct.encoding, 8, PropModeReplace, 3522 ct.encoding, 8, PropModeReplace,
3698 ct.value, (int)ct.nitems); 3523 ct.value, (int)ct.nitems);
3699 ev.property = rq.property; 3524 ev.property = property;
3700 3525
3701 if (freect) 3526 if (freect)
3702 XFree (ct.value); 3527 XFree (ct.value);
3703 } 3528 }
3704 3529
… …
3738 h += 2; min_it (h, nrow); 3563 h += 2; min_it (h, nrow);
3739 3564
3740 x -= 1; clamp_it (x, 0, ncol - w); 3565 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3566 y -= 1; clamp_it (y, 0, nrow - h);
3742 3567
3743 ov_x = x; ov_y = y; 3568 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3569 ov.w = w; ov.h = h;
3745 3570
3746 ov_text = new text_t *[h]; 3571 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3572 ov.rend = new rend_t *[h];
3748 3573
3749 for (y = 0; y < h; y++) 3574 for (y = 0; y < h; y++)
3750 { 3575 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3576 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3577 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3578
3754 text_t t0, t1, t2; 3579 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3580 rend_t r = OVERLAY_RSTYLE;
3756 3581
3757 if (y == 0) 3582 if (y == 0)
… …
3776} 3601}
3777 3602
3778void 3603void
3779rxvt_term::scr_overlay_off () NOTHROW 3604rxvt_term::scr_overlay_off () NOTHROW
3780{ 3605{
3781 if (!ov_text) 3606 if (!ov.text)
3782 return; 3607 return;
3783 3608
3784 want_refresh = 1; 3609 want_refresh = 1;
3785 3610
3786 for (int y = 0; y < ov_h; y++) 3611 for (int y = 0; y < ov.h; y++)
3787 { 3612 {
3788 delete [] ov_text[y]; 3613 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3614 delete [] ov.rend[y];
3790 } 3615 }
3791 3616
3792 delete [] ov_text; ov_text = 0; 3617 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3618 delete [] ov.rend; ov.rend = 0;
3794} 3619}
3795 3620
3796void 3621void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3622rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3623{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3624 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3625 return;
3801 3626
3802 x++, y++; 3627 x++, y++;
3803 3628
3804 ov_text[y][x] = text; 3629 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3630 ov.rend[y][x] = rend;
3806} 3631}
3807 3632
3808void 3633void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3634rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3635{
… …
3829} 3654}
3830 3655
3831void 3656void
3832rxvt_term::scr_swap_overlay () NOTHROW 3657rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3658{
3834 if (!ov_text) 3659 if (!ov.text)
3835 return; 3660 return;
3836 3661
3662 // hide cursor if it is within the overlay area
3663 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3664 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3665 screen.flags &= ~Screen_VisibleCursor;
3666
3837 // swap screen mem with overlay 3667 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3668 for (int y = ov.h; y--; )
3839 { 3669 {
3840 text_t *t1 = ov_text[y]; 3670 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3671 rend_t *r1 = ov.rend[y];
3842 3672
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3673 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3674 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3675
3846 for (int x = ov_w; x--; ) 3676 for (int x = ov.w; x--; )
3847 { 3677 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3678 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3679 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3680 }
3851 } 3681 }

Diff Legend

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