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.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
51 if (option (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
52 view_start = 0 50 view_start = 0
53#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_SELECTION_MARK() \
57 selection.beg.row = selection.beg.col \
58 = selection.mark.row = selection.mark.col \
59 = selection.end.row = selection.end.col = 0 55 selection.mark.row = selection.mark.col = 0
60 56
61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
62 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 58 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
64 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 60 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
144 col--; 140 col--;
145 141
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 144
145 l.touch ();
146
149 // found start, nuke 147 // found start, nuke
150 do { 148 do {
151 l.t[col] = ' '; 149 l.t[col] = ' ';
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
… …
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
162rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
163{ 161{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
164 view_start = 0; 166 view_start = 0;
165 num_scr = 0; 167 num_scr = 0;
166 168
167 if (ncol == 0) 169 if (ncol == 0)
168 ncol = 80; 170 ncol = 80;
… …
199 term_start = 0; 201 term_start = 0;
200 202
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 205
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 209
208 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
209 { 211 {
… …
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 275 }
274 276
275 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 279
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
281 283
… …
398 } 400 }
399 401
400 free (tabs); 402 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
402 404
403 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
405 407
406 CLEAR_ALL_SELECTION (); 408 CLEAR_SELECTION ();
409 CLEAR_SELECTION_MARK ();
407 410
408 prev_nrow = nrow; 411 prev_nrow = nrow;
409 prev_ncol = ncol; 412 prev_ncol = ncol;
410 413
411 tt_winch (); 414 tt_winch ();
… …
634 637
635 if (count > 0 638 if (count > 0
636 && row1 == 0 639 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 640 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 641 {
642 min_it (count, total_rows - (nrow - (row2 + 1)));
643
639 top_row = max (top_row - count, -saveLines); 644 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 645
644 // sever bottommost line 646 // sever bottommost line
645 { 647 {
646 line_t &l = ROW(row2 - count); 648 line_t &l = ROW(row2);
647 l.is_longer (0); 649 l.is_longer (0);
648 l.touch (); 650 l.touch ();
649 } 651 }
650 652
653 // scroll everything up 'count' lines
654 term_start = (term_start + count) % total_rows;
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
651 // erase newly scrolled-in lines 668 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 669 for (int i = count; i--; )
653 { 670 {
654 line_t &l = ROW(nrow - 1 - i); 671 line_t &l = ROW(row2 - i);
655 672
656 // optimize if already cleared, can be significant on slow machines 673 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 674 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 675 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 676 {
660 scr_blank_line (l, 0, l.l, rstyle); 677 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 678 l.l = 0;
… …
663 } 680 }
664 else 681 else
665 scr_blank_screen_mem (l, rstyle); 682 scr_blank_screen_mem (l, rstyle);
666 } 683 }
667 684
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 685 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen
687 && selection.beg.row <= row2)
682 { 688 {
683 selection.beg.row -= count; 689 selection.beg.row -= count;
684 selection.end.row -= count; 690 selection.end.row -= count;
685 selection.mark.row -= count; 691 selection.mark.row -= count;
686 692
687 if (selection.beg.row < top_row 693 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 694 }
695 695
696 // finally move the view window, if desired 696 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 698 && view_start != 0
… …
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1) 713 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2)) 714 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 { 715 {
716 CLEAR_ALL_SELECTION (); 716 CLEAR_SELECTION ();
717 selection.op = SELECTION_CLEAR; 717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
718 CLEAR_SELECTION_MARK ();
718 } 719 }
719 else if (selection.end.row >= row1 && selection.end.row <= row2) 720 else if (selection.end.row >= row1 && selection.end.row <= row2)
720 { 721 {
721 /* move selected region too */ 722 /* move selected region too */
722 selection.beg.row -= count; 723 selection.beg.row -= count;
… …
728 } 729 }
729 730
730 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
732 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
733 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
734 743
735 min_it (count, rows); 744 min_it (count, rows);
736 745
737 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 747
739 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
740 { 749 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 751
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 754 }
746 755
747 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
749 } 765 }
750 766
751 return count; 767 return count;
752} 768}
753 769
… …
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 776{
761 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
762 return; 778 return;
763 779
764 unsigned char checksel; 780 bool checksel;
765 unicode_t c; 781 unicode_t c;
766 int ncol = this->ncol; 782 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
768 784
769 want_refresh = 1; 785 want_refresh = 1;
… …
795 811
796 while (str < strend) 812 while (str < strend)
797 { 813 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 815
800 if (expect_false (c < 0x20)) 816 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 817 if (c == C0_LF)
802 { 818 {
803 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
804 820
805 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
824 { 840 {
825 scr_tab (1, true); 841 scr_tab (1, true);
826 continue; 842 continue;
827 } 843 }
828 844
829 if (expect_false ( 845 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 849 ))
834 { 850 {
… …
839 * should be a similar check. 855 * should be a similar check.
840 */ 856 */
841 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
842 } 858 }
843 859
844 if (expect_false (screen.flags & Screen_WrapNext)) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 861 {
846 scr_do_wrap (); 862 scr_do_wrap ();
847 863
848 line->l = ncol; 864 line->l = ncol;
849 line->is_longer (1); 865 line->is_longer (1);
… …
851 row = screen.cur.row; 867 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
853 } 869 }
854 870
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 873 c = 0xfffd;
858 874
859 // rely on wcwidth to tell us the character width, do wcwidth before 875 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
862 // locale. 878 // locale.
863 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
864 880
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 882 {
867 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 884 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
885 } 901 }
886 } 902 }
887 903
888 if (expect_false (screen.flags & Screen_Insert)) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
890 906
891 if (width != 0) 907 if (width != 0)
892 { 908 {
893#if !UNICODE_3 909#if !UNICODE_3
… …
898# else 914# else
899 c = 0xfffd; 915 c = 0xfffd;
900# endif 916# endif
901#endif 917#endif
902 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
903 // nuke the character at this position, if required 935 // nuke the character at this position, if required
904 if (expect_false ( 936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
905 line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col); 940 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 941
922 line->touch (); 942 line->touch ();
923 943
924 do 944 do
925 { 945 {
926 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
928 948
929 if (expect_true (screen.cur.col < ncol - 1)) 949 if (ecb_likely (screen.cur.col < ncol - 1))
930 screen.cur.col++; 950 screen.cur.col++;
931 else 951 else
932 { 952 {
933 line->l = ncol; 953 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
936 break; 956
957 goto end_of_line;
937 } 958 }
938 959
939 c = NOCHAR; 960 c = NOCHAR;
940 } 961 }
941 while (expect_false (--width > 0)); 962 while (ecb_unlikely (--width > 0));
942 963
943 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945 { 966 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 967 line->t[c] = ' ';
951 line->r[c] = rend; 968 line->r[c] = rend;
952 }
953 } 969 }
970
971end_of_line:
972 ;
954 } 973 }
955#if ENABLE_COMBINING 974#if ENABLE_COMBINING
956 else // width == 0 975 else // width == 0
957 { 976 {
958 if (c != 0xfeff) // ignore BOM 977 if (c != 0xfeff) // ignore BOM
… …
1021 1040
1022 want_refresh = 1; 1041 want_refresh = 1;
1023#endif 1042#endif
1024 } 1043 }
1025 } 1044 }
1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1026 else 1047 else
1027 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1028} 1049}
1029 1050
1030/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
… …
1678 { 1699 {
1679 rvideo_state = on; 1700 rvideo_state = on;
1680 1701
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1703#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1684#endif 1705#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1707
1687 XGCValues gcvalue; 1708 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
… …
1915 1936
1916# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1919# endif 1940# endif
1920 XMapWindow (dpy, parent[0]); 1941 XMapWindow (dpy, parent);
1921# endif 1942# endif
1922 1943
1923# if ENABLE_FRILLS 1944# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1945 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1946 set_urgency (1);
… …
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1939#endif 1960#endif
1940} 1961}
1941 1962
1942/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1943/* ARGSUSED */
1944void 1964void
1945rxvt_term::scr_printscreen (int fullhist) NOTHROW 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1946{ 1966{
1947#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1948 int nrows, row_start; 1968 int nrows, row_start;
… …
2022 * A: set up vars 2042 * A: set up vars
2023 */ 2043 */
2024 refresh_count = 0; 2044 refresh_count = 0;
2025 2045
2026 unsigned int old_screen_flags = screen.flags; 2046 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2047 bool have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2029 have_bg = bgPixmap.pixmap != None; 2049 have_bg = bg_pixmap != None;
2030#endif 2050#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2052
2033 /* 2053 /*
2034 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
… …
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2040 scr_swap_overlay (); 2060 scr_swap_overlay ();
2041#endif 2061#endif
2042 2062
2043 char showcursor = screen.flags & Screen_VisibleCursor; 2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2044 2064
2045 /* 2065 /*
2046 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2047 */ 2067 */
2048 { 2068 {
2049 unsigned char setoldcursor; 2069 bool setoldcursor;
2050 2070
2051#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2052 if (hidden_cursor) 2072 if (hidden_cursor)
2053 showcursor = 0; 2073 showcursor = 0;
2054#endif 2074#endif
… …
2226 continue; 2246 continue;
2227 2247
2228 // redraw one or more characters 2248 // redraw one or more characters
2229 2249
2230 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2232 --col; 2252 --col;
2233 2253
2234 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2255 text_t *text = stp + col;
2236 int count = 1; 2256 int count = 1;
… …
2274 2294
2275 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2276 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2277 2297
2278 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2279 while (expect_false (i && text[count] == NOCHAR)) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2280 count++, i--; 2300 count++, i--;
2281 2301
2282 /* 2302 /*
2283 * Determine the attributes for the string 2303 * Determine the attributes for the string
2284 */ 2304 */
2285 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2287 2307
2288 // only do special processing if any attributes are set, which is unlikely 2308 // only do special processing if any attributes are set, which is unlikely
2289 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2309 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2310 {
2291 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2292 2312
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
… …
2383 /* 2403 /*
2384 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2385 */ 2405 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2407
2388 if (expect_true (have_bg && back == Color_bg)) 2408 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2409 {
2390 // this is very ugly, maybe push it into ->draw? 2410 // this is very ugly, maybe push it into ->draw?
2391 2411
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2413 if (text[i] != ' ')
… …
2400 did_clear: ; 2420 did_clear: ;
2401 } 2421 }
2402 else 2422 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2424
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2426 {
2407#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2430 else
… …
2501 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2502 } 2522 }
2503} 2523}
2504 2524
2505void 2525void
2506rxvt_term::scr_recolour () NOTHROW 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2527{
2528 bool transparent = false;
2529
2508#ifdef HAVE_BG_PIXMAP 2530#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2531 if (bg_pixmap != None)
2510#else 2532 {
2533# ifdef ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT)
2535 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 2538
2539 transparent = true;
2540 }
2541 else
2542# endif
2543 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2546 }
2547 }
2548 else
2549#endif
2550 {
2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2553 }
2554
2555 XClearWindow (dpy, parent);
2515 2556
2516 if (scrollBar.win) 2557 if (scrollBar.win)
2517 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519 scrollBar.state = STATE_IDLE; 2563 scrollBar.state = SB_STATE_IDLE;
2520 scrollBar.show (0); 2564 scrollBar.show (0);
2521 } 2565 }
2522 2566
2523#endif 2567 if (refresh)
2524 2568 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2569 scr_clear ();
2527 scr_touch (true); 2570 scr_touch (true);
2571 }
2528 want_refresh = 1; 2572 want_refresh = 1;
2529} 2573}
2530 2574
2531/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2532void 2576void
… …
2620void 2664void
2621rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2666{
2623 int row, wrote; 2667 int row, wrote;
2624 unsigned int width, towrite; 2668 unsigned int width, towrite;
2625 char r1[] = "\n"; 2669 const char r1[] = "\n";
2626 2670
2627 for (row = saveLines + top_row; 2671 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2629 { 2673 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2647 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2648 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2649void 2693void
2650rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2651{ 2695{
2652 row_col_t pos;
2653
2654 if (!selection.op) 2696 if (!selection.op)
2655 return; 2697 return;
2656 2698
2699 row_col_t pos;
2657 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2658 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2661 || (check_more == 1 2704 || (check_more == 1
2662 && current_screen == selection.screen 2705 && current_screen == selection.screen
2663 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2664 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2665 || (check_more == 2 2708 || (check_more == 2
2666 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2667 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2668 || (check_more == 3 2711 || (check_more == 3
2669 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2670 || (check_more == 4 /* screen width change */
2671 && (selection.beg.row != selection.end.row
2672 || selection.end.col > ncol)))
2673 CLEAR_SELECTION (); 2713 CLEAR_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2674} 2717}
2675 2718
2676/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2677/* 2720/*
2678 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
2703 tt_paste (data, len); 2746 tt_paste (data, len);
2704} 2747}
2705 2748
2706/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2707/* 2750/*
2708 * Respond to a notification that a primary selection has been sent 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2709 * EXT: SelectionNotify 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2710 */ 2753 * as fallback
2711void
2712rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2713{
2714 if (prop == None) /* check for failed XConvertSelection */
2715 {
2716 if ((selection_type & Sel_CompoundText))
2717 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = 0;
2721 if (selnum != Sel_direct)
2722 selection_request_other (XA_STRING, selnum);
2723 }
2724
2725 if ((selection_type & Sel_UTF8String))
2726 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = Sel_CompoundText;
2730 if (selnum != Sel_direct)
2731 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2732 else
2733 selection_type = 0;
2734 }
2735
2736 return;
2737 }
2738
2739 unsigned long bytes_after;
2740 XTextProperty ct;
2741
2742 if (XGetWindowProperty (dpy, win, prop,
2743 0, PROP_SIZE / 4,
2744 delete_prop, AnyPropertyType,
2745 &ct.encoding, &ct.format,
2746 &ct.nitems, &bytes_after,
2747 &ct.value) != Success)
2748 {
2749 ct.value = 0;
2750 goto bailout;
2751 }
2752
2753 if (ct.encoding == None)
2754 goto bailout;
2755
2756 if (bytes_after)
2757 {
2758 // fetch and append remaining data
2759 XTextProperty ct2;
2760
2761 if (XGetWindowProperty (dpy, win, prop,
2762 ct.nitems / 4, (bytes_after + 3) / 4,
2763 delete_prop, AnyPropertyType,
2764 &ct2.encoding, &ct2.format,
2765 &ct2.nitems, &bytes_after,
2766 &ct2.value) != Success)
2767 goto bailout;
2768
2769 // realloc should be compatible to XFree, here, and elsewhere, too
2770 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2771 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2772 ct.nitems += ct2.nitems;
2773
2774 XFree (ct2.value);
2775 }
2776
2777 if (ct.value == 0)
2778 goto bailout;
2779
2780 if (ct.encoding == xa[XA_INCR])
2781 {
2782 // INCR selection, start handshake
2783 if (!delete_prop)
2784 XDeleteProperty (dpy, win, prop);
2785
2786 selection_wait = Sel_incr;
2787 incr_buf_fill = 0;
2788 incr_ev.start (10);
2789
2790 goto bailout;
2791 }
2792
2793 if (ct.nitems == 0)
2794 {
2795 if (selection_wait == Sel_incr)
2796 {
2797 XFree (ct.value);
2798
2799 // finally complete, now paste the whole thing
2800 selection_wait = Sel_normal;
2801 ct.value = (unsigned char *)incr_buf;
2802 ct.nitems = incr_buf_fill;
2803 incr_buf = 0;
2804 incr_buf_size = 0;
2805 incr_ev.stop ();
2806 }
2807 else
2808 {
2809 if (selection_wait == Sel_normal
2810 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2811 {
2812 /*
2813 * pass through again trying CUT_BUFFER0 if we've come from
2814 * XConvertSelection () but nothing was presented
2815 */
2816 selection_paste (display->root, XA_CUT_BUFFER0, False);
2817 }
2818
2819 goto bailout;
2820 }
2821 }
2822 else if (selection_wait == Sel_incr)
2823 {
2824 incr_ev.start (10);
2825
2826 while (incr_buf_fill + ct.nitems > incr_buf_size)
2827 {
2828 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2829 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2830 }
2831
2832 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2833 incr_buf_fill += ct.nitems;
2834
2835 goto bailout;
2836 }
2837
2838 char **cl;
2839 int cr;
2840
2841#if !ENABLE_MINIMAL
2842 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2843 // so recode it manually
2844 if (ct.encoding == xa[XA_UTF8_STRING])
2845 {
2846 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2847 char *s = rxvt_wcstombs (w);
2848 free (w);
2849 // TODO: strlen == only the first element will be converted. well...
2850 paste (s, strlen (s));
2851 free (s);
2852 }
2853 else
2854#endif
2855 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2856 && cl)
2857 {
2858 for (int i = 0; i < cr; i++)
2859 paste (cl[i], strlen (cl[i]));
2860
2861 XFreeStringList (cl);
2862 }
2863 else
2864 paste ((char *)ct.value, ct.nitems); // paste raw
2865
2866bailout:
2867 XFree (ct.value);
2868
2869 if (selection_wait == Sel_normal)
2870 selection_wait = Sel_none;
2871}
2872
2873void
2874rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2875{
2876 selection_wait = Sel_none;
2877
2878 incr_buf_size = 0;
2879 free (incr_buf);
2880
2881 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2882}
2883
2884void
2885rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2886{
2887 if (prop == None || selection_wait != Sel_incr)
2888 return;
2889
2890 selection_paste (win, prop, true);
2891}
2892
2893/* ------------------------------------------------------------------------- */
2894/*
2895 * Request the current selection:
2896 * Order: > internal selection if available
2897 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2898 * > CUT_BUFFER0
2899 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2900 * will auto fallback to CUT_BUFFER0
2901 * EXT: button 2 release 2754 * EXT: button 2 release
2902 */ 2755 */
2903void 2756void
2904rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2905{ 2758{
2906 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2907 {
2908 /* internal selection */
2909 char *str = rxvt_wcstombs (selection.text, selection.len);
2910 paste (str, strlen (str));
2911 free (str);
2912 return;
2913 } 2760 {
2914 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2915 { 2763 }
2916 selection_request_time = tm;
2917 selection_wait = Sel_normal;
2918
2919#if X_HAVE_UTF8_STRING
2920 selection_type = Sel_UTF8String;
2921 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2922 return;
2923#else
2924 selection_type = Sel_CompoundText;
2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2926 return;
2927#endif
2928 }
2929
2930 selection_wait = Sel_none; /* don't loop in selection_paste () */
2931 selection_paste (display->root, XA_CUT_BUFFER0, false);
2932}
2933
2934int
2935rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2936{
2937 Atom sel;
2938
2939 selection_type |= selnum;
2940
2941 if (selnum == Sel_Primary)
2942 sel = XA_PRIMARY;
2943 else if (selnum == Sel_Secondary)
2944 sel = XA_SECONDARY;
2945 else
2946 sel = xa[XA_CLIPBOARD];
2947
2948 if (XGetSelectionOwner (dpy, sel) != None)
2949 {
2950 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2951 vt, selection_request_time);
2952 return 1;
2953 }
2954
2955 return 0;
2956} 2764}
2957 2765
2958/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2959/* 2767/*
2960 * Clear all selected text 2768 * Clear all selected text
… …
2991 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2992 */ 2800 */
2993void 2801void
2994rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2995{ 2803{
2996 int i; 2804 int size;
2997 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2998 text_t *t; 2806 text_t *t;
2999 2807
3000 switch (selection.op) 2808 switch (selection.op)
3001 { 2809 {
… …
3017 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
3018 2826
3019 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3020 return; 2828 return;
3021 2829
3022 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3023 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3024 2832
3025 int ofs = 0; 2833 int ofs = 0;
3026 int extra = 0; 2834 int extra = 0;
3027 2835
3028 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
3034 { 2842 {
3035#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
3036 if (selection.rect) 2844 if (selection.rect)
3037 { 2845 {
3038 col = selection.beg.col; 2846 col = selection.beg.col;
3039 end_col = ncol + 1; 2847 end_col = selection.end.col;
3040 } 2848 }
3041 else 2849 else
3042#endif 2850#endif
3043 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
3044 2852
3045 col = max (col, 0); 2853 col = max (col, 0);
3046 2854
3047 if (row == selection.end.row 2855 if (row == selection.end.row)
3048#if !ENABLE_MINIMAL
3049 || selection.rect
3050#endif
3051 )
3052 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3053 2857
3054 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3055 2859
3056 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3064 2868
3065 extra -= (len - 1); 2869 extra -= (len - 1);
3066 2870
3067 if (extra < 0) 2871 if (extra < 0)
3068 { 2872 {
3069 extra += i; 2873 extra += size;
3070 i += i; 2874 size += size;
3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3072 } 2876 }
3073 2877
3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075 } 2879 }
3076#endif 2880#endif
… …
3088 2892
3089 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3090 } 2894 }
3091 else 2895 else
3092#endif 2896#endif
3093 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3094 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3095 } 2901 }
3096
3097 if (end_col != selection.end.col)
3098 new_selection_text[ofs++] = C0_LF;
3099 2902
3100 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3101 2904
3102 if (ofs == 0) 2905 if (ofs == 0)
3103 { 2906 {
… …
3609 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3610 */ 3413 */
3611void 3414void
3612rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3613{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3614 XSelectionEvent ev; 3418 XSelectionEvent ev;
3615 3419
3616 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3617 ev.property = None; 3421 ev.property = None;
3618 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3633 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3634#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3635 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3636#endif 3440#endif
3637 3441
3638 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3639 32, PropModeReplace, 3443 32, PropModeReplace,
3640 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3641 ev.property = rq.property; 3445 ev.property = property;
3642 } 3446 }
3643#if TODO // TODO 3447#if TODO // TODO
3644 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3645 { 3449 {
3646 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3647 } 3451 }
3648#endif 3452#endif
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3650 { 3454 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653 ev.property = rq.property; 3457 ev.property = property;
3654 } 3458 }
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3656 { 3460 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3659 ev.property = rq.property; 3463 ev.property = property;
3660 } 3464 }
3661 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3662 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3663 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3664 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3735 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3736 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3737 ct.encoding = target; 3541 ct.encoding = target;
3738 } 3542 }
3739 3543
3740 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3741 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3742 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3743 ev.property = rq.property; 3547 ev.property = property;
3744 3548
3745 if (freect) 3549 if (freect)
3746 XFree (ct.value); 3550 XFree (ct.value);
3747 } 3551 }
3748 3552

Diff Legend

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