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.338 by sf-exg, Sat Apr 3 16:30:39 2010 UTC vs.
Revision 1.393 by root, Sun Jul 10 00:40:17 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
198 term_start = 0; 203 term_start = 0;
199 204
200 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202 207
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
208 { 213 {
… …
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;
661 l.f = 0; 680 l.f = 0;
662 } 681 }
663 else 682 else
664 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
665 }
666
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 } 684 }
678 685
679 // move and/or clear selection, if any 686 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
681 { 688 {
… …
727 } 734 }
728 735
729 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
731 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
732 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
733 748
734 min_it (count, rows); 749 min_it (count, rows);
735 750
736 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 752
738 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
739 { 754 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 756
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 759 }
745 760
746 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2);
767 l.is_longer (0);
768 l.touch ();
769 }
748 } 770 }
749 771
750 return count; 772 return count;
751} 773}
752 774
… …
794 816
795 while (str < strend) 817 while (str < strend)
796 { 818 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 820
799 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 822 if (c == C0_LF)
801 { 823 {
802 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
803 825
804 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
823 { 845 {
824 scr_tab (1, true); 846 scr_tab (1, true);
825 continue; 847 continue;
826 } 848 }
827 849
828 if (expect_false ( 850 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 854 ))
833 { 855 {
… …
838 * should be a similar check. 860 * should be a similar check.
839 */ 861 */
840 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
841 } 863 }
842 864
843 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 866 {
845 scr_do_wrap (); 867 scr_do_wrap ();
846 868
847 line->l = ncol; 869 line->l = ncol;
848 line->is_longer (1); 870 line->is_longer (1);
… …
850 row = screen.cur.row; 872 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
852 } 874 }
853 875
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 878 c = 0xfffd;
857 879
858 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
861 // locale. 883 // locale.
862 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
863 885
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 887 {
866 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 889 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
884 } 906 }
885 } 907 }
886 908
887 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
889 911
890 if (width != 0) 912 if (width != 0)
891 { 913 {
892#if !UNICODE_3 914#if !UNICODE_3
… …
897# else 919# else
898 c = 0xfffd; 920 c = 0xfffd;
899# endif 921# endif
900#endif 922#endif
901 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
902 // nuke the character at this position, if required 940 // nuke the character at this position, if required
903 if (expect_false ( 941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 944 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); 945 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 946
921 line->touch (); 947 line->touch ();
922 948
923 do 949 do
924 { 950 {
925 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
927 953
928 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 955 screen.cur.col++;
930 else 956 else
931 { 957 {
932 line->l = ncol; 958 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
935 break; 961
962 goto end_of_line;
936 } 963 }
937 964
938 c = NOCHAR; 965 c = NOCHAR;
939 } 966 }
940 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
941 968
942 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 971 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 972 line->t[c] = ' ';
950 line->r[c] = rend; 973 line->r[c] = rend;
951 }
952 } 974 }
975
976end_of_line:
977 ;
953 } 978 }
954#if ENABLE_COMBINING 979#if ENABLE_COMBINING
955 else // width == 0 980 else // width == 0
956 { 981 {
957 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
1020 1045
1021 want_refresh = 1; 1046 want_refresh = 1;
1022#endif 1047#endif
1023 } 1048 }
1024 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1025 else 1052 else
1026 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1027} 1054}
1028 1055
1029/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1336 return; 1363 return;
1337 1364
1338 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1339 1366
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)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1370 {
1347 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1348 1372
1349 if (mapped && !view_start) 1373 if (mapped)
1350 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1353 } 1377 }
1354 else 1378 else
1355 { 1379 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1381
1358 if (mapped && !view_start) 1382 if (mapped)
1359 { 1383 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
… …
1370 1394
1371 for (; num--; row++) 1395 for (; num--; row++)
1372 { 1396 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1374 1398
1375 if (!view_start) 1399 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1401 }
1378} 1402}
1379 1403
1380#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1381void 1405void
… …
1680 { 1704 {
1681 rvideo_state = on; 1705 rvideo_state = on;
1682 1706
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1707 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1708#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1709 if (bg_pixmap == None)
1686#endif 1710#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1711 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1712
1689 XGCValues gcvalue; 1713 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1714 gcvalue.foreground = pix_colors[Color_fg];
… …
1917 1941
1918# ifndef NO_MAPALERT 1942# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1943# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1944 if (option (Opt_mapAlert))
1921# endif 1945# endif
1922 XMapWindow (dpy, parent[0]); 1946 XMapWindow (dpy, parent);
1923# endif 1947# endif
1924 1948
1925# if ENABLE_FRILLS 1949# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1950 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1951 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1964 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1965#endif
1942} 1966}
1943 1967
1944/* ------------------------------------------------------------------------- */ 1968/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */
1946void 1969void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1970rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1971{
1949#ifdef PRINTPIPE 1972#ifdef PRINTPIPE
1950 int nrows, row_start; 1973 int nrows, row_start;
… …
2026 refresh_count = 0; 2049 refresh_count = 0;
2027 2050
2028 unsigned int old_screen_flags = screen.flags; 2051 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2052 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2053#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2054 have_bg = bg_pixmap != None;
2032#endif 2055#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2056 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2057
2035 /* 2058 /*
2036 * B: reverse any characters which are selected 2059 * B: reverse any characters which are selected
… …
2228 continue; 2251 continue;
2229 2252
2230 // redraw one or more characters 2253 // redraw one or more characters
2231 2254
2232 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2257 --col;
2235 2258
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2260 text_t *text = stp + col;
2238 int count = 1; 2261 int count = 1;
2239 2262
2240 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2241 drp[col] = rend; 2264 drp[col] = rend;
… …
2276 2299
2277 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2279 2302
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2305 count++, i--;
2283 2306
2284 /* 2307 /*
2285 * Determine the attributes for the string 2308 * Determine the attributes for the string
2286 */ 2309 */
2287 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2289 2312
2290 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2315 {
2293 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2294 2317
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2338
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2340 fore = Color_UL;
2318#endif 2341#endif
2319 2342
2343#ifdef OPTION_HC
2344 if (rend & RS_Sel)
2345 {
2346 /* invert the column if no highlightColor is set or it is the
2347 * current cursor column */
2348 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2349 && ISSET_PIXCOLOR (Color_HC))
2350 {
2351 if (ISSET_PIXCOLOR (Color_HTC))
2352 fore = Color_HTC;
2353 // if invert is 0 reverse video is set so we use bg color as fg color
2354 else if (!invert)
2355 fore = back;
2356
2357 back = Color_HC;
2358 invert = 0;
2359 }
2360 }
2361#endif
2362
2320 if (invert) 2363 if (invert)
2321 { 2364 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 ::swap (fore, back); 2365 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2366
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2336 if (ISSET_PIXCOLOR (Color_RV))
2337 back = Color_RV;
2338# endif
2339 if (fore == back) 2368 if (fore == back)
2340 { 2369 {
2341 fore = Color_bg; 2370 fore = Color_bg;
2342 back = Color_fg; 2371 back = Color_fg;
2343 } 2372 }
… …
2379 /* 2408 /*
2380 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2381 */ 2410 */
2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2383 2412
2384 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2385 { 2414 {
2386 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2387 2416
2388 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2389 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2396 did_clear: ; 2425 did_clear: ;
2397 } 2426 }
2398 else 2427 else
2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2400 2429
2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2402 { 2431 {
2403#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2404 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2405 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2406 else 2435 else
… …
2497 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2498 } 2527 }
2499} 2528}
2500 2529
2501void 2530void
2502rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2532{
2533 bool transparent = false;
2534
2504#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2506#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2511 2561
2512 if (scrollBar.win) 2562 if (scrollBar.win)
2513 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = STATE_IDLE;
2516 scrollBar.show (0); 2569 scrollBar.show (0);
2517 } 2570 }
2518 2571
2519#endif 2572 if (refresh)
2520 2573 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2574 scr_clear ();
2523 scr_touch (true); 2575 scr_touch (true);
2576 }
2524 want_refresh = 1; 2577 want_refresh = 1;
2525} 2578}
2526 2579
2527/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2528void 2581void
… …
2596 { 2649 {
2597#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2598 if (selection.rect) 2651 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2655 else
2603#endif 2656#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2606 RS_RVid); 2659 RS_Sel | RS_RVid);
2607 } 2660 }
2608} 2661}
2609 2662
2610/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2611/* 2664/*
… …
2616void 2669void
2617rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2671{
2619 int row, wrote; 2672 int row, wrote;
2620 unsigned int width, towrite; 2673 unsigned int width, towrite;
2621 char r1[] = "\n"; 2674 const char r1[] = "\n";
2622 2675
2623 for (row = saveLines + top_row; 2676 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2677 row < saveLines + nrow - 1; row++)
2625 { 2678 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2679 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2672/* ------------------------------------------------------------------------- */ 2725/* ------------------------------------------------------------------------- */
2673/* 2726/*
2674 * Paste a selection direct to the command fd 2727 * Paste a selection direct to the command fd
2675 */ 2728 */
2676void 2729void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2730rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2731{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2732 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2733 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2734 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2735 data[i] = C0_CR;
… …
2688 2741
2689 if (priv_modes & PrivMode_BracketPaste) 2742 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2743 tt_printf ("\e[201~");
2691} 2744}
2692 2745
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2746void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2747rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2748{
2701 if (prop == None) /* check for failed XConvertSelection */ 2749 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2750 return;
2876 2751
2877 selection_paste (win, prop, true); 2752 tt_paste (data, len);
2878} 2753}
2879 2754
2880/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2881/* 2756/*
2882 * Request the current selection: 2757 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2758 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2759 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2760 * EXT: button 2 release
2889 */ 2761 */
2890void 2762void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2763rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2764{
2893 if (selection.text && selnum == Sel_Primary) 2765 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2766 {
2901 else 2767 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2768 selection_req->run ();
2902 { 2769 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2770}
2944 2771
2945/* ------------------------------------------------------------------------- */ 2772/* ------------------------------------------------------------------------- */
2946/* 2773/*
2947 * Clear all selected text 2774 * Clear all selected text
… …
2970 if (display->clipboard_owner == this) 2797 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2798 display->clipboard_owner = 0;
2972 } 2799 }
2973} 2800}
2974 2801
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2987}
2988
2989/* ------------------------------------------------------------------------- */ 2802/* ------------------------------------------------------------------------- */
2990/* 2803/*
2991 * Copy a selection into the cut buffer 2804 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2805 * EXT: button 1 or 3 release
2993 */ 2806 */
2994void 2807void
2995rxvt_term::selection_make (Time tm) 2808rxvt_term::selection_make (Time tm)
2996{ 2809{
2997 int i; 2810 int size;
2998 wchar_t *new_selection_text; 2811 wchar_t *new_selection_text;
2999 text_t *t; 2812 text_t *t;
3000 2813
3001 switch (selection.op) 2814 switch (selection.op)
3002 { 2815 {
… …
3018 return; /* nothing selected, go away */ 2831 return; /* nothing selected, go away */
3019 2832
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2833 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 2834 return;
3022 2835
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2836 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2837 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 2838
3026 int ofs = 0; 2839 int ofs = 0;
3027 int extra = 0; 2840 int extra = 0;
3028 2841
3029 int col = selection.beg.col; 2842 int col = selection.beg.col;
… …
3035 { 2848 {
3036#if !ENABLE_MINIMAL 2849#if !ENABLE_MINIMAL
3037 if (selection.rect) 2850 if (selection.rect)
3038 { 2851 {
3039 col = selection.beg.col; 2852 col = selection.beg.col;
3040 end_col = ncol + 1; 2853 end_col = selection.end.col;
3041 } 2854 }
3042 else 2855 else
3043#endif 2856#endif
3044 end_col = ROW(row).l; 2857 end_col = ROW(row).l;
3045 2858
3046 col = max (col, 0); 2859 col = max (col, 0);
3047 2860
3048 if (row == selection.end.row 2861 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 2862 min_it (end_col, selection.end.col);
3054 2863
3055 t = ROW(row).t + col; 2864 t = ROW(row).t + col;
3056 2865
3057 for (; col < end_col; col++) 2866 for (; col < end_col; col++)
… …
3065 2874
3066 extra -= (len - 1); 2875 extra -= (len - 1);
3067 2876
3068 if (extra < 0) 2877 if (extra < 0)
3069 { 2878 {
3070 extra += i; 2879 extra += size;
3071 i += i; 2880 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2881 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 2882 }
3074 2883
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2884 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 2885 }
3077#endif 2886#endif
… …
3089 2898
3090 new_selection_text[ofs++] = C0_LF; 2899 new_selection_text[ofs++] = C0_LF;
3091 } 2900 }
3092 else 2901 else
3093#endif 2902#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 2903 if (!ROW(row).is_longer ()
2904 && (row != selection.end.row || end_col != selection.end.col)
2905 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 2906 new_selection_text[ofs++] = C0_LF;
3096 } 2907 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 2908
3101 new_selection_text[ofs] = 0; 2909 new_selection_text[ofs] = 0;
3102 2910
3103 if (ofs == 0) 2911 if (ofs == 0)
3104 { 2912 {
… …
3610 * EXT: SelectionRequest 3418 * EXT: SelectionRequest
3611 */ 3419 */
3612void 3420void
3613rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3421rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3614{ 3422{
3423 Atom property = rq.property == None ? rq.target : rq.property;
3615 XSelectionEvent ev; 3424 XSelectionEvent ev;
3616 3425
3617 ev.type = SelectionNotify; 3426 ev.type = SelectionNotify;
3618 ev.property = None; 3427 ev.property = None;
3619 ev.display = rq.display; 3428 ev.display = rq.display;
… …
3634 *target++ = xa[XA_COMPOUND_TEXT]; 3443 *target++ = xa[XA_COMPOUND_TEXT];
3635#if X_HAVE_UTF8_STRING 3444#if X_HAVE_UTF8_STRING
3636 *target++ = xa[XA_UTF8_STRING]; 3445 *target++ = xa[XA_UTF8_STRING];
3637#endif 3446#endif
3638 3447
3639 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3448 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3640 32, PropModeReplace, 3449 32, PropModeReplace,
3641 (unsigned char *)target_list, target - target_list); 3450 (unsigned char *)target_list, target - target_list);
3642 ev.property = rq.property; 3451 ev.property = property;
3643 } 3452 }
3644#if TODO // TODO 3453#if TODO // TODO
3645 else if (rq.target == xa[XA_MULTIPLE]) 3454 else if (rq.target == xa[XA_MULTIPLE])
3646 { 3455 {
3647 /* TODO: Handle MULTIPLE */ 3456 /* TODO: Handle MULTIPLE */
3648 } 3457 }
3649#endif 3458#endif
3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3651 { 3460 {
3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3653 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3462 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property; 3463 ev.property = property;
3655 } 3464 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3465 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 { 3466 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3467 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3468 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3660 ev.property = rq.property; 3469 ev.property = property;
3661 } 3470 }
3662 else if (rq.target == XA_STRING 3471 else if (rq.target == XA_STRING
3663 || rq.target == xa[XA_TEXT] 3472 || rq.target == xa[XA_TEXT]
3664 || rq.target == xa[XA_COMPOUND_TEXT] 3473 || rq.target == xa[XA_COMPOUND_TEXT]
3665 || rq.target == xa[XA_UTF8_STRING] 3474 || rq.target == xa[XA_UTF8_STRING]
… …
3736 ct.value = (unsigned char *)cl; 3545 ct.value = (unsigned char *)cl;
3737 ct.nitems = selectlen; 3546 ct.nitems = selectlen;
3738 ct.encoding = target; 3547 ct.encoding = target;
3739 } 3548 }
3740 3549
3741 XChangeProperty (dpy, rq.requestor, rq.property, 3550 XChangeProperty (dpy, rq.requestor, property,
3742 ct.encoding, 8, PropModeReplace, 3551 ct.encoding, 8, PropModeReplace,
3743 ct.value, (int)ct.nitems); 3552 ct.value, (int)ct.nitems);
3744 ev.property = rq.property; 3553 ev.property = property;
3745 3554
3746 if (freect) 3555 if (freect)
3747 XFree (ct.value); 3556 XFree (ct.value);
3748 } 3557 }
3749 3558

Diff Legend

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