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 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_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 | |
160 | void |
161 | void |
161 | rxvt_term::scr_reset () |
162 | rxvt_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; |
… | |
… | |
231 | selection.text = NULL; |
236 | selection.text = NULL; |
232 | selection.len = 0; |
237 | selection.len = 0; |
233 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
234 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
235 | selection.clicks = 0; |
240 | selection.clicks = 0; |
|
|
241 | selection.clip_text = NULL; |
|
|
242 | selection.clip_len = 0; |
236 | } |
243 | } |
237 | else |
244 | else |
238 | { |
245 | { |
239 | /* |
246 | /* |
240 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
395 | } |
402 | } |
396 | |
403 | |
397 | free (tabs); |
404 | free (tabs); |
398 | tabs = (char *)rxvt_malloc (ncol); |
405 | tabs = (char *)rxvt_malloc (ncol); |
399 | |
406 | |
400 | for (int col = ncol; --col; ) |
407 | for (int col = ncol; col--; ) |
401 | tabs [col] = col % TABSIZE == 0; |
408 | tabs [col] = col % TABSIZE == 0; |
402 | |
409 | |
403 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
404 | |
411 | |
405 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
… | |
… | |
544 | want_refresh = 1; |
551 | want_refresh = 1; |
545 | view_start = 0; |
552 | view_start = 0; |
546 | |
553 | |
547 | selection_check (2); /* check for boundary cross */ |
554 | selection_check (2); /* check for boundary cross */ |
548 | |
555 | |
549 | int i = current_screen; current_screen = scrn; scrn = i; |
556 | current_screen = scrn; |
550 | |
557 | |
551 | #if NSCREENS |
558 | #if NSCREENS |
552 | if (option (Opt_secondaryScreen)) |
559 | if (option (Opt_secondaryScreen)) |
553 | { |
560 | { |
554 | num_scr = 0; |
561 | num_scr = 0; |
… | |
… | |
631 | |
638 | |
632 | if (count > 0 |
639 | if (count > 0 |
633 | && row1 == 0 |
640 | && row1 == 0 |
634 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
635 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
636 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
637 | |
|
|
638 | // scroll everything up 'count' lines |
|
|
639 | term_start = (term_start + count) % total_rows; |
|
|
640 | |
646 | |
641 | // sever bottommost line |
647 | // sever bottommost line |
642 | { |
648 | { |
643 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2 - 1); |
644 | l.is_longer (0); |
650 | l.is_longer (0); |
645 | l.touch (); |
651 | l.touch (); |
646 | } |
652 | } |
647 | |
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 | |
648 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
649 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
650 | { |
671 | { |
651 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
652 | |
673 | |
653 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
654 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
655 | 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))) |
656 | { |
677 | { |
657 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
658 | l.l = 0; |
679 | l.l = 0; |
659 | l.f = 0; |
680 | l.f = 0; |
660 | } |
681 | } |
661 | else |
682 | else |
662 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
663 | } |
|
|
664 | |
|
|
665 | // now copy lines below the scroll region bottom to the |
|
|
666 | // bottom of the screen again, so they look as if they |
|
|
667 | // hadn't moved. |
|
|
668 | for (int i = nrow; --i > row2; ) |
|
|
669 | { |
|
|
670 | line_t &l1 = ROW(i - count); |
|
|
671 | line_t &l2 = ROW(i); |
|
|
672 | |
|
|
673 | ::swap (l1, l2); |
|
|
674 | l2.touch (); |
|
|
675 | } |
684 | } |
676 | |
685 | |
677 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
678 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
679 | { |
688 | { |
… | |
… | |
725 | } |
734 | } |
726 | |
735 | |
727 | // use a simple and robust scrolling algorithm, this |
736 | // use a simple and robust scrolling algorithm, this |
728 | // part of scr_scroll_text is not time-critical. |
737 | // part of scr_scroll_text is not time-critical. |
729 | |
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 | |
730 | int rows = row2 - row1 + 1; |
747 | int rows = row2 - row1 + 1; |
731 | |
748 | |
732 | min_it (count, rows); |
749 | min_it (count, rows); |
733 | |
750 | |
734 | line_t *temp_buf = row_buf + total_rows; |
751 | line_t *temp_buf = row_buf + total_rows; |
… | |
… | |
741 | scr_blank_screen_mem (temp_buf [row], rstyle); |
758 | scr_blank_screen_mem (temp_buf [row], rstyle); |
742 | } |
759 | } |
743 | |
760 | |
744 | for (int row = 0; row < rows; row++) |
761 | for (int row = 0; row < rows; row++) |
745 | 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 | |
746 | } |
771 | } |
747 | |
772 | |
748 | return count; |
773 | return count; |
749 | } |
774 | } |
750 | |
775 | |
… | |
… | |
792 | |
817 | |
793 | while (str < strend) |
818 | while (str < strend) |
794 | { |
819 | { |
795 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
820 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
796 | |
821 | |
797 | if (expect_false (c < 0x20)) |
822 | if (ecb_unlikely (c < 0x20)) |
798 | if (c == C0_LF) |
823 | if (c == C0_LF) |
799 | { |
824 | { |
800 | max_it (line->l, screen.cur.col); |
825 | max_it (line->l, screen.cur.col); |
801 | |
826 | |
802 | screen.flags &= ~Screen_WrapNext; |
827 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
821 | { |
846 | { |
822 | scr_tab (1, true); |
847 | scr_tab (1, true); |
823 | continue; |
848 | continue; |
824 | } |
849 | } |
825 | |
850 | |
826 | if (expect_false ( |
851 | if (ecb_unlikely ( |
827 | checksel /* see if we're writing within selection */ |
852 | checksel /* see if we're writing within selection */ |
828 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
853 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
829 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
854 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
830 | )) |
855 | )) |
831 | { |
856 | { |
… | |
… | |
836 | * should be a similar check. |
861 | * should be a similar check. |
837 | */ |
862 | */ |
838 | CLEAR_SELECTION (); |
863 | CLEAR_SELECTION (); |
839 | } |
864 | } |
840 | |
865 | |
841 | if (expect_false (screen.flags & Screen_WrapNext)) |
866 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
842 | { |
867 | { |
843 | scr_do_wrap (); |
868 | scr_do_wrap (); |
844 | |
869 | |
845 | line->l = ncol; |
870 | line->l = ncol; |
846 | line->is_longer (1); |
871 | line->is_longer (1); |
… | |
… | |
848 | row = screen.cur.row; |
873 | row = screen.cur.row; |
849 | line = &ROW(row); /* _must_ refresh */ |
874 | line = &ROW(row); /* _must_ refresh */ |
850 | } |
875 | } |
851 | |
876 | |
852 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
877 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
853 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
878 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
854 | c = 0xfffd; |
879 | c = 0xfffd; |
855 | |
880 | |
856 | // 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 |
857 | // further replacements, as wcwidth might return -1 for the line |
882 | // further replacements, as wcwidth might return -1 for the line |
858 | // drawing characters below as they might be invalid in the current |
883 | // drawing characters below as they might be invalid in the current |
859 | // locale. |
884 | // locale. |
860 | int width = WCWIDTH (c); |
885 | int width = WCWIDTH (c); |
861 | |
886 | |
862 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
887 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
863 | { |
888 | { |
864 | // vt100 special graphics and line drawing |
889 | // vt100 special graphics and line drawing |
865 | // 5f-7e standard vt100 |
890 | // 5f-7e standard vt100 |
866 | // 40-5e rxvt extension for extra curses acs chars |
891 | // 40-5e rxvt extension for extra curses acs chars |
867 | static uint16_t vt100_0[62] = { // 41 .. 7e |
892 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
880 | c = vt100_0[c - 0x41]; |
905 | c = vt100_0[c - 0x41]; |
881 | width = 1; // vt100 line drawing characters are always single-width |
906 | width = 1; // vt100 line drawing characters are always single-width |
882 | } |
907 | } |
883 | } |
908 | } |
884 | |
909 | |
885 | if (expect_false (screen.flags & Screen_Insert)) |
910 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
886 | scr_insdel_chars (width, INSERT); |
911 | scr_insdel_chars (width, INSERT); |
887 | |
912 | |
888 | if (width != 0) |
913 | if (width != 0) |
889 | { |
914 | { |
890 | #if !UNICODE_3 |
915 | #if !UNICODE_3 |
… | |
… | |
895 | # else |
920 | # else |
896 | c = 0xfffd; |
921 | c = 0xfffd; |
897 | # endif |
922 | # endif |
898 | #endif |
923 | #endif |
899 | |
924 | |
|
|
925 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
926 | |
|
|
927 | // if the character doesn't fit into the remaining columns... |
|
|
928 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
929 | { |
|
|
930 | if (screen.flags & Screen_Autowrap) |
|
|
931 | { |
|
|
932 | // ... artificially enlargen the previous one |
|
|
933 | c = NOCHAR; |
|
|
934 | // and try the same character next loop iteration |
|
|
935 | --str; |
|
|
936 | } |
|
|
937 | else |
|
|
938 | screen.cur.col = ncol - width; |
|
|
939 | } |
|
|
940 | |
900 | // nuke the character at this position, if required |
941 | // nuke the character at this position, if required |
901 | if (expect_false ( |
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. |
902 | line->t[screen.cur.col] == NOCHAR |
945 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
903 | || (screen.cur.col < ncol - 1 |
|
|
904 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
905 | )) |
|
|
906 | scr_kill_char (*line, screen.cur.col); |
946 | scr_kill_char (*line, screen.cur.col); |
907 | |
|
|
908 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
909 | |
|
|
910 | // if the character doesn't fit into the remaining columns... |
|
|
911 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
912 | { |
|
|
913 | // ... artificially enlargen the previous one |
|
|
914 | c = NOCHAR; |
|
|
915 | // and try the same character next loop iteration |
|
|
916 | --str; |
|
|
917 | } |
|
|
918 | |
947 | |
919 | line->touch (); |
948 | line->touch (); |
920 | |
949 | |
921 | do |
950 | do |
922 | { |
951 | { |
923 | line->t[screen.cur.col] = c; |
952 | line->t[screen.cur.col] = c; |
924 | line->r[screen.cur.col] = rend; |
953 | line->r[screen.cur.col] = rend; |
925 | |
954 | |
926 | if (expect_true (screen.cur.col < ncol - 1)) |
955 | if (ecb_likely (screen.cur.col < ncol - 1)) |
927 | screen.cur.col++; |
956 | screen.cur.col++; |
928 | else |
957 | else |
929 | { |
958 | { |
930 | line->l = ncol; |
959 | line->l = ncol; |
931 | if (screen.flags & Screen_Autowrap) |
960 | if (screen.flags & Screen_Autowrap) |
932 | screen.flags |= Screen_WrapNext; |
961 | screen.flags |= Screen_WrapNext; |
933 | break; |
962 | |
|
|
963 | goto end_of_line; |
934 | } |
964 | } |
935 | |
965 | |
936 | c = NOCHAR; |
966 | c = NOCHAR; |
937 | } |
967 | } |
938 | while (expect_false (--width > 0)); |
968 | while (ecb_unlikely (--width > 0)); |
939 | |
969 | |
940 | // pad with spaces when overwriting wide character with smaller one |
970 | // pad with spaces when overwriting wide character with smaller one |
941 | if (expect_false (!width)) |
971 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
942 | { |
972 | { |
943 | line->touch (); |
|
|
944 | |
|
|
945 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
946 | { |
|
|
947 | line->t[c] = ' '; |
973 | line->t[c] = ' '; |
948 | line->r[c] = rend; |
974 | line->r[c] = rend; |
949 | } |
|
|
950 | } |
975 | } |
|
|
976 | |
|
|
977 | end_of_line: |
|
|
978 | ; |
951 | } |
979 | } |
952 | #if ENABLE_COMBINING |
980 | #if ENABLE_COMBINING |
953 | else // width == 0 |
981 | else // width == 0 |
954 | { |
982 | { |
955 | if (c != 0xfeff) // ignore BOM |
983 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1018 | |
1046 | |
1019 | want_refresh = 1; |
1047 | want_refresh = 1; |
1020 | #endif |
1048 | #endif |
1021 | } |
1049 | } |
1022 | } |
1050 | } |
|
|
1051 | else if (screen.flags & Screen_WrapNext) |
|
|
1052 | screen.flags &= ~Screen_WrapNext; |
1023 | else |
1053 | else |
1024 | scr_gotorc (0, -1, RELATIVE); |
1054 | scr_gotorc (0, -1, RELATIVE); |
1025 | } |
1055 | } |
1026 | |
1056 | |
1027 | /* ------------------------------------------------------------------------- */ |
1057 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1363 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1364 | return; |
1335 | |
1365 | |
1336 | min_it (num, nrow - row); |
1366 | min_it (num, nrow - row); |
1337 | |
1367 | |
1338 | // TODO: the code below does not work when view_start != 0 |
|
|
1339 | // the workaround is to disable the clear and use a normal refresh |
|
|
1340 | // when view_start != 0. mysterious. |
|
|
1341 | if (rstyle & (RS_RVid | RS_Uline)) |
1368 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1342 | ren = (rend_t) ~RS_None; |
1369 | ren = (rend_t) ~RS_None; |
1343 | else if (GET_BASEBG (rstyle) == Color_bg) |
1370 | else if (GET_BASEBG (rstyle) == Color_bg) |
1344 | { |
1371 | { |
1345 | ren = DEFAULT_RSTYLE; |
1372 | ren = DEFAULT_RSTYLE; |
1346 | |
1373 | |
1347 | if (mapped && !view_start) |
1374 | if (mapped) |
1348 | XClearArea (dpy, vt, 0, |
1375 | XClearArea (dpy, vt, 0, |
1349 | Row2Pixel (row - view_start), (unsigned int)width, |
1376 | Row2Pixel (row - view_start), (unsigned int)width, |
1350 | (unsigned int)Height2Pixel (num), False); |
1377 | (unsigned int)Height2Pixel (num), False); |
1351 | } |
1378 | } |
1352 | else |
1379 | else |
1353 | { |
1380 | { |
1354 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1381 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1355 | |
1382 | |
1356 | if (mapped && !view_start) |
1383 | if (mapped) |
1357 | { |
1384 | { |
1358 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1385 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1359 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1386 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1360 | XFillRectangle (dpy, vt, gc, |
1387 | XFillRectangle (dpy, vt, gc, |
1361 | 0, Row2Pixel (row - view_start), |
1388 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1368 | |
1395 | |
1369 | for (; num--; row++) |
1396 | for (; num--; row++) |
1370 | { |
1397 | { |
1371 | scr_blank_screen_mem (ROW(row), rstyle); |
1398 | scr_blank_screen_mem (ROW(row), rstyle); |
1372 | |
1399 | |
1373 | if (!view_start) |
1400 | if (row - view_start < nrow) |
1374 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1401 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1375 | } |
1402 | } |
1376 | } |
1403 | } |
1377 | |
1404 | |
1378 | #if !ENABLE_MINIMAL |
1405 | #if !ENABLE_MINIMAL |
1379 | void |
1406 | void |
… | |
… | |
1678 | { |
1705 | { |
1679 | rvideo_state = on; |
1706 | rvideo_state = on; |
1680 | |
1707 | |
1681 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1708 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1682 | #ifdef HAVE_BG_PIXMAP |
1709 | #ifdef HAVE_BG_PIXMAP |
1683 | if (bgPixmap.pixmap == None) |
1710 | if (bg_pixmap == None) |
1684 | #endif |
1711 | #endif |
1685 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1712 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1686 | |
1713 | |
1687 | XGCValues gcvalue; |
1714 | XGCValues gcvalue; |
1688 | gcvalue.foreground = pix_colors[Color_fg]; |
1715 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1832 | for (i = PART_BEG; i < RC_COUNT; i++) |
1859 | for (i = PART_BEG; i < RC_COUNT; i++) |
1833 | { |
1860 | { |
1834 | min_it (rc[i].col, ncol - 1); |
1861 | min_it (rc[i].col, ncol - 1); |
1835 | min_it (rc[i].row, nrow - 1); |
1862 | min_it (rc[i].row, nrow - 1); |
1836 | } |
1863 | } |
1837 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1864 | |
1838 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1865 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1839 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1866 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1840 | |
1867 | |
1841 | num_scr_allow = 0; |
1868 | num_scr_allow = 0; |
1842 | |
1869 | |
… | |
… | |
1915 | |
1942 | |
1916 | # ifndef NO_MAPALERT |
1943 | # ifndef NO_MAPALERT |
1917 | # ifdef MAPALERT_OPTION |
1944 | # ifdef MAPALERT_OPTION |
1918 | if (option (Opt_mapAlert)) |
1945 | if (option (Opt_mapAlert)) |
1919 | # endif |
1946 | # endif |
1920 | XMapWindow (dpy, parent[0]); |
1947 | XMapWindow (dpy, parent); |
1921 | # endif |
1948 | # endif |
1922 | |
1949 | |
1923 | # if ENABLE_FRILLS |
1950 | # if ENABLE_FRILLS |
1924 | if (option (Opt_urgentOnBell)) |
1951 | if (option (Opt_urgentOnBell)) |
1925 | set_urgency (1); |
1952 | set_urgency (1); |
… | |
… | |
1933 | |
1960 | |
1934 | bell_ev.start (VISUAL_BELL_DURATION); |
1961 | bell_ev.start (VISUAL_BELL_DURATION); |
1935 | } |
1962 | } |
1936 | else |
1963 | else |
1937 | XBell (dpy, 0); |
1964 | XBell (dpy, 0); |
|
|
1965 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1938 | #endif |
1966 | #endif |
1939 | } |
1967 | } |
1940 | |
1968 | |
1941 | /* ------------------------------------------------------------------------- */ |
1969 | /* ------------------------------------------------------------------------- */ |
1942 | /* ARGSUSED */ |
|
|
1943 | void |
1970 | void |
1944 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1971 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1945 | { |
1972 | { |
1946 | #ifdef PRINTPIPE |
1973 | #ifdef PRINTPIPE |
1947 | int nrows, row_start; |
1974 | int nrows, row_start; |
… | |
… | |
1961 | row_start = view_start; |
1988 | row_start = view_start; |
1962 | } |
1989 | } |
1963 | |
1990 | |
1964 | wctomb (0, 0); |
1991 | wctomb (0, 0); |
1965 | |
1992 | |
1966 | for (int r1 = 0; r1 < nrows; r1++) |
1993 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1967 | { |
1994 | { |
1968 | text_t *tp = ROW(r1).t; |
1995 | text_t *tp = ROW(r1).t; |
1969 | int len = ROW(r1).l; |
1996 | int len = ROW(r1).l; |
1970 | |
1997 | |
1971 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1998 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2023 | refresh_count = 0; |
2050 | refresh_count = 0; |
2024 | |
2051 | |
2025 | unsigned int old_screen_flags = screen.flags; |
2052 | unsigned int old_screen_flags = screen.flags; |
2026 | char have_bg = 0; |
2053 | char have_bg = 0; |
2027 | #ifdef HAVE_BG_PIXMAP |
2054 | #ifdef HAVE_BG_PIXMAP |
2028 | have_bg = bgPixmap.pixmap != None; |
2055 | have_bg = bg_pixmap != None; |
2029 | #endif |
2056 | #endif |
2030 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2057 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2031 | |
2058 | |
2032 | /* |
2059 | /* |
2033 | * B: reverse any characters which are selected |
2060 | * B: reverse any characters which are selected |
… | |
… | |
2082 | ccol2 = bgcolor_of (rstyle); |
2109 | ccol2 = bgcolor_of (rstyle); |
2083 | #else |
2110 | #else |
2084 | ccol2 = Color_bg; |
2111 | ccol2 = Color_bg; |
2085 | #endif |
2112 | #endif |
2086 | |
2113 | |
2087 | if (showcursor && focus) |
2114 | if (focus) |
2088 | { |
2115 | { |
2089 | if (option (Opt_cursorUnderline)) |
2116 | if (option (Opt_cursorUnderline)) |
2090 | *crp ^= RS_Uline; |
2117 | *crp ^= RS_Uline; |
2091 | else |
2118 | else |
2092 | { |
2119 | { |
… | |
… | |
2225 | continue; |
2252 | continue; |
2226 | |
2253 | |
2227 | // redraw one or more characters |
2254 | // redraw one or more characters |
2228 | |
2255 | |
2229 | // seek to the beginning of wide characters |
2256 | // seek to the beginning of wide characters |
2230 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2257 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2231 | --col; |
2258 | --col; |
2232 | |
2259 | |
2233 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2260 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2234 | text_t *text = stp + col; |
2261 | text_t *text = stp + col; |
2235 | int count = 1; |
2262 | int count = 1; |
2236 | |
2263 | |
2237 | dtp[col] = stp[col]; |
2264 | dtp[col] = stp[col]; |
2238 | drp[col] = rend; |
2265 | drp[col] = rend; |
… | |
… | |
2273 | |
2300 | |
2274 | col--; /* went one too far. move back */ |
2301 | col--; /* went one too far. move back */ |
2275 | count -= i; /* dump any matching trailing chars */ |
2302 | count -= i; /* dump any matching trailing chars */ |
2276 | |
2303 | |
2277 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2304 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2278 | while (expect_false (i && text[count] == NOCHAR)) |
2305 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2279 | count++, i--; |
2306 | count++, i--; |
2280 | |
2307 | |
2281 | /* |
2308 | /* |
2282 | * Determine the attributes for the string |
2309 | * Determine the attributes for the string |
2283 | */ |
2310 | */ |
2284 | int fore = fgcolor_of (rend); // desired foreground |
2311 | int fore = fgcolor_of (rend); // desired foreground |
2285 | int back = bgcolor_of (rend); // desired background |
2312 | int back = bgcolor_of (rend); // desired background |
2286 | |
2313 | |
2287 | // 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 |
2288 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2315 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2289 | { |
2316 | { |
2290 | bool invert = rend & RS_RVid; |
2317 | bool invert = rend & RS_RVid; |
2291 | |
2318 | |
2292 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2319 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2293 | if (rend & RS_Bold && fore == Color_fg) |
2320 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2312 | |
2339 | |
2313 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2340 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2314 | fore = Color_UL; |
2341 | fore = Color_UL; |
2315 | #endif |
2342 | #endif |
2316 | |
2343 | |
|
|
2344 | #ifdef OPTION_HC |
|
|
2345 | if (rend & RS_Sel) |
|
|
2346 | { |
|
|
2347 | /* invert the column if no highlightColor is set or it is the |
|
|
2348 | * current cursor column */ |
|
|
2349 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2350 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2351 | { |
|
|
2352 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2353 | fore = Color_HTC; |
|
|
2354 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2355 | else if (!invert) |
|
|
2356 | fore = back; |
|
|
2357 | |
|
|
2358 | back = Color_HC; |
|
|
2359 | invert = 0; |
|
|
2360 | } |
|
|
2361 | } |
|
|
2362 | #endif |
|
|
2363 | |
2317 | if (invert) |
2364 | if (invert) |
2318 | { |
2365 | { |
2319 | #ifdef OPTION_HC |
|
|
2320 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2321 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2322 | #endif |
|
|
2323 | /* invert the column if no highlightColor is set or it is the |
|
|
2324 | * current cursor column */ |
|
|
2325 | ::swap (fore, back); |
2366 | ::swap (fore, back); |
2326 | #ifdef OPTION_HC |
|
|
2327 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2328 | back = Color_HC; |
|
|
2329 | #endif |
|
|
2330 | |
2367 | |
2331 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2368 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2332 | # ifndef OPTION_HC |
|
|
2333 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2334 | back = Color_RV; |
|
|
2335 | # endif |
|
|
2336 | if (fore == back) |
2369 | if (fore == back) |
2337 | { |
2370 | { |
2338 | fore = Color_bg; |
2371 | fore = Color_bg; |
2339 | back = Color_fg; |
2372 | back = Color_fg; |
2340 | } |
2373 | } |
… | |
… | |
2376 | /* |
2409 | /* |
2377 | * Actually do the drawing of the string here |
2410 | * Actually do the drawing of the string here |
2378 | */ |
2411 | */ |
2379 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2412 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2380 | |
2413 | |
2381 | if (expect_true (have_bg && back == Color_bg)) |
2414 | if (ecb_likely (have_bg && back == Color_bg)) |
2382 | { |
2415 | { |
2383 | // this is very ugly, maybe push it into ->draw? |
2416 | // this is very ugly, maybe push it into ->draw? |
2384 | |
2417 | |
2385 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2418 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2386 | if (text[i] != ' ') |
2419 | if (text[i] != ' ') |
… | |
… | |
2393 | did_clear: ; |
2426 | did_clear: ; |
2394 | } |
2427 | } |
2395 | else |
2428 | else |
2396 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2429 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2397 | |
2430 | |
2398 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2431 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2399 | { |
2432 | { |
2400 | #if ENABLE_FRILLS |
2433 | #if ENABLE_FRILLS |
2401 | if (ISSET_PIXCOLOR (Color_underline)) |
2434 | if (ISSET_PIXCOLOR (Color_underline)) |
2402 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2435 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2403 | else |
2436 | else |
… | |
… | |
2494 | scr_remap_chars (swap_buf [i]); |
2527 | scr_remap_chars (swap_buf [i]); |
2495 | } |
2528 | } |
2496 | } |
2529 | } |
2497 | |
2530 | |
2498 | void |
2531 | void |
2499 | rxvt_term::scr_recolour () NOTHROW |
2532 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2500 | { |
2533 | { |
|
|
2534 | bool transparent = false; |
|
|
2535 | |
2501 | #ifdef HAVE_BG_PIXMAP |
2536 | #ifdef HAVE_BG_PIXMAP |
2502 | bgPixmap.apply (); |
2537 | if (bg_pixmap != None) |
2503 | #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); |
2504 | |
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 | { |
2505 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2557 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2506 | XClearWindow (dpy, parent[0]); |
|
|
2507 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2558 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2559 | } |
|
|
2560 | |
|
|
2561 | XClearWindow (dpy, parent); |
2508 | |
2562 | |
2509 | if (scrollBar.win) |
2563 | if (scrollBar.win) |
2510 | { |
2564 | { |
|
|
2565 | if (transparent) |
|
|
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2567 | else |
2511 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2512 | scrollBar.state = STATE_IDLE; |
2569 | scrollBar.state = STATE_IDLE; |
2513 | scrollBar.show (0); |
2570 | scrollBar.show (0); |
2514 | } |
2571 | } |
2515 | |
2572 | |
2516 | #endif |
2573 | if (refresh) |
2517 | |
2574 | { |
2518 | /* bgPixmap.apply () does not do the following : */ |
|
|
2519 | scr_clear (); |
2575 | scr_clear (); |
2520 | scr_touch (true); |
2576 | scr_touch (true); |
|
|
2577 | } |
2521 | want_refresh = 1; |
2578 | want_refresh = 1; |
2522 | } |
2579 | } |
2523 | |
2580 | |
2524 | /* ------------------------------------------------------------------------- */ |
2581 | /* ------------------------------------------------------------------------- */ |
2525 | void |
2582 | void |
… | |
… | |
2593 | { |
2650 | { |
2594 | #if !ENABLE_MINIMAL |
2651 | #if !ENABLE_MINIMAL |
2595 | if (selection.rect) |
2652 | if (selection.rect) |
2596 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2653 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2597 | selection.end.row, selection.end.col, |
2654 | selection.end.row, selection.end.col, |
2598 | RS_RVid, RS_RVid | RS_Uline); |
2655 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2599 | else |
2656 | else |
2600 | #endif |
2657 | #endif |
2601 | scr_xor_span (selection.beg.row, selection.beg.col, |
2658 | scr_xor_span (selection.beg.row, selection.beg.col, |
2602 | selection.end.row, selection.end.col, |
2659 | selection.end.row, selection.end.col, |
2603 | RS_RVid); |
2660 | RS_Sel | RS_RVid); |
2604 | } |
2661 | } |
2605 | } |
2662 | } |
2606 | |
2663 | |
2607 | /* ------------------------------------------------------------------------- */ |
2664 | /* ------------------------------------------------------------------------- */ |
2608 | /* |
2665 | /* |
… | |
… | |
2613 | void |
2670 | void |
2614 | rxvt_term::scr_dump (int fd) NOTHROW |
2671 | rxvt_term::scr_dump (int fd) NOTHROW |
2615 | { |
2672 | { |
2616 | int row, wrote; |
2673 | int row, wrote; |
2617 | unsigned int width, towrite; |
2674 | unsigned int width, towrite; |
2618 | char r1[] = "\n"; |
2675 | const char r1[] = "\n"; |
2619 | |
2676 | |
2620 | for (row = saveLines + top_row; |
2677 | for (row = saveLines + top_row; |
2621 | row < saveLines + nrow - 1; row++) |
2678 | row < saveLines + nrow - 1; row++) |
2622 | { |
2679 | { |
2623 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2680 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2669 | /* ------------------------------------------------------------------------- */ |
2726 | /* ------------------------------------------------------------------------- */ |
2670 | /* |
2727 | /* |
2671 | * Paste a selection direct to the command fd |
2728 | * Paste a selection direct to the command fd |
2672 | */ |
2729 | */ |
2673 | void |
2730 | void |
2674 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2731 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2675 | { |
2732 | { |
2676 | /* convert normal newline chars into common keyboard Return key sequence */ |
2733 | /* convert normal newline chars into common keyboard Return key sequence */ |
2677 | for (unsigned int i = 0; i < len; i++) |
2734 | for (unsigned int i = 0; i < len; i++) |
2678 | if (data[i] == C0_LF) |
2735 | if (data[i] == C0_LF) |
2679 | data[i] = C0_CR; |
2736 | data[i] = C0_CR; |
… | |
… | |
2685 | |
2742 | |
2686 | if (priv_modes & PrivMode_BracketPaste) |
2743 | if (priv_modes & PrivMode_BracketPaste) |
2687 | tt_printf ("\e[201~"); |
2744 | tt_printf ("\e[201~"); |
2688 | } |
2745 | } |
2689 | |
2746 | |
2690 | /* ------------------------------------------------------------------------- */ |
|
|
2691 | /* |
|
|
2692 | * Respond to a notification that a primary selection has been sent |
|
|
2693 | * EXT: SelectionNotify |
|
|
2694 | */ |
|
|
2695 | void |
2747 | void |
2696 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2748 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2697 | { |
2749 | { |
2698 | if (prop == None) /* check for failed XConvertSelection */ |
2750 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2699 | { |
|
|
2700 | if ((selection_type & Sel_CompoundText)) |
|
|
2701 | { |
|
|
2702 | int selnum = selection_type & Sel_whereMask; |
|
|
2703 | |
|
|
2704 | selection_type = 0; |
|
|
2705 | if (selnum != Sel_direct) |
|
|
2706 | selection_request_other (XA_STRING, selnum); |
|
|
2707 | } |
|
|
2708 | |
|
|
2709 | if ((selection_type & Sel_UTF8String)) |
|
|
2710 | { |
|
|
2711 | int selnum = selection_type & Sel_whereMask; |
|
|
2712 | |
|
|
2713 | selection_type = Sel_CompoundText; |
|
|
2714 | if (selnum != Sel_direct) |
|
|
2715 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2716 | else |
|
|
2717 | selection_type = 0; |
|
|
2718 | } |
|
|
2719 | |
|
|
2720 | return; |
|
|
2721 | } |
|
|
2722 | |
|
|
2723 | unsigned long bytes_after; |
|
|
2724 | XTextProperty ct; |
|
|
2725 | |
|
|
2726 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2727 | 0, PROP_SIZE / 4, |
|
|
2728 | delete_prop, AnyPropertyType, |
|
|
2729 | &ct.encoding, &ct.format, |
|
|
2730 | &ct.nitems, &bytes_after, |
|
|
2731 | &ct.value) != Success) |
|
|
2732 | { |
|
|
2733 | ct.value = 0; |
|
|
2734 | goto bailout; |
|
|
2735 | } |
|
|
2736 | |
|
|
2737 | if (ct.encoding == None) |
|
|
2738 | goto bailout; |
|
|
2739 | |
|
|
2740 | if (bytes_after) |
|
|
2741 | { |
|
|
2742 | // fetch and append remaining data |
|
|
2743 | XTextProperty ct2; |
|
|
2744 | |
|
|
2745 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2746 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2747 | delete_prop, AnyPropertyType, |
|
|
2748 | &ct2.encoding, &ct2.format, |
|
|
2749 | &ct2.nitems, &bytes_after, |
|
|
2750 | &ct2.value) != Success) |
|
|
2751 | goto bailout; |
|
|
2752 | |
|
|
2753 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2754 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2755 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2756 | ct.nitems += ct2.nitems; |
|
|
2757 | |
|
|
2758 | XFree (ct2.value); |
|
|
2759 | } |
|
|
2760 | |
|
|
2761 | if (ct.value == 0) |
|
|
2762 | goto bailout; |
|
|
2763 | |
|
|
2764 | if (ct.encoding == xa[XA_INCR]) |
|
|
2765 | { |
|
|
2766 | // INCR selection, start handshake |
|
|
2767 | if (!delete_prop) |
|
|
2768 | XDeleteProperty (dpy, win, prop); |
|
|
2769 | |
|
|
2770 | selection_wait = Sel_incr; |
|
|
2771 | incr_buf_fill = 0; |
|
|
2772 | incr_ev.start (10); |
|
|
2773 | |
|
|
2774 | goto bailout; |
|
|
2775 | } |
|
|
2776 | |
|
|
2777 | if (ct.nitems == 0) |
|
|
2778 | { |
|
|
2779 | if (selection_wait == Sel_incr) |
|
|
2780 | { |
|
|
2781 | XFree (ct.value); |
|
|
2782 | |
|
|
2783 | // finally complete, now paste the whole thing |
|
|
2784 | selection_wait = Sel_normal; |
|
|
2785 | ct.value = (unsigned char *)incr_buf; |
|
|
2786 | ct.nitems = incr_buf_fill; |
|
|
2787 | incr_buf = 0; |
|
|
2788 | incr_buf_size = 0; |
|
|
2789 | incr_ev.stop (); |
|
|
2790 | } |
|
|
2791 | else |
|
|
2792 | { |
|
|
2793 | if (selection_wait == Sel_normal |
|
|
2794 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2795 | { |
|
|
2796 | /* |
|
|
2797 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2798 | * XConvertSelection () but nothing was presented |
|
|
2799 | */ |
|
|
2800 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2801 | } |
|
|
2802 | |
|
|
2803 | goto bailout; |
|
|
2804 | } |
|
|
2805 | } |
|
|
2806 | else if (selection_wait == Sel_incr) |
|
|
2807 | { |
|
|
2808 | incr_ev.start (10); |
|
|
2809 | |
|
|
2810 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2811 | { |
|
|
2812 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2813 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2814 | } |
|
|
2815 | |
|
|
2816 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2817 | incr_buf_fill += ct.nitems; |
|
|
2818 | |
|
|
2819 | goto bailout; |
|
|
2820 | } |
|
|
2821 | |
|
|
2822 | char **cl; |
|
|
2823 | int cr; |
|
|
2824 | |
|
|
2825 | #if !ENABLE_MINIMAL |
|
|
2826 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2827 | // so recode it manually |
|
|
2828 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2829 | { |
|
|
2830 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2831 | char *s = rxvt_wcstombs (w); |
|
|
2832 | free (w); |
|
|
2833 | // TODO: strlen == only the first element will be converted. well... |
|
|
2834 | paste (s, strlen (s)); |
|
|
2835 | free (s); |
|
|
2836 | } |
|
|
2837 | else |
|
|
2838 | #endif |
|
|
2839 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2840 | && cl) |
|
|
2841 | { |
|
|
2842 | for (int i = 0; i < cr; i++) |
|
|
2843 | paste (cl[i], strlen (cl[i])); |
|
|
2844 | |
|
|
2845 | XFreeStringList (cl); |
|
|
2846 | } |
|
|
2847 | else |
|
|
2848 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2849 | |
|
|
2850 | bailout: |
|
|
2851 | XFree (ct.value); |
|
|
2852 | |
|
|
2853 | if (selection_wait == Sel_normal) |
|
|
2854 | selection_wait = Sel_none; |
|
|
2855 | } |
|
|
2856 | |
|
|
2857 | void |
|
|
2858 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2859 | { |
|
|
2860 | selection_wait = Sel_none; |
|
|
2861 | |
|
|
2862 | incr_buf_size = 0; |
|
|
2863 | free (incr_buf); |
|
|
2864 | |
|
|
2865 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2866 | } |
|
|
2867 | |
|
|
2868 | void |
|
|
2869 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2870 | { |
|
|
2871 | if (prop == None || selection_wait != Sel_incr) |
|
|
2872 | return; |
2751 | return; |
2873 | |
2752 | |
2874 | selection_paste (win, prop, true); |
2753 | tt_paste (data, len); |
2875 | } |
2754 | } |
2876 | |
2755 | |
2877 | /* ------------------------------------------------------------------------- */ |
2756 | /* ------------------------------------------------------------------------- */ |
2878 | /* |
2757 | /* |
2879 | * Request the current selection: |
2758 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2880 | * Order: > internal selection if available |
2759 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2881 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2760 | * as fallback |
2882 | * > CUT_BUFFER0 |
|
|
2883 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2884 | * will auto fallback to CUT_BUFFER0 |
|
|
2885 | * EXT: button 2 release |
2761 | * EXT: button 2 release |
2886 | */ |
2762 | */ |
2887 | void |
2763 | void |
2888 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2764 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2889 | { |
2765 | { |
2890 | if (selection.text && selnum == Sel_Primary) |
2766 | if (!selection_req) |
2891 | { |
|
|
2892 | /* internal selection */ |
|
|
2893 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2894 | paste (str, strlen (str)); |
|
|
2895 | free (str); |
|
|
2896 | return; |
|
|
2897 | } |
2767 | { |
2898 | else |
2768 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2769 | selection_req->run (); |
2899 | { |
2770 | } |
2900 | selection_request_time = tm; |
|
|
2901 | selection_wait = Sel_normal; |
|
|
2902 | |
|
|
2903 | #if X_HAVE_UTF8_STRING |
|
|
2904 | selection_type = Sel_UTF8String; |
|
|
2905 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2906 | return; |
|
|
2907 | #else |
|
|
2908 | selection_type = Sel_CompoundText; |
|
|
2909 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2910 | return; |
|
|
2911 | #endif |
|
|
2912 | } |
|
|
2913 | |
|
|
2914 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2915 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2916 | } |
|
|
2917 | |
|
|
2918 | int |
|
|
2919 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2920 | { |
|
|
2921 | Atom sel; |
|
|
2922 | |
|
|
2923 | selection_type |= selnum; |
|
|
2924 | |
|
|
2925 | if (selnum == Sel_Primary) |
|
|
2926 | sel = XA_PRIMARY; |
|
|
2927 | else if (selnum == Sel_Secondary) |
|
|
2928 | sel = XA_SECONDARY; |
|
|
2929 | else |
|
|
2930 | sel = xa[XA_CLIPBOARD]; |
|
|
2931 | |
|
|
2932 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2933 | { |
|
|
2934 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2935 | vt, selection_request_time); |
|
|
2936 | return 1; |
|
|
2937 | } |
|
|
2938 | |
|
|
2939 | return 0; |
|
|
2940 | } |
2771 | } |
2941 | |
2772 | |
2942 | /* ------------------------------------------------------------------------- */ |
2773 | /* ------------------------------------------------------------------------- */ |
2943 | /* |
2774 | /* |
2944 | * Clear all selected text |
2775 | * Clear all selected text |
2945 | * EXT: SelectionClear |
2776 | * EXT: SelectionClear |
2946 | */ |
2777 | */ |
2947 | void |
2778 | void |
2948 | rxvt_term::selection_clear () NOTHROW |
2779 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2949 | { |
2780 | { |
|
|
2781 | if (!clipboard) |
|
|
2782 | { |
2950 | want_refresh = 1; |
2783 | want_refresh = 1; |
2951 | free (selection.text); |
2784 | free (selection.text); |
2952 | selection.text = NULL; |
2785 | selection.text = NULL; |
2953 | selection.len = 0; |
2786 | selection.len = 0; |
2954 | CLEAR_SELECTION (); |
2787 | CLEAR_SELECTION (); |
2955 | |
2788 | |
2956 | if (display->selection_owner == this) |
2789 | if (display->selection_owner == this) |
2957 | display->selection_owner = 0; |
2790 | display->selection_owner = 0; |
|
|
2791 | } |
|
|
2792 | else |
|
|
2793 | { |
|
|
2794 | free (selection.clip_text); |
|
|
2795 | selection.clip_text = NULL; |
|
|
2796 | selection.clip_len = 0; |
|
|
2797 | |
|
|
2798 | if (display->clipboard_owner == this) |
|
|
2799 | display->clipboard_owner = 0; |
|
|
2800 | } |
2958 | } |
2801 | } |
2959 | |
2802 | |
2960 | /* ------------------------------------------------------------------------- */ |
2803 | /* ------------------------------------------------------------------------- */ |
2961 | /* |
2804 | /* |
2962 | * Copy a selection into the cut buffer |
2805 | * Copy a selection into the cut buffer |
2963 | * EXT: button 1 or 3 release |
2806 | * EXT: button 1 or 3 release |
2964 | */ |
2807 | */ |
2965 | void |
2808 | void |
2966 | rxvt_term::selection_make (Time tm) |
2809 | rxvt_term::selection_make (Time tm) |
2967 | { |
2810 | { |
2968 | int i; |
2811 | int size; |
2969 | wchar_t *new_selection_text; |
2812 | wchar_t *new_selection_text; |
2970 | text_t *t; |
2813 | text_t *t; |
2971 | |
2814 | |
2972 | switch (selection.op) |
2815 | switch (selection.op) |
2973 | { |
2816 | { |
… | |
… | |
2989 | return; /* nothing selected, go away */ |
2832 | return; /* nothing selected, go away */ |
2990 | |
2833 | |
2991 | 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))) |
2992 | return; |
2835 | return; |
2993 | |
2836 | |
2994 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2837 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2995 | 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)); |
2996 | |
2839 | |
2997 | int ofs = 0; |
2840 | int ofs = 0; |
2998 | int extra = 0; |
2841 | int extra = 0; |
2999 | |
2842 | |
3000 | int col = selection.beg.col; |
2843 | int col = selection.beg.col; |
… | |
… | |
3006 | { |
2849 | { |
3007 | #if !ENABLE_MINIMAL |
2850 | #if !ENABLE_MINIMAL |
3008 | if (selection.rect) |
2851 | if (selection.rect) |
3009 | { |
2852 | { |
3010 | col = selection.beg.col; |
2853 | col = selection.beg.col; |
3011 | end_col = ncol + 1; |
2854 | end_col = selection.end.col; |
3012 | } |
2855 | } |
3013 | else |
2856 | else |
3014 | #endif |
2857 | #endif |
3015 | end_col = ROW(row).l; |
2858 | end_col = ROW(row).l; |
3016 | |
2859 | |
3017 | col = max (col, 0); |
2860 | col = max (col, 0); |
3018 | |
2861 | |
3019 | if (row == selection.end.row |
2862 | if (row == selection.end.row) |
3020 | #if !ENABLE_MINIMAL |
|
|
3021 | || selection.rect |
|
|
3022 | #endif |
|
|
3023 | ) |
|
|
3024 | min_it (end_col, selection.end.col); |
2863 | min_it (end_col, selection.end.col); |
3025 | |
2864 | |
3026 | t = ROW(row).t + col; |
2865 | t = ROW(row).t + col; |
3027 | |
2866 | |
3028 | for (; col < end_col; col++) |
2867 | for (; col < end_col; col++) |
… | |
… | |
3036 | |
2875 | |
3037 | extra -= (len - 1); |
2876 | extra -= (len - 1); |
3038 | |
2877 | |
3039 | if (extra < 0) |
2878 | if (extra < 0) |
3040 | { |
2879 | { |
3041 | extra += i; |
2880 | extra += size; |
3042 | i += i; |
2881 | size += size; |
3043 | 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)); |
3044 | } |
2883 | } |
3045 | |
2884 | |
3046 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2885 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3047 | } |
2886 | } |
3048 | #endif |
2887 | #endif |
… | |
… | |
3060 | |
2899 | |
3061 | new_selection_text[ofs++] = C0_LF; |
2900 | new_selection_text[ofs++] = C0_LF; |
3062 | } |
2901 | } |
3063 | else |
2902 | else |
3064 | #endif |
2903 | #endif |
3065 | 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)) |
3066 | new_selection_text[ofs++] = C0_LF; |
2907 | new_selection_text[ofs++] = C0_LF; |
3067 | } |
2908 | } |
3068 | |
|
|
3069 | if (end_col != selection.end.col) |
|
|
3070 | new_selection_text[ofs++] = C0_LF; |
|
|
3071 | |
2909 | |
3072 | new_selection_text[ofs] = 0; |
2910 | new_selection_text[ofs] = 0; |
3073 | |
2911 | |
3074 | if (ofs == 0) |
2912 | if (ofs == 0) |
3075 | { |
2913 | { |
… | |
… | |
3088 | |
2926 | |
3089 | selection_grab (tm); |
2927 | selection_grab (tm); |
3090 | } |
2928 | } |
3091 | |
2929 | |
3092 | bool |
2930 | bool |
3093 | rxvt_term::selection_grab (Time tm) NOTHROW |
2931 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3094 | { |
2932 | { |
|
|
2933 | Atom sel; |
|
|
2934 | |
|
|
2935 | if (!clipboard) |
|
|
2936 | { |
3095 | selection_time = tm; |
2937 | selection_time = tm; |
|
|
2938 | sel = XA_PRIMARY; |
|
|
2939 | } |
|
|
2940 | else |
|
|
2941 | { |
|
|
2942 | clipboard_time = tm; |
|
|
2943 | sel = xa[XA_CLIPBOARD]; |
|
|
2944 | } |
3096 | |
2945 | |
3097 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2946 | XSetSelectionOwner (dpy, sel, vt, tm); |
3098 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2947 | if (XGetSelectionOwner (dpy, sel) == vt) |
3099 | { |
2948 | { |
3100 | display->set_selection_owner (this); |
2949 | display->set_selection_owner (this, clipboard); |
3101 | return true; |
2950 | return true; |
3102 | } |
2951 | } |
3103 | else |
2952 | else |
3104 | { |
2953 | { |
3105 | selection_clear (); |
2954 | selection_clear (clipboard); |
3106 | return false; |
2955 | return false; |
3107 | } |
2956 | } |
3108 | |
2957 | |
3109 | #if 0 |
2958 | #if 0 |
3110 | XTextProperty ct; |
2959 | XTextProperty ct; |
… | |
… | |
3570 | * EXT: SelectionRequest |
3419 | * EXT: SelectionRequest |
3571 | */ |
3420 | */ |
3572 | void |
3421 | void |
3573 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3422 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3574 | { |
3423 | { |
|
|
3424 | Atom property = rq.property == None ? rq.target : rq.property; |
3575 | XSelectionEvent ev; |
3425 | XSelectionEvent ev; |
3576 | |
3426 | |
3577 | ev.type = SelectionNotify; |
3427 | ev.type = SelectionNotify; |
3578 | ev.property = None; |
3428 | ev.property = None; |
3579 | ev.display = rq.display; |
3429 | ev.display = rq.display; |
… | |
… | |
3594 | *target++ = xa[XA_COMPOUND_TEXT]; |
3444 | *target++ = xa[XA_COMPOUND_TEXT]; |
3595 | #if X_HAVE_UTF8_STRING |
3445 | #if X_HAVE_UTF8_STRING |
3596 | *target++ = xa[XA_UTF8_STRING]; |
3446 | *target++ = xa[XA_UTF8_STRING]; |
3597 | #endif |
3447 | #endif |
3598 | |
3448 | |
3599 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3449 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3600 | 32, PropModeReplace, |
3450 | 32, PropModeReplace, |
3601 | (unsigned char *)target_list, target - target_list); |
3451 | (unsigned char *)target_list, target - target_list); |
3602 | ev.property = rq.property; |
3452 | ev.property = property; |
3603 | } |
3453 | } |
3604 | #if TODO // TODO |
3454 | #if TODO // TODO |
3605 | else if (rq.target == xa[XA_MULTIPLE]) |
3455 | else if (rq.target == xa[XA_MULTIPLE]) |
3606 | { |
3456 | { |
3607 | /* TODO: Handle MULTIPLE */ |
3457 | /* TODO: Handle MULTIPLE */ |
3608 | } |
3458 | } |
3609 | #endif |
3459 | #endif |
3610 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3460 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3611 | { |
3461 | { |
3612 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3462 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3613 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3463 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3614 | ev.property = rq.property; |
3464 | ev.property = property; |
|
|
3465 | } |
|
|
3466 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3467 | { |
|
|
3468 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3469 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3470 | ev.property = property; |
3615 | } |
3471 | } |
3616 | else if (rq.target == XA_STRING |
3472 | else if (rq.target == XA_STRING |
3617 | || rq.target == xa[XA_TEXT] |
3473 | || rq.target == xa[XA_TEXT] |
3618 | || rq.target == xa[XA_COMPOUND_TEXT] |
3474 | || rq.target == xa[XA_COMPOUND_TEXT] |
3619 | || rq.target == xa[XA_UTF8_STRING] |
3475 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3651 | { |
3507 | { |
3652 | target = xa[XA_COMPOUND_TEXT]; |
3508 | target = xa[XA_COMPOUND_TEXT]; |
3653 | style = enc_compound_text; |
3509 | style = enc_compound_text; |
3654 | } |
3510 | } |
3655 | |
3511 | |
3656 | if (selection.text) |
3512 | if (rq.selection == XA_PRIMARY && selection.text) |
3657 | { |
3513 | { |
3658 | cl = selection.text; |
3514 | cl = selection.text; |
3659 | selectlen = selection.len; |
3515 | selectlen = selection.len; |
|
|
3516 | } |
|
|
3517 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3518 | { |
|
|
3519 | cl = selection.clip_text; |
|
|
3520 | selectlen = selection.clip_len; |
3660 | } |
3521 | } |
3661 | else |
3522 | else |
3662 | { |
3523 | { |
3663 | cl = L""; |
3524 | cl = L""; |
3664 | selectlen = 0; |
3525 | selectlen = 0; |
… | |
… | |
3685 | ct.value = (unsigned char *)cl; |
3546 | ct.value = (unsigned char *)cl; |
3686 | ct.nitems = selectlen; |
3547 | ct.nitems = selectlen; |
3687 | ct.encoding = target; |
3548 | ct.encoding = target; |
3688 | } |
3549 | } |
3689 | |
3550 | |
3690 | XChangeProperty (dpy, rq.requestor, rq.property, |
3551 | XChangeProperty (dpy, rq.requestor, property, |
3691 | ct.encoding, 8, PropModeReplace, |
3552 | ct.encoding, 8, PropModeReplace, |
3692 | ct.value, (int)ct.nitems); |
3553 | ct.value, (int)ct.nitems); |
3693 | ev.property = rq.property; |
3554 | ev.property = property; |
3694 | |
3555 | |
3695 | if (freect) |
3556 | if (freect) |
3696 | XFree (ct.value); |
3557 | XFree (ct.value); |
3697 | } |
3558 | } |
3698 | |
3559 | |