… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | |
29 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
31 | |
32 | #include <inttypes.h> |
32 | #include <inttypes.h> |
33 | #include <wchar.h> |
|
|
34 | |
33 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
34 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
35 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
37 | { |
… | |
… | |
203 | /* |
202 | /* |
204 | * first time called so just malloc everything: don't rely on realloc |
203 | * first time called so just malloc everything: don't rely on realloc |
205 | * Note: this is still needed so that all the scrollback lines are NULL |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
206 | */ |
205 | */ |
207 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
208 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
209 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
210 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
211 | |
210 | |
212 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
213 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
214 | |
213 | |
215 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
216 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
215 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
217 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
216 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
218 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
217 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
219 | |
218 | |
220 | for (p = 0; p < nrow; p++) |
219 | for (p = 0; p < nrow; p++) |
221 | { |
220 | { |
222 | q = p + TermWin.saveLines; |
221 | q = p + TermWin.saveLines; |
223 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
222 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
… | |
… | |
442 | */ |
441 | */ |
443 | void |
442 | void |
444 | rxvt_term::scr_release () |
443 | rxvt_term::scr_release () |
445 | { |
444 | { |
446 | unsigned int total_rows; |
445 | unsigned int total_rows; |
447 | int i; |
|
|
448 | |
446 | |
449 | total_rows = TermWin.nrow + TermWin.saveLines; |
447 | total_rows = TermWin.nrow + TermWin.saveLines; |
450 | |
448 | |
451 | delete talloc; talloc = 0; |
449 | delete talloc; talloc = 0; |
452 | delete ralloc; ralloc = 0; |
450 | delete ralloc; ralloc = 0; |
… | |
… | |
700 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
698 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
701 | } |
699 | } |
702 | else if (j >= row1 && j <= row2) |
700 | else if (j >= row1 && j <= row2) |
703 | { |
701 | { |
704 | /* move selected region too */ |
702 | /* move selected region too */ |
705 | selection.beg.row -= count; |
703 | selection.beg.row -= count; |
706 | selection.end.row -= count; |
704 | selection.end.row -= count; |
707 | selection.mark.row -= count; |
705 | selection.mark.row -= count; |
708 | } |
706 | } |
709 | } |
707 | } |
710 | |
708 | |
711 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
709 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
… | |
… | |
719 | i = row2 - row1 + 1; |
717 | i = row2 - row1 + 1; |
720 | MIN_IT (count, i); |
718 | MIN_IT (count, i); |
721 | |
719 | |
722 | if (j > 0) |
720 | if (j > 0) |
723 | { |
721 | { |
724 | /* A: scroll up */ |
722 | /* scroll up */ |
725 | |
723 | |
726 | /* A1: Copy lines that will get clobbered by the rotation */ |
724 | /* Copy lines that will get clobbered by the rotation */ |
727 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
725 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
728 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
726 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
729 | |
727 | |
730 | /* A2: Rotate lines */ |
728 | /* Rotate lines */ |
731 | i = row2 - row1 - count + 1; |
729 | i = row2 - row1 - count + 1; |
732 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
730 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
733 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
731 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
734 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
732 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
735 | |
733 | |
736 | j = row2 - count + 1, i = count; |
734 | j = row2 - count + 1, i = count; |
737 | } |
735 | } |
738 | else /* if (j < 0) */ |
736 | else /* if (j < 0) */ |
739 | { |
737 | { |
740 | /* B: scroll down */ |
738 | /* scroll down */ |
741 | |
739 | |
742 | /* B1: Copy lines that will get clobbered by the rotation */ |
740 | /* Copy lines that will get clobbered by the rotation */ |
743 | for (i = 0, j = row2; i < count; i++, j--) |
741 | for (i = 0, j = row2; i < count; i++, j--) |
744 | { |
742 | { |
745 | buf_text[i] = screen.text[j]; |
743 | buf_text[i] = screen.text[j]; |
746 | buf_rend[i] = screen.rend[j]; |
744 | buf_rend[i] = screen.rend[j]; |
747 | } |
745 | } |
748 | |
746 | |
749 | /* B2: Rotate lines */ |
747 | /* Rotate lines */ |
750 | for (j = row2, i = j - count; i >= row1; i--, j--) |
748 | for (j = row2, i = j - count; i >= row1; i--, j--) |
751 | { |
749 | { |
752 | screen.tlen[j] = screen.tlen[i]; |
750 | screen.tlen[j] = screen.tlen[i]; |
753 | screen.text[j] = screen.text[i]; |
751 | screen.text[j] = screen.text[i]; |
754 | screen.rend[j] = screen.rend[i]; |
752 | screen.rend[j] = screen.rend[i]; |
… | |
… | |
756 | |
754 | |
757 | j = row1, i = count; |
755 | j = row1, i = count; |
758 | count = -count; |
756 | count = -count; |
759 | } |
757 | } |
760 | |
758 | |
761 | /* C: Resurrect lines */ |
759 | /* Resurrect lines */ |
762 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
760 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
763 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
761 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
764 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
762 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
765 | if (!spec) /* line length may not equal TermWin.ncol */ |
763 | if (!spec) /* line length may not equal TermWin.ncol */ |
766 | for (; i--; j++) |
764 | for (; i--; j++) |
… | |
… | |
774 | * Add text given in <str> of length <len> to screen struct |
772 | * Add text given in <str> of length <len> to screen struct |
775 | */ |
773 | */ |
776 | void |
774 | void |
777 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
775 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
778 | { |
776 | { |
|
|
777 | if (len <= 0) /* sanity */ |
|
|
778 | return; |
|
|
779 | |
779 | unsigned char checksel; |
780 | unsigned char checksel; |
780 | unicode_t c; |
781 | unicode_t c; |
781 | int i, row, last_col; |
782 | int row, last_col; |
782 | text_t *stp; |
783 | text_t *stp; |
783 | rend_t *srp; |
784 | rend_t *srp; |
784 | |
785 | const unicode_t *strend = str + len; |
785 | if (len <= 0) /* sanity */ |
|
|
786 | return; |
|
|
787 | |
786 | |
788 | want_refresh = 1; |
787 | want_refresh = 1; |
789 | ZERO_SCROLLBACK (); |
788 | ZERO_SCROLLBACK (); |
790 | last_col = TermWin.ncol; |
789 | last_col = TermWin.ncol; |
791 | |
790 | |
… | |
… | |
816 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
817 | |
816 | |
818 | stp = screen.text[row]; |
817 | stp = screen.text[row]; |
819 | srp = screen.rend[row]; |
818 | srp = screen.rend[row]; |
820 | |
819 | |
821 | while (len--) |
820 | while (str < strend) |
822 | { |
821 | { |
823 | c = *str++; |
822 | c = *str++; |
824 | |
823 | |
825 | if (c < 0x20) |
824 | if (c < 0x20) |
826 | switch (c) |
825 | if (c == C0_LF) |
|
|
826 | { |
|
|
827 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
828 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
829 | |
|
|
830 | screen.flags &= ~Screen_WrapNext; |
|
|
831 | |
|
|
832 | if (screen.cur.row == screen.bscroll) |
|
|
833 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
834 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
835 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
836 | |
|
|
837 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
838 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
839 | continue; |
|
|
840 | } |
|
|
841 | else if (c == C0_CR) |
827 | { |
842 | { |
828 | case C0_HT: |
|
|
829 | scr_tab (1, true); |
|
|
830 | continue; |
|
|
831 | |
|
|
832 | case C0_LF: |
|
|
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
843 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
844 | MAX_IT (screen.tlen[row], screen.cur.col); |
835 | |
845 | |
836 | screen.flags &= ~Screen_WrapNext; |
846 | screen.flags &= ~Screen_WrapNext; |
837 | |
|
|
838 | if (screen.cur.row == screen.bscroll) |
|
|
839 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
840 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
841 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
842 | |
|
|
843 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
844 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
845 | continue; |
|
|
846 | |
|
|
847 | case C0_CR: |
|
|
848 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
849 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
850 | |
|
|
851 | screen.flags &= ~Screen_WrapNext; |
|
|
852 | screen.cur.col = 0; |
847 | screen.cur.col = 0; |
853 | continue; |
848 | continue; |
|
|
849 | } |
|
|
850 | else if (c == C0_HT) |
|
|
851 | { |
|
|
852 | scr_tab (1, true); |
|
|
853 | continue; |
854 | } |
854 | } |
855 | |
855 | |
856 | if (checksel /* see if we're writing within selection */ |
856 | if (checksel /* see if we're writing within selection */ |
857 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
857 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
858 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
858 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
868 | |
868 | |
869 | if (screen.flags & Screen_WrapNext) |
869 | if (screen.flags & Screen_WrapNext) |
870 | { |
870 | { |
871 | screen.tlen[row] = -1; |
871 | screen.tlen[row] = -1; |
872 | |
872 | |
|
|
873 | scr_do_wrap (); |
|
|
874 | |
873 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
875 | row = screen.cur.row + TermWin.saveLines; |
874 | |
|
|
875 | stp = screen.text[row]; /* _must_ refresh */ |
876 | stp = screen.text[row]; /* _must_ refresh */ |
876 | srp = screen.rend[row]; /* _must_ refresh */ |
877 | srp = screen.rend[row]; /* _must_ refresh */ |
877 | } |
878 | } |
878 | |
879 | |
|
|
880 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
881 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
|
|
882 | c = 0xfffd; |
|
|
883 | |
879 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
884 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
880 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
885 | // do wcwidth before further replacements, as wcwidth might return -1 |
881 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
886 | // for the line drawing characters below as they might be invalid in the current |
|
|
887 | // locale. |
882 | int width = c < 0x100 ? 1 : wcwidth (c); |
888 | int width = c < 0x100 ? 1 : wcwidth (c); |
883 | |
889 | |
884 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
890 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
885 | { |
891 | { |
886 | // vt100 special graphics and line drawing |
892 | // vt100 special graphics and line drawing |
887 | // 5f-7e standard vt100 |
893 | // 5f-7e standard vt100 |
888 | // 40-5e rxvt extension for extra curses acs chars |
894 | // 40-5e rxvt extension for extra curses acs chars |
889 | static uint16_t vt100_0[63] = { // 40 .. 7e |
895 | static uint16_t vt100_0[62] = { // 41 .. 7e |
890 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
896 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
897 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
898 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
893 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
899 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
894 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
900 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
895 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
901 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
896 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
902 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
897 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
903 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
898 | }; |
904 | }; |
899 | |
905 | |
900 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
906 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
901 | { |
907 | { |
902 | c = vt100_0[c - 0x40]; |
908 | c = vt100_0[c - 0x41]; |
903 | width = 1; |
909 | width = 1; // vt100 line drawing characters are always single-width |
904 | } |
910 | } |
905 | } |
911 | } |
906 | |
912 | |
907 | if (screen.flags & Screen_Insert) |
913 | if (screen.flags & Screen_Insert) |
908 | scr_insdel_chars (width, INSERT); |
914 | scr_insdel_chars (width, INSERT); |
909 | |
915 | |
910 | if (width != 0) |
916 | if (width != 0) |
911 | { |
917 | { |
912 | // some utf-8 decoders decode surrogate characters. |
|
|
913 | if (0xd800 <= c && c <= 0xdfff) |
|
|
914 | c = 0xfffd; |
|
|
915 | |
|
|
916 | #if !UNICODE_3 |
918 | #if !UNICODE_3 |
917 | // trim characters we can't store directly :( |
919 | // trim characters we can't store directly :( |
918 | if (c >= 0x10000) |
920 | if (c >= 0x10000) |
919 | # if ENABLE_COMBINING |
921 | # if ENABLE_COMBINING |
920 | c = rxvt_composite.compose (c); // map to lower 16 bits |
922 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
943 | col++; |
945 | col++; |
944 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
946 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
945 | } |
947 | } |
946 | |
948 | |
947 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
949 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
950 | |
|
|
951 | // if the character doesn't fit into the remaining columns... |
|
|
952 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
953 | { |
|
|
954 | // ...output spaces |
|
|
955 | c = ' '; |
|
|
956 | // and try the same character next loop iteration |
|
|
957 | --str; |
|
|
958 | } |
948 | |
959 | |
949 | do |
960 | do |
950 | { |
961 | { |
951 | stp[screen.cur.col] = c; |
962 | stp[screen.cur.col] = c; |
952 | srp[screen.cur.col] = rend; |
963 | srp[screen.cur.col] = rend; |
… | |
… | |
971 | { |
982 | { |
972 | stp[c] = ' '; |
983 | stp[c] = ' '; |
973 | srp[c] = rend; |
984 | srp[c] = rend; |
974 | } |
985 | } |
975 | } |
986 | } |
976 | else if (width == 0) |
987 | else // width == 0 |
977 | { |
988 | { |
978 | #if ENABLE_COMBINING |
989 | #if ENABLE_COMBINING |
979 | // handle combining characters |
990 | // handle combining characters |
980 | // we just tag the accent on the previous on-screen character. |
991 | // we just tag the accent on the previous on-screen character. |
981 | // this is arguably not correct, but also arguably not wrong. |
992 | // this is arguably not correct, but also arguably not wrong. |
982 | // we don't handle double-width characters nicely yet. |
993 | // we don't handle double-width characters nicely yet. |
983 | |
|
|
984 | text_t *tp; |
994 | text_t *tp; |
985 | rend_t *rp; |
995 | rend_t *rp; |
986 | |
996 | |
987 | if (screen.cur.col > 0) |
997 | if (screen.cur.col > 0) |
988 | { |
998 | { |
… | |
… | |
1162 | */ |
1172 | */ |
1163 | #if ENABLE_FRILLS |
1173 | #if ENABLE_FRILLS |
1164 | void |
1174 | void |
1165 | rxvt_term::scr_forwardindex () |
1175 | rxvt_term::scr_forwardindex () |
1166 | { |
1176 | { |
1167 | int row; |
1177 | int row; |
1168 | |
1178 | |
1169 | if (screen.cur.col < TermWin.ncol - 1) |
1179 | if (screen.cur.col < TermWin.ncol - 1) |
1170 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1180 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1171 | else |
1181 | else |
1172 | { |
1182 | { |
… | |
… | |
1391 | screen.tlen[row + row_offset] = 0; |
1401 | screen.tlen[row + row_offset] = 0; |
1392 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1402 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1393 | } |
1403 | } |
1394 | } |
1404 | } |
1395 | |
1405 | |
|
|
1406 | #if ENABLE_FRILLS |
|
|
1407 | void |
|
|
1408 | rxvt_term::scr_erase_savelines () |
|
|
1409 | { |
|
|
1410 | want_refresh = 1; |
|
|
1411 | ZERO_SCROLLBACK (); |
|
|
1412 | |
|
|
1413 | TermWin.nscrolled = 0; |
|
|
1414 | } |
|
|
1415 | #endif |
|
|
1416 | |
1396 | /* ------------------------------------------------------------------------- */ |
1417 | /* ------------------------------------------------------------------------- */ |
1397 | /* |
1418 | /* |
1398 | * Fill the screen with `E's |
1419 | * Fill the screen with `E's |
1399 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1420 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1400 | */ |
1421 | */ |
1401 | void |
1422 | void |
1402 | rxvt_term::scr_E () |
1423 | rxvt_term::scr_E () |
1403 | { |
1424 | { |
1404 | int i, j, k; |
1425 | int i, j, k; |
1405 | rend_t *r1, fs; |
1426 | rend_t *r1, fs; |
1406 | |
1427 | |
1407 | want_refresh = 1; |
1428 | want_refresh = 1; |
1408 | ZERO_SCROLLBACK (); |
1429 | ZERO_SCROLLBACK (); |
1409 | |
1430 | |
1410 | num_scr_allow = 0; |
1431 | num_scr_allow = 0; |
… | |
… | |
1893 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1914 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1894 | { |
1915 | { |
1895 | int n; |
1916 | int n; |
1896 | unsigned int oldviewstart; |
1917 | unsigned int oldviewstart; |
1897 | |
1918 | |
1898 | #ifdef DEBUG_STRICT |
|
|
1899 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1900 | #endif |
|
|
1901 | oldviewstart = TermWin.view_start; |
1919 | oldviewstart = TermWin.view_start; |
|
|
1920 | |
1902 | if (direction == UP) |
1921 | if (direction == UP) |
1903 | { |
1922 | { |
1904 | n = TermWin.view_start + nlines; |
1923 | n = TermWin.view_start + nlines; |
1905 | TermWin.view_start = min (n, TermWin.nscrolled); |
1924 | TermWin.view_start = min (n, TermWin.nscrolled); |
1906 | } |
1925 | } |
1907 | else |
1926 | else |
1908 | { |
1927 | { |
1909 | n = TermWin.view_start - nlines; |
1928 | n = TermWin.view_start - nlines; |
1910 | TermWin.view_start = max (n, 0); |
1929 | TermWin.view_start = max (n, 0); |
1911 | } |
1930 | } |
|
|
1931 | |
1912 | return scr_changeview (oldviewstart); |
1932 | return scr_changeview (oldviewstart); |
1913 | } |
1933 | } |
1914 | |
1934 | |
1915 | int |
1935 | int |
1916 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1936 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
… | |
… | |
1927 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1928 | void |
1948 | void |
1929 | rxvt_term::scr_bell () |
1949 | rxvt_term::scr_bell () |
1930 | { |
1950 | { |
1931 | #ifndef NO_BELL |
1951 | #ifndef NO_BELL |
|
|
1952 | |
1932 | # ifndef NO_MAPALERT |
1953 | # ifndef NO_MAPALERT |
1933 | # ifdef MAPALERT_OPTION |
1954 | # ifdef MAPALERT_OPTION |
1934 | if (options & Opt_mapAlert) |
1955 | if (options & Opt_mapAlert) |
1935 | # endif |
1956 | # endif |
1936 | XMapWindow (display->display, TermWin.parent[0]); |
1957 | XMapWindow (display->display, TermWin.parent[0]); |
1937 | # endif |
1958 | # endif |
|
|
1959 | |
1938 | if (options & Opt_visualBell) |
1960 | if (options & Opt_visualBell) |
1939 | { |
1961 | { |
1940 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1962 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1963 | rxvt_usleep (VISUAL_BELL_DURATION); |
1941 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1964 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1942 | } |
1965 | } |
1943 | else |
1966 | else |
1944 | XBell (display->display, 0); |
1967 | XBell (display->display, 0); |
|
|
1968 | |
1945 | #endif |
1969 | #endif |
1946 | } |
1970 | } |
1947 | |
1971 | |
1948 | /* ------------------------------------------------------------------------- */ |
1972 | /* ------------------------------------------------------------------------- */ |
1949 | /* ARGSUSED */ |
1973 | /* ARGSUSED */ |
… | |
… | |
2004 | /* |
2028 | /* |
2005 | * Refresh the screen |
2029 | * Refresh the screen |
2006 | * drawn_text/drawn_rend contain the screen information before the update. |
2030 | * drawn_text/drawn_rend contain the screen information before the update. |
2007 | * screen.text/screen.rend contain what the screen will change to. |
2031 | * screen.text/screen.rend contain what the screen will change to. |
2008 | */ |
2032 | */ |
2009 | |
|
|
2010 | #define FONT_WIDTH(X, Y) \ |
|
|
2011 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
2012 | #define FONT_RBEAR(X, Y) \ |
|
|
2013 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
2014 | #define FONT_LBEAR(X, Y) \ |
|
|
2015 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
2016 | #define IS_FONT_CHAR(X, Y) \ |
|
|
2017 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
2018 | |
|
|
2019 | void |
2033 | void |
2020 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2034 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2021 | { |
2035 | { |
2022 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2036 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2023 | showcursor; /* show the cursor */ |
2037 | showcursor; /* show the cursor */ |
… | |
… | |
2042 | refresh_count = 0; |
2056 | refresh_count = 0; |
2043 | |
2057 | |
2044 | row_offset = TermWin.saveLines - TermWin.view_start; |
2058 | row_offset = TermWin.saveLines - TermWin.view_start; |
2045 | |
2059 | |
2046 | #if XPM_BACKGROUND |
2060 | #if XPM_BACKGROUND |
2047 | must_clear |= (bgPixmap.pixmap != None); |
2061 | must_clear |= bgPixmap.pixmap != None; |
2048 | #endif |
2062 | #endif |
2049 | #if TRANSPARENT |
2063 | #if TRANSPARENT |
2050 | must_clear |= ((options & Opt_transparent) && am_transparent); |
2064 | must_clear |= (options & Opt_transparent) && am_transparent; |
2051 | #endif |
2065 | #endif |
2052 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2066 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2053 | |
2067 | |
2054 | /* |
2068 | /* |
2055 | * B: reverse any characters which are selected |
2069 | * B: reverse any characters which are selected |
… | |
… | |
2079 | |
2093 | |
2080 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2094 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2081 | |
2095 | |
2082 | if (showcursor && TermWin.focus) |
2096 | if (showcursor && TermWin.focus) |
2083 | { |
2097 | { |
|
|
2098 | if (options & Opt_cursorUnderline) |
|
|
2099 | *crp ^= RS_Uline; |
|
|
2100 | else |
|
|
2101 | { |
2084 | *crp ^= RS_RVid; |
2102 | *crp ^= RS_RVid; |
|
|
2103 | |
2085 | #ifndef NO_CURSORCOLOR |
2104 | #ifndef NO_CURSORCOLOR |
2086 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2105 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2087 | if (ISSET_PIXCOLOR (Color_cursor)) |
2106 | if (ISSET_PIXCOLOR (Color_cursor)) |
2088 | ccol1 = Color_cursor; |
2107 | ccol1 = Color_cursor; |
2089 | else |
2108 | else |
2090 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2109 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2091 | ccol1 = GET_FGCOLOR (rstyle); |
2110 | ccol1 = GET_FGCOLOR (rstyle); |
2092 | #else |
2111 | #else |
2093 | ccol1 = Color_fg; |
2112 | ccol1 = Color_fg; |
2094 | #endif |
2113 | #endif |
2095 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2114 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2096 | ccol2 = Color_cursor2; |
2115 | ccol2 = Color_cursor2; |
2097 | else |
2116 | else |
2098 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2117 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2099 | ccol2 = GET_BGCOLOR (rstyle); |
2118 | ccol2 = GET_BGCOLOR (rstyle); |
2100 | #else |
2119 | #else |
2101 | ccol2 = Color_bg; |
2120 | ccol2 = Color_bg; |
2102 | #endif |
2121 | #endif |
2103 | *crp = SET_FGCOLOR (*crp, ccol1); |
2122 | *crp = SET_FGCOLOR (*crp, ccol1); |
2104 | *crp = SET_BGCOLOR (*crp, ccol2); |
2123 | *crp = SET_BGCOLOR (*crp, ccol2); |
2105 | #endif |
2124 | #endif |
|
|
2125 | } |
2106 | } |
2126 | } |
2107 | } |
2127 | } |
2108 | |
2128 | |
2109 | /* make sure no outline cursor is left around */ |
2129 | /* make sure no outline cursor is left around */ |
2110 | setoldcursor = 0; |
2130 | setoldcursor = 0; |
… | |
… | |
2140 | |
2160 | |
2141 | #if ENABLE_OVERLAY |
2161 | #if ENABLE_OVERLAY |
2142 | scr_swap_overlay (); |
2162 | scr_swap_overlay (); |
2143 | #endif |
2163 | #endif |
2144 | |
2164 | |
2145 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2146 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2147 | |
|
|
2148 | #ifndef NO_SLOW_LINK_SUPPORT |
2165 | #ifndef NO_SLOW_LINK_SUPPORT |
2149 | /* |
2166 | /* |
2150 | * D: CopyArea pass - very useful for slower links |
2167 | * D: CopyArea pass - very useful for slower links |
2151 | * This has been deliberately kept simple. |
2168 | * This has been deliberately kept simple. |
2152 | */ |
2169 | */ |
… | |
… | |
2287 | |
2304 | |
2288 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2305 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2289 | while (i && text[count] == NOCHAR) |
2306 | while (i && text[count] == NOCHAR) |
2290 | count++, i--; |
2307 | count++, i--; |
2291 | |
2308 | |
2292 | #if ENABLE_STYLES |
|
|
2293 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2294 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2295 | drp[col + 1] = ~srp[col + 1]; |
|
|
2296 | |
|
|
2297 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2298 | while (text > stp |
|
|
2299 | && srp[text - stp - 1] & RS_Careful |
|
|
2300 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2301 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2302 | #endif |
|
|
2303 | |
|
|
2304 | /* |
2309 | /* |
2305 | * Determine the attributes for the string |
2310 | * Determine the attributes for the string |
2306 | */ |
2311 | */ |
2307 | int fore = GET_FGCOLOR (rend); // desired foreground |
2312 | int fore = GET_FGCOLOR (rend); // desired foreground |
2308 | int back = GET_BGCOLOR (rend); // desired background |
2313 | int back = GET_BGCOLOR (rend); // desired background |
2309 | |
2314 | |
2310 | // only do special processing if ana attributes are set, which is rare |
2315 | // only do special processing if any attributes are set, which is rare |
2311 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2316 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2312 | { |
2317 | { |
|
|
2318 | #if ENABLE_STYLES |
|
|
2319 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2320 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2321 | drp[col + 1] = ~srp[col + 1]; |
|
|
2322 | |
|
|
2323 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2324 | while (text > stp |
|
|
2325 | && srp[text - stp - 1] & RS_Careful |
|
|
2326 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2327 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2328 | #endif |
|
|
2329 | |
2313 | bool invert = rend & RS_RVid; |
2330 | bool invert = rend & RS_RVid; |
2314 | |
2331 | |
2315 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2316 | if (rend & RS_Bold |
2333 | if (rend & RS_Bold |
2317 | && fore == Color_fg) |
2334 | && fore == Color_fg) |
… | |
… | |
2344 | SWAP_IT (fore, back, int); |
2361 | SWAP_IT (fore, back, int); |
2345 | |
2362 | |
2346 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2363 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | if (ISSET_PIXCOLOR (Color_RV)) |
2364 | if (ISSET_PIXCOLOR (Color_RV)) |
2348 | back = Color_RV; |
2365 | back = Color_RV; |
|
|
2366 | |
|
|
2367 | if (fore == back) |
|
|
2368 | { |
|
|
2369 | fore = Color_bg; |
|
|
2370 | back = Color_fg; |
|
|
2371 | } |
2349 | #endif |
2372 | #endif |
2350 | } |
2373 | } |
2351 | |
2374 | |
2352 | #ifdef TEXT_BLINK |
2375 | #ifdef TEXT_BLINK |
2353 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2376 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
… | |
… | |
2416 | */ |
2439 | */ |
2417 | if (showcursor) |
2440 | if (showcursor) |
2418 | { |
2441 | { |
2419 | if (TermWin.focus) |
2442 | if (TermWin.focus) |
2420 | { |
2443 | { |
|
|
2444 | if (options & Opt_cursorUnderline) |
|
|
2445 | *crp ^= RS_Uline; |
|
|
2446 | else |
|
|
2447 | { |
2421 | *crp ^= RS_RVid; |
2448 | *crp ^= RS_RVid; |
2422 | #ifndef NO_CURSORCOLOR |
2449 | #ifndef NO_CURSORCOLOR |
2423 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2450 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2424 | #endif |
2451 | #endif |
|
|
2452 | } |
2425 | } |
2453 | } |
2426 | else if (oldcursor.row >= 0) |
2454 | else if (oldcursor.row >= 0) |
2427 | { |
2455 | { |
|
|
2456 | int cursorwidth = 1; |
|
|
2457 | int col = oldcursor.col; |
|
|
2458 | |
|
|
2459 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2460 | col--; |
|
|
2461 | |
|
|
2462 | while (col + cursorwidth < TermWin.ncol |
|
|
2463 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
|
|
2464 | cursorwidth++; |
|
|
2465 | |
2428 | #ifndef NO_CURSORCOLOR |
2466 | #ifndef NO_CURSORCOLOR |
2429 | if (ISSET_PIXCOLOR (Color_cursor)) |
2467 | if (ISSET_PIXCOLOR (Color_cursor)) |
2430 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2468 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2431 | #endif |
2469 | #endif |
2432 | int cursorwidth = 1; |
|
|
2433 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2434 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2435 | cursorwidth++; |
|
|
2436 | |
2470 | |
2437 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2471 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2438 | Col2Pixel (oldcursor.col), |
2472 | Col2Pixel (col), |
2439 | Row2Pixel (oldcursor.row), |
2473 | Row2Pixel (oldcursor.row), |
2440 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2474 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2441 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2475 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2442 | } |
2476 | } |
2443 | } |
2477 | } |
… | |
… | |
2514 | if (!TermWin.mapped) |
2548 | if (!TermWin.mapped) |
2515 | return; |
2549 | return; |
2516 | |
2550 | |
2517 | num_scr_allow = 0; |
2551 | num_scr_allow = 0; |
2518 | want_refresh = 1; |
2552 | want_refresh = 1; |
2519 | |
|
|
2520 | #if TRANSPARENT |
|
|
2521 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2522 | { |
|
|
2523 | int i; |
|
|
2524 | |
|
|
2525 | if (!(options & Opt_transparent_all)) |
|
|
2526 | i = 0; |
|
|
2527 | else |
|
|
2528 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2529 | |
|
|
2530 | while (i--) |
|
|
2531 | if (TermWin.parent[i] != None) |
|
|
2532 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2533 | } |
|
|
2534 | #endif |
|
|
2535 | |
2553 | |
2536 | if (really) |
2554 | if (really) |
2537 | XClearWindow (display->display, TermWin.vt); |
2555 | XClearWindow (display->display, TermWin.vt); |
2538 | } |
2556 | } |
2539 | |
2557 | |
… | |
… | |
2902 | |
2920 | |
2903 | int |
2921 | int |
2904 | rxvt_term::selection_request_other (Atom target, int selnum) |
2922 | rxvt_term::selection_request_other (Atom target, int selnum) |
2905 | { |
2923 | { |
2906 | Atom sel; |
2924 | Atom sel; |
2907 | #ifdef DEBUG_SELECT |
|
|
2908 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
|
|
2909 | #endif |
|
|
2910 | |
2925 | |
2911 | selection_type |= selnum; |
2926 | selection_type |= selnum; |
2912 | |
2927 | |
2913 | if (selnum == Sel_Primary) |
2928 | if (selnum == Sel_Primary) |
2914 | sel = XA_PRIMARY; |
2929 | sel = XA_PRIMARY; |
… | |
… | |
3535 | */ |
3550 | */ |
3536 | void |
3551 | void |
3537 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3552 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3538 | { |
3553 | { |
3539 | XSelectionEvent ev; |
3554 | XSelectionEvent ev; |
|
|
3555 | dDisp; |
3540 | |
3556 | |
3541 | ev.type = SelectionNotify; |
3557 | ev.type = SelectionNotify; |
3542 | ev.property = None; |
3558 | ev.property = None; |
3543 | ev.display = rq.display; |
3559 | ev.display = rq.display; |
3544 | ev.requestor = rq.requestor; |
3560 | ev.requestor = rq.requestor; |
… | |
… | |
3558 | *target++ = xa[XA_COMPOUND_TEXT]; |
3574 | *target++ = xa[XA_COMPOUND_TEXT]; |
3559 | #if X_HAVE_UTF8_STRING |
3575 | #if X_HAVE_UTF8_STRING |
3560 | *target++ = xa[XA_UTF8_STRING]; |
3576 | *target++ = xa[XA_UTF8_STRING]; |
3561 | #endif |
3577 | #endif |
3562 | |
3578 | |
3563 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3579 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3564 | 32, PropModeReplace, |
3580 | 32, PropModeReplace, |
3565 | (unsigned char *)target_list, target - target_list); |
3581 | (unsigned char *)target_list, target - target_list); |
3566 | ev.property = rq.property; |
3582 | ev.property = rq.property; |
3567 | } |
3583 | } |
3568 | #if TODO // TODO |
3584 | #if TODO // TODO |
… | |
… | |
3571 | /* TODO: Handle MULTIPLE */ |
3587 | /* TODO: Handle MULTIPLE */ |
3572 | } |
3588 | } |
3573 | #endif |
3589 | #endif |
3574 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3590 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3575 | { |
3591 | { |
3576 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3592 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3577 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3593 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3578 | ev.property = rq.property; |
3594 | ev.property = rq.property; |
3579 | } |
3595 | } |
3580 | else if (rq.target == XA_STRING |
3596 | else if (rq.target == XA_STRING |
3581 | || rq.target == xa[XA_TEXT] |
3597 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3639 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3655 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3640 | ct.nitems = strlen ((char *)ct.value); |
3656 | ct.nitems = strlen ((char *)ct.value); |
3641 | } |
3657 | } |
3642 | else |
3658 | else |
3643 | #endif |
3659 | #endif |
3644 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3660 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3645 | freect = 1; |
3661 | freect = 1; |
3646 | else |
3662 | else |
3647 | { |
3663 | { |
3648 | /* if we failed to convert then send it raw */ |
3664 | /* if we failed to convert then send it raw */ |
3649 | ct.value = (unsigned char *)cl; |
3665 | ct.value = (unsigned char *)cl; |
3650 | ct.nitems = selectlen; |
3666 | ct.nitems = selectlen; |
3651 | ct.encoding = target; |
3667 | ct.encoding = target; |
3652 | } |
3668 | } |
3653 | |
3669 | |
3654 | XChangeProperty (display->display, rq.requestor, rq.property, |
3670 | XChangeProperty (disp, rq.requestor, rq.property, |
3655 | ct.encoding, 8, PropModeReplace, |
3671 | ct.encoding, 8, PropModeReplace, |
3656 | ct.value, (int)ct.nitems); |
3672 | ct.value, (int)ct.nitems); |
3657 | ev.property = rq.property; |
3673 | ev.property = rq.property; |
3658 | |
3674 | |
3659 | if (freect) |
3675 | if (freect) |
3660 | XFree (ct.value); |
3676 | XFree (ct.value); |
3661 | } |
3677 | } |
3662 | |
3678 | |
3663 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3679 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3664 | } |
3680 | } |
3665 | |
3681 | |
3666 | /* ------------------------------------------------------------------------- * |
3682 | /* ------------------------------------------------------------------------- * |
3667 | * MOUSE ROUTINES * |
3683 | * MOUSE ROUTINES * |
3668 | * ------------------------------------------------------------------------- */ |
3684 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3788 | while (*s) |
3804 | while (*s) |
3789 | scr_overlay_set (x++, y, *s++); |
3805 | scr_overlay_set (x++, y, *s++); |
3790 | } |
3806 | } |
3791 | |
3807 | |
3792 | void |
3808 | void |
|
|
3809 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3810 | { |
|
|
3811 | while (*s) |
|
|
3812 | { |
|
|
3813 | text_t t = *s++; |
|
|
3814 | int width = wcwidth (t); |
|
|
3815 | |
|
|
3816 | while (width--) |
|
|
3817 | { |
|
|
3818 | scr_overlay_set (x++, y, t); |
|
|
3819 | t = NOCHAR; |
|
|
3820 | } |
|
|
3821 | } |
|
|
3822 | } |
|
|
3823 | |
|
|
3824 | void |
3793 | rxvt_term::scr_swap_overlay () |
3825 | rxvt_term::scr_swap_overlay () |
3794 | { |
3826 | { |
3795 | if (!ov_text) |
3827 | if (!ov_text) |
3796 | return; |
3828 | return; |
3797 | |
3829 | |