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

Diff Legend

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