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.333 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.406 by sf-exg, Wed Nov 16 18:26:47 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
198 term_start = 0; 203 term_start = 0;
199 204
200 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202 207
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
208 { 213 {
… …
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 277 }
273 278
274 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
276 281
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
280 285
… …
397 } 402 }
398 403
399 free (tabs); 404 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
401 406
402 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
633 638
634 if (count > 0 639 if (count > 0
635 && row1 == 0 640 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
638 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 646
643 // sever bottommost line 647 // sever bottommost line
644 { 648 {
645 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
646 l.is_longer (0); 650 l.is_longer (0);
647 l.touch (); 651 l.touch ();
648 } 652 }
649 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
650 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 670 for (int i = count; i--; )
652 { 671 {
653 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
654 673
655 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 677 {
659 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 679 l.l = 0;
… …
662 } 681 }
663 else 682 else
664 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
665 } 684 }
666 685
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
679 // move and/or clear selection, if any 686 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
681 { 689 {
682 selection.beg.row -= count; 690 selection.beg.row -= count;
683 selection.end.row -= count; 691 selection.end.row -= count;
684 selection.mark.row -= count; 692 selection.mark.row -= count;
685 693
686 if (selection.beg.row < top_row 694 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 } 695 }
694 696
695 // finally move the view window, if desired 697 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 699 && view_start != 0
… …
727 } 729 }
728 730
729 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
731 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
732 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
733 743
734 min_it (count, rows); 744 min_it (count, rows);
735 745
736 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 747
738 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
739 { 749 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 751
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 754 }
745 755
746 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
748 } 765 }
749 766
750 return count; 767 return count;
751} 768}
752 769
… …
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 776{
760 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
761 return; 778 return;
762 779
763 unsigned char checksel; 780 bool checksel;
764 unicode_t c; 781 unicode_t c;
765 int ncol = this->ncol; 782 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
767 784
768 want_refresh = 1; 785 want_refresh = 1;
… …
794 811
795 while (str < strend) 812 while (str < strend)
796 { 813 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 815
799 if (expect_false (c < 0x20)) 816 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 817 if (c == C0_LF)
801 { 818 {
802 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
803 820
804 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
823 { 840 {
824 scr_tab (1, true); 841 scr_tab (1, true);
825 continue; 842 continue;
826 } 843 }
827 844
828 if (expect_false ( 845 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 849 ))
833 { 850 {
… …
838 * should be a similar check. 855 * should be a similar check.
839 */ 856 */
840 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
841 } 858 }
842 859
843 if (expect_false (screen.flags & Screen_WrapNext)) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 861 {
845 scr_do_wrap (); 862 scr_do_wrap ();
846 863
847 line->l = ncol; 864 line->l = ncol;
848 line->is_longer (1); 865 line->is_longer (1);
… …
850 row = screen.cur.row; 867 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
852 } 869 }
853 870
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 873 c = 0xfffd;
857 874
858 // rely on wcwidth to tell us the character width, do wcwidth before 875 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
861 // locale. 878 // locale.
862 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
863 880
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 882 {
866 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 884 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
884 } 901 }
885 } 902 }
886 903
887 if (expect_false (screen.flags & Screen_Insert)) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
889 906
890 if (width != 0) 907 if (width != 0)
891 { 908 {
892#if !UNICODE_3 909#if !UNICODE_3
… …
897# else 914# else
898 c = 0xfffd; 915 c = 0xfffd;
899# endif 916# endif
900#endif 917#endif
901 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
902 // nuke the character at this position, if required 935 // nuke the character at this position, if required
903 if (expect_false ( 936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 939 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); 940 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 941
921 line->touch (); 942 line->touch ();
922 943
923 do 944 do
924 { 945 {
925 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
927 948
928 if (expect_true (screen.cur.col < ncol - 1)) 949 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 950 screen.cur.col++;
930 else 951 else
931 { 952 {
932 line->l = ncol; 953 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
935 break; 956
957 goto end_of_line;
936 } 958 }
937 959
938 c = NOCHAR; 960 c = NOCHAR;
939 } 961 }
940 while (expect_false (--width > 0)); 962 while (ecb_unlikely (--width > 0));
941 963
942 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 966 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 967 line->t[c] = ' ';
950 line->r[c] = rend; 968 line->r[c] = rend;
951 }
952 } 969 }
970
971end_of_line:
972 ;
953 } 973 }
954#if ENABLE_COMBINING 974#if ENABLE_COMBINING
955 else // width == 0 975 else // width == 0
956 { 976 {
957 if (c != 0xfeff) // ignore BOM 977 if (c != 0xfeff) // ignore BOM
… …
1020 1040
1021 want_refresh = 1; 1041 want_refresh = 1;
1022#endif 1042#endif
1023 } 1043 }
1024 } 1044 }
1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1025 else 1047 else
1026 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1027} 1049}
1028 1050
1029/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
… …
1304 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1305 1327
1306 switch (mode) 1328 switch (mode)
1307 { 1329 {
1308 case 0: /* erase to end of screen */ 1330 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1331 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1332 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1333 num = nrow - row;
1313 break; 1334 break;
1314 case 1: /* erase to beginning of screen */ 1335 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1336 scr_erase_line (1);
1317 row = 0; 1337 row = 0;
1318 num = screen.cur.row; 1338 num = screen.cur.row;
1319 break; 1339 break;
1320 case 2: /* erase whole screen */ 1340 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1341 row = 0;
1323 num = nrow; 1342 num = nrow;
1324 break; 1343 break;
1325 default: 1344 default:
1326 return; 1345 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1354 if (row >= nrow) /* Out Of Bounds */
1336 return; 1355 return;
1337 1356
1338 min_it (num, nrow - row); 1357 min_it (num, nrow - row);
1339 1358
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)) 1359 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1360 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1361 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1362 {
1347 ren = DEFAULT_RSTYLE; 1363 ren = DEFAULT_RSTYLE;
1348 1364
1349 if (mapped && !view_start) 1365 if (mapped)
1350 XClearArea (dpy, vt, 0, 1366 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1367 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1368 (unsigned int)Height2Pixel (num), False);
1353 } 1369 }
1354 else 1370 else
1355 { 1371 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1372 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1373
1358 if (mapped && !view_start) 1374 if (mapped)
1359 { 1375 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1376 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1377 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1378 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1379 0, Row2Pixel (row - view_start),
… …
1370 1386
1371 for (; num--; row++) 1387 for (; num--; row++)
1372 { 1388 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1389 scr_blank_screen_mem (ROW(row), rstyle);
1374 1390
1375 if (!view_start) 1391 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1392 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1393 }
1378} 1394}
1379 1395
1380#if !ENABLE_MINIMAL 1396#if !ENABLE_MINIMAL
1381void 1397void
… …
1680 { 1696 {
1681 rvideo_state = on; 1697 rvideo_state = on;
1682 1698
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1699 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1700#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1701 if (bg_pixmap == None)
1686#endif 1702#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1703 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1704
1689 XGCValues gcvalue; 1705 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1706 gcvalue.foreground = pix_colors[Color_fg];
… …
1834 for (i = PART_BEG; i < RC_COUNT; i++) 1850 for (i = PART_BEG; i < RC_COUNT; i++)
1835 { 1851 {
1836 min_it (rc[i].col, ncol - 1); 1852 min_it (rc[i].col, ncol - 1);
1837 min_it (rc[i].row, nrow - 1); 1853 min_it (rc[i].row, nrow - 1);
1838 } 1854 }
1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1855
1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1856 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1857 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1842 1858
1843 num_scr_allow = 0; 1859 num_scr_allow = 0;
1844 1860
… …
1917 1933
1918# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1936 if (option (Opt_mapAlert))
1921# endif 1937# endif
1922 XMapWindow (dpy, parent[0]); 1938 XMapWindow (dpy, parent);
1923# endif 1939# endif
1924 1940
1925# if ENABLE_FRILLS 1941# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1942 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1943 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1956 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1957#endif
1942} 1958}
1943 1959
1944/* ------------------------------------------------------------------------- */ 1960/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */
1946void 1961void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1962rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1963{
1949#ifdef PRINTPIPE 1964#ifdef PRINTPIPE
1950 int nrows, row_start; 1965 int nrows, row_start;
… …
2024 * A: set up vars 2039 * A: set up vars
2025 */ 2040 */
2026 refresh_count = 0; 2041 refresh_count = 0;
2027 2042
2028 unsigned int old_screen_flags = screen.flags; 2043 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2044 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2045#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2046 have_bg = bg_pixmap != None;
2032#endif 2047#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2048 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2049
2035 /* 2050 /*
2036 * B: reverse any characters which are selected 2051 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2057 scr_swap_overlay ();
2043#endif 2058#endif
2044 2059
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2060 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2061
2047 /* 2062 /*
2048 * C: set the cursor character (s) 2063 * C: set the cursor character (s)
2049 */ 2064 */
2050 { 2065 {
2051 unsigned char setoldcursor; 2066 bool setoldcursor;
2052 2067
2053#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2069 if (hidden_cursor)
2055 showcursor = 0; 2070 showcursor = 0;
2056#endif 2071#endif
… …
2085 ccol2 = bgcolor_of (rstyle); 2100 ccol2 = bgcolor_of (rstyle);
2086#else 2101#else
2087 ccol2 = Color_bg; 2102 ccol2 = Color_bg;
2088#endif 2103#endif
2089 2104
2090 if (showcursor && focus) 2105 if (focus)
2091 { 2106 {
2092 if (option (Opt_cursorUnderline)) 2107 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2108 *crp ^= RS_Uline;
2094 else 2109 else
2095 { 2110 {
… …
2228 continue; 2243 continue;
2229 2244
2230 // redraw one or more characters 2245 // redraw one or more characters
2231 2246
2232 // seek to the beginning of wide characters 2247 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2248 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2249 --col;
2235 2250
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2251 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2252 text_t *text = stp + col;
2238 int count = 1; 2253 int count = 1;
2239 2254
2240 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2241 drp[col] = rend; 2256 drp[col] = rend;
… …
2276 2291
2277 col--; /* went one too far. move back */ 2292 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2293 count -= i; /* dump any matching trailing chars */
2279 2294
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2295 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2296 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2297 count++, i--;
2283 2298
2284 /* 2299 /*
2285 * Determine the attributes for the string 2300 * Determine the attributes for the string
2286 */ 2301 */
2287 int fore = fgcolor_of (rend); // desired foreground 2302 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2303 int back = bgcolor_of (rend); // desired background
2289 2304
2290 // only do special processing if any attributes are set, which is unlikely 2305 // 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))) 2306 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2307 {
2293 bool invert = rend & RS_RVid; 2308 bool invert = rend & RS_RVid;
2294 2309
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2310#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2311 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2330
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2331 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2332 fore = Color_UL;
2318#endif 2333#endif
2319 2334
2335#ifdef OPTION_HC
2336 if (rend & RS_Sel)
2337 {
2338 /* invert the column if no highlightColor is set or it is the
2339 * current cursor column */
2340 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2341 && ISSET_PIXCOLOR (Color_HC))
2342 {
2343 if (ISSET_PIXCOLOR (Color_HTC))
2344 fore = Color_HTC;
2345 // if invert is 0 reverse video is set so we use bg color as fg color
2346 else if (!invert)
2347 fore = back;
2348
2349 back = Color_HC;
2350 invert = 0;
2351 }
2352 }
2353#endif
2354
2320 if (invert) 2355 if (invert)
2321 { 2356 {
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); 2357 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2358
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2359#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) 2360 if (fore == back)
2340 { 2361 {
2341 fore = Color_bg; 2362 fore = Color_bg;
2342 back = Color_fg; 2363 back = Color_fg;
2343 } 2364 }
… …
2379 /* 2400 /*
2380 * Actually do the drawing of the string here 2401 * Actually do the drawing of the string here
2381 */ 2402 */
2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2403 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2383 2404
2384 if (expect_true (have_bg && back == Color_bg)) 2405 if (ecb_likely (have_bg && back == Color_bg))
2385 { 2406 {
2386 // this is very ugly, maybe push it into ->draw? 2407 // this is very ugly, maybe push it into ->draw?
2387 2408
2388 for (i = 0; i < count; i++) /* don't draw empty strings */ 2409 for (i = 0; i < count; i++) /* don't draw empty strings */
2389 if (text[i] != ' ') 2410 if (text[i] != ' ')
… …
2396 did_clear: ; 2417 did_clear: ;
2397 } 2418 }
2398 else 2419 else
2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2420 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2400 2421
2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2422 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2402 { 2423 {
2403#if ENABLE_FRILLS 2424#if ENABLE_FRILLS
2404 if (ISSET_PIXCOLOR (Color_underline)) 2425 if (ISSET_PIXCOLOR (Color_underline))
2405 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2426 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2406 else 2427 else
… …
2497 scr_remap_chars (swap_buf [i]); 2518 scr_remap_chars (swap_buf [i]);
2498 } 2519 }
2499} 2520}
2500 2521
2501void 2522void
2502rxvt_term::scr_recolour () NOTHROW 2523rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2524{
2525 bool transparent = false;
2526
2504#ifdef HAVE_BG_PIXMAP 2527#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2528 if (bg_pixmap != None)
2506#else 2529 {
2530# ifdef ENABLE_TRANSPARENCY
2531 if (bg_flags & BG_IS_TRANSPARENT)
2532 {
2533 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2534 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2535
2536 transparent = true;
2537 }
2538 else
2539# endif
2540 {
2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2542 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2543 }
2544 }
2545 else
2546#endif
2547 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2549 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2550 }
2551
2552 XClearWindow (dpy, parent);
2511 2553
2512 if (scrollBar.win) 2554 if (scrollBar.win)
2513 { 2555 {
2556 if (transparent)
2557 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2558 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2560 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2561 scrollBar.show (0);
2517 } 2562 }
2518 2563
2519#endif 2564 if (refresh)
2520 2565 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2566 scr_clear ();
2523 scr_touch (true); 2567 scr_touch (true);
2568 }
2524 want_refresh = 1; 2569 want_refresh = 1;
2525} 2570}
2526 2571
2527/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2528void 2573void
… …
2596 { 2641 {
2597#if !ENABLE_MINIMAL 2642#if !ENABLE_MINIMAL
2598 if (selection.rect) 2643 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2644 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2645 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2646 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2647 else
2603#endif 2648#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2649 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2606 RS_RVid); 2651 RS_Sel | RS_RVid);
2607 } 2652 }
2608} 2653}
2609 2654
2610/* ------------------------------------------------------------------------- */ 2655/* ------------------------------------------------------------------------- */
2611/* 2656/*
… …
2616void 2661void
2617rxvt_term::scr_dump (int fd) NOTHROW 2662rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2663{
2619 int row, wrote; 2664 int row, wrote;
2620 unsigned int width, towrite; 2665 unsigned int width, towrite;
2621 char r1[] = "\n"; 2666 const char r1[] = "\n";
2622 2667
2623 for (row = saveLines + top_row; 2668 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2669 row < saveLines + nrow - 1; row++)
2625 { 2670 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2671 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2643 * CHARACTER SELECTION * 2688 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2689 * ------------------------------------------------------------------------- */
2645void 2690void
2646rxvt_term::selection_check (int check_more) NOTHROW 2691rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2692{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2693 if (!selection.op)
2651 return; 2694 return;
2652 2695
2696 row_col_t pos;
2653 pos.row = pos.col = 0; 2697 pos.row = pos.col = 0;
2698
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2699 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2700 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2701 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2702 || (check_more == 1
2658 && current_screen == selection.screen 2703 && current_screen == selection.screen
… …
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2705 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2661 || (check_more == 2 2706 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos) 2707 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos)) 2708 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3 2709 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos)))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2711 CLEAR_ALL_SELECTION ();
2670} 2712}
2671 2713
2672/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2673/* 2715/*
2674 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
2675 */ 2717 */
2676void 2718void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2719rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2720{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2721 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2722 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2723 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2724 data[i] = C0_CR;
… …
2688 2730
2689 if (priv_modes & PrivMode_BracketPaste) 2731 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2732 tt_printf ("\e[201~");
2691} 2733}
2692 2734
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2735void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2736rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2737{
2701 if (prop == None) /* check for failed XConvertSelection */ 2738 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; 2739 return;
2876 2740
2877 selection_paste (win, prop, true); 2741 tt_paste (data, len);
2878} 2742}
2879 2743
2880/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2881/* 2745/*
2882 * Request the current selection: 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2748 * 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 2749 * EXT: button 2 release
2889 */ 2750 */
2890void 2751void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2753{
2893 if (selection.text && selnum == Sel_Primary) 2754 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 } 2755 {
2901 else 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2757 selection_req->run ();
2902 { 2758 }
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} 2759}
2944 2760
2945/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
2946/* 2762/*
2947 * Clear all selected text 2763 * Clear all selected text
… …
2970 if (display->clipboard_owner == this) 2786 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2787 display->clipboard_owner = 0;
2972 } 2788 }
2973} 2789}
2974 2790
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/* ------------------------------------------------------------------------- */ 2791/* ------------------------------------------------------------------------- */
2990/* 2792/*
2991 * Copy a selection into the cut buffer 2793 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2794 * EXT: button 1 or 3 release
2993 */ 2795 */
2994void 2796void
2995rxvt_term::selection_make (Time tm) 2797rxvt_term::selection_make (Time tm)
2996{ 2798{
2997 int i; 2799 int size;
2998 wchar_t *new_selection_text; 2800 wchar_t *new_selection_text;
2999 text_t *t; 2801 text_t *t;
3000 2802
3001 switch (selection.op) 2803 switch (selection.op)
3002 { 2804 {
… …
3018 return; /* nothing selected, go away */ 2820 return; /* nothing selected, go away */
3019 2821
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2822 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 2823 return;
3022 2824
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2825 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2826 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 2827
3026 int ofs = 0; 2828 int ofs = 0;
3027 int extra = 0; 2829 int extra = 0;
3028 2830
3029 int col = selection.beg.col; 2831 int col = selection.beg.col;
… …
3035 { 2837 {
3036#if !ENABLE_MINIMAL 2838#if !ENABLE_MINIMAL
3037 if (selection.rect) 2839 if (selection.rect)
3038 { 2840 {
3039 col = selection.beg.col; 2841 col = selection.beg.col;
3040 end_col = ncol + 1; 2842 end_col = selection.end.col;
3041 } 2843 }
3042 else 2844 else
3043#endif 2845#endif
3044 end_col = ROW(row).l; 2846 end_col = ROW(row).l;
3045 2847
3046 col = max (col, 0); 2848 col = max (col, 0);
3047 2849
3048 if (row == selection.end.row 2850 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 2851 min_it (end_col, selection.end.col);
3054 2852
3055 t = ROW(row).t + col; 2853 t = ROW(row).t + col;
3056 2854
3057 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
… …
3065 2863
3066 extra -= (len - 1); 2864 extra -= (len - 1);
3067 2865
3068 if (extra < 0) 2866 if (extra < 0)
3069 { 2867 {
3070 extra += i; 2868 extra += size;
3071 i += i; 2869 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 2871 }
3074 2872
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 2874 }
3077#endif 2875#endif
… …
3089 2887
3090 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3091 } 2889 }
3092 else 2890 else
3093#endif 2891#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 2892 if (!ROW(row).is_longer ()
2893 && (row != selection.end.row || end_col != selection.end.col)
2894 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 2895 new_selection_text[ofs++] = C0_LF;
3096 } 2896 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 2897
3101 new_selection_text[ofs] = 0; 2898 new_selection_text[ofs] = 0;
3102 2899
3103 if (ofs == 0) 2900 if (ofs == 0)
3104 { 2901 {
… …
3610 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3611 */ 3408 */
3612void 3409void
3613rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3614{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3615 XSelectionEvent ev; 3413 XSelectionEvent ev;
3616 3414
3617 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3618 ev.property = None; 3416 ev.property = None;
3619 ev.display = rq.display; 3417 ev.display = rq.display;
… …
3634 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3635#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3636 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3637#endif 3435#endif
3638 3436
3639 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3640 32, PropModeReplace, 3438 32, PropModeReplace,
3641 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3642 ev.property = rq.property; 3440 ev.property = property;
3643 } 3441 }
3644#if TODO // TODO 3442#if TODO // TODO
3645 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3646 { 3444 {
3647 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3648 } 3446 }
3649#endif 3447#endif
3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3651 { 3449 {
3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3653 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property; 3452 ev.property = property;
3655 } 3453 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 { 3455 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3456 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3660 ev.property = rq.property; 3458 ev.property = property;
3661 } 3459 }
3662 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3663 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3664 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3665 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3736 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3737 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3738 ct.encoding = target; 3536 ct.encoding = target;
3739 } 3537 }
3740 3538
3741 XChangeProperty (dpy, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3742 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3743 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3744 ev.property = rq.property; 3542 ev.property = property;
3745 3543
3746 if (freect) 3544 if (freect)
3747 XFree (ct.value); 3545 XFree (ct.value);
3748 } 3546 }
3749 3547

Diff Legend

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