… | |
… | |
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); |
… | |
… | |
294 | ralloc->free (drawn_rend[p]); |
293 | ralloc->free (drawn_rend[p]); |
295 | } |
294 | } |
296 | |
295 | |
297 | /* we have fewer rows so fix up cursor position */ |
296 | /* we have fewer rows so fix up cursor position */ |
298 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
299 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
|
|
300 | |
298 | |
301 | scr_reset_realloc (); /* realloc _last_ */ |
299 | scr_reset_realloc (); /* realloc _last_ */ |
302 | } |
300 | } |
303 | else if (nrow > prev_nrow) |
301 | else if (nrow > prev_nrow) |
304 | { |
302 | { |
… | |
… | |
335 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
336 | screen.cur.row += k; |
334 | screen.cur.row += k; |
337 | screen.s_cur.row += k; |
335 | screen.s_cur.row += k; |
338 | TermWin.nscrolled -= k; |
336 | TermWin.nscrolled -= k; |
339 | } |
337 | } |
|
|
338 | |
340 | #ifdef DEBUG_STRICT |
339 | #ifdef DEBUG_STRICT |
341 | assert (screen.cur.row < TermWin.nrow); |
340 | assert (screen.cur.row < TermWin.nrow); |
342 | assert (swap.cur.row < TermWin.nrow); |
|
|
343 | #else /* drive with your eyes closed */ |
341 | #else /* drive with your eyes closed */ |
344 | |
|
|
345 | MIN_IT (screen.cur.row, nrow - 1); |
342 | MIN_IT (screen.cur.row, nrow - 1); |
346 | MIN_IT (swap.cur.row, nrow - 1); |
|
|
347 | #endif |
343 | #endif |
348 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
344 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
349 | } |
345 | } |
350 | |
346 | |
351 | /* resize columns */ |
347 | /* resize columns */ |
… | |
… | |
394 | } |
390 | } |
395 | |
391 | |
396 | } |
392 | } |
397 | |
393 | |
398 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
394 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
399 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
|
|
400 | |
395 | |
401 | delete talloc; talloc = ta; |
396 | delete talloc; talloc = ta; |
402 | delete ralloc; ralloc = ra; |
397 | delete ralloc; ralloc = ra; |
403 | } |
398 | } |
404 | |
399 | |
… | |
… | |
566 | if (current_screen == scrn) |
561 | if (current_screen == scrn) |
567 | return scrn; |
562 | return scrn; |
568 | |
563 | |
569 | selection_check (2); /* check for boundary cross */ |
564 | selection_check (2); /* check for boundary cross */ |
570 | |
565 | |
571 | SWAP_IT (current_screen, scrn, int); |
566 | i = current_screen; current_screen = scrn; scrn = i; |
572 | |
567 | |
573 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
568 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
574 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
569 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
575 | # ifdef DEBUG_STRICT |
|
|
576 | assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow); |
|
|
577 | assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol); |
|
|
578 | # else /* drive with your eyes closed */ |
|
|
579 | MAX_IT (screen.cur.row, 0); |
570 | MAX_IT (screen.cur.row, 0); |
580 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
571 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
581 | MAX_IT (screen.cur.col, 0); |
572 | MAX_IT (screen.cur.col, 0); |
582 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
573 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
583 | # endif |
|
|
584 | |
574 | |
585 | #if NSCREENS |
575 | #if NSCREENS |
586 | if (options & Opt_secondaryScreen) |
576 | if (options & Opt_secondaryScreen) |
587 | { |
577 | { |
588 | num_scr = 0; |
578 | num_scr = 0; |
… | |
… | |
709 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
699 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
710 | } |
700 | } |
711 | else if (j >= row1 && j <= row2) |
701 | else if (j >= row1 && j <= row2) |
712 | { |
702 | { |
713 | /* move selected region too */ |
703 | /* move selected region too */ |
714 | selection.beg.row -= count; |
704 | selection.beg.row -= count; |
715 | selection.end.row -= count; |
705 | selection.end.row -= count; |
716 | selection.mark.row -= count; |
706 | selection.mark.row -= count; |
717 | } |
707 | } |
718 | } |
708 | } |
719 | |
709 | |
720 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
710 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
… | |
… | |
728 | i = row2 - row1 + 1; |
718 | i = row2 - row1 + 1; |
729 | MIN_IT (count, i); |
719 | MIN_IT (count, i); |
730 | |
720 | |
731 | if (j > 0) |
721 | if (j > 0) |
732 | { |
722 | { |
733 | /* A: scroll up */ |
723 | /* scroll up */ |
734 | |
724 | |
735 | /* A1: Copy lines that will get clobbered by the rotation */ |
725 | /* Copy lines that will get clobbered by the rotation */ |
736 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
726 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
737 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
727 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
738 | |
728 | |
739 | /* A2: Rotate lines */ |
729 | /* Rotate lines */ |
740 | i = row2 - row1 - count + 1; |
730 | i = row2 - row1 - count + 1; |
741 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
731 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
742 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
732 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
743 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
733 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
744 | |
734 | |
745 | j = row2 - count + 1, i = count; |
735 | j = row2 - count + 1, i = count; |
746 | } |
736 | } |
747 | else /* if (j < 0) */ |
737 | else /* if (j < 0) */ |
748 | { |
738 | { |
749 | /* B: scroll down */ |
739 | /* scroll down */ |
750 | |
740 | |
751 | /* B1: Copy lines that will get clobbered by the rotation */ |
741 | /* Copy lines that will get clobbered by the rotation */ |
752 | for (i = 0, j = row2; i < count; i++, j--) |
742 | for (i = 0, j = row2; i < count; i++, j--) |
753 | { |
743 | { |
754 | buf_text[i] = screen.text[j]; |
744 | buf_text[i] = screen.text[j]; |
755 | buf_rend[i] = screen.rend[j]; |
745 | buf_rend[i] = screen.rend[j]; |
756 | } |
746 | } |
757 | |
747 | |
758 | /* B2: Rotate lines */ |
748 | /* Rotate lines */ |
759 | for (j = row2, i = j - count; i >= row1; i--, j--) |
749 | for (j = row2, i = j - count; i >= row1; i--, j--) |
760 | { |
750 | { |
761 | screen.tlen[j] = screen.tlen[i]; |
751 | screen.tlen[j] = screen.tlen[i]; |
762 | screen.text[j] = screen.text[i]; |
752 | screen.text[j] = screen.text[i]; |
763 | screen.rend[j] = screen.rend[i]; |
753 | screen.rend[j] = screen.rend[i]; |
… | |
… | |
765 | |
755 | |
766 | j = row1, i = count; |
756 | j = row1, i = count; |
767 | count = -count; |
757 | count = -count; |
768 | } |
758 | } |
769 | |
759 | |
770 | /* C: Resurrect lines */ |
760 | /* Resurrect lines */ |
771 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
761 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
772 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
762 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
773 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
763 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
774 | if (!spec) /* line length may not equal TermWin.ncol */ |
764 | if (!spec) /* line length may not equal TermWin.ncol */ |
775 | for (; i--; j++) |
765 | for (; i--; j++) |
… | |
… | |
783 | * Add text given in <str> of length <len> to screen struct |
773 | * Add text given in <str> of length <len> to screen struct |
784 | */ |
774 | */ |
785 | void |
775 | void |
786 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
776 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
787 | { |
777 | { |
|
|
778 | if (len <= 0) /* sanity */ |
|
|
779 | return; |
|
|
780 | |
788 | unsigned char checksel; |
781 | unsigned char checksel; |
789 | unicode_t c; |
782 | unicode_t c; |
790 | int i, row, last_col; |
783 | int i, row, last_col; |
791 | text_t *stp; |
784 | text_t *stp; |
792 | rend_t *srp; |
785 | rend_t *srp; |
793 | |
786 | const unicode_t *strend = str + len; |
794 | if (len <= 0) /* sanity */ |
|
|
795 | return; |
|
|
796 | |
787 | |
797 | want_refresh = 1; |
788 | want_refresh = 1; |
798 | ZERO_SCROLLBACK (); |
789 | ZERO_SCROLLBACK (); |
799 | last_col = TermWin.ncol; |
790 | last_col = TermWin.ncol; |
800 | |
791 | |
… | |
… | |
825 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
816 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
826 | |
817 | |
827 | stp = screen.text[row]; |
818 | stp = screen.text[row]; |
828 | srp = screen.rend[row]; |
819 | srp = screen.rend[row]; |
829 | |
820 | |
830 | while (len--) |
821 | while (str < strend) |
831 | { |
822 | { |
832 | c = *str++; |
823 | c = *str++; |
833 | |
824 | |
834 | if (c < 0x20) |
825 | if (c < 0x20) |
835 | switch (c) |
826 | if (c == C0_LF) |
|
|
827 | { |
|
|
828 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
829 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
830 | |
|
|
831 | screen.flags &= ~Screen_WrapNext; |
|
|
832 | |
|
|
833 | if (screen.cur.row == screen.bscroll) |
|
|
834 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
835 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
836 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
837 | |
|
|
838 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
839 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
840 | continue; |
|
|
841 | } |
|
|
842 | else if (c == C0_CR) |
836 | { |
843 | { |
837 | case C0_HT: |
|
|
838 | scr_tab (1, true); |
|
|
839 | continue; |
|
|
840 | |
|
|
841 | case C0_LF: |
|
|
842 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
844 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
843 | MAX_IT (screen.tlen[row], screen.cur.col); |
845 | MAX_IT (screen.tlen[row], screen.cur.col); |
844 | |
846 | |
845 | screen.flags &= ~Screen_WrapNext; |
847 | screen.flags &= ~Screen_WrapNext; |
846 | |
|
|
847 | if (screen.cur.row == screen.bscroll) |
|
|
848 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
849 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
850 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
851 | |
|
|
852 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
853 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
854 | continue; |
|
|
855 | |
|
|
856 | case C0_CR: |
|
|
857 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
858 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
859 | |
|
|
860 | screen.flags &= ~Screen_WrapNext; |
|
|
861 | screen.cur.col = 0; |
848 | screen.cur.col = 0; |
862 | continue; |
849 | continue; |
|
|
850 | } |
|
|
851 | else if (c == C0_HT) |
|
|
852 | { |
|
|
853 | scr_tab (1, true); |
|
|
854 | continue; |
863 | } |
855 | } |
864 | |
856 | |
865 | if (checksel /* see if we're writing within selection */ |
857 | if (checksel /* see if we're writing within selection */ |
866 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
858 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
867 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
859 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
877 | |
869 | |
878 | if (screen.flags & Screen_WrapNext) |
870 | if (screen.flags & Screen_WrapNext) |
879 | { |
871 | { |
880 | screen.tlen[row] = -1; |
872 | screen.tlen[row] = -1; |
881 | |
873 | |
|
|
874 | scr_do_wrap (); |
|
|
875 | |
882 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
876 | row = screen.cur.row + TermWin.saveLines; |
883 | |
|
|
884 | stp = screen.text[row]; /* _must_ refresh */ |
877 | stp = screen.text[row]; /* _must_ refresh */ |
885 | srp = screen.rend[row]; /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
886 | } |
879 | } |
887 | |
880 | |
|
|
881 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
882 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
|
|
883 | c = 0xfffd; |
|
|
884 | |
888 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
885 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
889 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
886 | // do wcwidth before further replacements, as wcwidth might return -1 |
890 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
887 | // for the line drawing characters below as they might be invalid in the current |
|
|
888 | // locale. |
891 | int width = c < 0x100 ? 1 : wcwidth (c); |
889 | int width = c < 0x100 ? 1 : wcwidth (c); |
892 | |
890 | |
893 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
891 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
894 | { |
892 | { |
895 | // vt100 special graphics and line drawing |
893 | // vt100 special graphics and line drawing |
896 | // 5f-7e standard vt100 |
894 | // 5f-7e standard vt100 |
897 | // 40-5e rxvt extension for extra curses acs chars |
895 | // 40-5e rxvt extension for extra curses acs chars |
898 | static uint16_t vt100_0[63] = { // 40 .. 7e |
896 | static uint16_t vt100_0[62] = { // 41 .. 7e |
899 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
897 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
900 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
898 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
901 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
899 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
902 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
900 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
903 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
901 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
904 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
902 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
905 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
903 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
906 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
904 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
907 | }; |
905 | }; |
908 | |
906 | |
909 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
907 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
910 | { |
908 | { |
911 | c = vt100_0[c - 0x40]; |
909 | c = vt100_0[c - 0x41]; |
912 | width = 1; |
910 | width = 1; // vt100 line drawing characters are always single-width |
913 | } |
911 | } |
914 | } |
912 | } |
915 | |
913 | |
916 | if (screen.flags & Screen_Insert) |
914 | if (screen.flags & Screen_Insert) |
917 | scr_insdel_chars (width, INSERT); |
915 | scr_insdel_chars (width, INSERT); |
918 | |
916 | |
919 | if (width != 0) |
917 | if (width != 0) |
920 | { |
918 | { |
921 | // some utf-8 decoders decode surrogate characters. |
|
|
922 | if (0xd800 <= c && c <= 0xdfff) |
|
|
923 | c = 0xfffd; |
|
|
924 | |
|
|
925 | #if !UNICODE_3 |
919 | #if !UNICODE_3 |
926 | // trim characters we can't store directly :( |
920 | // trim characters we can't store directly :( |
927 | if (c >= 0x10000) |
921 | if (c >= 0x10000) |
928 | # if ENABLE_COMBINING |
922 | # if ENABLE_COMBINING |
929 | c = rxvt_composite.compose (c); // map to lower 16 bits |
923 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
952 | col++; |
946 | col++; |
953 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
947 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
954 | } |
948 | } |
955 | |
949 | |
956 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
950 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
951 | |
|
|
952 | // if the character doesn't fit into the remaining columns... |
|
|
953 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
954 | { |
|
|
955 | // ...output spaces |
|
|
956 | c = ' '; |
|
|
957 | // and try the same character next loop iteration |
|
|
958 | --str; |
|
|
959 | } |
957 | |
960 | |
958 | do |
961 | do |
959 | { |
962 | { |
960 | stp[screen.cur.col] = c; |
963 | stp[screen.cur.col] = c; |
961 | srp[screen.cur.col] = rend; |
964 | srp[screen.cur.col] = rend; |
… | |
… | |
980 | { |
983 | { |
981 | stp[c] = ' '; |
984 | stp[c] = ' '; |
982 | srp[c] = rend; |
985 | srp[c] = rend; |
983 | } |
986 | } |
984 | } |
987 | } |
985 | else if (width == 0) |
988 | else // width == 0 |
986 | { |
989 | { |
987 | #if ENABLE_COMBINING |
990 | #if ENABLE_COMBINING |
988 | // handle combining characters |
991 | // handle combining characters |
989 | // we just tag the accent on the previous on-screen character. |
992 | // we just tag the accent on the previous on-screen character. |
990 | // this is arguably not correct, but also arguably not wrong. |
993 | // this is arguably not correct, but also arguably not wrong. |
991 | // we don't handle double-width characters nicely yet. |
994 | // we don't handle double-width characters nicely yet. |
992 | |
|
|
993 | text_t *tp; |
995 | text_t *tp; |
994 | rend_t *rp; |
996 | rend_t *rp; |
995 | |
997 | |
996 | if (screen.cur.col > 0) |
998 | if (screen.cur.col > 0) |
997 | { |
999 | { |
… | |
… | |
1171 | */ |
1173 | */ |
1172 | #if ENABLE_FRILLS |
1174 | #if ENABLE_FRILLS |
1173 | void |
1175 | void |
1174 | rxvt_term::scr_forwardindex () |
1176 | rxvt_term::scr_forwardindex () |
1175 | { |
1177 | { |
1176 | int row; |
1178 | int row; |
1177 | |
1179 | |
1178 | if (screen.cur.col < TermWin.ncol - 1) |
1180 | if (screen.cur.col < TermWin.ncol - 1) |
1179 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1181 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1180 | else |
1182 | else |
1181 | { |
1183 | { |
… | |
… | |
1400 | screen.tlen[row + row_offset] = 0; |
1402 | screen.tlen[row + row_offset] = 0; |
1401 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1403 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1402 | } |
1404 | } |
1403 | } |
1405 | } |
1404 | |
1406 | |
|
|
1407 | #if ENABLE_FRILLS |
|
|
1408 | void |
|
|
1409 | rxvt_term::scr_erase_savelines () |
|
|
1410 | { |
|
|
1411 | want_refresh = 1; |
|
|
1412 | ZERO_SCROLLBACK (); |
|
|
1413 | |
|
|
1414 | TermWin.nscrolled = 0; |
|
|
1415 | } |
|
|
1416 | #endif |
|
|
1417 | |
1405 | /* ------------------------------------------------------------------------- */ |
1418 | /* ------------------------------------------------------------------------- */ |
1406 | /* |
1419 | /* |
1407 | * Fill the screen with `E's |
1420 | * Fill the screen with `E's |
1408 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1421 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1409 | */ |
1422 | */ |
1410 | void |
1423 | void |
1411 | rxvt_term::scr_E () |
1424 | rxvt_term::scr_E () |
1412 | { |
1425 | { |
1413 | int i, j, k; |
1426 | int i, j, k; |
1414 | rend_t *r1, fs; |
1427 | rend_t *r1, fs; |
1415 | |
1428 | |
1416 | want_refresh = 1; |
1429 | want_refresh = 1; |
1417 | ZERO_SCROLLBACK (); |
1430 | ZERO_SCROLLBACK (); |
1418 | |
1431 | |
1419 | num_scr_allow = 0; |
1432 | num_scr_allow = 0; |
… | |
… | |
1902 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1915 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1903 | { |
1916 | { |
1904 | int n; |
1917 | int n; |
1905 | unsigned int oldviewstart; |
1918 | unsigned int oldviewstart; |
1906 | |
1919 | |
1907 | #ifdef DEBUG_STRICT |
|
|
1908 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1909 | #endif |
|
|
1910 | oldviewstart = TermWin.view_start; |
1920 | oldviewstart = TermWin.view_start; |
|
|
1921 | |
1911 | if (direction == UP) |
1922 | if (direction == UP) |
1912 | { |
1923 | { |
1913 | n = TermWin.view_start + nlines; |
1924 | n = TermWin.view_start + nlines; |
1914 | TermWin.view_start = min (n, TermWin.nscrolled); |
1925 | TermWin.view_start = min (n, TermWin.nscrolled); |
1915 | } |
1926 | } |
1916 | else |
1927 | else |
1917 | { |
1928 | { |
1918 | n = TermWin.view_start - nlines; |
1929 | n = TermWin.view_start - nlines; |
1919 | TermWin.view_start = max (n, 0); |
1930 | TermWin.view_start = max (n, 0); |
1920 | } |
1931 | } |
|
|
1932 | |
1921 | return scr_changeview (oldviewstart); |
1933 | return scr_changeview (oldviewstart); |
1922 | } |
1934 | } |
1923 | |
1935 | |
1924 | int |
1936 | int |
1925 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1937 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
… | |
… | |
2013 | /* |
2025 | /* |
2014 | * Refresh the screen |
2026 | * Refresh the screen |
2015 | * drawn_text/drawn_rend contain the screen information before the update. |
2027 | * drawn_text/drawn_rend contain the screen information before the update. |
2016 | * screen.text/screen.rend contain what the screen will change to. |
2028 | * screen.text/screen.rend contain what the screen will change to. |
2017 | */ |
2029 | */ |
2018 | |
|
|
2019 | #define FONT_WIDTH(X, Y) \ |
|
|
2020 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
2021 | #define FONT_RBEAR(X, Y) \ |
|
|
2022 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
2023 | #define FONT_LBEAR(X, Y) \ |
|
|
2024 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
2025 | #define IS_FONT_CHAR(X, Y) \ |
|
|
2026 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
2027 | |
|
|
2028 | void |
2030 | void |
2029 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2031 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2030 | { |
2032 | { |
2031 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2033 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2032 | showcursor; /* show the cursor */ |
2034 | showcursor; /* show the cursor */ |
… | |
… | |
2051 | refresh_count = 0; |
2053 | refresh_count = 0; |
2052 | |
2054 | |
2053 | row_offset = TermWin.saveLines - TermWin.view_start; |
2055 | row_offset = TermWin.saveLines - TermWin.view_start; |
2054 | |
2056 | |
2055 | #if XPM_BACKGROUND |
2057 | #if XPM_BACKGROUND |
2056 | must_clear |= (bgPixmap.pixmap != None); |
2058 | must_clear |= bgPixmap.pixmap != None; |
2057 | #endif |
2059 | #endif |
2058 | #if TRANSPARENT |
2060 | #if TRANSPARENT |
2059 | must_clear |= ((options & Opt_transparent) && am_transparent); |
2061 | must_clear |= (options & Opt_transparent) && am_transparent; |
2060 | #endif |
2062 | #endif |
2061 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2063 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2062 | |
2064 | |
2063 | /* |
2065 | /* |
2064 | * B: reverse any characters which are selected |
2066 | * B: reverse any characters which are selected |
… | |
… | |
2088 | |
2090 | |
2089 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2091 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2090 | |
2092 | |
2091 | if (showcursor && TermWin.focus) |
2093 | if (showcursor && TermWin.focus) |
2092 | { |
2094 | { |
|
|
2095 | if (options & Opt_cursorUnderline) |
|
|
2096 | *crp ^= RS_Uline; |
|
|
2097 | else |
|
|
2098 | { |
2093 | *crp ^= RS_RVid; |
2099 | *crp ^= RS_RVid; |
|
|
2100 | |
2094 | #ifndef NO_CURSORCOLOR |
2101 | #ifndef NO_CURSORCOLOR |
2095 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2102 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2096 | if (ISSET_PIXCOLOR (Color_cursor)) |
2103 | if (ISSET_PIXCOLOR (Color_cursor)) |
2097 | ccol1 = Color_cursor; |
2104 | ccol1 = Color_cursor; |
2098 | else |
2105 | else |
2099 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2106 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2100 | ccol1 = GET_FGCOLOR (rstyle); |
2107 | ccol1 = GET_FGCOLOR (rstyle); |
2101 | #else |
2108 | #else |
2102 | ccol1 = Color_fg; |
2109 | ccol1 = Color_fg; |
2103 | #endif |
2110 | #endif |
2104 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2111 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2105 | ccol2 = Color_cursor2; |
2112 | ccol2 = Color_cursor2; |
2106 | else |
2113 | else |
2107 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2114 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2108 | ccol2 = GET_BGCOLOR (rstyle); |
2115 | ccol2 = GET_BGCOLOR (rstyle); |
2109 | #else |
2116 | #else |
2110 | ccol2 = Color_bg; |
2117 | ccol2 = Color_bg; |
2111 | #endif |
2118 | #endif |
2112 | *crp = SET_FGCOLOR (*crp, ccol1); |
2119 | *crp = SET_FGCOLOR (*crp, ccol1); |
2113 | *crp = SET_BGCOLOR (*crp, ccol2); |
2120 | *crp = SET_BGCOLOR (*crp, ccol2); |
2114 | #endif |
2121 | #endif |
|
|
2122 | } |
2115 | } |
2123 | } |
2116 | } |
2124 | } |
2117 | |
2125 | |
2118 | /* make sure no outline cursor is left around */ |
2126 | /* make sure no outline cursor is left around */ |
2119 | setoldcursor = 0; |
2127 | setoldcursor = 0; |
… | |
… | |
2400 | else |
2408 | else |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2409 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2402 | |
2410 | |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2411 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2404 | { |
2412 | { |
|
|
2413 | #if ENABLE_FRILLS |
|
|
2414 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2415 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2416 | else |
|
|
2417 | #endif |
2405 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2418 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2419 | |
2406 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2420 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2407 | xpixel, ypixel + font->ascent + 1, |
2421 | xpixel, ypixel + font->ascent + 1, |
2408 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2422 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2409 | } |
2423 | } |
2410 | } /* for (col....) */ |
2424 | } /* for (col....) */ |
… | |
… | |
2419 | */ |
2433 | */ |
2420 | if (showcursor) |
2434 | if (showcursor) |
2421 | { |
2435 | { |
2422 | if (TermWin.focus) |
2436 | if (TermWin.focus) |
2423 | { |
2437 | { |
|
|
2438 | if (options & Opt_cursorUnderline) |
|
|
2439 | *crp ^= RS_Uline; |
|
|
2440 | else |
|
|
2441 | { |
2424 | *crp ^= RS_RVid; |
2442 | *crp ^= RS_RVid; |
2425 | #ifndef NO_CURSORCOLOR |
2443 | #ifndef NO_CURSORCOLOR |
2426 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2444 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2427 | #endif |
2445 | #endif |
|
|
2446 | } |
2428 | } |
2447 | } |
2429 | else if (oldcursor.row >= 0) |
2448 | else if (oldcursor.row >= 0) |
2430 | { |
2449 | { |
|
|
2450 | int cursorwidth = 1; |
|
|
2451 | int col = oldcursor.col; |
|
|
2452 | |
|
|
2453 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2454 | col--; |
|
|
2455 | |
|
|
2456 | while (col + cursorwidth < TermWin.ncol |
|
|
2457 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
|
|
2458 | cursorwidth++; |
|
|
2459 | |
2431 | #ifndef NO_CURSORCOLOR |
2460 | #ifndef NO_CURSORCOLOR |
2432 | if (ISSET_PIXCOLOR (Color_cursor)) |
2461 | if (ISSET_PIXCOLOR (Color_cursor)) |
2433 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2462 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2434 | #endif |
2463 | #endif |
2435 | int cursorwidth = 1; |
|
|
2436 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2437 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2438 | cursorwidth++; |
|
|
2439 | |
2464 | |
2440 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2465 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2441 | Col2Pixel (oldcursor.col), |
2466 | Col2Pixel (col), |
2442 | Row2Pixel (oldcursor.row), |
2467 | Row2Pixel (oldcursor.row), |
2443 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2468 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2444 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2469 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2445 | } |
2470 | } |
2446 | } |
2471 | } |
… | |
… | |
2656 | /* ------------------------------------------------------------------------- */ |
2681 | /* ------------------------------------------------------------------------- */ |
2657 | /* |
2682 | /* |
2658 | * Paste a selection direct to the command fd |
2683 | * Paste a selection direct to the command fd |
2659 | */ |
2684 | */ |
2660 | void |
2685 | void |
2661 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2686 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2662 | { |
2687 | { |
2663 | unsigned int i, j, n; |
|
|
2664 | unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE); |
|
|
2665 | |
|
|
2666 | /* convert normal newline chars into common keyboard Return key sequence */ |
2688 | /* convert normal newline chars into common keyboard Return key sequence */ |
2667 | for (i = 0; i < len; i += PASTE_SIZE) |
2689 | for (unsigned int i = 0; i < len; i++) |
2668 | { |
|
|
2669 | n = min (len - i, PASTE_SIZE); |
|
|
2670 | memcpy (ds, data + i, n); |
|
|
2671 | |
|
|
2672 | for (j = 0; j < n; j++) |
|
|
2673 | if (ds[j] == C0_LF) |
2690 | if (data[i] == C0_LF) |
2674 | ds[j] = C0_CR; |
2691 | data[i] = C0_CR; |
2675 | |
2692 | |
2676 | tt_write (ds, (int)n); |
2693 | tt_write (data, len); |
2677 | } |
|
|
2678 | |
|
|
2679 | free (ds); |
|
|
2680 | } |
2694 | } |
2681 | |
2695 | |
2682 | /* ------------------------------------------------------------------------- */ |
2696 | /* ------------------------------------------------------------------------- */ |
2683 | /* |
2697 | /* |
2684 | * Respond to a notification that a primary selection has been sent |
2698 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2714 | |
2728 | |
2715 | unsigned long bytes_after; |
2729 | unsigned long bytes_after; |
2716 | XTextProperty ct; |
2730 | XTextProperty ct; |
2717 | |
2731 | |
2718 | if (XGetWindowProperty (display->display, win, prop, |
2732 | if (XGetWindowProperty (display->display, win, prop, |
2719 | 0, (long)(PROP_SIZE / 4), |
2733 | 0, PROP_SIZE / 4, |
2720 | delete_prop, AnyPropertyType, |
2734 | delete_prop, AnyPropertyType, |
2721 | &ct.encoding, &ct.format, |
2735 | &ct.encoding, &ct.format, |
2722 | &ct.nitems, &bytes_after, |
2736 | &ct.nitems, &bytes_after, |
2723 | &ct.value) != Success) |
2737 | &ct.value) != Success) |
2724 | { |
2738 | { |
… | |
… | |
2731 | |
2745 | |
2732 | if (bytes_after) |
2746 | if (bytes_after) |
2733 | { |
2747 | { |
2734 | // fetch and append remaining data |
2748 | // fetch and append remaining data |
2735 | XTextProperty ct2; |
2749 | XTextProperty ct2; |
2736 | unsigned long bytes_after2; |
|
|
2737 | |
2750 | |
2738 | if (XGetWindowProperty (display->display, win, prop, |
2751 | if (XGetWindowProperty (display->display, win, prop, |
2739 | ct.nitems / 4, (long) (bytes_after + 3) / 4, |
2752 | ct.nitems / 4, (bytes_after + 3) / 4, |
2740 | delete_prop, AnyPropertyType, |
2753 | delete_prop, AnyPropertyType, |
2741 | &ct2.encoding, &ct2.format, |
2754 | &ct2.encoding, &ct2.format, |
2742 | &ct2.nitems, &bytes_after2, |
2755 | &ct2.nitems, &bytes_after, |
2743 | &ct2.value) != Success) |
2756 | &ct2.value) != Success) |
2744 | goto bailout; |
2757 | goto bailout; |
2745 | |
2758 | |
2746 | // realloc should be compatible to XFree, here, and elsewhere, too |
2759 | // realloc should be compatible to XFree, here, and elsewhere, too |
2747 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + bytes_after); |
2760 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2748 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems); |
2761 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2749 | ct.nitems += ct2.nitems; |
2762 | ct.nitems += ct2.nitems; |
2750 | |
2763 | |
2751 | XFree (ct2.value); |
2764 | XFree (ct2.value); |
2752 | } |
2765 | } |
2753 | else if (delete_prop) |
|
|
2754 | XDeleteProperty (display->display, win, prop); |
|
|
2755 | |
2766 | |
2756 | if (ct.value == 0) |
2767 | if (ct.value == 0) |
2757 | goto bailout; |
2768 | goto bailout; |
2758 | |
2769 | |
2759 | if (ct.encoding == xa[XA_INCR]) |
2770 | if (ct.encoding == xa[XA_INCR]) |
… | |
… | |
2919 | |
2930 | |
2920 | int |
2931 | int |
2921 | rxvt_term::selection_request_other (Atom target, int selnum) |
2932 | rxvt_term::selection_request_other (Atom target, int selnum) |
2922 | { |
2933 | { |
2923 | Atom sel; |
2934 | Atom sel; |
2924 | #ifdef DEBUG_SELECT |
|
|
2925 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
|
|
2926 | #endif |
|
|
2927 | |
2935 | |
2928 | selection_type |= selnum; |
2936 | selection_type |= selnum; |
2929 | |
2937 | |
2930 | if (selnum == Sel_Primary) |
2938 | if (selnum == Sel_Primary) |
2931 | sel = XA_PRIMARY; |
2939 | sel = XA_PRIMARY; |
… | |
… | |
3426 | selection_delimit_word (DN, &selection.end, &selection.end); |
3434 | selection_delimit_word (DN, &selection.end, &selection.end); |
3427 | } |
3435 | } |
3428 | else if (selection.clicks == 3) |
3436 | else if (selection.clicks == 3) |
3429 | { |
3437 | { |
3430 | #if ENABLE_FRILLS |
3438 | #if ENABLE_FRILLS |
3431 | if ((options & Opt_tripleclickwords)) |
3439 | if (options & Opt_tripleclickwords) |
3432 | { |
3440 | { |
3433 | int end_row; |
3441 | int end_row; |
3434 | |
3442 | |
3435 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3443 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3436 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3444 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
… | |
… | |
3454 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3462 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3455 | selection.mark.col++; |
3463 | selection.mark.col++; |
3456 | |
3464 | |
3457 | selection.beg.col = 0; |
3465 | selection.beg.col = 0; |
3458 | selection.end.col = ncol; |
3466 | selection.end.col = ncol; |
|
|
3467 | |
|
|
3468 | // select a complete logical line |
|
|
3469 | while (selection.beg.row > -TermWin.saveLines |
|
|
3470 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
|
|
3471 | selection.beg.row--; |
|
|
3472 | |
|
|
3473 | while (selection.end.row < TermWin.nrow |
|
|
3474 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
|
|
3475 | selection.end.row++; |
3459 | } |
3476 | } |
3460 | } |
3477 | } |
3461 | |
3478 | |
3462 | if (button3 && buttonpress) |
3479 | if (button3 && buttonpress) |
3463 | { /* mark may need to be changed */ |
3480 | { /* mark may need to be changed */ |
… | |
… | |
3543 | */ |
3560 | */ |
3544 | void |
3561 | void |
3545 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3562 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3546 | { |
3563 | { |
3547 | XSelectionEvent ev; |
3564 | XSelectionEvent ev; |
|
|
3565 | dDisp; |
3548 | |
3566 | |
3549 | ev.type = SelectionNotify; |
3567 | ev.type = SelectionNotify; |
3550 | ev.property = None; |
3568 | ev.property = None; |
3551 | ev.display = rq.display; |
3569 | ev.display = rq.display; |
3552 | ev.requestor = rq.requestor; |
3570 | ev.requestor = rq.requestor; |
… | |
… | |
3566 | *target++ = xa[XA_COMPOUND_TEXT]; |
3584 | *target++ = xa[XA_COMPOUND_TEXT]; |
3567 | #if X_HAVE_UTF8_STRING |
3585 | #if X_HAVE_UTF8_STRING |
3568 | *target++ = xa[XA_UTF8_STRING]; |
3586 | *target++ = xa[XA_UTF8_STRING]; |
3569 | #endif |
3587 | #endif |
3570 | |
3588 | |
3571 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3589 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3572 | 32, PropModeReplace, |
3590 | 32, PropModeReplace, |
3573 | (unsigned char *)target_list, target - target_list); |
3591 | (unsigned char *)target_list, target - target_list); |
3574 | ev.property = rq.property; |
3592 | ev.property = rq.property; |
3575 | } |
3593 | } |
3576 | #if TODO // TODO |
3594 | #if TODO // TODO |
… | |
… | |
3579 | /* TODO: Handle MULTIPLE */ |
3597 | /* TODO: Handle MULTIPLE */ |
3580 | } |
3598 | } |
3581 | #endif |
3599 | #endif |
3582 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3600 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3583 | { |
3601 | { |
3584 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3602 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3585 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3603 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3586 | ev.property = rq.property; |
3604 | ev.property = rq.property; |
3587 | } |
3605 | } |
3588 | else if (rq.target == XA_STRING |
3606 | else if (rq.target == XA_STRING |
3589 | || rq.target == xa[XA_TEXT] |
3607 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3647 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3665 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3648 | ct.nitems = strlen ((char *)ct.value); |
3666 | ct.nitems = strlen ((char *)ct.value); |
3649 | } |
3667 | } |
3650 | else |
3668 | else |
3651 | #endif |
3669 | #endif |
3652 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3670 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3653 | freect = 1; |
3671 | freect = 1; |
3654 | else |
3672 | else |
3655 | { |
3673 | { |
3656 | /* if we failed to convert then send it raw */ |
3674 | /* if we failed to convert then send it raw */ |
3657 | ct.value = (unsigned char *)cl; |
3675 | ct.value = (unsigned char *)cl; |
3658 | ct.nitems = selectlen; |
3676 | ct.nitems = selectlen; |
3659 | ct.encoding = target; |
3677 | ct.encoding = target; |
3660 | } |
3678 | } |
3661 | |
3679 | |
3662 | XChangeProperty (display->display, rq.requestor, rq.property, |
3680 | XChangeProperty (disp, rq.requestor, rq.property, |
3663 | ct.encoding, 8, PropModeReplace, |
3681 | ct.encoding, 8, PropModeReplace, |
3664 | ct.value, (int)ct.nitems); |
3682 | ct.value, (int)ct.nitems); |
3665 | ev.property = rq.property; |
3683 | ev.property = rq.property; |
3666 | |
3684 | |
3667 | if (freect) |
3685 | if (freect) |
3668 | XFree (ct.value); |
3686 | XFree (ct.value); |
3669 | } |
3687 | } |
3670 | |
3688 | |
3671 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3689 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3672 | } |
3690 | } |
3673 | |
3691 | |
3674 | /* ------------------------------------------------------------------------- * |
3692 | /* ------------------------------------------------------------------------- * |
3675 | * MOUSE ROUTINES * |
3693 | * MOUSE ROUTINES * |
3676 | * ------------------------------------------------------------------------- */ |
3694 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3796 | while (*s) |
3814 | while (*s) |
3797 | scr_overlay_set (x++, y, *s++); |
3815 | scr_overlay_set (x++, y, *s++); |
3798 | } |
3816 | } |
3799 | |
3817 | |
3800 | void |
3818 | void |
|
|
3819 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3820 | { |
|
|
3821 | while (*s) |
|
|
3822 | { |
|
|
3823 | text_t t = *s++; |
|
|
3824 | int width = wcwidth (t); |
|
|
3825 | |
|
|
3826 | while (width--) |
|
|
3827 | { |
|
|
3828 | scr_overlay_set (x++, y, t); |
|
|
3829 | t = NOCHAR; |
|
|
3830 | } |
|
|
3831 | } |
|
|
3832 | } |
|
|
3833 | |
|
|
3834 | void |
3801 | rxvt_term::scr_swap_overlay () |
3835 | rxvt_term::scr_swap_overlay () |
3802 | { |
3836 | { |
3803 | if (!ov_text) |
3837 | if (!ov_text) |
3804 | return; |
3838 | return; |
3805 | |
3839 | |