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.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC vs.
Revision 1.398 by sf-exg, Wed Nov 2 15:11:51 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
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
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 * ------------------------------------------------------------------------- */
… …
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 146
147 l.touch ();
148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
153 col++; 153 col++;
… …
159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
163{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
164 view_start = 0; 168 view_start = 0;
165 num_scr = 0; 169 num_scr = 0;
166 170
167 if (ncol == 0) 171 if (ncol == 0)
168 ncol = 80; 172 ncol = 80;
… …
199 term_start = 0; 203 term_start = 0;
200 204
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 207
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 211
208 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
209 { 213 {
… …
271 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);
272 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);
273 } 277 }
274 278
275 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 281
278 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
279 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
281 285
… …
398 } 402 }
399 403
400 free (tabs); 404 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
402 406
403 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
405 409
406 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
407 411
408 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
634 638
635 if (count > 0 639 if (count > 0
636 && row1 == 0 640 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
639 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 646
644 // sever bottommost line 647 // sever bottommost line
645 { 648 {
646 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
647 l.is_longer (0); 650 l.is_longer (0);
648 l.touch (); 651 l.touch ();
649 } 652 }
650 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
651 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 670 for (int i = count; i--; )
653 { 671 {
654 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
655 673
656 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 675 // 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))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 677 {
660 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 679 l.l = 0;
… …
663 } 681 }
664 else 682 else
665 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
666 } 684 }
667 685
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
681 if (selection.op && current_screen == selection.screen)
682 {
683 selection.beg.row -= count;
684 selection.end.row -= count;
685 selection.mark.row -= count;
686
687 if (selection.beg.row < top_row
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 }
695
696 // finally move the view window, if desired 686 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 688 && view_start != 0
699 && view_start != -saveLines) 689 && view_start != -saveLines)
700 scr_page (UP, count); 690 scr_page (UP, count);
… …
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 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));
704 } 694 }
705 else 695 else
706 { 696 {
707 if (selection.op && current_screen == selection.screen)
708 {
709 if ((selection.beg.row < row1 && selection.end.row > row1)
710 || (selection.beg.row < row2 && selection.end.row > row2)
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 {
716 CLEAR_ALL_SELECTION ();
717 selection.op = SELECTION_CLEAR;
718 }
719 else if (selection.end.row >= row1 && selection.end.row <= row2)
720 {
721 /* move selected region too */
722 selection.beg.row -= count;
723 selection.end.row -= count;
724 selection.mark.row -= count;
725
726 selection_check (0);
727 }
728 }
729
730 // use a simple and robust scrolling algorithm, this 697 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 698 // part of scr_scroll_text is not time-critical.
732 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
733 int rows = row2 - row1 + 1; 708 int rows = row2 - row1 + 1;
734 709
735 min_it (count, rows); 710 min_it (count, rows);
736 711
737 line_t *temp_buf = row_buf + total_rows; 712 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 713
739 for (int row = 0; row < rows; row++) 714 for (int row = 0; row < rows; row++)
740 { 715 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 716 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 717
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 719 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 720 }
746 721
747 for (int row = 0; row < rows; row++) 722 for (int row = 0; row < rows; row++)
748 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 }
749 } 752 }
750 753
751 return count; 754 return count;
752} 755}
753 756
… …
795 798
796 while (str < strend) 799 while (str < strend)
797 { 800 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 802
800 if (expect_false (c < 0x20)) 803 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 804 if (c == C0_LF)
802 { 805 {
803 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
804 807
805 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
824 { 827 {
825 scr_tab (1, true); 828 scr_tab (1, true);
826 continue; 829 continue;
827 } 830 }
828 831
829 if (expect_false ( 832 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 836 ))
834 { 837 {
… …
839 * should be a similar check. 842 * should be a similar check.
840 */ 843 */
841 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
842 } 845 }
843 846
844 if (expect_false (screen.flags & Screen_WrapNext)) 847 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 848 {
846 scr_do_wrap (); 849 scr_do_wrap ();
847 850
848 line->l = ncol; 851 line->l = ncol;
849 line->is_longer (1); 852 line->is_longer (1);
… …
851 row = screen.cur.row; 854 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
853 } 856 }
854 857
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 859 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 860 c = 0xfffd;
858 861
859 // 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
860 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
862 // locale. 865 // locale.
863 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
864 867
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 868 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 869 {
867 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 871 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
885 } 888 }
886 } 889 }
887 890
888 if (expect_false (screen.flags & Screen_Insert)) 891 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
890 893
891 if (width != 0) 894 if (width != 0)
892 { 895 {
893#if !UNICODE_3 896#if !UNICODE_3
… …
898# else 901# else
899 c = 0xfffd; 902 c = 0xfffd;
900# endif 903# endif
901#endif 904#endif
902 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
903 // nuke the character at this position, if required 922 // nuke the character at this position, if required
904 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.
905 line->t[screen.cur.col] == NOCHAR 926 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); 927 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 928
922 line->touch (); 929 line->touch ();
923 930
924 do 931 do
925 { 932 {
926 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 934 line->r[screen.cur.col] = rend;
928 935
929 if (expect_true (screen.cur.col < ncol - 1)) 936 if (ecb_likely (screen.cur.col < ncol - 1))
930 screen.cur.col++; 937 screen.cur.col++;
931 else 938 else
932 { 939 {
933 line->l = ncol; 940 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
936 break; 943
944 goto end_of_line;
937 } 945 }
938 946
939 c = NOCHAR; 947 c = NOCHAR;
940 } 948 }
941 while (expect_false (--width > 0)); 949 while (ecb_unlikely (--width > 0));
942 950
943 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 952 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945 { 953 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 954 line->t[c] = ' ';
951 line->r[c] = rend; 955 line->r[c] = rend;
952 }
953 } 956 }
957
958end_of_line:
959 ;
954 } 960 }
955#if ENABLE_COMBINING 961#if ENABLE_COMBINING
956 else // width == 0 962 else // width == 0
957 { 963 {
958 if (c != 0xfeff) // ignore BOM 964 if (c != 0xfeff) // ignore BOM
… …
1021 1027
1022 want_refresh = 1; 1028 want_refresh = 1;
1023#endif 1029#endif
1024 } 1030 }
1025 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1026 else 1034 else
1027 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1028} 1036}
1029 1037
1030/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1337 return; 1345 return;
1338 1346
1339 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1340 1348
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1352 {
1348 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1349 1354
1350 if (mapped && !view_start) 1355 if (mapped)
1351 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1354 } 1359 }
1355 else 1360 else
1356 { 1361 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1363
1359 if (mapped && !view_start) 1364 if (mapped)
1360 { 1365 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1369 0, Row2Pixel (row - view_start),
… …
1371 1376
1372 for (; num--; row++) 1377 for (; num--; row++)
1373 { 1378 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1375 1380
1376 if (!view_start) 1381 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1383 }
1379} 1384}
1380 1385
1381#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1382void 1387void
… …
1681 { 1686 {
1682 rvideo_state = on; 1687 rvideo_state = on;
1683 1688
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1690#ifdef HAVE_BG_PIXMAP
1686 if (bgPixmap.pixmap == None) 1691 if (bg_pixmap == None)
1687#endif 1692#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1694
1690 XGCValues gcvalue; 1695 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
… …
1918 1923
1919# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1922# endif 1927# endif
1923 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent);
1924# endif 1929# endif
1925 1930
1926# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1933 set_urgency (1);
… …
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1942#endif 1947#endif
1943} 1948}
1944 1949
1945/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1946/* ARGSUSED */
1947void 1951void
1948rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1949{ 1953{
1950#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1951 int nrows, row_start; 1955 int nrows, row_start;
… …
2027 refresh_count = 0; 2031 refresh_count = 0;
2028 2032
2029 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2034 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2033#endif 2037#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2039
2036 /* 2040 /*
2037 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2229 continue; 2233 continue;
2230 2234
2231 // redraw one or more characters 2235 // redraw one or more characters
2232 2236
2233 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2234 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2235 --col; 2239 --col;
2236 2240
2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2238 text_t *text = stp + col; 2242 text_t *text = stp + col;
2239 int count = 1; 2243 int count = 1;
… …
2277 2281
2278 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2280 2284
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2286 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2287 count++, i--;
2284 2288
2285 /* 2289 /*
2286 * Determine the attributes for the string 2290 * Determine the attributes for the string
2287 */ 2291 */
2288 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2290 2294
2291 // 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
2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2296 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2297 {
2294 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2295 2299
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2386 /* 2390 /*
2387 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2388 */ 2392 */
2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2390 2394
2391 if (expect_true (have_bg && back == Color_bg)) 2395 if (ecb_likely (have_bg && back == Color_bg))
2392 { 2396 {
2393 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2394 2398
2395 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2396 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2403 did_clear: ; 2407 did_clear: ;
2404 } 2408 }
2405 else 2409 else
2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2407 2411
2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2409 { 2413 {
2410#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413 else 2417 else
… …
2504 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2505 } 2509 }
2506} 2510}
2507 2511
2508void 2512void
2509rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2514{
2515 bool transparent = false;
2516
2511#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2512 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2513#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);
2514 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 {
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2516 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2542 XClearWindow (dpy, parent);
2518 2543
2519 if (scrollBar.win) 2544 if (scrollBar.win)
2520 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2522 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = SB_STATE_IDLE;
2523 scrollBar.show (0); 2551 scrollBar.show (0);
2524 } 2552 }
2525 2553
2526#endif 2554 if (refresh)
2527 2555 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2556 scr_clear ();
2530 scr_touch (true); 2557 scr_touch (true);
2558 }
2531 want_refresh = 1; 2559 want_refresh = 1;
2532} 2560}
2533 2561
2534/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2535void 2563void
… …
2623void 2651void
2624rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2653{
2626 int row, wrote; 2654 int row, wrote;
2627 unsigned int width, towrite; 2655 unsigned int width, towrite;
2628 char r1[] = "\n"; 2656 const char r1[] = "\n";
2629 2657
2630 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2632 { 2660 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2650 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2651 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2652void 2680void
2653rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2654{ 2682{
2655 row_col_t pos;
2656
2657 if (!selection.op) 2683 if (!selection.op)
2658 return; 2684 return;
2659 2685
2686 row_col_t pos;
2660 pos.row = pos.col = 0; 2687 pos.row = pos.col = 0;
2688
2661 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2662 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2663 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2664 || (check_more == 1 2692 || (check_more == 1
2665 && current_screen == selection.screen 2693 && current_screen == selection.screen
… …
2671 || (check_more == 3 2699 || (check_more == 3
2672 && ROWCOL_IS_AFTER (selection.end, pos)) 2700 && ROWCOL_IS_AFTER (selection.end, pos))
2673 || (check_more == 4 /* screen width change */ 2701 || (check_more == 4 /* screen width change */
2674 && (selection.beg.row != selection.end.row 2702 && (selection.beg.row != selection.end.row
2675 || selection.end.col > ncol))) 2703 || selection.end.col > ncol)))
2676 CLEAR_SELECTION (); 2704 CLEAR_ALL_SELECTION ();
2677} 2705}
2678 2706
2679/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2680/* 2708/*
2681 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
… …
2706 tt_paste (data, len); 2734 tt_paste (data, len);
2707} 2735}
2708 2736
2709/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2710/* 2738/*
2711 * Respond to a notification that a primary selection has been sent 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2712 * EXT: SelectionNotify 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2713 */ 2741 * as fallback
2714void
2715rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2716{
2717 if (prop == None) /* check for failed XConvertSelection */
2718 {
2719 if ((selection_type & Sel_CompoundText))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = 0;
2724 if (selnum != Sel_direct)
2725 selection_request_other (XA_STRING, selnum);
2726 }
2727
2728 if ((selection_type & Sel_UTF8String))
2729 {
2730 int selnum = selection_type & Sel_whereMask;
2731
2732 selection_type = Sel_CompoundText;
2733 if (selnum != Sel_direct)
2734 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2735 else
2736 selection_type = 0;
2737 }
2738
2739 return;
2740 }
2741
2742 unsigned long bytes_after;
2743 XTextProperty ct;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 0, PROP_SIZE / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct.encoding, &ct.format,
2749 &ct.nitems, &bytes_after,
2750 &ct.value) != Success)
2751 {
2752 ct.value = 0;
2753 goto bailout;
2754 }
2755
2756 if (ct.encoding == None)
2757 goto bailout;
2758
2759 if (bytes_after)
2760 {
2761 // fetch and append remaining data
2762 XTextProperty ct2;
2763
2764 if (XGetWindowProperty (dpy, win, prop,
2765 ct.nitems / 4, (bytes_after + 3) / 4,
2766 delete_prop, AnyPropertyType,
2767 &ct2.encoding, &ct2.format,
2768 &ct2.nitems, &bytes_after,
2769 &ct2.value) != Success)
2770 goto bailout;
2771
2772 // realloc should be compatible to XFree, here, and elsewhere, too
2773 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2774 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2775 ct.nitems += ct2.nitems;
2776
2777 XFree (ct2.value);
2778 }
2779
2780 if (ct.value == 0)
2781 goto bailout;
2782
2783 if (ct.encoding == xa[XA_INCR])
2784 {
2785 // INCR selection, start handshake
2786 if (!delete_prop)
2787 XDeleteProperty (dpy, win, prop);
2788
2789 selection_wait = Sel_incr;
2790 incr_buf_fill = 0;
2791 incr_ev.start (10);
2792
2793 goto bailout;
2794 }
2795
2796 if (ct.nitems == 0)
2797 {
2798 if (selection_wait == Sel_incr)
2799 {
2800 XFree (ct.value);
2801
2802 // finally complete, now paste the whole thing
2803 selection_wait = Sel_normal;
2804 ct.value = (unsigned char *)incr_buf;
2805 ct.nitems = incr_buf_fill;
2806 incr_buf = 0;
2807 incr_buf_size = 0;
2808 incr_ev.stop ();
2809 }
2810 else
2811 {
2812 if (selection_wait == Sel_normal
2813 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2814 {
2815 /*
2816 * pass through again trying CUT_BUFFER0 if we've come from
2817 * XConvertSelection () but nothing was presented
2818 */
2819 selection_paste (display->root, XA_CUT_BUFFER0, False);
2820 }
2821
2822 goto bailout;
2823 }
2824 }
2825 else if (selection_wait == Sel_incr)
2826 {
2827 incr_ev.start (10);
2828
2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2830 {
2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2832 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2833 }
2834
2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2836 incr_buf_fill += ct.nitems;
2837
2838 goto bailout;
2839 }
2840
2841 char **cl;
2842 int cr;
2843
2844#if !ENABLE_MINIMAL
2845 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2846 // so recode it manually
2847 if (ct.encoding == xa[XA_UTF8_STRING])
2848 {
2849 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2850 char *s = rxvt_wcstombs (w);
2851 free (w);
2852 // TODO: strlen == only the first element will be converted. well...
2853 paste (s, strlen (s));
2854 free (s);
2855 }
2856 else
2857#endif
2858 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2859 && cl)
2860 {
2861 for (int i = 0; i < cr; i++)
2862 paste (cl[i], strlen (cl[i]));
2863
2864 XFreeStringList (cl);
2865 }
2866 else
2867 paste ((char *)ct.value, ct.nitems); // paste raw
2868
2869bailout:
2870 XFree (ct.value);
2871
2872 if (selection_wait == Sel_normal)
2873 selection_wait = Sel_none;
2874}
2875
2876void
2877rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2878{
2879 selection_wait = Sel_none;
2880
2881 incr_buf_size = 0;
2882 free (incr_buf);
2883
2884 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2885}
2886
2887void
2888rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2889{
2890 if (prop == None || selection_wait != Sel_incr)
2891 return;
2892
2893 selection_paste (win, prop, true);
2894}
2895
2896/* ------------------------------------------------------------------------- */
2897/*
2898 * Request the current selection:
2899 * Order: > internal selection if available
2900 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2901 * > CUT_BUFFER0
2902 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2903 * will auto fallback to CUT_BUFFER0
2904 * EXT: button 2 release 2742 * EXT: button 2 release
2905 */ 2743 */
2906void 2744void
2907rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2908{ 2746{
2909 if (selection.text && selnum == Sel_Primary) 2747 if (!selection_req)
2910 {
2911 /* internal selection */
2912 char *str = rxvt_wcstombs (selection.text, selection.len);
2913 paste (str, strlen (str));
2914 free (str);
2915 return;
2916 } 2748 {
2917 else 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2750 selection_req->run ();
2918 { 2751 }
2919 selection_request_time = tm;
2920 selection_wait = Sel_normal;
2921
2922#if X_HAVE_UTF8_STRING
2923 selection_type = Sel_UTF8String;
2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2925 return;
2926#else
2927 selection_type = Sel_CompoundText;
2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2929 return;
2930#endif
2931 }
2932
2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
2935}
2936
2937int
2938rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2939{
2940 Atom sel;
2941
2942 selection_type |= selnum;
2943
2944 if (selnum == Sel_Primary)
2945 sel = XA_PRIMARY;
2946 else if (selnum == Sel_Secondary)
2947 sel = XA_SECONDARY;
2948 else
2949 sel = xa[XA_CLIPBOARD];
2950
2951 if (XGetSelectionOwner (dpy, sel) != None)
2952 {
2953 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2954 vt, selection_request_time);
2955 return 1;
2956 }
2957
2958 return 0;
2959} 2752}
2960 2753
2961/* ------------------------------------------------------------------------- */ 2754/* ------------------------------------------------------------------------- */
2962/* 2755/*
2963 * Clear all selected text 2756 * Clear all selected text
… …
2994 * EXT: button 1 or 3 release 2787 * EXT: button 1 or 3 release
2995 */ 2788 */
2996void 2789void
2997rxvt_term::selection_make (Time tm) 2790rxvt_term::selection_make (Time tm)
2998{ 2791{
2999 int i; 2792 int size;
3000 wchar_t *new_selection_text; 2793 wchar_t *new_selection_text;
3001 text_t *t; 2794 text_t *t;
3002 2795
3003 switch (selection.op) 2796 switch (selection.op)
3004 { 2797 {
… …
3020 return; /* nothing selected, go away */ 2813 return; /* nothing selected, go away */
3021 2814
3022 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2815 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3023 return; 2816 return;
3024 2817
3025 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2818 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3026 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2819 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3027 2820
3028 int ofs = 0; 2821 int ofs = 0;
3029 int extra = 0; 2822 int extra = 0;
3030 2823
3031 int col = selection.beg.col; 2824 int col = selection.beg.col;
… …
3037 { 2830 {
3038#if !ENABLE_MINIMAL 2831#if !ENABLE_MINIMAL
3039 if (selection.rect) 2832 if (selection.rect)
3040 { 2833 {
3041 col = selection.beg.col; 2834 col = selection.beg.col;
3042 end_col = ncol + 1; 2835 end_col = selection.end.col;
3043 } 2836 }
3044 else 2837 else
3045#endif 2838#endif
3046 end_col = ROW(row).l; 2839 end_col = ROW(row).l;
3047 2840
3048 col = max (col, 0); 2841 col = max (col, 0);
3049 2842
3050 if (row == selection.end.row 2843 if (row == selection.end.row)
3051#if !ENABLE_MINIMAL
3052 || selection.rect
3053#endif
3054 )
3055 min_it (end_col, selection.end.col); 2844 min_it (end_col, selection.end.col);
3056 2845
3057 t = ROW(row).t + col; 2846 t = ROW(row).t + col;
3058 2847
3059 for (; col < end_col; col++) 2848 for (; col < end_col; col++)
… …
3067 2856
3068 extra -= (len - 1); 2857 extra -= (len - 1);
3069 2858
3070 if (extra < 0) 2859 if (extra < 0)
3071 { 2860 {
3072 extra += i; 2861 extra += size;
3073 i += i; 2862 size += size;
3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2863 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3075 } 2864 }
3076 2865
3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2866 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3078 } 2867 }
3079#endif 2868#endif
… …
3091 2880
3092 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3093 } 2882 }
3094 else 2883 else
3095#endif 2884#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row) 2885 if (!ROW(row).is_longer ()
2886 && (row != selection.end.row || end_col != selection.end.col)
2887 && (row != selection.beg.row || selection.beg.col < ncol))
3097 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3098 } 2889 }
3099
3100 if (end_col != selection.end.col)
3101 new_selection_text[ofs++] = C0_LF;
3102 2890
3103 new_selection_text[ofs] = 0; 2891 new_selection_text[ofs] = 0;
3104 2892
3105 if (ofs == 0) 2893 if (ofs == 0)
3106 { 2894 {
… …
3612 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3613 */ 3401 */
3614void 3402void
3615rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3616{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3617 XSelectionEvent ev; 3406 XSelectionEvent ev;
3618 3407
3619 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3620 ev.property = None; 3409 ev.property = None;
3621 ev.display = rq.display; 3410 ev.display = rq.display;
… …
3636 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3637#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3638 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3639#endif 3428#endif
3640 3429
3641 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3642 32, PropModeReplace, 3431 32, PropModeReplace,
3643 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3644 ev.property = rq.property; 3433 ev.property = property;
3645 } 3434 }
3646#if TODO // TODO 3435#if TODO // TODO
3647 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3648 { 3437 {
3649 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3650 } 3439 }
3651#endif 3440#endif
3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3653 { 3442 {
3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3655 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656 ev.property = rq.property; 3445 ev.property = property;
3657 } 3446 }
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3659 { 3448 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3662 ev.property = rq.property; 3451 ev.property = property;
3663 } 3452 }
3664 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3665 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3666 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3667 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
… …
3738 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3739 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3740 ct.encoding = target; 3529 ct.encoding = target;
3741 } 3530 }
3742 3531
3743 XChangeProperty (dpy, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3744 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3745 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3746 ev.property = rq.property; 3535 ev.property = property;
3747 3536
3748 if (freect) 3537 if (freect)
3749 XFree (ct.value); 3538 XFree (ct.value);
3750 } 3539 }
3751 3540

Diff Legend

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