… | |
… | |
203 | term_start = 0; |
203 | term_start = 0; |
204 | |
204 | |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
207 | |
207 | |
208 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
211 | |
211 | |
212 | for (int row = nrow; row--; ) |
212 | for (int row = nrow; row--; ) |
213 | { |
213 | { |
… | |
… | |
275 | 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); |
276 | 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); |
277 | } |
277 | } |
278 | |
278 | |
279 | line_t *old_buf = row_buf; |
279 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
281 | |
281 | |
282 | 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 |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
285 | |
285 | |
… | |
… | |
638 | |
638 | |
639 | if (count > 0 |
639 | if (count > 0 |
640 | && row1 == 0 |
640 | && row1 == 0 |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
642 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
643 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
644 | |
|
|
645 | // scroll everything up 'count' lines |
|
|
646 | term_start = (term_start + count) % total_rows; |
|
|
647 | |
646 | |
648 | // sever bottommost line |
647 | // sever bottommost line |
649 | { |
648 | { |
650 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2); |
651 | l.is_longer (0); |
650 | l.is_longer (0); |
652 | l.touch (); |
651 | l.touch (); |
653 | } |
652 | } |
654 | |
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 | |
655 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
656 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
657 | { |
671 | { |
658 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
659 | |
673 | |
660 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
661 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
662 | 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))) |
663 | { |
677 | { |
664 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
665 | l.l = 0; |
679 | l.l = 0; |
… | |
… | |
667 | } |
681 | } |
668 | else |
682 | else |
669 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
670 | } |
684 | } |
671 | |
685 | |
672 | // now copy lines below the scroll region bottom to the |
|
|
673 | // bottom of the screen again, so they look as if they |
|
|
674 | // hadn't moved. |
|
|
675 | for (int i = nrow; --i > row2; ) |
|
|
676 | { |
|
|
677 | line_t &l1 = ROW(i - count); |
|
|
678 | line_t &l2 = ROW(i); |
|
|
679 | |
|
|
680 | ::swap (l1, l2); |
|
|
681 | l2.touch (); |
|
|
682 | } |
|
|
683 | |
|
|
684 | // move and/or clear selection, if any |
|
|
685 | if (selection.op && current_screen == selection.screen) |
|
|
686 | { |
|
|
687 | selection.beg.row -= count; |
|
|
688 | selection.end.row -= count; |
|
|
689 | selection.mark.row -= count; |
|
|
690 | |
|
|
691 | if (selection.beg.row < top_row |
|
|
692 | || selection.end.row < top_row |
|
|
693 | || selection.mark.row < top_row) |
|
|
694 | { |
|
|
695 | CLEAR_ALL_SELECTION (); |
|
|
696 | selection.op = SELECTION_CLEAR; |
|
|
697 | } |
|
|
698 | } |
|
|
699 | |
|
|
700 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
701 | if (option (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
702 | && view_start != 0 |
688 | && view_start != 0 |
703 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
704 | scr_page (UP, count); |
690 | scr_page (UP, count); |
… | |
… | |
706 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
707 | 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)); |
708 | } |
694 | } |
709 | else |
695 | else |
710 | { |
696 | { |
711 | if (selection.op && current_screen == selection.screen) |
|
|
712 | { |
|
|
713 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
714 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
715 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
716 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
717 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
718 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
719 | { |
|
|
720 | CLEAR_ALL_SELECTION (); |
|
|
721 | selection.op = SELECTION_CLEAR; |
|
|
722 | } |
|
|
723 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
724 | { |
|
|
725 | /* move selected region too */ |
|
|
726 | selection.beg.row -= count; |
|
|
727 | selection.end.row -= count; |
|
|
728 | selection.mark.row -= count; |
|
|
729 | |
|
|
730 | selection_check (0); |
|
|
731 | } |
|
|
732 | } |
|
|
733 | |
|
|
734 | // use a simple and robust scrolling algorithm, this |
697 | // use a simple and robust scrolling algorithm, this |
735 | // part of scr_scroll_text is not time-critical. |
698 | // part of scr_scroll_text is not time-critical. |
736 | |
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 | |
737 | int rows = row2 - row1 + 1; |
708 | int rows = row2 - row1 + 1; |
738 | |
709 | |
739 | min_it (count, rows); |
710 | min_it (count, rows); |
740 | |
711 | |
741 | line_t *temp_buf = row_buf + total_rows; |
712 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
742 | |
713 | |
743 | for (int row = 0; row < rows; row++) |
714 | for (int row = 0; row < rows; row++) |
744 | { |
715 | { |
745 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
716 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
746 | |
717 | |
… | |
… | |
748 | scr_blank_screen_mem (temp_buf [row], rstyle); |
719 | scr_blank_screen_mem (temp_buf [row], rstyle); |
749 | } |
720 | } |
750 | |
721 | |
751 | for (int row = 0; row < rows; row++) |
722 | for (int row = 0; row < rows; row++) |
752 | 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 | } |
753 | } |
752 | } |
754 | |
753 | |
755 | return count; |
754 | return count; |
756 | } |
755 | } |
757 | |
756 | |
… | |
… | |
799 | |
798 | |
800 | while (str < strend) |
799 | while (str < strend) |
801 | { |
800 | { |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
801 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
803 | |
802 | |
804 | if (expect_false (c < 0x20)) |
803 | if (ecb_unlikely (c < 0x20)) |
805 | if (c == C0_LF) |
804 | if (c == C0_LF) |
806 | { |
805 | { |
807 | max_it (line->l, screen.cur.col); |
806 | max_it (line->l, screen.cur.col); |
808 | |
807 | |
809 | screen.flags &= ~Screen_WrapNext; |
808 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
828 | { |
827 | { |
829 | scr_tab (1, true); |
828 | scr_tab (1, true); |
830 | continue; |
829 | continue; |
831 | } |
830 | } |
832 | |
831 | |
833 | if (expect_false ( |
832 | if (ecb_unlikely ( |
834 | checksel /* see if we're writing within selection */ |
833 | checksel /* see if we're writing within selection */ |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
834 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
835 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
837 | )) |
836 | )) |
838 | { |
837 | { |
… | |
… | |
843 | * should be a similar check. |
842 | * should be a similar check. |
844 | */ |
843 | */ |
845 | CLEAR_SELECTION (); |
844 | CLEAR_SELECTION (); |
846 | } |
845 | } |
847 | |
846 | |
848 | if (expect_false (screen.flags & Screen_WrapNext)) |
847 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
849 | { |
848 | { |
850 | scr_do_wrap (); |
849 | scr_do_wrap (); |
851 | |
850 | |
852 | line->l = ncol; |
851 | line->l = ncol; |
853 | line->is_longer (1); |
852 | line->is_longer (1); |
… | |
… | |
855 | row = screen.cur.row; |
854 | row = screen.cur.row; |
856 | line = &ROW(row); /* _must_ refresh */ |
855 | line = &ROW(row); /* _must_ refresh */ |
857 | } |
856 | } |
858 | |
857 | |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
858 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
859 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
861 | c = 0xfffd; |
860 | c = 0xfffd; |
862 | |
861 | |
863 | // 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 |
864 | // further replacements, as wcwidth might return -1 for the line |
863 | // further replacements, as wcwidth might return -1 for the line |
865 | // drawing characters below as they might be invalid in the current |
864 | // drawing characters below as they might be invalid in the current |
866 | // locale. |
865 | // locale. |
867 | int width = WCWIDTH (c); |
866 | int width = WCWIDTH (c); |
868 | |
867 | |
869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
868 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
870 | { |
869 | { |
871 | // vt100 special graphics and line drawing |
870 | // vt100 special graphics and line drawing |
872 | // 5f-7e standard vt100 |
871 | // 5f-7e standard vt100 |
873 | // 40-5e rxvt extension for extra curses acs chars |
872 | // 40-5e rxvt extension for extra curses acs chars |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
873 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
887 | c = vt100_0[c - 0x41]; |
886 | c = vt100_0[c - 0x41]; |
888 | width = 1; // vt100 line drawing characters are always single-width |
887 | width = 1; // vt100 line drawing characters are always single-width |
889 | } |
888 | } |
890 | } |
889 | } |
891 | |
890 | |
892 | if (expect_false (screen.flags & Screen_Insert)) |
891 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
893 | scr_insdel_chars (width, INSERT); |
892 | scr_insdel_chars (width, INSERT); |
894 | |
893 | |
895 | if (width != 0) |
894 | if (width != 0) |
896 | { |
895 | { |
897 | #if !UNICODE_3 |
896 | #if !UNICODE_3 |
… | |
… | |
905 | #endif |
904 | #endif |
906 | |
905 | |
907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
908 | |
907 | |
909 | // if the character doesn't fit into the remaining columns... |
908 | // if the character doesn't fit into the remaining columns... |
910 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
909 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
911 | { |
910 | { |
912 | if (screen.flags & Screen_Autowrap) |
911 | if (screen.flags & Screen_Autowrap) |
913 | { |
912 | { |
914 | // ... artificially enlargen the previous one |
913 | // ... artificially enlargen the previous one |
915 | c = NOCHAR; |
914 | c = NOCHAR; |
… | |
… | |
922 | |
921 | |
923 | // nuke the character at this position, if required |
922 | // nuke the character at this position, if required |
924 | // due to wonderful coincidences everywhere else in this loop |
923 | // due to wonderful coincidences everywhere else in this loop |
925 | // we never have to check for overwriting a wide char itself, |
924 | // we never have to check for overwriting a wide char itself, |
926 | // only its tail. |
925 | // only its tail. |
927 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
926 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
928 | scr_kill_char (*line, screen.cur.col); |
927 | scr_kill_char (*line, screen.cur.col); |
929 | |
928 | |
930 | line->touch (); |
929 | line->touch (); |
931 | |
930 | |
932 | do |
931 | do |
933 | { |
932 | { |
934 | line->t[screen.cur.col] = c; |
933 | line->t[screen.cur.col] = c; |
935 | line->r[screen.cur.col] = rend; |
934 | line->r[screen.cur.col] = rend; |
936 | |
935 | |
937 | if (expect_true (screen.cur.col < ncol - 1)) |
936 | if (ecb_likely (screen.cur.col < ncol - 1)) |
938 | screen.cur.col++; |
937 | screen.cur.col++; |
939 | else |
938 | else |
940 | { |
939 | { |
941 | line->l = ncol; |
940 | line->l = ncol; |
942 | if (screen.flags & Screen_Autowrap) |
941 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
945 | goto end_of_line; |
944 | goto end_of_line; |
946 | } |
945 | } |
947 | |
946 | |
948 | c = NOCHAR; |
947 | c = NOCHAR; |
949 | } |
948 | } |
950 | while (expect_false (--width > 0)); |
949 | while (ecb_unlikely (--width > 0)); |
951 | |
950 | |
952 | // pad with spaces when overwriting wide character with smaller one |
951 | // pad with spaces when overwriting wide character with smaller one |
953 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
952 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
954 | { |
953 | { |
955 | line->t[c] = ' '; |
954 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
955 | line->r[c] = rend; |
957 | } |
956 | } |
958 | |
957 | |
… | |
… | |
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1946 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1948 | #endif |
1947 | #endif |
1949 | } |
1948 | } |
1950 | |
1949 | |
1951 | /* ------------------------------------------------------------------------- */ |
1950 | /* ------------------------------------------------------------------------- */ |
1952 | /* ARGSUSED */ |
|
|
1953 | void |
1951 | void |
1954 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1952 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | { |
1953 | { |
1956 | #ifdef PRINTPIPE |
1954 | #ifdef PRINTPIPE |
1957 | int nrows, row_start; |
1955 | int nrows, row_start; |
… | |
… | |
2235 | continue; |
2233 | continue; |
2236 | |
2234 | |
2237 | // redraw one or more characters |
2235 | // redraw one or more characters |
2238 | |
2236 | |
2239 | // seek to the beginning of wide characters |
2237 | // seek to the beginning of wide characters |
2240 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2238 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2241 | --col; |
2239 | --col; |
2242 | |
2240 | |
2243 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2244 | text_t *text = stp + col; |
2242 | text_t *text = stp + col; |
2245 | int count = 1; |
2243 | int count = 1; |
… | |
… | |
2283 | |
2281 | |
2284 | col--; /* went one too far. move back */ |
2282 | col--; /* went one too far. move back */ |
2285 | count -= i; /* dump any matching trailing chars */ |
2283 | count -= i; /* dump any matching trailing chars */ |
2286 | |
2284 | |
2287 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2285 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | while (expect_false (i && text[count] == NOCHAR)) |
2286 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2289 | count++, i--; |
2287 | count++, i--; |
2290 | |
2288 | |
2291 | /* |
2289 | /* |
2292 | * Determine the attributes for the string |
2290 | * Determine the attributes for the string |
2293 | */ |
2291 | */ |
2294 | int fore = fgcolor_of (rend); // desired foreground |
2292 | int fore = fgcolor_of (rend); // desired foreground |
2295 | int back = bgcolor_of (rend); // desired background |
2293 | int back = bgcolor_of (rend); // desired background |
2296 | |
2294 | |
2297 | // 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 |
2298 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2296 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2299 | { |
2297 | { |
2300 | bool invert = rend & RS_RVid; |
2298 | bool invert = rend & RS_RVid; |
2301 | |
2299 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2300 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | if (rend & RS_Bold && fore == Color_fg) |
2301 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2392 | /* |
2390 | /* |
2393 | * Actually do the drawing of the string here |
2391 | * Actually do the drawing of the string here |
2394 | */ |
2392 | */ |
2395 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2393 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2396 | |
2394 | |
2397 | if (expect_true (have_bg && back == Color_bg)) |
2395 | if (ecb_likely (have_bg && back == Color_bg)) |
2398 | { |
2396 | { |
2399 | // this is very ugly, maybe push it into ->draw? |
2397 | // this is very ugly, maybe push it into ->draw? |
2400 | |
2398 | |
2401 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2399 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2402 | if (text[i] != ' ') |
2400 | if (text[i] != ' ') |
… | |
… | |
2409 | did_clear: ; |
2407 | did_clear: ; |
2410 | } |
2408 | } |
2411 | else |
2409 | else |
2412 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2410 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2413 | |
2411 | |
2414 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2412 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2415 | { |
2413 | { |
2416 | #if ENABLE_FRILLS |
2414 | #if ENABLE_FRILLS |
2417 | if (ISSET_PIXCOLOR (Color_underline)) |
2415 | if (ISSET_PIXCOLOR (Color_underline)) |
2418 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2416 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2419 | else |
2417 | else |
… | |
… | |
2547 | { |
2545 | { |
2548 | if (transparent) |
2546 | if (transparent) |
2549 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2547 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2550 | else |
2548 | else |
2551 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2552 | scrollBar.state = STATE_IDLE; |
2550 | scrollBar.state = SB_STATE_IDLE; |
2553 | scrollBar.show (0); |
2551 | scrollBar.show (0); |
2554 | } |
2552 | } |
2555 | |
2553 | |
2556 | if (refresh) |
2554 | if (refresh) |
2557 | { |
2555 | { |
… | |
… | |
2680 | * CHARACTER SELECTION * |
2678 | * CHARACTER SELECTION * |
2681 | * ------------------------------------------------------------------------- */ |
2679 | * ------------------------------------------------------------------------- */ |
2682 | void |
2680 | void |
2683 | rxvt_term::selection_check (int check_more) NOTHROW |
2681 | rxvt_term::selection_check (int check_more) NOTHROW |
2684 | { |
2682 | { |
2685 | row_col_t pos; |
|
|
2686 | |
|
|
2687 | if (!selection.op) |
2683 | if (!selection.op) |
2688 | return; |
2684 | return; |
2689 | |
2685 | |
|
|
2686 | row_col_t pos; |
2690 | pos.row = pos.col = 0; |
2687 | pos.row = pos.col = 0; |
|
|
2688 | |
2691 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2689 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2692 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2690 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2693 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2694 | || (check_more == 1 |
2692 | || (check_more == 1 |
2695 | && current_screen == selection.screen |
2693 | && current_screen == selection.screen |
… | |
… | |
2697 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2695 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2698 | || (check_more == 2 |
2696 | || (check_more == 2 |
2699 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2697 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2700 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2698 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2701 | || (check_more == 3 |
2699 | || (check_more == 3 |
2702 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2700 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2703 | || (check_more == 4 /* screen width change */ |
|
|
2704 | && (selection.beg.row != selection.end.row |
|
|
2705 | || selection.end.col > ncol))) |
|
|
2706 | CLEAR_SELECTION (); |
2701 | CLEAR_ALL_SELECTION (); |
2707 | } |
2702 | } |
2708 | |
2703 | |
2709 | /* ------------------------------------------------------------------------- */ |
2704 | /* ------------------------------------------------------------------------- */ |
2710 | /* |
2705 | /* |
2711 | * Paste a selection direct to the command fd |
2706 | * Paste a selection direct to the command fd |
… | |
… | |
2736 | tt_paste (data, len); |
2731 | tt_paste (data, len); |
2737 | } |
2732 | } |
2738 | |
2733 | |
2739 | /* ------------------------------------------------------------------------- */ |
2734 | /* ------------------------------------------------------------------------- */ |
2740 | /* |
2735 | /* |
2741 | * Request the current selection: |
2736 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2742 | * Order: > internal selection if available |
2737 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2743 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2738 | * as fallback |
2744 | * > CUT_BUFFER0 |
|
|
2745 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2746 | * will auto fallback to CUT_BUFFER0 |
|
|
2747 | * EXT: button 2 release |
2739 | * EXT: button 2 release |
2748 | */ |
2740 | */ |
2749 | void |
2741 | void |
2750 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2742 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2751 | { |
2743 | { |
… | |
… | |
3405 | * EXT: SelectionRequest |
3397 | * EXT: SelectionRequest |
3406 | */ |
3398 | */ |
3407 | void |
3399 | void |
3408 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3400 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3409 | { |
3401 | { |
|
|
3402 | Atom property = rq.property == None ? rq.target : rq.property; |
3410 | XSelectionEvent ev; |
3403 | XSelectionEvent ev; |
3411 | |
3404 | |
3412 | ev.type = SelectionNotify; |
3405 | ev.type = SelectionNotify; |
3413 | ev.property = None; |
3406 | ev.property = None; |
3414 | ev.display = rq.display; |
3407 | ev.display = rq.display; |
… | |
… | |
3429 | *target++ = xa[XA_COMPOUND_TEXT]; |
3422 | *target++ = xa[XA_COMPOUND_TEXT]; |
3430 | #if X_HAVE_UTF8_STRING |
3423 | #if X_HAVE_UTF8_STRING |
3431 | *target++ = xa[XA_UTF8_STRING]; |
3424 | *target++ = xa[XA_UTF8_STRING]; |
3432 | #endif |
3425 | #endif |
3433 | |
3426 | |
3434 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3427 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3435 | 32, PropModeReplace, |
3428 | 32, PropModeReplace, |
3436 | (unsigned char *)target_list, target - target_list); |
3429 | (unsigned char *)target_list, target - target_list); |
3437 | ev.property = rq.property; |
3430 | ev.property = property; |
3438 | } |
3431 | } |
3439 | #if TODO // TODO |
3432 | #if TODO // TODO |
3440 | else if (rq.target == xa[XA_MULTIPLE]) |
3433 | else if (rq.target == xa[XA_MULTIPLE]) |
3441 | { |
3434 | { |
3442 | /* TODO: Handle MULTIPLE */ |
3435 | /* TODO: Handle MULTIPLE */ |
3443 | } |
3436 | } |
3444 | #endif |
3437 | #endif |
3445 | 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) |
3446 | { |
3439 | { |
3447 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3440 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3448 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3441 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3449 | ev.property = rq.property; |
3442 | ev.property = property; |
3450 | } |
3443 | } |
3451 | 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) |
3452 | { |
3445 | { |
3453 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3446 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3454 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3447 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3455 | ev.property = rq.property; |
3448 | ev.property = property; |
3456 | } |
3449 | } |
3457 | else if (rq.target == XA_STRING |
3450 | else if (rq.target == XA_STRING |
3458 | || rq.target == xa[XA_TEXT] |
3451 | || rq.target == xa[XA_TEXT] |
3459 | || rq.target == xa[XA_COMPOUND_TEXT] |
3452 | || rq.target == xa[XA_COMPOUND_TEXT] |
3460 | || rq.target == xa[XA_UTF8_STRING] |
3453 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3531 | ct.value = (unsigned char *)cl; |
3524 | ct.value = (unsigned char *)cl; |
3532 | ct.nitems = selectlen; |
3525 | ct.nitems = selectlen; |
3533 | ct.encoding = target; |
3526 | ct.encoding = target; |
3534 | } |
3527 | } |
3535 | |
3528 | |
3536 | XChangeProperty (dpy, rq.requestor, rq.property, |
3529 | XChangeProperty (dpy, rq.requestor, property, |
3537 | ct.encoding, 8, PropModeReplace, |
3530 | ct.encoding, 8, PropModeReplace, |
3538 | ct.value, (int)ct.nitems); |
3531 | ct.value, (int)ct.nitems); |
3539 | ev.property = rq.property; |
3532 | ev.property = property; |
3540 | |
3533 | |
3541 | if (freect) |
3534 | if (freect) |
3542 | XFree (ct.value); |
3535 | XFree (ct.value); |
3543 | } |
3536 | } |
3544 | |
3537 | |