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.348 by sf-exg, Sat Oct 9 22:33:45 2010 UTC vs.
Revision 1.412 by root, Wed Jan 18 12:26:59 2012 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.
… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 146
147 l.touch ();
148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
153 col++; 153 col++;
… …
159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
163{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
164 view_start = 0; 168 view_start = 0;
165 num_scr = 0; 169 num_scr = 0;
166 170
167 if (ncol == 0) 171 if (ncol == 0)
168 ncol = 80; 172 ncol = 80;
… …
199 term_start = 0; 203 term_start = 0;
200 204
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 207
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 211
208 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
209 { 213 {
… …
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 277 }
274 278
275 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 281
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
281 285
… …
398 } 402 }
399 403
400 free (tabs); 404 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
402 406
403 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
405 409
406 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
407 411
408 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
545 return; 549 return;
546 550
547 want_refresh = 1; 551 want_refresh = 1;
548 view_start = 0; 552 view_start = 0;
549 553
550 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 ();
551 560
552 current_screen = scrn; 561 current_screen = scrn;
553 562
554#if NSCREENS 563#if NSCREENS
555 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
… …
634 643
635 if (count > 0 644 if (count > 0
636 && row1 == 0 645 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
639 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 651
644 // sever bottommost line 652 // sever bottommost line
645 { 653 {
646 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
647 l.is_longer (0); 655 l.is_longer (0);
648 l.touch (); 656 l.touch ();
649 } 657 }
650 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
651 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 675 for (int i = count; i--; )
653 { 676 {
654 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
655 678
656 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 680 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 682 {
660 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 684 l.l = 0;
… …
663 } 686 }
664 else 687 else
665 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
666 } 689 }
667 690
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 691 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
682 { 694 {
683 selection.beg.row -= count; 695 selection.beg.row -= count;
684 selection.end.row -= count; 696 selection.end.row -= count;
685 selection.mark.row -= count; 697 selection.mark.row -= count;
686 698
687 if (selection.beg.row < top_row 699 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 700 }
695 701
696 // finally move the view window, if desired 702 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 704 && view_start != 0
… …
728 } 734 }
729 735
730 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
732 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
733 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
734 748
735 min_it (count, rows); 749 min_it (count, rows);
736 750
737 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 752
739 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
740 { 754 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 756
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 759 }
746 760
747 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
748 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 }
749 } 770 }
750 771
751 return count; 772 return count;
752} 773}
753 774
… …
759rxvt_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
760{ 781{
761 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
762 return; 783 return;
763 784
764 unsigned char checksel; 785 bool checksel;
765 unicode_t c; 786 unicode_t c;
766 int ncol = this->ncol; 787 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
768 789
769 want_refresh = 1; 790 want_refresh = 1;
… …
795 816
796 while (str < strend) 817 while (str < strend)
797 { 818 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 820
800 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 822 if (c == C0_LF)
802 { 823 {
803 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
804 825
805 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
824 { 845 {
825 scr_tab (1, true); 846 scr_tab (1, true);
826 continue; 847 continue;
827 } 848 }
828 849
829 if (expect_false ( 850 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 854 ))
834 { 855 {
… …
839 * should be a similar check. 860 * should be a similar check.
840 */ 861 */
841 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
842 } 863 }
843 864
844 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 866 {
846 scr_do_wrap (); 867 scr_do_wrap ();
847 868
848 line->l = ncol; 869 line->l = ncol;
849 line->is_longer (1); 870 line->is_longer (1);
… …
851 row = screen.cur.row; 872 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
853 } 874 }
854 875
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 878 c = 0xfffd;
858 879
859 // 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
860 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
862 // locale. 883 // locale.
863 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
864 885
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 887 {
867 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 889 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
885 } 906 }
886 } 907 }
887 908
888 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
890 911
891 if (width != 0) 912 if (width != 0)
892 { 913 {
893#if !UNICODE_3 914#if !UNICODE_3
… …
898# else 919# else
899 c = 0xfffd; 920 c = 0xfffd;
900# endif 921# endif
901#endif 922#endif
902 923
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 925
913 // if the character doesn't fit into the remaining columns... 926 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
915 { 928 {
916 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
917 { 930 {
918 // ... artificially enlargen the previous one 931 // ... artificially enlargen the previous one
919 c = NOCHAR; 932 c = NOCHAR;
… …
922 } 935 }
923 else 936 else
924 screen.cur.col = ncol - width; 937 screen.cur.col = ncol - width;
925 } 938 }
926 939
940 // nuke the character at this position, if required
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.
944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
945 scr_kill_char (*line, screen.cur.col);
946
927 line->touch (); 947 line->touch ();
928 948
929 do 949 do
930 { 950 {
931 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
933 953
934 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 955 screen.cur.col++;
936 else 956 else
937 { 957 {
938 line->l = ncol; 958 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
941 break; 961
962 goto end_of_line;
942 } 963 }
943 964
944 c = NOCHAR; 965 c = NOCHAR;
945 } 966 }
946 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
947 968
948 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 971 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 972 line->t[c] = ' ';
956 line->r[c] = rend; 973 line->r[c] = rend;
957 }
958 } 974 }
975
976end_of_line:
977 ;
959 } 978 }
960#if ENABLE_COMBINING 979#if ENABLE_COMBINING
961 else // width == 0 980 else // width == 0
962 { 981 {
963 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
1026 1045
1027 want_refresh = 1; 1046 want_refresh = 1;
1028#endif 1047#endif
1029 } 1048 }
1030 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1031 else 1052 else
1032 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1033} 1054}
1034 1055
1035/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1291 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1292} 1313}
1293 1314
1294/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1295/* 1316/*
1296 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1321 */
1301void 1322void
… …
1310 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1311 1332
1312 switch (mode) 1333 switch (mode)
1313 { 1334 {
1314 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1336 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1338 num = nrow - row;
1319 break; 1339 break;
1320 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1341 scr_erase_line (1);
1323 row = 0; 1342 row = 0;
1324 num = screen.cur.row; 1343 num = screen.cur.row;
1325 break; 1344 break;
1326 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1346 row = 0;
1329 num = nrow; 1347 num = nrow;
1330 break; 1348 break;
1331 default: 1349 default:
1332 return; 1350 return;
… …
1349 { 1367 {
1350 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1351 1369
1352 if (mapped) 1370 if (mapped)
1353 XClearArea (dpy, vt, 0, 1371 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1372 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1373 (unsigned int)Height2Pixel (num), False);
1356 } 1374 }
1357 else 1375 else
1358 { 1376 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1362 { 1380 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1383 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1384 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1385 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1386 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1389 }
1372 } 1390 }
… …
1403 1421
1404 want_refresh = 1; 1422 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1406 1424
1407 num_scr_allow = 0; 1425 num_scr_allow = 0;
1408 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 ();
1409 1431
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1412 { 1434 {
1413 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1683 { 1705 {
1684 rvideo_state = on; 1706 rvideo_state = on;
1685 1707
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1689#endif 1711#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1713
1692 XGCValues gcvalue; 1714 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1854 * Refresh the entire screen 1876 * Refresh the entire screen
1855 */ 1877 */
1856void 1878void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1879rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1880{
1859 scr_expose (0, 0, width, height, refresh); 1881 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1882}
1861 1883
1862/* ------------------------------------------------------------------------- */ 1884/* ------------------------------------------------------------------------- */
1863/* 1885/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1886 * Move the display so that the line represented by scrollbar value Y is at
… …
1920 1942
1921# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1924# endif 1946# endif
1925 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1926# endif 1948# endif
1927 1949
1928# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1952 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1966#endif
1945} 1967}
1946 1968
1947/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */
1949void 1970void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1972{
1952#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1953 int nrows, row_start; 1974 int nrows, row_start;
… …
2027 * A: set up vars 2048 * A: set up vars
2028 */ 2049 */
2029 refresh_count = 0; 2050 refresh_count = 0;
2030 2051
2031 unsigned int old_screen_flags = screen.flags; 2052 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2053 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2035#endif 2056#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2058
2038 /* 2059 /*
2039 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2066 scr_swap_overlay ();
2046#endif 2067#endif
2047 2068
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2070
2050 /* 2071 /*
2051 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2052 */ 2073 */
2053 { 2074 {
2054 unsigned char setoldcursor; 2075 bool setoldcursor;
2055 2076
2056#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2078 if (hidden_cursor)
2058 showcursor = 0; 2079 showcursor = 0;
2059#endif 2080#endif
… …
2146 { 2167 {
2147 int16_t nits; 2168 int16_t nits;
2148 int i = num_scr; 2169 int i = num_scr;
2149 int j; 2170 int j;
2150 int len, wlen; 2171 int len, wlen;
2151 dLocal (int, num_scr);
2152 2172
2153 j = nrow; 2173 j = nrow;
2154 wlen = len = -1; 2174 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2175 row = i > 0 ? 0 : j - 1;
2156 2176
… …
2231 continue; 2251 continue;
2232 2252
2233 // redraw one or more characters 2253 // redraw one or more characters
2234 2254
2235 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2257 --col;
2238 2258
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2260 text_t *text = stp + col;
2241 int count = 1; 2261 int count = 1;
… …
2279 2299
2280 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2282 2302
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2305 count++, i--;
2286 2306
2287 /* 2307 /*
2288 * Determine the attributes for the string 2308 * Determine the attributes for the string
2289 */ 2309 */
2290 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2292 2312
2293 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2315 {
2296 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2297 2317
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2408 /*
2389 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2390 */ 2410 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2412
2393 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2414 {
2395 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2396 2416
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2405 did_clear: ; 2425 did_clear: ;
2406 } 2426 }
2407 else 2427 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2429
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2431 {
2412#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2435 else
… …
2506 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2507 } 2527 }
2508} 2528}
2509 2529
2510void 2530void
2511rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2512{ 2532{
2533 bool transparent = false;
2534
2513#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2514 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2515#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2516 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2517 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2518 XClearWindow (dpy, parent[0]);
2519 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2520 2561
2521 if (scrollBar.win) 2562 if (scrollBar.win)
2522 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2523 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2524 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2525 scrollBar.show (0); 2569 scrollBar.show (0);
2526 } 2570 }
2527 2571
2528#endif 2572 if (refresh)
2529 2573 {
2530 /* bgPixmap.apply () does not do the following : */
2531 scr_clear (); 2574 scr_clear ();
2532 scr_touch (true); 2575 scr_touch (true);
2576 }
2533 want_refresh = 1; 2577 want_refresh = 1;
2534} 2578}
2535 2579
2536/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2537void 2581void
… …
2623 */ 2667 */
2624#if 0 2668#if 0
2625void 2669void
2626rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2627{ 2671{
2628 int row, wrote; 2672 // if this method is needed, it can be implemented by factoring the
2629 unsigned int width, towrite; 2673 // relevant code in scr_printscreen
2630 char r1[] = "\n";
2631
2632 for (row = saveLines + top_row;
2633 row < saveLines + nrow - 1; row++)
2634 {
2635 width = row_buf[row].l >= 0 ? row_buf[row].l
2636 : ncol;
2637 for (towrite = width; towrite; towrite -= wrote)
2638 {
2639 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2640 towrite);
2641 if (wrote < 0)
2642 return; /* XXX: death, no report */
2643 }
2644 if (row_buf[row].l >= 0)
2645 if (write (fd, r1, 1) <= 0)
2646 return; /* XXX: death, no report */
2647 }
2648} 2674}
2649#endif 2675#endif
2650 2676
2651/* ------------------------------------------------------------------------- * 2677/* ------------------------------------------------------------------------- *
2652 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2653 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2654void 2680void
2655rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2656{ 2682{
2657 row_col_t pos;
2658
2659 if (!selection.op) 2683 if (!selection.op)
2660 return; 2684 return;
2661 2685
2662 pos.row = pos.col = 0;
2663 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2686 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2664 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2665 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2666 || (check_more == 1 2689 || (check_more == 1
2667 && current_screen == selection.screen 2690 && current_screen == selection.screen
2668 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2669 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2670 || (check_more == 2
2671 && ROWCOL_IS_BEFORE (selection.beg, pos)
2672 && ROWCOL_IS_AFTER (selection.end, pos))
2673 || (check_more == 3
2674 && ROWCOL_IS_AFTER (selection.end, pos))
2675 || (check_more == 4 /* screen width change */
2676 && (selection.beg.row != selection.end.row
2677 || selection.end.col > ncol)))
2678 CLEAR_SELECTION (); 2693 CLEAR_ALL_SELECTION ();
2679} 2694}
2680 2695
2681/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2682/* 2697/*
2683 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
… …
2689 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2690 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2691 data[i] = C0_CR; 2706 data[i] = C0_CR;
2692 2707
2693 if (priv_modes & PrivMode_BracketPaste) 2708 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[200~"); 2709 tt_printf ("\x1b[200~");
2695 2710
2696 tt_write (data, len); 2711 tt_write (data, len);
2697 2712
2698 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2699 tt_printf ("\e[201~"); 2714 tt_printf ("\x1b[201~");
2700} 2715}
2701 2716
2702void 2717void
2703rxvt_term::paste (char *data, unsigned int len) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{ 2719{
… …
2708 tt_paste (data, len); 2723 tt_paste (data, len);
2709} 2724}
2710 2725
2711/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2712/* 2727/*
2713 * Respond to a notification that a primary selection has been sent 2728 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2714 * EXT: SelectionNotify 2729 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2715 */ 2730 * as fallback
2716void
2717rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2718{
2719 if (prop == None) /* check for failed XConvertSelection */
2720 {
2721 if ((selection_type & Sel_CompoundText))
2722 {
2723 int selnum = selection_type & Sel_whereMask;
2724
2725 selection_type = 0;
2726 if (selnum != Sel_direct)
2727 selection_request_other (XA_STRING, selnum);
2728 }
2729
2730 if ((selection_type & Sel_UTF8String))
2731 {
2732 int selnum = selection_type & Sel_whereMask;
2733
2734 selection_type = Sel_CompoundText;
2735 if (selnum != Sel_direct)
2736 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2737 else
2738 selection_type = 0;
2739 }
2740
2741 return;
2742 }
2743
2744 unsigned long bytes_after;
2745 XTextProperty ct;
2746
2747 if (XGetWindowProperty (dpy, win, prop,
2748 0, PROP_SIZE / 4,
2749 delete_prop, AnyPropertyType,
2750 &ct.encoding, &ct.format,
2751 &ct.nitems, &bytes_after,
2752 &ct.value) != Success)
2753 {
2754 ct.value = 0;
2755 goto bailout;
2756 }
2757
2758 if (ct.encoding == None)
2759 goto bailout;
2760
2761 if (bytes_after)
2762 {
2763 // fetch and append remaining data
2764 XTextProperty ct2;
2765
2766 if (XGetWindowProperty (dpy, win, prop,
2767 ct.nitems / 4, (bytes_after + 3) / 4,
2768 delete_prop, AnyPropertyType,
2769 &ct2.encoding, &ct2.format,
2770 &ct2.nitems, &bytes_after,
2771 &ct2.value) != Success)
2772 goto bailout;
2773
2774 // realloc should be compatible to XFree, here, and elsewhere, too
2775 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2776 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2777 ct.nitems += ct2.nitems;
2778
2779 XFree (ct2.value);
2780 }
2781
2782 if (ct.value == 0)
2783 goto bailout;
2784
2785 if (ct.encoding == xa[XA_INCR])
2786 {
2787 // INCR selection, start handshake
2788 if (!delete_prop)
2789 XDeleteProperty (dpy, win, prop);
2790
2791 selection_wait = Sel_incr;
2792 incr_buf_fill = 0;
2793 incr_ev.start (10);
2794
2795 goto bailout;
2796 }
2797
2798 if (ct.nitems == 0)
2799 {
2800 if (selection_wait == Sel_incr)
2801 {
2802 XFree (ct.value);
2803
2804 // finally complete, now paste the whole thing
2805 selection_wait = Sel_normal;
2806 ct.value = (unsigned char *)incr_buf;
2807 ct.nitems = incr_buf_fill;
2808 incr_buf = 0;
2809 incr_buf_size = 0;
2810 incr_ev.stop ();
2811 }
2812 else
2813 {
2814 if (selection_wait == Sel_normal
2815 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2816 {
2817 /*
2818 * pass through again trying CUT_BUFFER0 if we've come from
2819 * XConvertSelection () but nothing was presented
2820 */
2821 selection_paste (display->root, XA_CUT_BUFFER0, False);
2822 }
2823
2824 goto bailout;
2825 }
2826 }
2827 else if (selection_wait == Sel_incr)
2828 {
2829 incr_ev.start (10);
2830
2831 while (incr_buf_fill + ct.nitems > incr_buf_size)
2832 {
2833 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2834 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2835 }
2836
2837 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2838 incr_buf_fill += ct.nitems;
2839
2840 goto bailout;
2841 }
2842
2843 char **cl;
2844 int cr;
2845
2846#if !ENABLE_MINIMAL
2847 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2848 // so recode it manually
2849 if (ct.encoding == xa[XA_UTF8_STRING])
2850 {
2851 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2852 char *s = rxvt_wcstombs (w);
2853 free (w);
2854 // TODO: strlen == only the first element will be converted. well...
2855 paste (s, strlen (s));
2856 free (s);
2857 }
2858 else
2859#endif
2860 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2861 && cl)
2862 {
2863 for (int i = 0; i < cr; i++)
2864 paste (cl[i], strlen (cl[i]));
2865
2866 XFreeStringList (cl);
2867 }
2868 else
2869 paste ((char *)ct.value, ct.nitems); // paste raw
2870
2871bailout:
2872 XFree (ct.value);
2873
2874 if (selection_wait == Sel_normal)
2875 selection_wait = Sel_none;
2876}
2877
2878void
2879rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2880{
2881 selection_wait = Sel_none;
2882
2883 incr_buf_size = 0;
2884 free (incr_buf);
2885
2886 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2887}
2888
2889void
2890rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2891{
2892 if (prop == None || selection_wait != Sel_incr)
2893 return;
2894
2895 selection_paste (win, prop, true);
2896}
2897
2898/* ------------------------------------------------------------------------- */
2899/*
2900 * Request the current selection:
2901 * Order: > internal selection if available
2902 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2903 * > CUT_BUFFER0
2904 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2905 * will auto fallback to CUT_BUFFER0
2906 * EXT: button 2 release 2731 * EXT: button 2 release
2907 */ 2732 */
2908void 2733void
2909rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2734rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2910{ 2735{
2911 if (selection.text && selnum == Sel_Primary) 2736 if (!selection_req)
2912 {
2913 /* internal selection */
2914 char *str = rxvt_wcstombs (selection.text, selection.len);
2915 paste (str, strlen (str));
2916 free (str);
2917 return;
2918 } 2737 {
2919 else 2738 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2739 selection_req->run ();
2920 { 2740 }
2921 selection_request_time = tm;
2922 selection_wait = Sel_normal;
2923
2924#if X_HAVE_UTF8_STRING
2925 selection_type = Sel_UTF8String;
2926 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2927 return;
2928#else
2929 selection_type = Sel_CompoundText;
2930 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2931 return;
2932#endif
2933 }
2934
2935 selection_wait = Sel_none; /* don't loop in selection_paste () */
2936 selection_paste (display->root, XA_CUT_BUFFER0, false);
2937}
2938
2939int
2940rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2941{
2942 Atom sel;
2943
2944 selection_type |= selnum;
2945
2946 if (selnum == Sel_Primary)
2947 sel = XA_PRIMARY;
2948 else if (selnum == Sel_Secondary)
2949 sel = XA_SECONDARY;
2950 else
2951 sel = xa[XA_CLIPBOARD];
2952
2953 if (XGetSelectionOwner (dpy, sel) != None)
2954 {
2955 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2956 vt, selection_request_time);
2957 return 1;
2958 }
2959
2960 return 0;
2961} 2741}
2962 2742
2963/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2964/* 2744/*
2965 * Clear all selected text 2745 * Clear all selected text
… …
2996 * EXT: button 1 or 3 release 2776 * EXT: button 1 or 3 release
2997 */ 2777 */
2998void 2778void
2999rxvt_term::selection_make (Time tm) 2779rxvt_term::selection_make (Time tm)
3000{ 2780{
3001 int i; 2781 int size;
3002 wchar_t *new_selection_text; 2782 wchar_t *new_selection_text;
3003 text_t *t; 2783 text_t *t;
3004 2784
3005 switch (selection.op) 2785 switch (selection.op)
3006 { 2786 {
… …
3022 return; /* nothing selected, go away */ 2802 return; /* nothing selected, go away */
3023 2803
3024 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2804 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3025 return; 2805 return;
3026 2806
3027 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2807 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3028 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2808 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3029 2809
3030 int ofs = 0; 2810 int ofs = 0;
3031 int extra = 0; 2811 int extra = 0;
3032 2812
3033 int col = selection.beg.col; 2813 int col = selection.beg.col;
… …
3039 { 2819 {
3040#if !ENABLE_MINIMAL 2820#if !ENABLE_MINIMAL
3041 if (selection.rect) 2821 if (selection.rect)
3042 { 2822 {
3043 col = selection.beg.col; 2823 col = selection.beg.col;
3044 end_col = ncol + 1; 2824 end_col = selection.end.col;
3045 } 2825 }
3046 else 2826 else
3047#endif 2827#endif
3048 end_col = ROW(row).l; 2828 end_col = ROW(row).l;
3049 2829
3050 col = max (col, 0); 2830 col = max (col, 0);
3051 2831
3052 if (row == selection.end.row 2832 if (row == selection.end.row)
3053#if !ENABLE_MINIMAL
3054 || selection.rect
3055#endif
3056 )
3057 min_it (end_col, selection.end.col); 2833 min_it (end_col, selection.end.col);
3058 2834
3059 t = ROW(row).t + col; 2835 t = ROW(row).t + col;
3060 2836
3061 for (; col < end_col; col++) 2837 for (; col < end_col; col++)
… …
3069 2845
3070 extra -= (len - 1); 2846 extra -= (len - 1);
3071 2847
3072 if (extra < 0) 2848 if (extra < 0)
3073 { 2849 {
3074 extra += i; 2850 extra += size;
3075 i += i; 2851 size += size;
3076 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2852 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3077 } 2853 }
3078 2854
3079 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2855 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3080 } 2856 }
3081#endif 2857#endif
… …
3093 2869
3094 new_selection_text[ofs++] = C0_LF; 2870 new_selection_text[ofs++] = C0_LF;
3095 } 2871 }
3096 else 2872 else
3097#endif 2873#endif
3098 if (!ROW(row).is_longer () && row != selection.end.row) 2874 if (!ROW(row).is_longer ()
2875 && (row != selection.end.row || end_col != selection.end.col)
2876 && (row != selection.beg.row || selection.beg.col < ncol))
3099 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3100 } 2878 }
3101
3102 if (end_col != selection.end.col)
3103 new_selection_text[ofs++] = C0_LF;
3104 2879
3105 new_selection_text[ofs] = 0; 2880 new_selection_text[ofs] = 0;
3106 2881
3107 if (ofs == 0) 2882 if (ofs == 0)
3108 { 2883 {
… …
3614 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3615 */ 3390 */
3616void 3391void
3617rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3618{ 3393{
3394 Atom property = rq.property == None ? rq.target : rq.property;
3619 XSelectionEvent ev; 3395 XSelectionEvent ev;
3620 3396
3621 ev.type = SelectionNotify; 3397 ev.type = SelectionNotify;
3622 ev.property = None; 3398 ev.property = None;
3623 ev.display = rq.display; 3399 ev.display = rq.display;
… …
3638 *target++ = xa[XA_COMPOUND_TEXT]; 3414 *target++ = xa[XA_COMPOUND_TEXT];
3639#if X_HAVE_UTF8_STRING 3415#if X_HAVE_UTF8_STRING
3640 *target++ = xa[XA_UTF8_STRING]; 3416 *target++ = xa[XA_UTF8_STRING];
3641#endif 3417#endif
3642 3418
3643 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3419 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3644 32, PropModeReplace, 3420 32, PropModeReplace,
3645 (unsigned char *)target_list, target - target_list); 3421 (unsigned char *)target_list, target - target_list);
3646 ev.property = rq.property; 3422 ev.property = property;
3647 } 3423 }
3648#if TODO // TODO 3424#if TODO // TODO
3649 else if (rq.target == xa[XA_MULTIPLE]) 3425 else if (rq.target == xa[XA_MULTIPLE])
3650 { 3426 {
3651 /* TODO: Handle MULTIPLE */ 3427 /* TODO: Handle MULTIPLE */
3652 } 3428 }
3653#endif 3429#endif
3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3430 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3655 { 3431 {
3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3432 XChangeProperty (dpy, rq.requestor, property, rq.target,
3657 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3433 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3658 ev.property = rq.property; 3434 ev.property = property;
3659 } 3435 }
3660 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3661 { 3437 {
3662 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3663 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3439 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3664 ev.property = rq.property; 3440 ev.property = property;
3665 } 3441 }
3666 else if (rq.target == XA_STRING 3442 else if (rq.target == XA_STRING
3667 || rq.target == xa[XA_TEXT] 3443 || rq.target == xa[XA_TEXT]
3668 || rq.target == xa[XA_COMPOUND_TEXT] 3444 || rq.target == xa[XA_COMPOUND_TEXT]
3669 || rq.target == xa[XA_UTF8_STRING] 3445 || rq.target == xa[XA_UTF8_STRING]
… …
3740 ct.value = (unsigned char *)cl; 3516 ct.value = (unsigned char *)cl;
3741 ct.nitems = selectlen; 3517 ct.nitems = selectlen;
3742 ct.encoding = target; 3518 ct.encoding = target;
3743 } 3519 }
3744 3520
3745 XChangeProperty (dpy, rq.requestor, rq.property, 3521 XChangeProperty (dpy, rq.requestor, property,
3746 ct.encoding, 8, PropModeReplace, 3522 ct.encoding, 8, PropModeReplace,
3747 ct.value, (int)ct.nitems); 3523 ct.value, (int)ct.nitems);
3748 ev.property = rq.property; 3524 ev.property = property;
3749 3525
3750 if (freect) 3526 if (freect)
3751 XFree (ct.value); 3527 XFree (ct.value);
3752 } 3528 }
3753 3529

Diff Legend

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