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.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC vs.
Revision 1.399 by sf-exg, Thu Nov 3 10:42: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{
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
… …
395 } 402 }
396 403
397 free (tabs); 404 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
399 406
400 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
402 409
403 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
404 411
405 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
631 638
632 if (count > 0 639 if (count > 0
633 && row1 == 0 640 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
636 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 646
641 // sever bottommost line 647 // sever bottommost line
642 { 648 {
643 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
644 l.is_longer (0); 650 l.is_longer (0);
645 l.touch (); 651 l.touch ();
646 } 652 }
647 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
648 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 670 for (int i = count; i--; )
650 { 671 {
651 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
652 673
653 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
655 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)))
656 { 677 {
657 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 679 l.l = 0;
… …
660 } 681 }
661 else 682 else
662 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
663 } 684 }
664 685
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
677 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen)
679 {
680 selection.beg.row -= count;
681 selection.end.row -= count;
682 selection.mark.row -= count;
683
684 if (selection.beg.row < top_row
685 || selection.end.row < top_row
686 || selection.mark.row < top_row)
687 {
688 CLEAR_ALL_SELECTION ();
689 selection.op = SELECTION_CLEAR;
690 }
691 }
692
693 // finally move the view window, if desired 686 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 688 && view_start != 0
696 && view_start != -saveLines) 689 && view_start != -saveLines)
697 scr_page (UP, count); 690 scr_page (UP, count);
… …
699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
700 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
701 } 694 }
702 else 695 else
703 { 696 {
704 if (selection.op && current_screen == selection.screen)
705 {
706 if ((selection.beg.row < row1 && selection.end.row > row1)
707 || (selection.beg.row < row2 && selection.end.row > row2)
708 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
709 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
710 || (selection.end.row - count < row1 && selection.end.row >= row1)
711 || (selection.end.row - count > row2 && selection.end.row <= row2))
712 {
713 CLEAR_ALL_SELECTION ();
714 selection.op = SELECTION_CLEAR;
715 }
716 else if (selection.end.row >= row1 && selection.end.row <= row2)
717 {
718 /* move selected region too */
719 selection.beg.row -= count;
720 selection.end.row -= count;
721 selection.mark.row -= count;
722
723 selection_check (0);
724 }
725 }
726
727 // use a simple and robust scrolling algorithm, this 697 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 698 // part of scr_scroll_text is not time-critical.
729 699
700 // sever line above scroll region
701 if (row1)
702 {
703 line_t &l = ROW(row1 - 1);
704 l.is_longer (0);
705 l.touch ();
706 }
707
730 int rows = row2 - row1 + 1; 708 int rows = row2 - row1 + 1;
731 709
732 min_it (count, rows); 710 min_it (count, rows);
733 711
734 line_t *temp_buf = row_buf + total_rows; 712 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 713
736 for (int row = 0; row < rows; row++) 714 for (int row = 0; row < rows; row++)
737 { 715 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 716 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 717
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 719 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 720 }
743 721
744 for (int row = 0; row < rows; row++) 722 for (int row = 0; row < rows; row++)
745 ROW(row1 + row) = temp_buf [row]; 723 ROW(row1 + row) = temp_buf [row];
724
725 // sever bottommost line
726 {
727 line_t &l = ROW(row2);
728 l.is_longer (0);
729 l.touch ();
730 }
731 }
732
733 // move and/or clear selection, if any
734 if (selection.op && current_screen == selection.screen)
735 {
736 if ((selection.beg.row < row1 && selection.end.row > row1)
737 || (selection.beg.row < row2 && selection.end.row > row2)
738 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
739 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
740 || (selection.end.row - count < row1 && selection.end.row >= row1)
741 || (selection.end.row - count > row2 && selection.end.row <= row2))
742 CLEAR_ALL_SELECTION ();
743 else if (selection.end.row >= row1 && selection.end.row <= row2)
744 {
745 /* move selected region too */
746 selection.beg.row -= count;
747 selection.end.row -= count;
748 selection.mark.row -= count;
749
750 selection_check (0);
751 }
746 } 752 }
747 753
748 return count; 754 return count;
749} 755}
750 756
… …
792 798
793 while (str < strend) 799 while (str < strend)
794 { 800 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 802
797 if (expect_false (c < 0x20)) 803 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 804 if (c == C0_LF)
799 { 805 {
800 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
801 807
802 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
821 { 827 {
822 scr_tab (1, true); 828 scr_tab (1, true);
823 continue; 829 continue;
824 } 830 }
825 831
826 if (expect_false ( 832 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 836 ))
831 { 837 {
… …
836 * should be a similar check. 842 * should be a similar check.
837 */ 843 */
838 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
839 } 845 }
840 846
841 if (expect_false (screen.flags & Screen_WrapNext)) 847 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 848 {
843 scr_do_wrap (); 849 scr_do_wrap ();
844 850
845 line->l = ncol; 851 line->l = ncol;
846 line->is_longer (1); 852 line->is_longer (1);
… …
848 row = screen.cur.row; 854 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
850 } 856 }
851 857
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 859 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 860 c = 0xfffd;
855 861
856 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
857 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
859 // locale. 865 // locale.
860 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
861 867
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 868 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 869 {
864 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 871 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
882 } 888 }
883 } 889 }
884 890
885 if (expect_false (screen.flags & Screen_Insert)) 891 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
887 893
888 if (width != 0) 894 if (width != 0)
889 { 895 {
890#if !UNICODE_3 896#if !UNICODE_3
… …
895# else 901# else
896 c = 0xfffd; 902 c = 0xfffd;
897# endif 903# endif
898#endif 904#endif
899 905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
910 {
911 if (screen.flags & Screen_Autowrap)
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 else
919 screen.cur.col = ncol - width;
920 }
921
900 // nuke the character at this position, if required 922 // nuke the character at this position, if required
901 if (expect_false ( 923 // due to wonderful coincidences everywhere else in this loop
924 // we never have to check for overwriting a wide char itself,
925 // only its tail.
902 line->t[screen.cur.col] == NOCHAR 926 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col); 927 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 928
919 line->touch (); 929 line->touch ();
920 930
921 do 931 do
922 { 932 {
923 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 934 line->r[screen.cur.col] = rend;
925 935
926 if (expect_true (screen.cur.col < ncol - 1)) 936 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 937 screen.cur.col++;
928 else 938 else
929 { 939 {
930 line->l = ncol; 940 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
933 break; 943
944 goto end_of_line;
934 } 945 }
935 946
936 c = NOCHAR; 947 c = NOCHAR;
937 } 948 }
938 while (expect_false (--width > 0)); 949 while (ecb_unlikely (--width > 0));
939 950
940 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 952 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 953 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 954 line->t[c] = ' ';
948 line->r[c] = rend; 955 line->r[c] = rend;
949 }
950 } 956 }
957
958end_of_line:
959 ;
951 } 960 }
952#if ENABLE_COMBINING 961#if ENABLE_COMBINING
953 else // width == 0 962 else // width == 0
954 { 963 {
955 if (c != 0xfeff) // ignore BOM 964 if (c != 0xfeff) // ignore BOM
… …
1018 1027
1019 want_refresh = 1; 1028 want_refresh = 1;
1020#endif 1029#endif
1021 } 1030 }
1022 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1023 else 1034 else
1024 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1025} 1036}
1026 1037
1027/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1334 return; 1345 return;
1335 1346
1336 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1337 1348
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1352 {
1345 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1346 1354
1347 if (mapped && !view_start) 1355 if (mapped)
1348 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1351 } 1359 }
1352 else 1360 else
1353 { 1361 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1363
1356 if (mapped && !view_start) 1364 if (mapped)
1357 { 1365 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1369 0, Row2Pixel (row - view_start),
… …
1368 1376
1369 for (; num--; row++) 1377 for (; num--; row++)
1370 { 1378 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1372 1380
1373 if (!view_start) 1381 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1383 }
1376} 1384}
1377 1385
1378#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1379void 1387void
… …
1678 { 1686 {
1679 rvideo_state = on; 1687 rvideo_state = on;
1680 1688
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1690#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1691 if (bg_pixmap == None)
1684#endif 1692#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1694
1687 XGCValues gcvalue; 1695 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1841 {
1834 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1836 } 1844 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1845
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1848
1841 num_scr_allow = 0; 1849 num_scr_allow = 0;
1842 1850
… …
1915 1923
1916# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1919# endif 1927# endif
1920 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent);
1921# endif 1929# endif
1922 1930
1923# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1933 set_urgency (1);
… …
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1939#endif 1947#endif
1940} 1948}
1941 1949
1942/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1943/* ARGSUSED */
1944void 1951void
1945rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1946{ 1953{
1947#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1948 int nrows, row_start; 1955 int nrows, row_start;
… …
2024 refresh_count = 0; 2031 refresh_count = 0;
2025 2032
2026 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2034 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2029 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2030#endif 2037#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2039
2033 /* 2040 /*
2034 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2083 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2084#else 2091#else
2085 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2086#endif 2093#endif
2087 2094
2088 if (showcursor && focus) 2095 if (focus)
2089 { 2096 {
2090 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2092 else 2099 else
2093 { 2100 {
… …
2226 continue; 2233 continue;
2227 2234
2228 // redraw one or more characters 2235 // redraw one or more characters
2229 2236
2230 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2232 --col; 2239 --col;
2233 2240
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2242 text_t *text = stp + col;
2236 int count = 1; 2243 int count = 1;
2237 2244
2238 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2239 drp[col] = rend; 2246 drp[col] = rend;
… …
2274 2281
2275 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2276 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2277 2284
2278 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2279 while (expect_false (i && text[count] == NOCHAR)) 2286 while (ecb_unlikely (i && text[count] == NOCHAR))
2280 count++, i--; 2287 count++, i--;
2281 2288
2282 /* 2289 /*
2283 * Determine the attributes for the string 2290 * Determine the attributes for the string
2284 */ 2291 */
2285 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2287 2294
2288 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2297 {
2291 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2292 2299
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2320
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2322 fore = Color_UL;
2316#endif 2323#endif
2317 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2318 if (invert) 2345 if (invert)
2319 { 2346 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2347 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2348
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2350 if (fore == back)
2338 { 2351 {
2339 fore = Color_bg; 2352 fore = Color_bg;
2340 back = Color_fg; 2353 back = Color_fg;
2341 } 2354 }
… …
2377 /* 2390 /*
2378 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2379 */ 2392 */
2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2381 2394
2382 if (expect_true (have_bg && back == Color_bg)) 2395 if (ecb_likely (have_bg && back == Color_bg))
2383 { 2396 {
2384 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2385 2398
2386 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2387 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2394 did_clear: ; 2407 did_clear: ;
2395 } 2408 }
2396 else 2409 else
2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398 2411
2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2400 { 2413 {
2401#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404 else 2417 else
… …
2495 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2496 } 2509 }
2497} 2510}
2498 2511
2499void 2512void
2500rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2501{ 2514{
2515 bool transparent = false;
2516
2502#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2503 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2504#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2505 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2507 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2542 XClearWindow (dpy, parent);
2509 2543
2510 if (scrollBar.win) 2544 if (scrollBar.win)
2511 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2513 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = SB_STATE_IDLE;
2514 scrollBar.show (0); 2551 scrollBar.show (0);
2515 } 2552 }
2516 2553
2517#endif 2554 if (refresh)
2518 2555 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2556 scr_clear ();
2521 scr_touch (true); 2557 scr_touch (true);
2558 }
2522 want_refresh = 1; 2559 want_refresh = 1;
2523} 2560}
2524 2561
2525/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2526void 2563void
… …
2594 { 2631 {
2595#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2596 if (selection.rect) 2633 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2637 else
2601#endif 2638#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2604 RS_RVid); 2641 RS_Sel | RS_RVid);
2605 } 2642 }
2606} 2643}
2607 2644
2608/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2609/* 2646/*
… …
2614void 2651void
2615rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2616{ 2653{
2617 int row, wrote; 2654 int row, wrote;
2618 unsigned int width, towrite; 2655 unsigned int width, towrite;
2619 char r1[] = "\n"; 2656 const char r1[] = "\n";
2620 2657
2621 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2623 { 2660 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2641 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2642 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2643void 2680void
2644rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2645{ 2682{
2646 row_col_t pos;
2647
2648 if (!selection.op) 2683 if (!selection.op)
2649 return; 2684 return;
2650 2685
2686 row_col_t pos;
2651 pos.row = pos.col = 0; 2687 pos.row = pos.col = 0;
2688
2652 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2654 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2655 || (check_more == 1 2692 || (check_more == 1
2656 && current_screen == selection.screen 2693 && current_screen == selection.screen
… …
2658 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2659 || (check_more == 2 2696 || (check_more == 2
2660 && ROWCOL_IS_BEFORE (selection.beg, pos) 2697 && ROWCOL_IS_BEFORE (selection.beg, pos)
2661 && ROWCOL_IS_AFTER (selection.end, pos)) 2698 && ROWCOL_IS_AFTER (selection.end, pos))
2662 || (check_more == 3 2699 || (check_more == 3
2663 && ROWCOL_IS_AFTER (selection.end, pos)) 2700 && ROWCOL_IS_AFTER (selection.end, pos)))
2664 || (check_more == 4 /* screen width change */
2665 && (selection.beg.row != selection.end.row
2666 || selection.end.col > ncol)))
2667 CLEAR_SELECTION (); 2701 CLEAR_ALL_SELECTION ();
2668} 2702}
2669 2703
2670/* ------------------------------------------------------------------------- */ 2704/* ------------------------------------------------------------------------- */
2671/* 2705/*
2672 * Paste a selection direct to the command fd 2706 * Paste a selection direct to the command fd
2673 */ 2707 */
2674void 2708void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2709rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2710{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2711 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2712 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2713 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2714 data[i] = C0_CR;
… …
2686 2720
2687 if (priv_modes & PrivMode_BracketPaste) 2721 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2722 tt_printf ("\e[201~");
2689} 2723}
2690 2724
2691/* ------------------------------------------------------------------------- */
2692/*
2693 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify
2695 */
2696void 2725void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2726rxvt_term::paste (char *data, unsigned int len) NOTHROW
2698{ 2727{
2699 if (prop == None) /* check for failed XConvertSelection */ 2728 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; 2729 return;
2874 2730
2875 selection_paste (win, prop, true); 2731 tt_paste (data, len);
2876} 2732}
2877 2733
2878/* ------------------------------------------------------------------------- */ 2734/* ------------------------------------------------------------------------- */
2879/* 2735/*
2880 * Request the current selection: 2736 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2881 * Order: > internal selection if available 2737 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2738 * 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 2739 * EXT: button 2 release
2887 */ 2740 */
2888void 2741void
2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2742rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2890{ 2743{
2891 if (selection.text && selnum == Sel_Primary) 2744 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 } 2745 {
2899 else 2746 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2747 selection_req->run ();
2900 { 2748 }
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} 2749}
2942 2750
2943/* ------------------------------------------------------------------------- */ 2751/* ------------------------------------------------------------------------- */
2944/* 2752/*
2945 * Clear all selected text 2753 * Clear all selected text
2946 * EXT: SelectionClear 2754 * EXT: SelectionClear
2947 */ 2755 */
2948void 2756void
2949rxvt_term::selection_clear () NOTHROW 2757rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2758{
2759 if (!clipboard)
2760 {
2951 want_refresh = 1; 2761 want_refresh = 1;
2952 free (selection.text); 2762 free (selection.text);
2953 selection.text = NULL; 2763 selection.text = NULL;
2954 selection.len = 0; 2764 selection.len = 0;
2955 CLEAR_SELECTION (); 2765 CLEAR_SELECTION ();
2956 2766
2957 if (display->selection_owner == this) 2767 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2768 display->selection_owner = 0;
2769 }
2770 else
2771 {
2772 free (selection.clip_text);
2773 selection.clip_text = NULL;
2774 selection.clip_len = 0;
2775
2776 if (display->clipboard_owner == this)
2777 display->clipboard_owner = 0;
2778 }
2959} 2779}
2960 2780
2961/* ------------------------------------------------------------------------- */ 2781/* ------------------------------------------------------------------------- */
2962/* 2782/*
2963 * Copy a selection into the cut buffer 2783 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 2784 * EXT: button 1 or 3 release
2965 */ 2785 */
2966void 2786void
2967rxvt_term::selection_make (Time tm) 2787rxvt_term::selection_make (Time tm)
2968{ 2788{
2969 int i; 2789 int size;
2970 wchar_t *new_selection_text; 2790 wchar_t *new_selection_text;
2971 text_t *t; 2791 text_t *t;
2972 2792
2973 switch (selection.op) 2793 switch (selection.op)
2974 { 2794 {
… …
2990 return; /* nothing selected, go away */ 2810 return; /* nothing selected, go away */
2991 2811
2992 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2812 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2993 return; 2813 return;
2994 2814
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2815 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2816 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2997 2817
2998 int ofs = 0; 2818 int ofs = 0;
2999 int extra = 0; 2819 int extra = 0;
3000 2820
3001 int col = selection.beg.col; 2821 int col = selection.beg.col;
… …
3007 { 2827 {
3008#if !ENABLE_MINIMAL 2828#if !ENABLE_MINIMAL
3009 if (selection.rect) 2829 if (selection.rect)
3010 { 2830 {
3011 col = selection.beg.col; 2831 col = selection.beg.col;
3012 end_col = ncol + 1; 2832 end_col = selection.end.col;
3013 } 2833 }
3014 else 2834 else
3015#endif 2835#endif
3016 end_col = ROW(row).l; 2836 end_col = ROW(row).l;
3017 2837
3018 col = max (col, 0); 2838 col = max (col, 0);
3019 2839
3020 if (row == selection.end.row 2840 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 2841 min_it (end_col, selection.end.col);
3026 2842
3027 t = ROW(row).t + col; 2843 t = ROW(row).t + col;
3028 2844
3029 for (; col < end_col; col++) 2845 for (; col < end_col; col++)
… …
3037 2853
3038 extra -= (len - 1); 2854 extra -= (len - 1);
3039 2855
3040 if (extra < 0) 2856 if (extra < 0)
3041 { 2857 {
3042 extra += i; 2858 extra += size;
3043 i += i; 2859 size += size;
3044 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2860 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3045 } 2861 }
3046 2862
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2863 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 2864 }
3049#endif 2865#endif
… …
3061 2877
3062 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3063 } 2879 }
3064 else 2880 else
3065#endif 2881#endif
3066 if (!ROW(row).is_longer () && row != selection.end.row) 2882 if (!ROW(row).is_longer ()
2883 && (row != selection.end.row || end_col != selection.end.col)
2884 && (row != selection.beg.row || selection.beg.col < ncol))
3067 new_selection_text[ofs++] = C0_LF; 2885 new_selection_text[ofs++] = C0_LF;
3068 } 2886 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 2887
3073 new_selection_text[ofs] = 0; 2888 new_selection_text[ofs] = 0;
3074 2889
3075 if (ofs == 0) 2890 if (ofs == 0)
3076 { 2891 {
… …
3089 2904
3090 selection_grab (tm); 2905 selection_grab (tm);
3091} 2906}
3092 2907
3093bool 2908bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 2909rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 2910{
2911 Atom sel;
2912
2913 if (!clipboard)
2914 {
3096 selection_time = tm; 2915 selection_time = tm;
2916 sel = XA_PRIMARY;
2917 }
2918 else
2919 {
2920 clipboard_time = tm;
2921 sel = xa[XA_CLIPBOARD];
2922 }
3097 2923
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2924 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2925 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 2926 {
3101 display->set_selection_owner (this); 2927 display->set_selection_owner (this, clipboard);
3102 return true; 2928 return true;
3103 } 2929 }
3104 else 2930 else
3105 { 2931 {
3106 selection_clear (); 2932 selection_clear (clipboard);
3107 return false; 2933 return false;
3108 } 2934 }
3109 2935
3110#if 0 2936#if 0
3111 XTextProperty ct; 2937 XTextProperty ct;
… …
3571 * EXT: SelectionRequest 3397 * EXT: SelectionRequest
3572 */ 3398 */
3573void 3399void
3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3400rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3575{ 3401{
3402 Atom property = rq.property == None ? rq.target : rq.property;
3576 XSelectionEvent ev; 3403 XSelectionEvent ev;
3577 3404
3578 ev.type = SelectionNotify; 3405 ev.type = SelectionNotify;
3579 ev.property = None; 3406 ev.property = None;
3580 ev.display = rq.display; 3407 ev.display = rq.display;
… …
3595 *target++ = xa[XA_COMPOUND_TEXT]; 3422 *target++ = xa[XA_COMPOUND_TEXT];
3596#if X_HAVE_UTF8_STRING 3423#if X_HAVE_UTF8_STRING
3597 *target++ = xa[XA_UTF8_STRING]; 3424 *target++ = xa[XA_UTF8_STRING];
3598#endif 3425#endif
3599 3426
3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3427 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3601 32, PropModeReplace, 3428 32, PropModeReplace,
3602 (unsigned char *)target_list, target - target_list); 3429 (unsigned char *)target_list, target - target_list);
3603 ev.property = rq.property; 3430 ev.property = property;
3604 } 3431 }
3605#if TODO // TODO 3432#if TODO // TODO
3606 else if (rq.target == xa[XA_MULTIPLE]) 3433 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3434 {
3608 /* TODO: Handle MULTIPLE */ 3435 /* TODO: Handle MULTIPLE */
3609 } 3436 }
3610#endif 3437#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3438 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3439 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3440 XChangeProperty (dpy, rq.requestor, property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3441 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3615 ev.property = rq.property; 3442 ev.property = property;
3443 }
3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3445 {
3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3447 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3448 ev.property = property;
3616 } 3449 }
3617 else if (rq.target == XA_STRING 3450 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3451 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3452 || rq.target == xa[XA_COMPOUND_TEXT]
3620 || rq.target == xa[XA_UTF8_STRING] 3453 || rq.target == xa[XA_UTF8_STRING]
… …
3652 { 3485 {
3653 target = xa[XA_COMPOUND_TEXT]; 3486 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3487 style = enc_compound_text;
3655 } 3488 }
3656 3489
3657 if (selection.text) 3490 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3491 {
3659 cl = selection.text; 3492 cl = selection.text;
3660 selectlen = selection.len; 3493 selectlen = selection.len;
3494 }
3495 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3496 {
3497 cl = selection.clip_text;
3498 selectlen = selection.clip_len;
3661 } 3499 }
3662 else 3500 else
3663 { 3501 {
3664 cl = L""; 3502 cl = L"";
3665 selectlen = 0; 3503 selectlen = 0;
… …
3686 ct.value = (unsigned char *)cl; 3524 ct.value = (unsigned char *)cl;
3687 ct.nitems = selectlen; 3525 ct.nitems = selectlen;
3688 ct.encoding = target; 3526 ct.encoding = target;
3689 } 3527 }
3690 3528
3691 XChangeProperty (dpy, rq.requestor, rq.property, 3529 XChangeProperty (dpy, rq.requestor, property,
3692 ct.encoding, 8, PropModeReplace, 3530 ct.encoding, 8, PropModeReplace,
3693 ct.value, (int)ct.nitems); 3531 ct.value, (int)ct.nitems);
3694 ev.property = rq.property; 3532 ev.property = property;
3695 3533
3696 if (freect) 3534 if (freect)
3697 XFree (ct.value); 3535 XFree (ct.value);
3698 } 3536 }
3699 3537

Diff Legend

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