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; |
… | |
… | |
198 | term_start = 0; |
203 | term_start = 0; |
199 | |
204 | |
200 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
201 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
202 | |
207 | |
203 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
204 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
205 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
206 | |
211 | |
207 | for (int row = nrow; row--; ) |
212 | for (int row = nrow; row--; ) |
208 | { |
213 | { |
… | |
… | |
270 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
271 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | } |
277 | } |
273 | |
278 | |
274 | line_t *old_buf = row_buf; |
279 | line_t *old_buf = row_buf; |
275 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
276 | |
281 | |
277 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
280 | |
285 | |
… | |
… | |
397 | } |
402 | } |
398 | |
403 | |
399 | free (tabs); |
404 | free (tabs); |
400 | tabs = (char *)rxvt_malloc (ncol); |
405 | tabs = (char *)rxvt_malloc (ncol); |
401 | |
406 | |
402 | for (int col = ncol; --col; ) |
407 | for (int col = ncol; col--; ) |
403 | tabs [col] = col % TABSIZE == 0; |
408 | tabs [col] = col % TABSIZE == 0; |
404 | |
409 | |
405 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
406 | |
411 | |
407 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
… | |
… | |
633 | |
638 | |
634 | if (count > 0 |
639 | if (count > 0 |
635 | && row1 == 0 |
640 | && row1 == 0 |
636 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
637 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
638 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
639 | |
|
|
640 | // scroll everything up 'count' lines |
|
|
641 | term_start = (term_start + count) % total_rows; |
|
|
642 | |
646 | |
643 | // sever bottommost line |
647 | // sever bottommost line |
644 | { |
648 | { |
645 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2); |
646 | l.is_longer (0); |
650 | l.is_longer (0); |
647 | l.touch (); |
651 | l.touch (); |
648 | } |
652 | } |
649 | |
653 | |
|
|
654 | // scroll everything up 'count' lines |
|
|
655 | term_start = (term_start + count) % total_rows; |
|
|
656 | |
|
|
657 | // now copy lines below the scroll region bottom to the |
|
|
658 | // bottom of the screen again, so they look as if they |
|
|
659 | // hadn't moved. |
|
|
660 | for (int i = nrow; --i > row2; ) |
|
|
661 | { |
|
|
662 | line_t &l1 = ROW(i - count); |
|
|
663 | line_t &l2 = ROW(i); |
|
|
664 | |
|
|
665 | ::swap (l1, l2); |
|
|
666 | l2.touch (); |
|
|
667 | } |
|
|
668 | |
650 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
651 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
652 | { |
671 | { |
653 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
654 | |
673 | |
655 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
656 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
657 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
676 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
658 | { |
677 | { |
659 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
660 | l.l = 0; |
679 | l.l = 0; |
… | |
… | |
662 | } |
681 | } |
663 | else |
682 | else |
664 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
665 | } |
684 | } |
666 | |
685 | |
667 | // now copy lines below the scroll region bottom to the |
|
|
668 | // bottom of the screen again, so they look as if they |
|
|
669 | // hadn't moved. |
|
|
670 | for (int i = nrow; --i > row2; ) |
|
|
671 | { |
|
|
672 | line_t &l1 = ROW(i - count); |
|
|
673 | line_t &l2 = ROW(i); |
|
|
674 | |
|
|
675 | ::swap (l1, l2); |
|
|
676 | l2.touch (); |
|
|
677 | } |
|
|
678 | |
|
|
679 | // move and/or clear selection, if any |
|
|
680 | if (selection.op && current_screen == selection.screen) |
|
|
681 | { |
|
|
682 | selection.beg.row -= count; |
|
|
683 | selection.end.row -= count; |
|
|
684 | selection.mark.row -= count; |
|
|
685 | |
|
|
686 | if (selection.beg.row < top_row |
|
|
687 | || selection.end.row < top_row |
|
|
688 | || selection.mark.row < top_row) |
|
|
689 | { |
|
|
690 | CLEAR_ALL_SELECTION (); |
|
|
691 | selection.op = SELECTION_CLEAR; |
|
|
692 | } |
|
|
693 | } |
|
|
694 | |
|
|
695 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
696 | if (option (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
697 | && view_start != 0 |
688 | && view_start != 0 |
698 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
699 | scr_page (UP, count); |
690 | scr_page (UP, count); |
… | |
… | |
701 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
702 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
693 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
703 | } |
694 | } |
704 | else |
695 | else |
705 | { |
696 | { |
706 | if (selection.op && current_screen == selection.screen) |
|
|
707 | { |
|
|
708 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
709 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
710 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
711 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
712 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
713 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
714 | { |
|
|
715 | CLEAR_ALL_SELECTION (); |
|
|
716 | selection.op = SELECTION_CLEAR; |
|
|
717 | } |
|
|
718 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
719 | { |
|
|
720 | /* move selected region too */ |
|
|
721 | selection.beg.row -= count; |
|
|
722 | selection.end.row -= count; |
|
|
723 | selection.mark.row -= count; |
|
|
724 | |
|
|
725 | selection_check (0); |
|
|
726 | } |
|
|
727 | } |
|
|
728 | |
|
|
729 | // use a simple and robust scrolling algorithm, this |
697 | // use a simple and robust scrolling algorithm, this |
730 | // part of scr_scroll_text is not time-critical. |
698 | // part of scr_scroll_text is not time-critical. |
731 | |
699 | |
|
|
700 | // sever line above scroll region |
|
|
701 | if (row1) |
|
|
702 | { |
|
|
703 | line_t &l = ROW(row1 - 1); |
|
|
704 | l.is_longer (0); |
|
|
705 | l.touch (); |
|
|
706 | } |
|
|
707 | |
732 | int rows = row2 - row1 + 1; |
708 | int rows = row2 - row1 + 1; |
733 | |
709 | |
734 | min_it (count, rows); |
710 | min_it (count, rows); |
735 | |
711 | |
736 | line_t *temp_buf = row_buf + total_rows; |
712 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
737 | |
713 | |
738 | for (int row = 0; row < rows; row++) |
714 | for (int row = 0; row < rows; row++) |
739 | { |
715 | { |
740 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
716 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
741 | |
717 | |
… | |
… | |
743 | scr_blank_screen_mem (temp_buf [row], rstyle); |
719 | scr_blank_screen_mem (temp_buf [row], rstyle); |
744 | } |
720 | } |
745 | |
721 | |
746 | for (int row = 0; row < rows; row++) |
722 | for (int row = 0; row < rows; row++) |
747 | ROW(row1 + row) = temp_buf [row]; |
723 | ROW(row1 + row) = temp_buf [row]; |
|
|
724 | |
|
|
725 | // sever bottommost line |
|
|
726 | { |
|
|
727 | line_t &l = ROW(row2); |
|
|
728 | l.is_longer (0); |
|
|
729 | l.touch (); |
|
|
730 | } |
|
|
731 | } |
|
|
732 | |
|
|
733 | // move and/or clear selection, if any |
|
|
734 | if (selection.op && current_screen == selection.screen) |
|
|
735 | { |
|
|
736 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
737 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
738 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
739 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
740 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
741 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
742 | CLEAR_ALL_SELECTION (); |
|
|
743 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
744 | { |
|
|
745 | /* move selected region too */ |
|
|
746 | selection.beg.row -= count; |
|
|
747 | selection.end.row -= count; |
|
|
748 | selection.mark.row -= count; |
|
|
749 | |
|
|
750 | selection_check (0); |
|
|
751 | } |
748 | } |
752 | } |
749 | |
753 | |
750 | return count; |
754 | return count; |
751 | } |
755 | } |
752 | |
756 | |
… | |
… | |
794 | |
798 | |
795 | while (str < strend) |
799 | while (str < strend) |
796 | { |
800 | { |
797 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
801 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
798 | |
802 | |
799 | if (expect_false (c < 0x20)) |
803 | if (ecb_unlikely (c < 0x20)) |
800 | if (c == C0_LF) |
804 | if (c == C0_LF) |
801 | { |
805 | { |
802 | max_it (line->l, screen.cur.col); |
806 | max_it (line->l, screen.cur.col); |
803 | |
807 | |
804 | screen.flags &= ~Screen_WrapNext; |
808 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
823 | { |
827 | { |
824 | scr_tab (1, true); |
828 | scr_tab (1, true); |
825 | continue; |
829 | continue; |
826 | } |
830 | } |
827 | |
831 | |
828 | if (expect_false ( |
832 | if (ecb_unlikely ( |
829 | checksel /* see if we're writing within selection */ |
833 | checksel /* see if we're writing within selection */ |
830 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
834 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
831 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
835 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
832 | )) |
836 | )) |
833 | { |
837 | { |
… | |
… | |
838 | * should be a similar check. |
842 | * should be a similar check. |
839 | */ |
843 | */ |
840 | CLEAR_SELECTION (); |
844 | CLEAR_SELECTION (); |
841 | } |
845 | } |
842 | |
846 | |
843 | if (expect_false (screen.flags & Screen_WrapNext)) |
847 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
844 | { |
848 | { |
845 | scr_do_wrap (); |
849 | scr_do_wrap (); |
846 | |
850 | |
847 | line->l = ncol; |
851 | line->l = ncol; |
848 | line->is_longer (1); |
852 | line->is_longer (1); |
… | |
… | |
850 | row = screen.cur.row; |
854 | row = screen.cur.row; |
851 | line = &ROW(row); /* _must_ refresh */ |
855 | line = &ROW(row); /* _must_ refresh */ |
852 | } |
856 | } |
853 | |
857 | |
854 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
858 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
855 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
859 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
856 | c = 0xfffd; |
860 | c = 0xfffd; |
857 | |
861 | |
858 | // rely on wcwidth to tell us the character width, do wcwidth before |
862 | // rely on wcwidth to tell us the character width, do wcwidth before |
859 | // further replacements, as wcwidth might return -1 for the line |
863 | // further replacements, as wcwidth might return -1 for the line |
860 | // drawing characters below as they might be invalid in the current |
864 | // drawing characters below as they might be invalid in the current |
861 | // locale. |
865 | // locale. |
862 | int width = WCWIDTH (c); |
866 | int width = WCWIDTH (c); |
863 | |
867 | |
864 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
868 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
865 | { |
869 | { |
866 | // vt100 special graphics and line drawing |
870 | // vt100 special graphics and line drawing |
867 | // 5f-7e standard vt100 |
871 | // 5f-7e standard vt100 |
868 | // 40-5e rxvt extension for extra curses acs chars |
872 | // 40-5e rxvt extension for extra curses acs chars |
869 | static uint16_t vt100_0[62] = { // 41 .. 7e |
873 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
882 | c = vt100_0[c - 0x41]; |
886 | c = vt100_0[c - 0x41]; |
883 | width = 1; // vt100 line drawing characters are always single-width |
887 | width = 1; // vt100 line drawing characters are always single-width |
884 | } |
888 | } |
885 | } |
889 | } |
886 | |
890 | |
887 | if (expect_false (screen.flags & Screen_Insert)) |
891 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
888 | scr_insdel_chars (width, INSERT); |
892 | scr_insdel_chars (width, INSERT); |
889 | |
893 | |
890 | if (width != 0) |
894 | if (width != 0) |
891 | { |
895 | { |
892 | #if !UNICODE_3 |
896 | #if !UNICODE_3 |
… | |
… | |
897 | # else |
901 | # else |
898 | c = 0xfffd; |
902 | c = 0xfffd; |
899 | # endif |
903 | # endif |
900 | #endif |
904 | #endif |
901 | |
905 | |
|
|
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
907 | |
|
|
908 | // if the character doesn't fit into the remaining columns... |
|
|
909 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
910 | { |
|
|
911 | if (screen.flags & Screen_Autowrap) |
|
|
912 | { |
|
|
913 | // ... artificially enlargen the previous one |
|
|
914 | c = NOCHAR; |
|
|
915 | // and try the same character next loop iteration |
|
|
916 | --str; |
|
|
917 | } |
|
|
918 | else |
|
|
919 | screen.cur.col = ncol - width; |
|
|
920 | } |
|
|
921 | |
902 | // nuke the character at this position, if required |
922 | // nuke the character at this position, if required |
903 | if (expect_false ( |
923 | // due to wonderful coincidences everywhere else in this loop |
|
|
924 | // we never have to check for overwriting a wide char itself, |
|
|
925 | // only its tail. |
904 | line->t[screen.cur.col] == NOCHAR |
926 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
905 | || (screen.cur.col < ncol - 1 |
|
|
906 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
907 | )) |
|
|
908 | scr_kill_char (*line, screen.cur.col); |
927 | scr_kill_char (*line, screen.cur.col); |
909 | |
|
|
910 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
911 | |
|
|
912 | // if the character doesn't fit into the remaining columns... |
|
|
913 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
914 | { |
|
|
915 | // ... artificially enlargen the previous one |
|
|
916 | c = NOCHAR; |
|
|
917 | // and try the same character next loop iteration |
|
|
918 | --str; |
|
|
919 | } |
|
|
920 | |
928 | |
921 | line->touch (); |
929 | line->touch (); |
922 | |
930 | |
923 | do |
931 | do |
924 | { |
932 | { |
925 | line->t[screen.cur.col] = c; |
933 | line->t[screen.cur.col] = c; |
926 | line->r[screen.cur.col] = rend; |
934 | line->r[screen.cur.col] = rend; |
927 | |
935 | |
928 | if (expect_true (screen.cur.col < ncol - 1)) |
936 | if (ecb_likely (screen.cur.col < ncol - 1)) |
929 | screen.cur.col++; |
937 | screen.cur.col++; |
930 | else |
938 | else |
931 | { |
939 | { |
932 | line->l = ncol; |
940 | line->l = ncol; |
933 | if (screen.flags & Screen_Autowrap) |
941 | if (screen.flags & Screen_Autowrap) |
934 | screen.flags |= Screen_WrapNext; |
942 | screen.flags |= Screen_WrapNext; |
935 | break; |
943 | |
|
|
944 | goto end_of_line; |
936 | } |
945 | } |
937 | |
946 | |
938 | c = NOCHAR; |
947 | c = NOCHAR; |
939 | } |
948 | } |
940 | while (expect_false (--width > 0)); |
949 | while (ecb_unlikely (--width > 0)); |
941 | |
950 | |
942 | // pad with spaces when overwriting wide character with smaller one |
951 | // pad with spaces when overwriting wide character with smaller one |
943 | if (expect_false (!width)) |
952 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
944 | { |
953 | { |
945 | line->touch (); |
|
|
946 | |
|
|
947 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
948 | { |
|
|
949 | line->t[c] = ' '; |
954 | line->t[c] = ' '; |
950 | line->r[c] = rend; |
955 | line->r[c] = rend; |
951 | } |
|
|
952 | } |
956 | } |
|
|
957 | |
|
|
958 | end_of_line: |
|
|
959 | ; |
953 | } |
960 | } |
954 | #if ENABLE_COMBINING |
961 | #if ENABLE_COMBINING |
955 | else // width == 0 |
962 | else // width == 0 |
956 | { |
963 | { |
957 | if (c != 0xfeff) // ignore BOM |
964 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1020 | |
1027 | |
1021 | want_refresh = 1; |
1028 | want_refresh = 1; |
1022 | #endif |
1029 | #endif |
1023 | } |
1030 | } |
1024 | } |
1031 | } |
|
|
1032 | else if (screen.flags & Screen_WrapNext) |
|
|
1033 | screen.flags &= ~Screen_WrapNext; |
1025 | else |
1034 | else |
1026 | scr_gotorc (0, -1, RELATIVE); |
1035 | scr_gotorc (0, -1, RELATIVE); |
1027 | } |
1036 | } |
1028 | |
1037 | |
1029 | /* ------------------------------------------------------------------------- */ |
1038 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1335 | if (row >= nrow) /* Out Of Bounds */ |
1344 | if (row >= nrow) /* Out Of Bounds */ |
1336 | return; |
1345 | return; |
1337 | |
1346 | |
1338 | min_it (num, nrow - row); |
1347 | min_it (num, nrow - row); |
1339 | |
1348 | |
1340 | // TODO: the code below does not work when view_start != 0 |
|
|
1341 | // the workaround is to disable the clear and use a normal refresh |
|
|
1342 | // when view_start != 0. mysterious. |
|
|
1343 | if (rstyle & (RS_RVid | RS_Uline)) |
1349 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1344 | ren = (rend_t) ~RS_None; |
1350 | ren = (rend_t) ~RS_None; |
1345 | else if (GET_BASEBG (rstyle) == Color_bg) |
1351 | else if (GET_BASEBG (rstyle) == Color_bg) |
1346 | { |
1352 | { |
1347 | ren = DEFAULT_RSTYLE; |
1353 | ren = DEFAULT_RSTYLE; |
1348 | |
1354 | |
1349 | if (mapped && !view_start) |
1355 | if (mapped) |
1350 | XClearArea (dpy, vt, 0, |
1356 | XClearArea (dpy, vt, 0, |
1351 | Row2Pixel (row - view_start), (unsigned int)width, |
1357 | Row2Pixel (row - view_start), (unsigned int)width, |
1352 | (unsigned int)Height2Pixel (num), False); |
1358 | (unsigned int)Height2Pixel (num), False); |
1353 | } |
1359 | } |
1354 | else |
1360 | else |
1355 | { |
1361 | { |
1356 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1362 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1357 | |
1363 | |
1358 | if (mapped && !view_start) |
1364 | if (mapped) |
1359 | { |
1365 | { |
1360 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1366 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1362 | XFillRectangle (dpy, vt, gc, |
1368 | XFillRectangle (dpy, vt, gc, |
1363 | 0, Row2Pixel (row - view_start), |
1369 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1370 | |
1376 | |
1371 | for (; num--; row++) |
1377 | for (; num--; row++) |
1372 | { |
1378 | { |
1373 | scr_blank_screen_mem (ROW(row), rstyle); |
1379 | scr_blank_screen_mem (ROW(row), rstyle); |
1374 | |
1380 | |
1375 | if (!view_start) |
1381 | if (row - view_start < nrow) |
1376 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1382 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1377 | } |
1383 | } |
1378 | } |
1384 | } |
1379 | |
1385 | |
1380 | #if !ENABLE_MINIMAL |
1386 | #if !ENABLE_MINIMAL |
1381 | void |
1387 | void |
… | |
… | |
1680 | { |
1686 | { |
1681 | rvideo_state = on; |
1687 | rvideo_state = on; |
1682 | |
1688 | |
1683 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1689 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1684 | #ifdef HAVE_BG_PIXMAP |
1690 | #ifdef HAVE_BG_PIXMAP |
1685 | if (bgPixmap.pixmap == None) |
1691 | if (bg_pixmap == None) |
1686 | #endif |
1692 | #endif |
1687 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1693 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1688 | |
1694 | |
1689 | XGCValues gcvalue; |
1695 | XGCValues gcvalue; |
1690 | gcvalue.foreground = pix_colors[Color_fg]; |
1696 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1834 | for (i = PART_BEG; i < RC_COUNT; i++) |
1840 | for (i = PART_BEG; i < RC_COUNT; i++) |
1835 | { |
1841 | { |
1836 | min_it (rc[i].col, ncol - 1); |
1842 | min_it (rc[i].col, ncol - 1); |
1837 | min_it (rc[i].row, nrow - 1); |
1843 | min_it (rc[i].row, nrow - 1); |
1838 | } |
1844 | } |
1839 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1845 | |
1840 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1846 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1841 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1847 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1842 | |
1848 | |
1843 | num_scr_allow = 0; |
1849 | num_scr_allow = 0; |
1844 | |
1850 | |
… | |
… | |
1917 | |
1923 | |
1918 | # ifndef NO_MAPALERT |
1924 | # ifndef NO_MAPALERT |
1919 | # ifdef MAPALERT_OPTION |
1925 | # ifdef MAPALERT_OPTION |
1920 | if (option (Opt_mapAlert)) |
1926 | if (option (Opt_mapAlert)) |
1921 | # endif |
1927 | # endif |
1922 | XMapWindow (dpy, parent[0]); |
1928 | XMapWindow (dpy, parent); |
1923 | # endif |
1929 | # endif |
1924 | |
1930 | |
1925 | # if ENABLE_FRILLS |
1931 | # if ENABLE_FRILLS |
1926 | if (option (Opt_urgentOnBell)) |
1932 | if (option (Opt_urgentOnBell)) |
1927 | set_urgency (1); |
1933 | set_urgency (1); |
… | |
… | |
1940 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1946 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1941 | #endif |
1947 | #endif |
1942 | } |
1948 | } |
1943 | |
1949 | |
1944 | /* ------------------------------------------------------------------------- */ |
1950 | /* ------------------------------------------------------------------------- */ |
1945 | /* ARGSUSED */ |
|
|
1946 | void |
1951 | void |
1947 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1952 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1948 | { |
1953 | { |
1949 | #ifdef PRINTPIPE |
1954 | #ifdef PRINTPIPE |
1950 | int nrows, row_start; |
1955 | int nrows, row_start; |
… | |
… | |
2026 | refresh_count = 0; |
2031 | refresh_count = 0; |
2027 | |
2032 | |
2028 | unsigned int old_screen_flags = screen.flags; |
2033 | unsigned int old_screen_flags = screen.flags; |
2029 | char have_bg = 0; |
2034 | char have_bg = 0; |
2030 | #ifdef HAVE_BG_PIXMAP |
2035 | #ifdef HAVE_BG_PIXMAP |
2031 | have_bg = bgPixmap.pixmap != None; |
2036 | have_bg = bg_pixmap != None; |
2032 | #endif |
2037 | #endif |
2033 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2034 | |
2039 | |
2035 | /* |
2040 | /* |
2036 | * B: reverse any characters which are selected |
2041 | * B: reverse any characters which are selected |
… | |
… | |
2085 | ccol2 = bgcolor_of (rstyle); |
2090 | ccol2 = bgcolor_of (rstyle); |
2086 | #else |
2091 | #else |
2087 | ccol2 = Color_bg; |
2092 | ccol2 = Color_bg; |
2088 | #endif |
2093 | #endif |
2089 | |
2094 | |
2090 | if (showcursor && focus) |
2095 | if (focus) |
2091 | { |
2096 | { |
2092 | if (option (Opt_cursorUnderline)) |
2097 | if (option (Opt_cursorUnderline)) |
2093 | *crp ^= RS_Uline; |
2098 | *crp ^= RS_Uline; |
2094 | else |
2099 | else |
2095 | { |
2100 | { |
… | |
… | |
2228 | continue; |
2233 | continue; |
2229 | |
2234 | |
2230 | // redraw one or more characters |
2235 | // redraw one or more characters |
2231 | |
2236 | |
2232 | // seek to the beginning of wide characters |
2237 | // seek to the beginning of wide characters |
2233 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2238 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2234 | --col; |
2239 | --col; |
2235 | |
2240 | |
2236 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2237 | text_t *text = stp + col; |
2242 | text_t *text = stp + col; |
2238 | int count = 1; |
2243 | int count = 1; |
2239 | |
2244 | |
2240 | dtp[col] = stp[col]; |
2245 | dtp[col] = stp[col]; |
2241 | drp[col] = rend; |
2246 | drp[col] = rend; |
… | |
… | |
2276 | |
2281 | |
2277 | col--; /* went one too far. move back */ |
2282 | col--; /* went one too far. move back */ |
2278 | count -= i; /* dump any matching trailing chars */ |
2283 | count -= i; /* dump any matching trailing chars */ |
2279 | |
2284 | |
2280 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2285 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2281 | while (expect_false (i && text[count] == NOCHAR)) |
2286 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2282 | count++, i--; |
2287 | count++, i--; |
2283 | |
2288 | |
2284 | /* |
2289 | /* |
2285 | * Determine the attributes for the string |
2290 | * Determine the attributes for the string |
2286 | */ |
2291 | */ |
2287 | int fore = fgcolor_of (rend); // desired foreground |
2292 | int fore = fgcolor_of (rend); // desired foreground |
2288 | int back = bgcolor_of (rend); // desired background |
2293 | int back = bgcolor_of (rend); // desired background |
2289 | |
2294 | |
2290 | // only do special processing if any attributes are set, which is unlikely |
2295 | // only do special processing if any attributes are set, which is unlikely |
2291 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2296 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2292 | { |
2297 | { |
2293 | bool invert = rend & RS_RVid; |
2298 | bool invert = rend & RS_RVid; |
2294 | |
2299 | |
2295 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2300 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2296 | if (rend & RS_Bold && fore == Color_fg) |
2301 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2315 | |
2320 | |
2316 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2321 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2317 | fore = Color_UL; |
2322 | fore = Color_UL; |
2318 | #endif |
2323 | #endif |
2319 | |
2324 | |
|
|
2325 | #ifdef OPTION_HC |
|
|
2326 | if (rend & RS_Sel) |
|
|
2327 | { |
|
|
2328 | /* invert the column if no highlightColor is set or it is the |
|
|
2329 | * current cursor column */ |
|
|
2330 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2331 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2332 | { |
|
|
2333 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2334 | fore = Color_HTC; |
|
|
2335 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2336 | else if (!invert) |
|
|
2337 | fore = back; |
|
|
2338 | |
|
|
2339 | back = Color_HC; |
|
|
2340 | invert = 0; |
|
|
2341 | } |
|
|
2342 | } |
|
|
2343 | #endif |
|
|
2344 | |
2320 | if (invert) |
2345 | if (invert) |
2321 | { |
2346 | { |
2322 | #ifdef OPTION_HC |
|
|
2323 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2324 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2325 | #endif |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | ::swap (fore, back); |
2347 | ::swap (fore, back); |
2329 | #ifdef OPTION_HC |
|
|
2330 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2331 | back = Color_HC; |
|
|
2332 | #endif |
|
|
2333 | |
2348 | |
2334 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2349 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2335 | # ifndef OPTION_HC |
|
|
2336 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2337 | back = Color_RV; |
|
|
2338 | # endif |
|
|
2339 | if (fore == back) |
2350 | if (fore == back) |
2340 | { |
2351 | { |
2341 | fore = Color_bg; |
2352 | fore = Color_bg; |
2342 | back = Color_fg; |
2353 | back = Color_fg; |
2343 | } |
2354 | } |
… | |
… | |
2379 | /* |
2390 | /* |
2380 | * Actually do the drawing of the string here |
2391 | * Actually do the drawing of the string here |
2381 | */ |
2392 | */ |
2382 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2393 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2383 | |
2394 | |
2384 | if (expect_true (have_bg && back == Color_bg)) |
2395 | if (ecb_likely (have_bg && back == Color_bg)) |
2385 | { |
2396 | { |
2386 | // this is very ugly, maybe push it into ->draw? |
2397 | // this is very ugly, maybe push it into ->draw? |
2387 | |
2398 | |
2388 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2399 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2389 | if (text[i] != ' ') |
2400 | if (text[i] != ' ') |
… | |
… | |
2396 | did_clear: ; |
2407 | did_clear: ; |
2397 | } |
2408 | } |
2398 | else |
2409 | else |
2399 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2410 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2400 | |
2411 | |
2401 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2412 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2402 | { |
2413 | { |
2403 | #if ENABLE_FRILLS |
2414 | #if ENABLE_FRILLS |
2404 | if (ISSET_PIXCOLOR (Color_underline)) |
2415 | if (ISSET_PIXCOLOR (Color_underline)) |
2405 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2416 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2406 | else |
2417 | else |
… | |
… | |
2497 | scr_remap_chars (swap_buf [i]); |
2508 | scr_remap_chars (swap_buf [i]); |
2498 | } |
2509 | } |
2499 | } |
2510 | } |
2500 | |
2511 | |
2501 | void |
2512 | void |
2502 | rxvt_term::scr_recolour () NOTHROW |
2513 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2503 | { |
2514 | { |
|
|
2515 | bool transparent = false; |
|
|
2516 | |
2504 | #ifdef HAVE_BG_PIXMAP |
2517 | #ifdef HAVE_BG_PIXMAP |
2505 | bgPixmap.apply (); |
2518 | if (bg_pixmap != None) |
2506 | #else |
2519 | { |
|
|
2520 | # ifdef ENABLE_TRANSPARENCY |
|
|
2521 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2522 | { |
|
|
2523 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2524 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2507 | |
2525 | |
|
|
2526 | transparent = true; |
|
|
2527 | } |
|
|
2528 | else |
|
|
2529 | # endif |
|
|
2530 | { |
|
|
2531 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2532 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2533 | } |
|
|
2534 | } |
|
|
2535 | else |
|
|
2536 | #endif |
|
|
2537 | { |
2508 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2538 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2509 | XClearWindow (dpy, parent[0]); |
|
|
2510 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2539 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2540 | } |
|
|
2541 | |
|
|
2542 | XClearWindow (dpy, parent); |
2511 | |
2543 | |
2512 | if (scrollBar.win) |
2544 | if (scrollBar.win) |
2513 | { |
2545 | { |
|
|
2546 | if (transparent) |
|
|
2547 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2548 | else |
2514 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2515 | scrollBar.state = STATE_IDLE; |
2550 | scrollBar.state = SB_STATE_IDLE; |
2516 | scrollBar.show (0); |
2551 | scrollBar.show (0); |
2517 | } |
2552 | } |
2518 | |
2553 | |
2519 | #endif |
2554 | if (refresh) |
2520 | |
2555 | { |
2521 | /* bgPixmap.apply () does not do the following : */ |
|
|
2522 | scr_clear (); |
2556 | scr_clear (); |
2523 | scr_touch (true); |
2557 | scr_touch (true); |
|
|
2558 | } |
2524 | want_refresh = 1; |
2559 | want_refresh = 1; |
2525 | } |
2560 | } |
2526 | |
2561 | |
2527 | /* ------------------------------------------------------------------------- */ |
2562 | /* ------------------------------------------------------------------------- */ |
2528 | void |
2563 | void |
… | |
… | |
2596 | { |
2631 | { |
2597 | #if !ENABLE_MINIMAL |
2632 | #if !ENABLE_MINIMAL |
2598 | if (selection.rect) |
2633 | if (selection.rect) |
2599 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2634 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2600 | selection.end.row, selection.end.col, |
2635 | selection.end.row, selection.end.col, |
2601 | RS_RVid, RS_RVid | RS_Uline); |
2636 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2602 | else |
2637 | else |
2603 | #endif |
2638 | #endif |
2604 | scr_xor_span (selection.beg.row, selection.beg.col, |
2639 | scr_xor_span (selection.beg.row, selection.beg.col, |
2605 | selection.end.row, selection.end.col, |
2640 | selection.end.row, selection.end.col, |
2606 | RS_RVid); |
2641 | RS_Sel | RS_RVid); |
2607 | } |
2642 | } |
2608 | } |
2643 | } |
2609 | |
2644 | |
2610 | /* ------------------------------------------------------------------------- */ |
2645 | /* ------------------------------------------------------------------------- */ |
2611 | /* |
2646 | /* |
… | |
… | |
2616 | void |
2651 | void |
2617 | rxvt_term::scr_dump (int fd) NOTHROW |
2652 | rxvt_term::scr_dump (int fd) NOTHROW |
2618 | { |
2653 | { |
2619 | int row, wrote; |
2654 | int row, wrote; |
2620 | unsigned int width, towrite; |
2655 | unsigned int width, towrite; |
2621 | char r1[] = "\n"; |
2656 | const char r1[] = "\n"; |
2622 | |
2657 | |
2623 | for (row = saveLines + top_row; |
2658 | for (row = saveLines + top_row; |
2624 | row < saveLines + nrow - 1; row++) |
2659 | row < saveLines + nrow - 1; row++) |
2625 | { |
2660 | { |
2626 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2661 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2643 | * CHARACTER SELECTION * |
2678 | * CHARACTER SELECTION * |
2644 | * ------------------------------------------------------------------------- */ |
2679 | * ------------------------------------------------------------------------- */ |
2645 | void |
2680 | void |
2646 | rxvt_term::selection_check (int check_more) NOTHROW |
2681 | rxvt_term::selection_check (int check_more) NOTHROW |
2647 | { |
2682 | { |
2648 | row_col_t pos; |
|
|
2649 | |
|
|
2650 | if (!selection.op) |
2683 | if (!selection.op) |
2651 | return; |
2684 | return; |
2652 | |
2685 | |
|
|
2686 | row_col_t pos; |
2653 | pos.row = pos.col = 0; |
2687 | pos.row = pos.col = 0; |
|
|
2688 | |
2654 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2689 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2655 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2690 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2656 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2657 | || (check_more == 1 |
2692 | || (check_more == 1 |
2658 | && current_screen == selection.screen |
2693 | && current_screen == selection.screen |
… | |
… | |
2660 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2695 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2661 | || (check_more == 2 |
2696 | || (check_more == 2 |
2662 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2697 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2663 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2698 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2664 | || (check_more == 3 |
2699 | || (check_more == 3 |
2665 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2700 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2666 | || (check_more == 4 /* screen width change */ |
|
|
2667 | && (selection.beg.row != selection.end.row |
|
|
2668 | || selection.end.col > ncol))) |
|
|
2669 | CLEAR_SELECTION (); |
2701 | CLEAR_ALL_SELECTION (); |
2670 | } |
2702 | } |
2671 | |
2703 | |
2672 | /* ------------------------------------------------------------------------- */ |
2704 | /* ------------------------------------------------------------------------- */ |
2673 | /* |
2705 | /* |
2674 | * Paste a selection direct to the command fd |
2706 | * Paste a selection direct to the command fd |
2675 | */ |
2707 | */ |
2676 | void |
2708 | void |
2677 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2709 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2678 | { |
2710 | { |
2679 | /* convert normal newline chars into common keyboard Return key sequence */ |
2711 | /* convert normal newline chars into common keyboard Return key sequence */ |
2680 | for (unsigned int i = 0; i < len; i++) |
2712 | for (unsigned int i = 0; i < len; i++) |
2681 | if (data[i] == C0_LF) |
2713 | if (data[i] == C0_LF) |
2682 | data[i] = C0_CR; |
2714 | data[i] = C0_CR; |
… | |
… | |
2688 | |
2720 | |
2689 | if (priv_modes & PrivMode_BracketPaste) |
2721 | if (priv_modes & PrivMode_BracketPaste) |
2690 | tt_printf ("\e[201~"); |
2722 | tt_printf ("\e[201~"); |
2691 | } |
2723 | } |
2692 | |
2724 | |
2693 | /* ------------------------------------------------------------------------- */ |
|
|
2694 | /* |
|
|
2695 | * Respond to a notification that a primary selection has been sent |
|
|
2696 | * EXT: SelectionNotify |
|
|
2697 | */ |
|
|
2698 | void |
2725 | void |
2699 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2726 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2700 | { |
2727 | { |
2701 | if (prop == None) /* check for failed XConvertSelection */ |
2728 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2702 | { |
|
|
2703 | if ((selection_type & Sel_CompoundText)) |
|
|
2704 | { |
|
|
2705 | int selnum = selection_type & Sel_whereMask; |
|
|
2706 | |
|
|
2707 | selection_type = 0; |
|
|
2708 | if (selnum != Sel_direct) |
|
|
2709 | selection_request_other (XA_STRING, selnum); |
|
|
2710 | } |
|
|
2711 | |
|
|
2712 | if ((selection_type & Sel_UTF8String)) |
|
|
2713 | { |
|
|
2714 | int selnum = selection_type & Sel_whereMask; |
|
|
2715 | |
|
|
2716 | selection_type = Sel_CompoundText; |
|
|
2717 | if (selnum != Sel_direct) |
|
|
2718 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2719 | else |
|
|
2720 | selection_type = 0; |
|
|
2721 | } |
|
|
2722 | |
|
|
2723 | return; |
|
|
2724 | } |
|
|
2725 | |
|
|
2726 | unsigned long bytes_after; |
|
|
2727 | XTextProperty ct; |
|
|
2728 | |
|
|
2729 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2730 | 0, PROP_SIZE / 4, |
|
|
2731 | delete_prop, AnyPropertyType, |
|
|
2732 | &ct.encoding, &ct.format, |
|
|
2733 | &ct.nitems, &bytes_after, |
|
|
2734 | &ct.value) != Success) |
|
|
2735 | { |
|
|
2736 | ct.value = 0; |
|
|
2737 | goto bailout; |
|
|
2738 | } |
|
|
2739 | |
|
|
2740 | if (ct.encoding == None) |
|
|
2741 | goto bailout; |
|
|
2742 | |
|
|
2743 | if (bytes_after) |
|
|
2744 | { |
|
|
2745 | // fetch and append remaining data |
|
|
2746 | XTextProperty ct2; |
|
|
2747 | |
|
|
2748 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2749 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2750 | delete_prop, AnyPropertyType, |
|
|
2751 | &ct2.encoding, &ct2.format, |
|
|
2752 | &ct2.nitems, &bytes_after, |
|
|
2753 | &ct2.value) != Success) |
|
|
2754 | goto bailout; |
|
|
2755 | |
|
|
2756 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2757 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2758 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2759 | ct.nitems += ct2.nitems; |
|
|
2760 | |
|
|
2761 | XFree (ct2.value); |
|
|
2762 | } |
|
|
2763 | |
|
|
2764 | if (ct.value == 0) |
|
|
2765 | goto bailout; |
|
|
2766 | |
|
|
2767 | if (ct.encoding == xa[XA_INCR]) |
|
|
2768 | { |
|
|
2769 | // INCR selection, start handshake |
|
|
2770 | if (!delete_prop) |
|
|
2771 | XDeleteProperty (dpy, win, prop); |
|
|
2772 | |
|
|
2773 | selection_wait = Sel_incr; |
|
|
2774 | incr_buf_fill = 0; |
|
|
2775 | incr_ev.start (10); |
|
|
2776 | |
|
|
2777 | goto bailout; |
|
|
2778 | } |
|
|
2779 | |
|
|
2780 | if (ct.nitems == 0) |
|
|
2781 | { |
|
|
2782 | if (selection_wait == Sel_incr) |
|
|
2783 | { |
|
|
2784 | XFree (ct.value); |
|
|
2785 | |
|
|
2786 | // finally complete, now paste the whole thing |
|
|
2787 | selection_wait = Sel_normal; |
|
|
2788 | ct.value = (unsigned char *)incr_buf; |
|
|
2789 | ct.nitems = incr_buf_fill; |
|
|
2790 | incr_buf = 0; |
|
|
2791 | incr_buf_size = 0; |
|
|
2792 | incr_ev.stop (); |
|
|
2793 | } |
|
|
2794 | else |
|
|
2795 | { |
|
|
2796 | if (selection_wait == Sel_normal |
|
|
2797 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2798 | { |
|
|
2799 | /* |
|
|
2800 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2801 | * XConvertSelection () but nothing was presented |
|
|
2802 | */ |
|
|
2803 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2804 | } |
|
|
2805 | |
|
|
2806 | goto bailout; |
|
|
2807 | } |
|
|
2808 | } |
|
|
2809 | else if (selection_wait == Sel_incr) |
|
|
2810 | { |
|
|
2811 | incr_ev.start (10); |
|
|
2812 | |
|
|
2813 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2814 | { |
|
|
2815 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2816 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2817 | } |
|
|
2818 | |
|
|
2819 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2820 | incr_buf_fill += ct.nitems; |
|
|
2821 | |
|
|
2822 | goto bailout; |
|
|
2823 | } |
|
|
2824 | |
|
|
2825 | char **cl; |
|
|
2826 | int cr; |
|
|
2827 | |
|
|
2828 | #if !ENABLE_MINIMAL |
|
|
2829 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2830 | // so recode it manually |
|
|
2831 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2832 | { |
|
|
2833 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2834 | char *s = rxvt_wcstombs (w); |
|
|
2835 | free (w); |
|
|
2836 | // TODO: strlen == only the first element will be converted. well... |
|
|
2837 | paste (s, strlen (s)); |
|
|
2838 | free (s); |
|
|
2839 | } |
|
|
2840 | else |
|
|
2841 | #endif |
|
|
2842 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2843 | && cl) |
|
|
2844 | { |
|
|
2845 | for (int i = 0; i < cr; i++) |
|
|
2846 | paste (cl[i], strlen (cl[i])); |
|
|
2847 | |
|
|
2848 | XFreeStringList (cl); |
|
|
2849 | } |
|
|
2850 | else |
|
|
2851 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2852 | |
|
|
2853 | bailout: |
|
|
2854 | XFree (ct.value); |
|
|
2855 | |
|
|
2856 | if (selection_wait == Sel_normal) |
|
|
2857 | selection_wait = Sel_none; |
|
|
2858 | } |
|
|
2859 | |
|
|
2860 | void |
|
|
2861 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2862 | { |
|
|
2863 | selection_wait = Sel_none; |
|
|
2864 | |
|
|
2865 | incr_buf_size = 0; |
|
|
2866 | free (incr_buf); |
|
|
2867 | |
|
|
2868 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2869 | } |
|
|
2870 | |
|
|
2871 | void |
|
|
2872 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2873 | { |
|
|
2874 | if (prop == None || selection_wait != Sel_incr) |
|
|
2875 | return; |
2729 | return; |
2876 | |
2730 | |
2877 | selection_paste (win, prop, true); |
2731 | tt_paste (data, len); |
2878 | } |
2732 | } |
2879 | |
2733 | |
2880 | /* ------------------------------------------------------------------------- */ |
2734 | /* ------------------------------------------------------------------------- */ |
2881 | /* |
2735 | /* |
2882 | * Request the current selection: |
2736 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2883 | * Order: > internal selection if available |
2737 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2884 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2738 | * as fallback |
2885 | * > CUT_BUFFER0 |
|
|
2886 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2887 | * will auto fallback to CUT_BUFFER0 |
|
|
2888 | * EXT: button 2 release |
2739 | * EXT: button 2 release |
2889 | */ |
2740 | */ |
2890 | void |
2741 | void |
2891 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2742 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2892 | { |
2743 | { |
2893 | if (selection.text && selnum == Sel_Primary) |
2744 | if (!selection_req) |
2894 | { |
|
|
2895 | /* internal selection */ |
|
|
2896 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2897 | paste (str, strlen (str)); |
|
|
2898 | free (str); |
|
|
2899 | return; |
|
|
2900 | } |
2745 | { |
2901 | else |
2746 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2747 | selection_req->run (); |
2902 | { |
2748 | } |
2903 | selection_request_time = tm; |
|
|
2904 | selection_wait = Sel_normal; |
|
|
2905 | |
|
|
2906 | #if X_HAVE_UTF8_STRING |
|
|
2907 | selection_type = Sel_UTF8String; |
|
|
2908 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2909 | return; |
|
|
2910 | #else |
|
|
2911 | selection_type = Sel_CompoundText; |
|
|
2912 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2913 | return; |
|
|
2914 | #endif |
|
|
2915 | } |
|
|
2916 | |
|
|
2917 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2918 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2919 | } |
|
|
2920 | |
|
|
2921 | int |
|
|
2922 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2923 | { |
|
|
2924 | Atom sel; |
|
|
2925 | |
|
|
2926 | selection_type |= selnum; |
|
|
2927 | |
|
|
2928 | if (selnum == Sel_Primary) |
|
|
2929 | sel = XA_PRIMARY; |
|
|
2930 | else if (selnum == Sel_Secondary) |
|
|
2931 | sel = XA_SECONDARY; |
|
|
2932 | else |
|
|
2933 | sel = xa[XA_CLIPBOARD]; |
|
|
2934 | |
|
|
2935 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2936 | { |
|
|
2937 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2938 | vt, selection_request_time); |
|
|
2939 | return 1; |
|
|
2940 | } |
|
|
2941 | |
|
|
2942 | return 0; |
|
|
2943 | } |
2749 | } |
2944 | |
2750 | |
2945 | /* ------------------------------------------------------------------------- */ |
2751 | /* ------------------------------------------------------------------------- */ |
2946 | /* |
2752 | /* |
2947 | * Clear all selected text |
2753 | * Clear all selected text |
… | |
… | |
2970 | if (display->clipboard_owner == this) |
2776 | if (display->clipboard_owner == this) |
2971 | display->clipboard_owner = 0; |
2777 | display->clipboard_owner = 0; |
2972 | } |
2778 | } |
2973 | } |
2779 | } |
2974 | |
2780 | |
2975 | void |
|
|
2976 | rxvt_term::clipboard_copy (Time tm) |
|
|
2977 | { |
|
|
2978 | if (selection.len > 0) |
|
|
2979 | { |
|
|
2980 | free (selection.clip_text); |
|
|
2981 | selection.clip_len = selection.len; |
|
|
2982 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2983 | memcpy (selection.clip_text, selection.text, |
|
|
2984 | sizeof (wchar_t) * selection.clip_len); |
|
|
2985 | selection_grab (tm, true); |
|
|
2986 | } |
|
|
2987 | } |
|
|
2988 | |
|
|
2989 | /* ------------------------------------------------------------------------- */ |
2781 | /* ------------------------------------------------------------------------- */ |
2990 | /* |
2782 | /* |
2991 | * Copy a selection into the cut buffer |
2783 | * Copy a selection into the cut buffer |
2992 | * EXT: button 1 or 3 release |
2784 | * EXT: button 1 or 3 release |
2993 | */ |
2785 | */ |
2994 | void |
2786 | void |
2995 | rxvt_term::selection_make (Time tm) |
2787 | rxvt_term::selection_make (Time tm) |
2996 | { |
2788 | { |
2997 | int i; |
2789 | int size; |
2998 | wchar_t *new_selection_text; |
2790 | wchar_t *new_selection_text; |
2999 | text_t *t; |
2791 | text_t *t; |
3000 | |
2792 | |
3001 | switch (selection.op) |
2793 | switch (selection.op) |
3002 | { |
2794 | { |
… | |
… | |
3018 | return; /* nothing selected, go away */ |
2810 | return; /* nothing selected, go away */ |
3019 | |
2811 | |
3020 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2812 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3021 | return; |
2813 | return; |
3022 | |
2814 | |
3023 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2815 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3024 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2816 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3025 | |
2817 | |
3026 | int ofs = 0; |
2818 | int ofs = 0; |
3027 | int extra = 0; |
2819 | int extra = 0; |
3028 | |
2820 | |
3029 | int col = selection.beg.col; |
2821 | int col = selection.beg.col; |
… | |
… | |
3035 | { |
2827 | { |
3036 | #if !ENABLE_MINIMAL |
2828 | #if !ENABLE_MINIMAL |
3037 | if (selection.rect) |
2829 | if (selection.rect) |
3038 | { |
2830 | { |
3039 | col = selection.beg.col; |
2831 | col = selection.beg.col; |
3040 | end_col = ncol + 1; |
2832 | end_col = selection.end.col; |
3041 | } |
2833 | } |
3042 | else |
2834 | else |
3043 | #endif |
2835 | #endif |
3044 | end_col = ROW(row).l; |
2836 | end_col = ROW(row).l; |
3045 | |
2837 | |
3046 | col = max (col, 0); |
2838 | col = max (col, 0); |
3047 | |
2839 | |
3048 | if (row == selection.end.row |
2840 | if (row == selection.end.row) |
3049 | #if !ENABLE_MINIMAL |
|
|
3050 | || selection.rect |
|
|
3051 | #endif |
|
|
3052 | ) |
|
|
3053 | min_it (end_col, selection.end.col); |
2841 | min_it (end_col, selection.end.col); |
3054 | |
2842 | |
3055 | t = ROW(row).t + col; |
2843 | t = ROW(row).t + col; |
3056 | |
2844 | |
3057 | for (; col < end_col; col++) |
2845 | for (; col < end_col; col++) |
… | |
… | |
3065 | |
2853 | |
3066 | extra -= (len - 1); |
2854 | extra -= (len - 1); |
3067 | |
2855 | |
3068 | if (extra < 0) |
2856 | if (extra < 0) |
3069 | { |
2857 | { |
3070 | extra += i; |
2858 | extra += size; |
3071 | i += i; |
2859 | size += size; |
3072 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2860 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3073 | } |
2861 | } |
3074 | |
2862 | |
3075 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2863 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3076 | } |
2864 | } |
3077 | #endif |
2865 | #endif |
… | |
… | |
3089 | |
2877 | |
3090 | new_selection_text[ofs++] = C0_LF; |
2878 | new_selection_text[ofs++] = C0_LF; |
3091 | } |
2879 | } |
3092 | else |
2880 | else |
3093 | #endif |
2881 | #endif |
3094 | if (!ROW(row).is_longer () && row != selection.end.row) |
2882 | if (!ROW(row).is_longer () |
|
|
2883 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2884 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3095 | new_selection_text[ofs++] = C0_LF; |
2885 | new_selection_text[ofs++] = C0_LF; |
3096 | } |
2886 | } |
3097 | |
|
|
3098 | if (end_col != selection.end.col) |
|
|
3099 | new_selection_text[ofs++] = C0_LF; |
|
|
3100 | |
2887 | |
3101 | new_selection_text[ofs] = 0; |
2888 | new_selection_text[ofs] = 0; |
3102 | |
2889 | |
3103 | if (ofs == 0) |
2890 | if (ofs == 0) |
3104 | { |
2891 | { |
… | |
… | |
3610 | * EXT: SelectionRequest |
3397 | * EXT: SelectionRequest |
3611 | */ |
3398 | */ |
3612 | void |
3399 | void |
3613 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3400 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3614 | { |
3401 | { |
|
|
3402 | Atom property = rq.property == None ? rq.target : rq.property; |
3615 | XSelectionEvent ev; |
3403 | XSelectionEvent ev; |
3616 | |
3404 | |
3617 | ev.type = SelectionNotify; |
3405 | ev.type = SelectionNotify; |
3618 | ev.property = None; |
3406 | ev.property = None; |
3619 | ev.display = rq.display; |
3407 | ev.display = rq.display; |
… | |
… | |
3634 | *target++ = xa[XA_COMPOUND_TEXT]; |
3422 | *target++ = xa[XA_COMPOUND_TEXT]; |
3635 | #if X_HAVE_UTF8_STRING |
3423 | #if X_HAVE_UTF8_STRING |
3636 | *target++ = xa[XA_UTF8_STRING]; |
3424 | *target++ = xa[XA_UTF8_STRING]; |
3637 | #endif |
3425 | #endif |
3638 | |
3426 | |
3639 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3427 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3640 | 32, PropModeReplace, |
3428 | 32, PropModeReplace, |
3641 | (unsigned char *)target_list, target - target_list); |
3429 | (unsigned char *)target_list, target - target_list); |
3642 | ev.property = rq.property; |
3430 | ev.property = property; |
3643 | } |
3431 | } |
3644 | #if TODO // TODO |
3432 | #if TODO // TODO |
3645 | else if (rq.target == xa[XA_MULTIPLE]) |
3433 | else if (rq.target == xa[XA_MULTIPLE]) |
3646 | { |
3434 | { |
3647 | /* TODO: Handle MULTIPLE */ |
3435 | /* TODO: Handle MULTIPLE */ |
3648 | } |
3436 | } |
3649 | #endif |
3437 | #endif |
3650 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3438 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3651 | { |
3439 | { |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3440 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3653 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3441 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3654 | ev.property = rq.property; |
3442 | ev.property = property; |
3655 | } |
3443 | } |
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3444 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3657 | { |
3445 | { |
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3446 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3659 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3447 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3660 | ev.property = rq.property; |
3448 | ev.property = property; |
3661 | } |
3449 | } |
3662 | else if (rq.target == XA_STRING |
3450 | else if (rq.target == XA_STRING |
3663 | || rq.target == xa[XA_TEXT] |
3451 | || rq.target == xa[XA_TEXT] |
3664 | || rq.target == xa[XA_COMPOUND_TEXT] |
3452 | || rq.target == xa[XA_COMPOUND_TEXT] |
3665 | || rq.target == xa[XA_UTF8_STRING] |
3453 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3736 | ct.value = (unsigned char *)cl; |
3524 | ct.value = (unsigned char *)cl; |
3737 | ct.nitems = selectlen; |
3525 | ct.nitems = selectlen; |
3738 | ct.encoding = target; |
3526 | ct.encoding = target; |
3739 | } |
3527 | } |
3740 | |
3528 | |
3741 | XChangeProperty (dpy, rq.requestor, rq.property, |
3529 | XChangeProperty (dpy, rq.requestor, property, |
3742 | ct.encoding, 8, PropModeReplace, |
3530 | ct.encoding, 8, PropModeReplace, |
3743 | ct.value, (int)ct.nitems); |
3531 | ct.value, (int)ct.nitems); |
3744 | ev.property = rq.property; |
3532 | ev.property = property; |
3745 | |
3533 | |
3746 | if (freect) |
3534 | if (freect) |
3747 | XFree (ct.value); |
3535 | XFree (ct.value); |
3748 | } |
3536 | } |
3749 | |
3537 | |