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.342 by root, Thu Jul 1 20:02:43 2010 UTC vs.
Revision 1.407 by sf-exg, Wed Nov 16 18:52: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;
… …
544 return; 549 return;
545 550
546 want_refresh = 1; 551 want_refresh = 1;
547 view_start = 0; 552 view_start = 0;
548 553
549 selection_check (2); /* check for boundary cross */ 554 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
550 560
551 current_screen = scrn; 561 current_screen = scrn;
552 562
553#if NSCREENS 563#if NSCREENS
554 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
… …
633 643
634 if (count > 0 644 if (count > 0
635 && row1 == 0 645 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
638 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 651
643 // sever bottommost line 652 // sever bottommost line
644 { 653 {
645 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
646 l.is_longer (0); 655 l.is_longer (0);
647 l.touch (); 656 l.touch ();
648 } 657 }
649 658
659 // scroll everything up 'count' lines
660 term_start = (term_start + count) % total_rows;
661
662 // now copy lines below the scroll region bottom to the
663 // bottom of the screen again, so they look as if they
664 // hadn't moved.
665 for (int i = nrow; --i > row2; )
666 {
667 line_t &l1 = ROW(i - count);
668 line_t &l2 = ROW(i);
669
670 ::swap (l1, l2);
671 l2.touch ();
672 }
673
650 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 675 for (int i = count; i--; )
652 { 676 {
653 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
654 678
655 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 680 // 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))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 682 {
659 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 684 l.l = 0;
… …
662 } 686 }
663 else 687 else
664 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
665 } 689 }
666 690
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 691 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
681 { 694 {
682 selection.beg.row -= count; 695 selection.beg.row -= count;
683 selection.end.row -= count; 696 selection.end.row -= count;
684 selection.mark.row -= count; 697 selection.mark.row -= count;
685 698
686 if (selection.beg.row < top_row 699 selection_check (0);
687 || selection.end.row < top_row
688 || selection.mark.row < top_row)
689 {
690 CLEAR_ALL_SELECTION ();
691 selection.op = SELECTION_CLEAR;
692 }
693 } 700 }
694 701
695 // finally move the view window, if desired 702 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 704 && view_start != 0
… …
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
… …
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 781{
760 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
761 return; 783 return;
762 784
763 unsigned char checksel; 785 bool checksel;
764 unicode_t c; 786 unicode_t c;
765 int ncol = this->ncol; 787 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
767 789
768 want_refresh = 1; 790 want_refresh = 1;
… …
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/* ------------------------------------------------------------------------- */
… …
1304 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1305 1332
1306 switch (mode) 1333 switch (mode)
1307 { 1334 {
1308 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1336 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1338 num = nrow - row;
1313 break; 1339 break;
1314 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1341 scr_erase_line (1);
1317 row = 0; 1342 row = 0;
1318 num = screen.cur.row; 1343 num = screen.cur.row;
1319 break; 1344 break;
1320 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1346 row = 0;
1323 num = nrow; 1347 num = nrow;
1324 break; 1348 break;
1325 default: 1349 default:
1326 return; 1350 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1336 return; 1360 return;
1337 1361
1338 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1339 1363
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_Blink | RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1367 {
1347 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1348 1369
1349 if (mapped && !view_start) 1370 if (mapped)
1350 XClearArea (dpy, vt, 0, 1371 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1372 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1373 (unsigned int)Height2Pixel (num), False);
1353 } 1374 }
1354 else 1375 else
1355 { 1376 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1378
1358 if (mapped && !view_start) 1379 if (mapped)
1359 { 1380 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1383 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1384 0, Row2Pixel (row - view_start),
… …
1370 1391
1371 for (; num--; row++) 1392 for (; num--; row++)
1372 { 1393 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1374 1395
1375 if (!view_start) 1396 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1398 }
1378} 1399}
1379 1400
1380#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1381void 1402void
… …
1400 1421
1401 want_refresh = 1; 1422 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1403 1424
1404 num_scr_allow = 0; 1425 num_scr_allow = 0;
1405 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1406 1431
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1409 { 1434 {
1410 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1680 { 1705 {
1681 rvideo_state = on; 1706 rvideo_state = on;
1682 1707
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1686#endif 1711#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1713
1689 XGCValues gcvalue; 1714 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1917 1942
1918# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1921# endif 1946# endif
1922 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1923# endif 1948# endif
1924 1949
1925# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1952 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1966#endif
1942} 1967}
1943 1968
1944/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */
1946void 1970void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1972{
1949#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1950 int nrows, row_start; 1974 int nrows, row_start;
… …
2024 * A: set up vars 2048 * A: set up vars
2025 */ 2049 */
2026 refresh_count = 0; 2050 refresh_count = 0;
2027 2051
2028 unsigned int old_screen_flags = screen.flags; 2052 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2053 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2032#endif 2056#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2058
2035 /* 2059 /*
2036 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2066 scr_swap_overlay ();
2043#endif 2067#endif
2044 2068
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2070
2047 /* 2071 /*
2048 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2049 */ 2073 */
2050 { 2074 {
2051 unsigned char setoldcursor; 2075 bool setoldcursor;
2052 2076
2053#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2078 if (hidden_cursor)
2055 showcursor = 0; 2079 showcursor = 0;
2056#endif 2080#endif
… …
2228 continue; 2252 continue;
2229 2253
2230 // redraw one or more characters 2254 // redraw one or more characters
2231 2255
2232 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2258 --col;
2235 2259
2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2261 text_t *text = stp + col;
2238 int count = 1; 2262 int count = 1;
… …
2276 2300
2277 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2279 2303
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2306 count++, i--;
2283 2307
2284 /* 2308 /*
2285 * Determine the attributes for the string 2309 * Determine the attributes for the string
2286 */ 2310 */
2287 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2289 2313
2290 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2316 {
2293 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2294 2318
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2385 /* 2409 /*
2386 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2387 */ 2411 */
2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2389 2413
2390 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2391 { 2415 {
2392 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2393 2417
2394 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2395 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2402 did_clear: ; 2426 did_clear: ;
2403 } 2427 }
2404 else 2428 else
2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2406 2430
2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2408 { 2432 {
2409#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2410 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2411 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2412 else 2436 else
… …
2503 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2504 } 2528 }
2505} 2529}
2506 2530
2507void 2531void
2508rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2509{ 2533{
2534 bool transparent = false;
2535
2510#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2511 bgPixmap.apply (); 2537 if (bg_pixmap != None)
2512#else 2538 {
2539# ifdef ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2513 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2552 }
2553 }
2554 else
2555#endif
2556 {
2514 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2515 XClearWindow (dpy, parent[0]);
2516 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2517 2562
2518 if (scrollBar.win) 2563 if (scrollBar.win)
2519 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2520 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2521 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2522 scrollBar.show (0); 2570 scrollBar.show (0);
2523 } 2571 }
2524 2572
2525#endif 2573 if (refresh)
2526 2574 {
2527 /* bgPixmap.apply () does not do the following : */
2528 scr_clear (); 2575 scr_clear ();
2529 scr_touch (true); 2576 scr_touch (true);
2577 }
2530 want_refresh = 1; 2578 want_refresh = 1;
2531} 2579}
2532 2580
2533/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2534void 2582void
… …
2622void 2670void
2623rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2624{ 2672{
2625 int row, wrote; 2673 int row, wrote;
2626 unsigned int width, towrite; 2674 unsigned int width, towrite;
2627 char r1[] = "\n"; 2675 const char r1[] = "\n";
2628 2676
2629 for (row = saveLines + top_row; 2677 for (row = saveLines + top_row;
2630 row < saveLines + nrow - 1; row++) 2678 row < saveLines + nrow - 1; row++)
2631 { 2679 {
2632 width = row_buf[row].l >= 0 ? row_buf[row].l 2680 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2649 * CHARACTER SELECTION * 2697 * CHARACTER SELECTION *
2650 * ------------------------------------------------------------------------- */ 2698 * ------------------------------------------------------------------------- */
2651void 2699void
2652rxvt_term::selection_check (int check_more) NOTHROW 2700rxvt_term::selection_check (int check_more) NOTHROW
2653{ 2701{
2654 row_col_t pos;
2655
2656 if (!selection.op) 2702 if (!selection.op)
2657 return; 2703 return;
2658 2704
2659 pos.row = pos.col = 0;
2660 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2705 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2661 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2706 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2662 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2707 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2663 || (check_more == 1 2708 || (check_more == 1
2664 && current_screen == selection.screen 2709 && current_screen == selection.screen
2665 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2710 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2666 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2711 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2667 || (check_more == 2
2668 && ROWCOL_IS_BEFORE (selection.beg, pos)
2669 && ROWCOL_IS_AFTER (selection.end, pos))
2670 || (check_more == 3
2671 && ROWCOL_IS_AFTER (selection.end, pos))
2672 || (check_more == 4 /* screen width change */
2673 && (selection.beg.row != selection.end.row
2674 || selection.end.col > ncol)))
2675 CLEAR_SELECTION (); 2712 CLEAR_ALL_SELECTION ();
2676} 2713}
2677 2714
2678/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2679/* 2716/*
2680 * Paste a selection direct to the command fd 2717 * Paste a selection direct to the command fd
2681 */ 2718 */
2682void 2719void
2683rxvt_term::paste (char *data, unsigned int len) NOTHROW 2720rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2684{ 2721{
2685 /* convert normal newline chars into common keyboard Return key sequence */ 2722 /* convert normal newline chars into common keyboard Return key sequence */
2686 for (unsigned int i = 0; i < len; i++) 2723 for (unsigned int i = 0; i < len; i++)
2687 if (data[i] == C0_LF) 2724 if (data[i] == C0_LF)
2688 data[i] = C0_CR; 2725 data[i] = C0_CR;
… …
2694 2731
2695 if (priv_modes & PrivMode_BracketPaste) 2732 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[201~"); 2733 tt_printf ("\e[201~");
2697} 2734}
2698 2735
2699/* ------------------------------------------------------------------------- */
2700/*
2701 * Respond to a notification that a primary selection has been sent
2702 * EXT: SelectionNotify
2703 */
2704void 2736void
2705rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2737rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2738{
2707 if (prop == None) /* check for failed XConvertSelection */ 2739 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; 2740 return;
2882 2741
2883 selection_paste (win, prop, true); 2742 tt_paste (data, len);
2884} 2743}
2885 2744
2886/* ------------------------------------------------------------------------- */ 2745/* ------------------------------------------------------------------------- */
2887/* 2746/*
2888 * Request the current selection: 2747 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2889 * Order: > internal selection if available 2748 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2890 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2749 * 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 2750 * EXT: button 2 release
2895 */ 2751 */
2896void 2752void
2897rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2753rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2898{ 2754{
2899 if (selection.text && selnum == Sel_Primary) 2755 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 } 2756 {
2907 else 2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2758 selection_req->run ();
2908 { 2759 }
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} 2760}
2950 2761
2951/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2952/* 2763/*
2953 * Clear all selected text 2764 * Clear all selected text
… …
2976 if (display->clipboard_owner == this) 2787 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0; 2788 display->clipboard_owner = 0;
2978 } 2789 }
2979} 2790}
2980 2791
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/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2996/* 2793/*
2997 * Copy a selection into the cut buffer 2794 * Copy a selection into the cut buffer
2998 * EXT: button 1 or 3 release 2795 * EXT: button 1 or 3 release
2999 */ 2796 */
3000void 2797void
3001rxvt_term::selection_make (Time tm) 2798rxvt_term::selection_make (Time tm)
3002{ 2799{
3003 int i; 2800 int size;
3004 wchar_t *new_selection_text; 2801 wchar_t *new_selection_text;
3005 text_t *t; 2802 text_t *t;
3006 2803
3007 switch (selection.op) 2804 switch (selection.op)
3008 { 2805 {
… …
3024 return; /* nothing selected, go away */ 2821 return; /* nothing selected, go away */
3025 2822
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2823 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 2824 return;
3028 2825
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2826 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2827 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 2828
3032 int ofs = 0; 2829 int ofs = 0;
3033 int extra = 0; 2830 int extra = 0;
3034 2831
3035 int col = selection.beg.col; 2832 int col = selection.beg.col;
… …
3041 { 2838 {
3042#if !ENABLE_MINIMAL 2839#if !ENABLE_MINIMAL
3043 if (selection.rect) 2840 if (selection.rect)
3044 { 2841 {
3045 col = selection.beg.col; 2842 col = selection.beg.col;
3046 end_col = ncol + 1; 2843 end_col = selection.end.col;
3047 } 2844 }
3048 else 2845 else
3049#endif 2846#endif
3050 end_col = ROW(row).l; 2847 end_col = ROW(row).l;
3051 2848
3052 col = max (col, 0); 2849 col = max (col, 0);
3053 2850
3054 if (row == selection.end.row 2851 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2852 min_it (end_col, selection.end.col);
3060 2853
3061 t = ROW(row).t + col; 2854 t = ROW(row).t + col;
3062 2855
3063 for (; col < end_col; col++) 2856 for (; col < end_col; col++)
… …
3071 2864
3072 extra -= (len - 1); 2865 extra -= (len - 1);
3073 2866
3074 if (extra < 0) 2867 if (extra < 0)
3075 { 2868 {
3076 extra += i; 2869 extra += size;
3077 i += i; 2870 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2871 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 2872 }
3080 2873
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2874 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2875 }
3083#endif 2876#endif
… …
3095 2888
3096 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3097 } 2890 }
3098 else 2891 else
3099#endif 2892#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 2893 if (!ROW(row).is_longer ()
2894 && (row != selection.end.row || end_col != selection.end.col)
2895 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 2896 new_selection_text[ofs++] = C0_LF;
3102 } 2897 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2898
3107 new_selection_text[ofs] = 0; 2899 new_selection_text[ofs] = 0;
3108 2900
3109 if (ofs == 0) 2901 if (ofs == 0)
3110 { 2902 {
… …
3616 * EXT: SelectionRequest 3408 * EXT: SelectionRequest
3617 */ 3409 */
3618void 3410void
3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3411rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3620{ 3412{
3413 Atom property = rq.property == None ? rq.target : rq.property;
3621 XSelectionEvent ev; 3414 XSelectionEvent ev;
3622 3415
3623 ev.type = SelectionNotify; 3416 ev.type = SelectionNotify;
3624 ev.property = None; 3417 ev.property = None;
3625 ev.display = rq.display; 3418 ev.display = rq.display;
… …
3640 *target++ = xa[XA_COMPOUND_TEXT]; 3433 *target++ = xa[XA_COMPOUND_TEXT];
3641#if X_HAVE_UTF8_STRING 3434#if X_HAVE_UTF8_STRING
3642 *target++ = xa[XA_UTF8_STRING]; 3435 *target++ = xa[XA_UTF8_STRING];
3643#endif 3436#endif
3644 3437
3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3438 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3646 32, PropModeReplace, 3439 32, PropModeReplace,
3647 (unsigned char *)target_list, target - target_list); 3440 (unsigned char *)target_list, target - target_list);
3648 ev.property = rq.property; 3441 ev.property = property;
3649 } 3442 }
3650#if TODO // TODO 3443#if TODO // TODO
3651 else if (rq.target == xa[XA_MULTIPLE]) 3444 else if (rq.target == xa[XA_MULTIPLE])
3652 { 3445 {
3653 /* TODO: Handle MULTIPLE */ 3446 /* TODO: Handle MULTIPLE */
3654 } 3447 }
3655#endif 3448#endif
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3657 { 3450 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3452 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property; 3453 ev.property = property;
3661 } 3454 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3455 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 { 3456 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3457 XChangeProperty (dpy, rq.requestor, property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3458 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3666 ev.property = rq.property; 3459 ev.property = property;
3667 } 3460 }
3668 else if (rq.target == XA_STRING 3461 else if (rq.target == XA_STRING
3669 || rq.target == xa[XA_TEXT] 3462 || rq.target == xa[XA_TEXT]
3670 || rq.target == xa[XA_COMPOUND_TEXT] 3463 || rq.target == xa[XA_COMPOUND_TEXT]
3671 || rq.target == xa[XA_UTF8_STRING] 3464 || rq.target == xa[XA_UTF8_STRING]
… …
3742 ct.value = (unsigned char *)cl; 3535 ct.value = (unsigned char *)cl;
3743 ct.nitems = selectlen; 3536 ct.nitems = selectlen;
3744 ct.encoding = target; 3537 ct.encoding = target;
3745 } 3538 }
3746 3539
3747 XChangeProperty (dpy, rq.requestor, rq.property, 3540 XChangeProperty (dpy, rq.requestor, property,
3748 ct.encoding, 8, PropModeReplace, 3541 ct.encoding, 8, PropModeReplace,
3749 ct.value, (int)ct.nitems); 3542 ct.value, (int)ct.nitems);
3750 ev.property = rq.property; 3543 ev.property = property;
3751 3544
3752 if (freect) 3545 if (freect)
3753 XFree (ct.value); 3546 XFree (ct.value);
3754 } 3547 }
3755 3548

Diff Legend

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