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 | |
161 | void |
161 | void |
162 | rxvt_term::scr_reset () |
162 | rxvt_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; |
… | |
… | |
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; |
… | |
… | |
634 | |
638 | |
635 | if (count > 0 |
639 | if (count > 0 |
636 | && row1 == 0 |
640 | && row1 == 0 |
637 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
638 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
639 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
640 | |
|
|
641 | // scroll everything up 'count' lines |
|
|
642 | term_start = (term_start + count) % total_rows; |
|
|
643 | |
646 | |
644 | // sever bottommost line |
647 | // sever bottommost line |
645 | { |
648 | { |
646 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2 - 1); |
647 | l.is_longer (0); |
650 | l.is_longer (0); |
648 | l.touch (); |
651 | l.touch (); |
649 | } |
652 | } |
650 | |
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 | |
651 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
652 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
653 | { |
671 | { |
654 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
655 | |
673 | |
656 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
657 | // could be rolled into scr_blank_screen_mem |
675 | // 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))) |
676 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
659 | { |
677 | { |
660 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
661 | l.l = 0; |
679 | l.l = 0; |
662 | l.f = 0; |
680 | l.f = 0; |
663 | } |
681 | } |
664 | else |
682 | else |
665 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
666 | } |
|
|
667 | |
|
|
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 | } |
684 | } |
679 | |
685 | |
680 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
681 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
682 | { |
688 | { |
… | |
… | |
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 = row_buf + total_rows; |
… | |
… | |
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 - 1); |
|
|
767 | l.is_longer (0); |
|
|
768 | l.touch (); |
|
|
769 | } |
|
|
770 | |
749 | } |
771 | } |
750 | |
772 | |
751 | return count; |
773 | return count; |
752 | } |
774 | } |
753 | |
775 | |
… | |
… | |
795 | |
817 | |
796 | while (str < strend) |
818 | while (str < strend) |
797 | { |
819 | { |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
820 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
799 | |
821 | |
800 | if (expect_false (c < 0x20)) |
822 | if (ecb_unlikely (c < 0x20)) |
801 | if (c == C0_LF) |
823 | if (c == C0_LF) |
802 | { |
824 | { |
803 | max_it (line->l, screen.cur.col); |
825 | max_it (line->l, screen.cur.col); |
804 | |
826 | |
805 | screen.flags &= ~Screen_WrapNext; |
827 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
824 | { |
846 | { |
825 | scr_tab (1, true); |
847 | scr_tab (1, true); |
826 | continue; |
848 | continue; |
827 | } |
849 | } |
828 | |
850 | |
829 | if (expect_false ( |
851 | if (ecb_unlikely ( |
830 | checksel /* see if we're writing within selection */ |
852 | checksel /* see if we're writing within selection */ |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
853 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
854 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
833 | )) |
855 | )) |
834 | { |
856 | { |
… | |
… | |
839 | * should be a similar check. |
861 | * should be a similar check. |
840 | */ |
862 | */ |
841 | CLEAR_SELECTION (); |
863 | CLEAR_SELECTION (); |
842 | } |
864 | } |
843 | |
865 | |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
866 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
845 | { |
867 | { |
846 | scr_do_wrap (); |
868 | scr_do_wrap (); |
847 | |
869 | |
848 | line->l = ncol; |
870 | line->l = ncol; |
849 | line->is_longer (1); |
871 | line->is_longer (1); |
… | |
… | |
851 | row = screen.cur.row; |
873 | row = screen.cur.row; |
852 | line = &ROW(row); /* _must_ refresh */ |
874 | line = &ROW(row); /* _must_ refresh */ |
853 | } |
875 | } |
854 | |
876 | |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
877 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
878 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
857 | c = 0xfffd; |
879 | c = 0xfffd; |
858 | |
880 | |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
881 | // rely on wcwidth to tell us the character width, do wcwidth before |
860 | // further replacements, as wcwidth might return -1 for the line |
882 | // further replacements, as wcwidth might return -1 for the line |
861 | // drawing characters below as they might be invalid in the current |
883 | // drawing characters below as they might be invalid in the current |
862 | // locale. |
884 | // locale. |
863 | int width = WCWIDTH (c); |
885 | int width = WCWIDTH (c); |
864 | |
886 | |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
887 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
866 | { |
888 | { |
867 | // vt100 special graphics and line drawing |
889 | // vt100 special graphics and line drawing |
868 | // 5f-7e standard vt100 |
890 | // 5f-7e standard vt100 |
869 | // 40-5e rxvt extension for extra curses acs chars |
891 | // 40-5e rxvt extension for extra curses acs chars |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
892 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
883 | c = vt100_0[c - 0x41]; |
905 | c = vt100_0[c - 0x41]; |
884 | width = 1; // vt100 line drawing characters are always single-width |
906 | width = 1; // vt100 line drawing characters are always single-width |
885 | } |
907 | } |
886 | } |
908 | } |
887 | |
909 | |
888 | if (expect_false (screen.flags & Screen_Insert)) |
910 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
889 | scr_insdel_chars (width, INSERT); |
911 | scr_insdel_chars (width, INSERT); |
890 | |
912 | |
891 | if (width != 0) |
913 | if (width != 0) |
892 | { |
914 | { |
893 | #if !UNICODE_3 |
915 | #if !UNICODE_3 |
… | |
… | |
898 | # else |
920 | # else |
899 | c = 0xfffd; |
921 | c = 0xfffd; |
900 | # endif |
922 | # endif |
901 | #endif |
923 | #endif |
902 | |
924 | |
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)); |
925 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
912 | |
926 | |
913 | // if the character doesn't fit into the remaining columns... |
927 | // if the character doesn't fit into the remaining columns... |
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
928 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
915 | { |
929 | { |
916 | if (screen.flags & Screen_Autowrap) |
930 | if (screen.flags & Screen_Autowrap) |
917 | { |
931 | { |
918 | // ... artificially enlargen the previous one |
932 | // ... artificially enlargen the previous one |
919 | c = NOCHAR; |
933 | c = NOCHAR; |
… | |
… | |
922 | } |
936 | } |
923 | else |
937 | else |
924 | screen.cur.col = ncol - width; |
938 | screen.cur.col = ncol - width; |
925 | } |
939 | } |
926 | |
940 | |
|
|
941 | // nuke the character at this position, if required |
|
|
942 | // due to wonderful coincidences everywhere else in this loop |
|
|
943 | // we never have to check for overwriting a wide char itself, |
|
|
944 | // only its tail. |
|
|
945 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
|
|
946 | scr_kill_char (*line, screen.cur.col); |
|
|
947 | |
927 | line->touch (); |
948 | line->touch (); |
928 | |
949 | |
929 | do |
950 | do |
930 | { |
951 | { |
931 | line->t[screen.cur.col] = c; |
952 | line->t[screen.cur.col] = c; |
932 | line->r[screen.cur.col] = rend; |
953 | line->r[screen.cur.col] = rend; |
933 | |
954 | |
934 | if (expect_true (screen.cur.col < ncol - 1)) |
955 | if (ecb_likely (screen.cur.col < ncol - 1)) |
935 | screen.cur.col++; |
956 | screen.cur.col++; |
936 | else |
957 | else |
937 | { |
958 | { |
938 | line->l = ncol; |
959 | line->l = ncol; |
939 | if (screen.flags & Screen_Autowrap) |
960 | if (screen.flags & Screen_Autowrap) |
940 | screen.flags |= Screen_WrapNext; |
961 | screen.flags |= Screen_WrapNext; |
941 | break; |
962 | |
|
|
963 | goto end_of_line; |
942 | } |
964 | } |
943 | |
965 | |
944 | c = NOCHAR; |
966 | c = NOCHAR; |
945 | } |
967 | } |
946 | while (expect_false (--width > 0)); |
968 | while (ecb_unlikely (--width > 0)); |
947 | |
969 | |
948 | // pad with spaces when overwriting wide character with smaller one |
970 | // pad with spaces when overwriting wide character with smaller one |
949 | if (expect_false (!width)) |
971 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
950 | { |
972 | { |
951 | line->touch (); |
|
|
952 | |
|
|
953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
954 | { |
|
|
955 | line->t[c] = ' '; |
973 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
974 | line->r[c] = rend; |
957 | } |
|
|
958 | } |
975 | } |
|
|
976 | |
|
|
977 | end_of_line: |
|
|
978 | ; |
959 | } |
979 | } |
960 | #if ENABLE_COMBINING |
980 | #if ENABLE_COMBINING |
961 | else // width == 0 |
981 | else // width == 0 |
962 | { |
982 | { |
963 | if (c != 0xfeff) // ignore BOM |
983 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1026 | |
1046 | |
1027 | want_refresh = 1; |
1047 | want_refresh = 1; |
1028 | #endif |
1048 | #endif |
1029 | } |
1049 | } |
1030 | } |
1050 | } |
1031 | #ifdef TERMCAP_HAS_BW |
|
|
1032 | else if (screen.flags & Screen_WrapNext) |
1051 | else if (screen.flags & Screen_WrapNext) |
1033 | screen.flags &= ~Screen_WrapNext; |
1052 | screen.flags &= ~Screen_WrapNext; |
1034 | #endif |
|
|
1035 | else |
1053 | else |
1036 | scr_gotorc (0, -1, RELATIVE); |
1054 | scr_gotorc (0, -1, RELATIVE); |
1037 | } |
1055 | } |
1038 | |
1056 | |
1039 | /* ------------------------------------------------------------------------- */ |
1057 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1687 | { |
1705 | { |
1688 | rvideo_state = on; |
1706 | rvideo_state = on; |
1689 | |
1707 | |
1690 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1708 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1691 | #ifdef HAVE_BG_PIXMAP |
1709 | #ifdef HAVE_BG_PIXMAP |
1692 | if (bgPixmap.pixmap == None) |
1710 | if (bg_pixmap == None) |
1693 | #endif |
1711 | #endif |
1694 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1712 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1695 | |
1713 | |
1696 | XGCValues gcvalue; |
1714 | XGCValues gcvalue; |
1697 | gcvalue.foreground = pix_colors[Color_fg]; |
1715 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1924 | |
1942 | |
1925 | # ifndef NO_MAPALERT |
1943 | # ifndef NO_MAPALERT |
1926 | # ifdef MAPALERT_OPTION |
1944 | # ifdef MAPALERT_OPTION |
1927 | if (option (Opt_mapAlert)) |
1945 | if (option (Opt_mapAlert)) |
1928 | # endif |
1946 | # endif |
1929 | XMapWindow (dpy, parent[0]); |
1947 | XMapWindow (dpy, parent); |
1930 | # endif |
1948 | # endif |
1931 | |
1949 | |
1932 | # if ENABLE_FRILLS |
1950 | # if ENABLE_FRILLS |
1933 | if (option (Opt_urgentOnBell)) |
1951 | if (option (Opt_urgentOnBell)) |
1934 | set_urgency (1); |
1952 | set_urgency (1); |
… | |
… | |
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1965 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1948 | #endif |
1966 | #endif |
1949 | } |
1967 | } |
1950 | |
1968 | |
1951 | /* ------------------------------------------------------------------------- */ |
1969 | /* ------------------------------------------------------------------------- */ |
1952 | /* ARGSUSED */ |
|
|
1953 | void |
1970 | void |
1954 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1971 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | { |
1972 | { |
1956 | #ifdef PRINTPIPE |
1973 | #ifdef PRINTPIPE |
1957 | int nrows, row_start; |
1974 | int nrows, row_start; |
… | |
… | |
2033 | refresh_count = 0; |
2050 | refresh_count = 0; |
2034 | |
2051 | |
2035 | unsigned int old_screen_flags = screen.flags; |
2052 | unsigned int old_screen_flags = screen.flags; |
2036 | char have_bg = 0; |
2053 | char have_bg = 0; |
2037 | #ifdef HAVE_BG_PIXMAP |
2054 | #ifdef HAVE_BG_PIXMAP |
2038 | have_bg = bgPixmap.pixmap != None; |
2055 | have_bg = bg_pixmap != None; |
2039 | #endif |
2056 | #endif |
2040 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2057 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2041 | |
2058 | |
2042 | /* |
2059 | /* |
2043 | * B: reverse any characters which are selected |
2060 | * B: reverse any characters which are selected |
… | |
… | |
2235 | continue; |
2252 | continue; |
2236 | |
2253 | |
2237 | // redraw one or more characters |
2254 | // redraw one or more characters |
2238 | |
2255 | |
2239 | // seek to the beginning of wide characters |
2256 | // seek to the beginning of wide characters |
2240 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2257 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2241 | --col; |
2258 | --col; |
2242 | |
2259 | |
2243 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2260 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2244 | text_t *text = stp + col; |
2261 | text_t *text = stp + col; |
2245 | int count = 1; |
2262 | int count = 1; |
… | |
… | |
2283 | |
2300 | |
2284 | col--; /* went one too far. move back */ |
2301 | col--; /* went one too far. move back */ |
2285 | count -= i; /* dump any matching trailing chars */ |
2302 | count -= i; /* dump any matching trailing chars */ |
2286 | |
2303 | |
2287 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2304 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | while (expect_false (i && text[count] == NOCHAR)) |
2305 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2289 | count++, i--; |
2306 | count++, i--; |
2290 | |
2307 | |
2291 | /* |
2308 | /* |
2292 | * Determine the attributes for the string |
2309 | * Determine the attributes for the string |
2293 | */ |
2310 | */ |
2294 | int fore = fgcolor_of (rend); // desired foreground |
2311 | int fore = fgcolor_of (rend); // desired foreground |
2295 | int back = bgcolor_of (rend); // desired background |
2312 | int back = bgcolor_of (rend); // desired background |
2296 | |
2313 | |
2297 | // only do special processing if any attributes are set, which is unlikely |
2314 | // only do special processing if any attributes are set, which is unlikely |
2298 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2315 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2299 | { |
2316 | { |
2300 | bool invert = rend & RS_RVid; |
2317 | bool invert = rend & RS_RVid; |
2301 | |
2318 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2319 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | if (rend & RS_Bold && fore == Color_fg) |
2320 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2392 | /* |
2409 | /* |
2393 | * Actually do the drawing of the string here |
2410 | * Actually do the drawing of the string here |
2394 | */ |
2411 | */ |
2395 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2412 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2396 | |
2413 | |
2397 | if (expect_true (have_bg && back == Color_bg)) |
2414 | if (ecb_likely (have_bg && back == Color_bg)) |
2398 | { |
2415 | { |
2399 | // this is very ugly, maybe push it into ->draw? |
2416 | // this is very ugly, maybe push it into ->draw? |
2400 | |
2417 | |
2401 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2418 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2402 | if (text[i] != ' ') |
2419 | if (text[i] != ' ') |
… | |
… | |
2409 | did_clear: ; |
2426 | did_clear: ; |
2410 | } |
2427 | } |
2411 | else |
2428 | else |
2412 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2429 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2413 | |
2430 | |
2414 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2431 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2415 | { |
2432 | { |
2416 | #if ENABLE_FRILLS |
2433 | #if ENABLE_FRILLS |
2417 | if (ISSET_PIXCOLOR (Color_underline)) |
2434 | if (ISSET_PIXCOLOR (Color_underline)) |
2418 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2435 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2419 | else |
2436 | else |
… | |
… | |
2510 | scr_remap_chars (swap_buf [i]); |
2527 | scr_remap_chars (swap_buf [i]); |
2511 | } |
2528 | } |
2512 | } |
2529 | } |
2513 | |
2530 | |
2514 | void |
2531 | void |
2515 | rxvt_term::scr_recolour () NOTHROW |
2532 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2516 | { |
2533 | { |
|
|
2534 | bool transparent = false; |
|
|
2535 | |
2517 | #ifdef HAVE_BG_PIXMAP |
2536 | #ifdef HAVE_BG_PIXMAP |
2518 | bgPixmap.apply (); |
2537 | if (bg_pixmap != None) |
2519 | #else |
2538 | { |
|
|
2539 | # ifdef ENABLE_TRANSPARENCY |
|
|
2540 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2541 | { |
|
|
2542 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2543 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2520 | |
2544 | |
|
|
2545 | transparent = true; |
|
|
2546 | } |
|
|
2547 | else |
|
|
2548 | # endif |
|
|
2549 | { |
|
|
2550 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2551 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2552 | } |
|
|
2553 | } |
|
|
2554 | else |
|
|
2555 | #endif |
|
|
2556 | { |
2521 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2557 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2522 | XClearWindow (dpy, parent[0]); |
|
|
2523 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2558 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2559 | } |
|
|
2560 | |
|
|
2561 | XClearWindow (dpy, parent); |
2524 | |
2562 | |
2525 | if (scrollBar.win) |
2563 | if (scrollBar.win) |
2526 | { |
2564 | { |
|
|
2565 | if (transparent) |
|
|
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2567 | else |
2527 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2528 | scrollBar.state = STATE_IDLE; |
2569 | scrollBar.state = STATE_IDLE; |
2529 | scrollBar.show (0); |
2570 | scrollBar.show (0); |
2530 | } |
2571 | } |
2531 | |
2572 | |
2532 | #endif |
2573 | if (refresh) |
2533 | |
2574 | { |
2534 | /* bgPixmap.apply () does not do the following : */ |
|
|
2535 | scr_clear (); |
2575 | scr_clear (); |
2536 | scr_touch (true); |
2576 | scr_touch (true); |
|
|
2577 | } |
2537 | want_refresh = 1; |
2578 | want_refresh = 1; |
2538 | } |
2579 | } |
2539 | |
2580 | |
2540 | /* ------------------------------------------------------------------------- */ |
2581 | /* ------------------------------------------------------------------------- */ |
2541 | void |
2582 | void |
… | |
… | |
2629 | void |
2670 | void |
2630 | rxvt_term::scr_dump (int fd) NOTHROW |
2671 | rxvt_term::scr_dump (int fd) NOTHROW |
2631 | { |
2672 | { |
2632 | int row, wrote; |
2673 | int row, wrote; |
2633 | unsigned int width, towrite; |
2674 | unsigned int width, towrite; |
2634 | char r1[] = "\n"; |
2675 | const char r1[] = "\n"; |
2635 | |
2676 | |
2636 | for (row = saveLines + top_row; |
2677 | for (row = saveLines + top_row; |
2637 | row < saveLines + nrow - 1; row++) |
2678 | row < saveLines + nrow - 1; row++) |
2638 | { |
2679 | { |
2639 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2680 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2712 | tt_paste (data, len); |
2753 | tt_paste (data, len); |
2713 | } |
2754 | } |
2714 | |
2755 | |
2715 | /* ------------------------------------------------------------------------- */ |
2756 | /* ------------------------------------------------------------------------- */ |
2716 | /* |
2757 | /* |
2717 | * Respond to a notification that a primary selection has been sent |
2758 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2718 | * EXT: SelectionNotify |
2759 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2719 | */ |
2760 | * as fallback |
2720 | void |
|
|
2721 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
|
|
2722 | { |
|
|
2723 | if (prop == None) /* check for failed XConvertSelection */ |
|
|
2724 | { |
|
|
2725 | if ((selection_type & Sel_CompoundText)) |
|
|
2726 | { |
|
|
2727 | int selnum = selection_type & Sel_whereMask; |
|
|
2728 | |
|
|
2729 | selection_type = 0; |
|
|
2730 | if (selnum != Sel_direct) |
|
|
2731 | selection_request_other (XA_STRING, selnum); |
|
|
2732 | } |
|
|
2733 | |
|
|
2734 | if ((selection_type & Sel_UTF8String)) |
|
|
2735 | { |
|
|
2736 | int selnum = selection_type & Sel_whereMask; |
|
|
2737 | |
|
|
2738 | selection_type = Sel_CompoundText; |
|
|
2739 | if (selnum != Sel_direct) |
|
|
2740 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2741 | else |
|
|
2742 | selection_type = 0; |
|
|
2743 | } |
|
|
2744 | |
|
|
2745 | return; |
|
|
2746 | } |
|
|
2747 | |
|
|
2748 | unsigned long bytes_after; |
|
|
2749 | XTextProperty ct; |
|
|
2750 | |
|
|
2751 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2752 | 0, PROP_SIZE / 4, |
|
|
2753 | delete_prop, AnyPropertyType, |
|
|
2754 | &ct.encoding, &ct.format, |
|
|
2755 | &ct.nitems, &bytes_after, |
|
|
2756 | &ct.value) != Success) |
|
|
2757 | { |
|
|
2758 | ct.value = 0; |
|
|
2759 | goto bailout; |
|
|
2760 | } |
|
|
2761 | |
|
|
2762 | if (ct.encoding == None) |
|
|
2763 | goto bailout; |
|
|
2764 | |
|
|
2765 | if (bytes_after) |
|
|
2766 | { |
|
|
2767 | // fetch and append remaining data |
|
|
2768 | XTextProperty ct2; |
|
|
2769 | |
|
|
2770 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2771 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2772 | delete_prop, AnyPropertyType, |
|
|
2773 | &ct2.encoding, &ct2.format, |
|
|
2774 | &ct2.nitems, &bytes_after, |
|
|
2775 | &ct2.value) != Success) |
|
|
2776 | goto bailout; |
|
|
2777 | |
|
|
2778 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2779 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2780 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2781 | ct.nitems += ct2.nitems; |
|
|
2782 | |
|
|
2783 | XFree (ct2.value); |
|
|
2784 | } |
|
|
2785 | |
|
|
2786 | if (ct.value == 0) |
|
|
2787 | goto bailout; |
|
|
2788 | |
|
|
2789 | if (ct.encoding == xa[XA_INCR]) |
|
|
2790 | { |
|
|
2791 | // INCR selection, start handshake |
|
|
2792 | if (!delete_prop) |
|
|
2793 | XDeleteProperty (dpy, win, prop); |
|
|
2794 | |
|
|
2795 | selection_wait = Sel_incr; |
|
|
2796 | incr_buf_fill = 0; |
|
|
2797 | incr_ev.start (10); |
|
|
2798 | |
|
|
2799 | goto bailout; |
|
|
2800 | } |
|
|
2801 | |
|
|
2802 | if (ct.nitems == 0) |
|
|
2803 | { |
|
|
2804 | if (selection_wait == Sel_incr) |
|
|
2805 | { |
|
|
2806 | XFree (ct.value); |
|
|
2807 | |
|
|
2808 | // finally complete, now paste the whole thing |
|
|
2809 | selection_wait = Sel_normal; |
|
|
2810 | ct.value = (unsigned char *)incr_buf; |
|
|
2811 | ct.nitems = incr_buf_fill; |
|
|
2812 | incr_buf = 0; |
|
|
2813 | incr_buf_size = 0; |
|
|
2814 | incr_ev.stop (); |
|
|
2815 | } |
|
|
2816 | else |
|
|
2817 | { |
|
|
2818 | if (selection_wait == Sel_normal |
|
|
2819 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2820 | { |
|
|
2821 | /* |
|
|
2822 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2823 | * XConvertSelection () but nothing was presented |
|
|
2824 | */ |
|
|
2825 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2826 | } |
|
|
2827 | |
|
|
2828 | goto bailout; |
|
|
2829 | } |
|
|
2830 | } |
|
|
2831 | else if (selection_wait == Sel_incr) |
|
|
2832 | { |
|
|
2833 | incr_ev.start (10); |
|
|
2834 | |
|
|
2835 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2836 | { |
|
|
2837 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2838 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2839 | } |
|
|
2840 | |
|
|
2841 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2842 | incr_buf_fill += ct.nitems; |
|
|
2843 | |
|
|
2844 | goto bailout; |
|
|
2845 | } |
|
|
2846 | |
|
|
2847 | char **cl; |
|
|
2848 | int cr; |
|
|
2849 | |
|
|
2850 | #if !ENABLE_MINIMAL |
|
|
2851 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2852 | // so recode it manually |
|
|
2853 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2854 | { |
|
|
2855 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2856 | char *s = rxvt_wcstombs (w); |
|
|
2857 | free (w); |
|
|
2858 | // TODO: strlen == only the first element will be converted. well... |
|
|
2859 | paste (s, strlen (s)); |
|
|
2860 | free (s); |
|
|
2861 | } |
|
|
2862 | else |
|
|
2863 | #endif |
|
|
2864 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2865 | && cl) |
|
|
2866 | { |
|
|
2867 | for (int i = 0; i < cr; i++) |
|
|
2868 | paste (cl[i], strlen (cl[i])); |
|
|
2869 | |
|
|
2870 | XFreeStringList (cl); |
|
|
2871 | } |
|
|
2872 | else |
|
|
2873 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2874 | |
|
|
2875 | bailout: |
|
|
2876 | XFree (ct.value); |
|
|
2877 | |
|
|
2878 | if (selection_wait == Sel_normal) |
|
|
2879 | selection_wait = Sel_none; |
|
|
2880 | } |
|
|
2881 | |
|
|
2882 | void |
|
|
2883 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2884 | { |
|
|
2885 | selection_wait = Sel_none; |
|
|
2886 | |
|
|
2887 | incr_buf_size = 0; |
|
|
2888 | free (incr_buf); |
|
|
2889 | |
|
|
2890 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2891 | } |
|
|
2892 | |
|
|
2893 | void |
|
|
2894 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2895 | { |
|
|
2896 | if (prop == None || selection_wait != Sel_incr) |
|
|
2897 | return; |
|
|
2898 | |
|
|
2899 | selection_paste (win, prop, true); |
|
|
2900 | } |
|
|
2901 | |
|
|
2902 | /* ------------------------------------------------------------------------- */ |
|
|
2903 | /* |
|
|
2904 | * Request the current selection: |
|
|
2905 | * Order: > internal selection if available |
|
|
2906 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
|
|
2907 | * > CUT_BUFFER0 |
|
|
2908 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2909 | * will auto fallback to CUT_BUFFER0 |
|
|
2910 | * EXT: button 2 release |
2761 | * EXT: button 2 release |
2911 | */ |
2762 | */ |
2912 | void |
2763 | void |
2913 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2764 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2914 | { |
2765 | { |
2915 | if (selection.text && selnum == Sel_Primary) |
2766 | if (!selection_req) |
2916 | { |
|
|
2917 | /* internal selection */ |
|
|
2918 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2919 | paste (str, strlen (str)); |
|
|
2920 | free (str); |
|
|
2921 | return; |
|
|
2922 | } |
2767 | { |
2923 | else |
2768 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2769 | selection_req->run (); |
2924 | { |
2770 | } |
2925 | selection_request_time = tm; |
|
|
2926 | selection_wait = Sel_normal; |
|
|
2927 | |
|
|
2928 | #if X_HAVE_UTF8_STRING |
|
|
2929 | selection_type = Sel_UTF8String; |
|
|
2930 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2931 | return; |
|
|
2932 | #else |
|
|
2933 | selection_type = Sel_CompoundText; |
|
|
2934 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2935 | return; |
|
|
2936 | #endif |
|
|
2937 | } |
|
|
2938 | |
|
|
2939 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2940 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2941 | } |
|
|
2942 | |
|
|
2943 | int |
|
|
2944 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2945 | { |
|
|
2946 | Atom sel; |
|
|
2947 | |
|
|
2948 | selection_type |= selnum; |
|
|
2949 | |
|
|
2950 | if (selnum == Sel_Primary) |
|
|
2951 | sel = XA_PRIMARY; |
|
|
2952 | else if (selnum == Sel_Secondary) |
|
|
2953 | sel = XA_SECONDARY; |
|
|
2954 | else |
|
|
2955 | sel = xa[XA_CLIPBOARD]; |
|
|
2956 | |
|
|
2957 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2958 | { |
|
|
2959 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2960 | vt, selection_request_time); |
|
|
2961 | return 1; |
|
|
2962 | } |
|
|
2963 | |
|
|
2964 | return 0; |
|
|
2965 | } |
2771 | } |
2966 | |
2772 | |
2967 | /* ------------------------------------------------------------------------- */ |
2773 | /* ------------------------------------------------------------------------- */ |
2968 | /* |
2774 | /* |
2969 | * Clear all selected text |
2775 | * Clear all selected text |
… | |
… | |
3000 | * EXT: button 1 or 3 release |
2806 | * EXT: button 1 or 3 release |
3001 | */ |
2807 | */ |
3002 | void |
2808 | void |
3003 | rxvt_term::selection_make (Time tm) |
2809 | rxvt_term::selection_make (Time tm) |
3004 | { |
2810 | { |
3005 | int i; |
2811 | int size; |
3006 | wchar_t *new_selection_text; |
2812 | wchar_t *new_selection_text; |
3007 | text_t *t; |
2813 | text_t *t; |
3008 | |
2814 | |
3009 | switch (selection.op) |
2815 | switch (selection.op) |
3010 | { |
2816 | { |
… | |
… | |
3026 | return; /* nothing selected, go away */ |
2832 | return; /* nothing selected, go away */ |
3027 | |
2833 | |
3028 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2834 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3029 | return; |
2835 | return; |
3030 | |
2836 | |
3031 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2837 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3032 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2838 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3033 | |
2839 | |
3034 | int ofs = 0; |
2840 | int ofs = 0; |
3035 | int extra = 0; |
2841 | int extra = 0; |
3036 | |
2842 | |
3037 | int col = selection.beg.col; |
2843 | int col = selection.beg.col; |
… | |
… | |
3043 | { |
2849 | { |
3044 | #if !ENABLE_MINIMAL |
2850 | #if !ENABLE_MINIMAL |
3045 | if (selection.rect) |
2851 | if (selection.rect) |
3046 | { |
2852 | { |
3047 | col = selection.beg.col; |
2853 | col = selection.beg.col; |
3048 | end_col = ncol + 1; |
2854 | end_col = selection.end.col; |
3049 | } |
2855 | } |
3050 | else |
2856 | else |
3051 | #endif |
2857 | #endif |
3052 | end_col = ROW(row).l; |
2858 | end_col = ROW(row).l; |
3053 | |
2859 | |
3054 | col = max (col, 0); |
2860 | col = max (col, 0); |
3055 | |
2861 | |
3056 | if (row == selection.end.row |
2862 | if (row == selection.end.row) |
3057 | #if !ENABLE_MINIMAL |
|
|
3058 | || selection.rect |
|
|
3059 | #endif |
|
|
3060 | ) |
|
|
3061 | min_it (end_col, selection.end.col); |
2863 | min_it (end_col, selection.end.col); |
3062 | |
2864 | |
3063 | t = ROW(row).t + col; |
2865 | t = ROW(row).t + col; |
3064 | |
2866 | |
3065 | for (; col < end_col; col++) |
2867 | for (; col < end_col; col++) |
… | |
… | |
3073 | |
2875 | |
3074 | extra -= (len - 1); |
2876 | extra -= (len - 1); |
3075 | |
2877 | |
3076 | if (extra < 0) |
2878 | if (extra < 0) |
3077 | { |
2879 | { |
3078 | extra += i; |
2880 | extra += size; |
3079 | i += i; |
2881 | size += size; |
3080 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2882 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3081 | } |
2883 | } |
3082 | |
2884 | |
3083 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2885 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3084 | } |
2886 | } |
3085 | #endif |
2887 | #endif |
… | |
… | |
3097 | |
2899 | |
3098 | new_selection_text[ofs++] = C0_LF; |
2900 | new_selection_text[ofs++] = C0_LF; |
3099 | } |
2901 | } |
3100 | else |
2902 | else |
3101 | #endif |
2903 | #endif |
3102 | if (!ROW(row).is_longer () && row != selection.end.row) |
2904 | if (!ROW(row).is_longer () |
|
|
2905 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2906 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3103 | new_selection_text[ofs++] = C0_LF; |
2907 | new_selection_text[ofs++] = C0_LF; |
3104 | } |
2908 | } |
3105 | |
|
|
3106 | if (end_col != selection.end.col) |
|
|
3107 | new_selection_text[ofs++] = C0_LF; |
|
|
3108 | |
2909 | |
3109 | new_selection_text[ofs] = 0; |
2910 | new_selection_text[ofs] = 0; |
3110 | |
2911 | |
3111 | if (ofs == 0) |
2912 | if (ofs == 0) |
3112 | { |
2913 | { |
… | |
… | |
3618 | * EXT: SelectionRequest |
3419 | * EXT: SelectionRequest |
3619 | */ |
3420 | */ |
3620 | void |
3421 | void |
3621 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3422 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3622 | { |
3423 | { |
|
|
3424 | Atom property = rq.property == None ? rq.target : rq.property; |
3623 | XSelectionEvent ev; |
3425 | XSelectionEvent ev; |
3624 | |
3426 | |
3625 | ev.type = SelectionNotify; |
3427 | ev.type = SelectionNotify; |
3626 | ev.property = None; |
3428 | ev.property = None; |
3627 | ev.display = rq.display; |
3429 | ev.display = rq.display; |
… | |
… | |
3642 | *target++ = xa[XA_COMPOUND_TEXT]; |
3444 | *target++ = xa[XA_COMPOUND_TEXT]; |
3643 | #if X_HAVE_UTF8_STRING |
3445 | #if X_HAVE_UTF8_STRING |
3644 | *target++ = xa[XA_UTF8_STRING]; |
3446 | *target++ = xa[XA_UTF8_STRING]; |
3645 | #endif |
3447 | #endif |
3646 | |
3448 | |
3647 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3449 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3648 | 32, PropModeReplace, |
3450 | 32, PropModeReplace, |
3649 | (unsigned char *)target_list, target - target_list); |
3451 | (unsigned char *)target_list, target - target_list); |
3650 | ev.property = rq.property; |
3452 | ev.property = property; |
3651 | } |
3453 | } |
3652 | #if TODO // TODO |
3454 | #if TODO // TODO |
3653 | else if (rq.target == xa[XA_MULTIPLE]) |
3455 | else if (rq.target == xa[XA_MULTIPLE]) |
3654 | { |
3456 | { |
3655 | /* TODO: Handle MULTIPLE */ |
3457 | /* TODO: Handle MULTIPLE */ |
3656 | } |
3458 | } |
3657 | #endif |
3459 | #endif |
3658 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3460 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3659 | { |
3461 | { |
3660 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3462 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3661 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3463 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3662 | ev.property = rq.property; |
3464 | ev.property = property; |
3663 | } |
3465 | } |
3664 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3466 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3665 | { |
3467 | { |
3666 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3468 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3667 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3469 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3668 | ev.property = rq.property; |
3470 | ev.property = property; |
3669 | } |
3471 | } |
3670 | else if (rq.target == XA_STRING |
3472 | else if (rq.target == XA_STRING |
3671 | || rq.target == xa[XA_TEXT] |
3473 | || rq.target == xa[XA_TEXT] |
3672 | || rq.target == xa[XA_COMPOUND_TEXT] |
3474 | || rq.target == xa[XA_COMPOUND_TEXT] |
3673 | || rq.target == xa[XA_UTF8_STRING] |
3475 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3744 | ct.value = (unsigned char *)cl; |
3546 | ct.value = (unsigned char *)cl; |
3745 | ct.nitems = selectlen; |
3547 | ct.nitems = selectlen; |
3746 | ct.encoding = target; |
3548 | ct.encoding = target; |
3747 | } |
3549 | } |
3748 | |
3550 | |
3749 | XChangeProperty (dpy, rq.requestor, rq.property, |
3551 | XChangeProperty (dpy, rq.requestor, property, |
3750 | ct.encoding, 8, PropModeReplace, |
3552 | ct.encoding, 8, PropModeReplace, |
3751 | ct.value, (int)ct.nitems); |
3553 | ct.value, (int)ct.nitems); |
3752 | ev.property = rq.property; |
3554 | ev.property = property; |
3753 | |
3555 | |
3754 | if (freect) |
3556 | if (freect) |
3755 | XFree (ct.value); |
3557 | XFree (ct.value); |
3756 | } |
3558 | } |
3757 | |
3559 | |