… | |
… | |
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 - 1); |
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; |
666 | l.f = 0; |
680 | l.f = 0; |
667 | } |
681 | } |
668 | else |
682 | else |
669 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
670 | } |
|
|
671 | |
|
|
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 | } |
684 | } |
683 | |
685 | |
684 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
685 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
686 | { |
688 | { |
… | |
… | |
732 | } |
734 | } |
733 | |
735 | |
734 | // use a simple and robust scrolling algorithm, this |
736 | // use a simple and robust scrolling algorithm, this |
735 | // part of scr_scroll_text is not time-critical. |
737 | // part of scr_scroll_text is not time-critical. |
736 | |
738 | |
|
|
739 | // sever line above scroll region |
|
|
740 | if (row1) |
|
|
741 | { |
|
|
742 | line_t &l = ROW(row1 - 1); |
|
|
743 | l.is_longer (0); |
|
|
744 | l.touch (); |
|
|
745 | } |
|
|
746 | |
737 | int rows = row2 - row1 + 1; |
747 | int rows = row2 - row1 + 1; |
738 | |
748 | |
739 | min_it (count, rows); |
749 | min_it (count, rows); |
740 | |
750 | |
741 | line_t *temp_buf = row_buf + total_rows; |
751 | line_t *temp_buf = row_buf + total_rows; |
… | |
… | |
748 | scr_blank_screen_mem (temp_buf [row], rstyle); |
758 | scr_blank_screen_mem (temp_buf [row], rstyle); |
749 | } |
759 | } |
750 | |
760 | |
751 | for (int row = 0; row < rows; row++) |
761 | for (int row = 0; row < rows; row++) |
752 | ROW(row1 + row) = temp_buf [row]; |
762 | ROW(row1 + row) = temp_buf [row]; |
|
|
763 | |
|
|
764 | // sever bottommost line |
|
|
765 | { |
|
|
766 | line_t &l = ROW(row2 - 1); |
|
|
767 | l.is_longer (0); |
|
|
768 | l.touch (); |
|
|
769 | } |
|
|
770 | |
753 | } |
771 | } |
754 | |
772 | |
755 | return count; |
773 | return count; |
756 | } |
774 | } |
757 | |
775 | |
… | |
… | |
799 | |
817 | |
800 | while (str < strend) |
818 | while (str < strend) |
801 | { |
819 | { |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
820 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
803 | |
821 | |
804 | if (expect_false (c < 0x20)) |
822 | if (ecb_unlikely (c < 0x20)) |
805 | if (c == C0_LF) |
823 | if (c == C0_LF) |
806 | { |
824 | { |
807 | max_it (line->l, screen.cur.col); |
825 | max_it (line->l, screen.cur.col); |
808 | |
826 | |
809 | screen.flags &= ~Screen_WrapNext; |
827 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
828 | { |
846 | { |
829 | scr_tab (1, true); |
847 | scr_tab (1, true); |
830 | continue; |
848 | continue; |
831 | } |
849 | } |
832 | |
850 | |
833 | if (expect_false ( |
851 | if (ecb_unlikely ( |
834 | checksel /* see if we're writing within selection */ |
852 | checksel /* see if we're writing within selection */ |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
853 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
854 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
837 | )) |
855 | )) |
838 | { |
856 | { |
… | |
… | |
843 | * should be a similar check. |
861 | * should be a similar check. |
844 | */ |
862 | */ |
845 | CLEAR_SELECTION (); |
863 | CLEAR_SELECTION (); |
846 | } |
864 | } |
847 | |
865 | |
848 | if (expect_false (screen.flags & Screen_WrapNext)) |
866 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
849 | { |
867 | { |
850 | scr_do_wrap (); |
868 | scr_do_wrap (); |
851 | |
869 | |
852 | line->l = ncol; |
870 | line->l = ncol; |
853 | line->is_longer (1); |
871 | line->is_longer (1); |
… | |
… | |
855 | row = screen.cur.row; |
873 | row = screen.cur.row; |
856 | line = &ROW(row); /* _must_ refresh */ |
874 | line = &ROW(row); /* _must_ refresh */ |
857 | } |
875 | } |
858 | |
876 | |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
877 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
878 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
861 | c = 0xfffd; |
879 | c = 0xfffd; |
862 | |
880 | |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
881 | // rely on wcwidth to tell us the character width, do wcwidth before |
864 | // further replacements, as wcwidth might return -1 for the line |
882 | // further replacements, as wcwidth might return -1 for the line |
865 | // drawing characters below as they might be invalid in the current |
883 | // drawing characters below as they might be invalid in the current |
866 | // locale. |
884 | // locale. |
867 | int width = WCWIDTH (c); |
885 | int width = WCWIDTH (c); |
868 | |
886 | |
869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
887 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
870 | { |
888 | { |
871 | // vt100 special graphics and line drawing |
889 | // vt100 special graphics and line drawing |
872 | // 5f-7e standard vt100 |
890 | // 5f-7e standard vt100 |
873 | // 40-5e rxvt extension for extra curses acs chars |
891 | // 40-5e rxvt extension for extra curses acs chars |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
892 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
887 | c = vt100_0[c - 0x41]; |
905 | c = vt100_0[c - 0x41]; |
888 | width = 1; // vt100 line drawing characters are always single-width |
906 | width = 1; // vt100 line drawing characters are always single-width |
889 | } |
907 | } |
890 | } |
908 | } |
891 | |
909 | |
892 | if (expect_false (screen.flags & Screen_Insert)) |
910 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
893 | scr_insdel_chars (width, INSERT); |
911 | scr_insdel_chars (width, INSERT); |
894 | |
912 | |
895 | if (width != 0) |
913 | if (width != 0) |
896 | { |
914 | { |
897 | #if !UNICODE_3 |
915 | #if !UNICODE_3 |
… | |
… | |
905 | #endif |
923 | #endif |
906 | |
924 | |
907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
925 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
908 | |
926 | |
909 | // if the character doesn't fit into the remaining columns... |
927 | // if the character doesn't fit into the remaining columns... |
910 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
928 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
911 | { |
929 | { |
912 | if (screen.flags & Screen_Autowrap) |
930 | if (screen.flags & Screen_Autowrap) |
913 | { |
931 | { |
914 | // ... artificially enlargen the previous one |
932 | // ... artificially enlargen the previous one |
915 | c = NOCHAR; |
933 | c = NOCHAR; |
… | |
… | |
922 | |
940 | |
923 | // nuke the character at this position, if required |
941 | // nuke the character at this position, if required |
924 | // due to wonderful coincidences everywhere else in this loop |
942 | // due to wonderful coincidences everywhere else in this loop |
925 | // we never have to check for overwriting a wide char itself, |
943 | // we never have to check for overwriting a wide char itself, |
926 | // only its tail. |
944 | // only its tail. |
927 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
945 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
928 | scr_kill_char (*line, screen.cur.col); |
946 | scr_kill_char (*line, screen.cur.col); |
929 | |
947 | |
930 | line->touch (); |
948 | line->touch (); |
931 | |
949 | |
932 | do |
950 | do |
933 | { |
951 | { |
934 | line->t[screen.cur.col] = c; |
952 | line->t[screen.cur.col] = c; |
935 | line->r[screen.cur.col] = rend; |
953 | line->r[screen.cur.col] = rend; |
936 | |
954 | |
937 | if (expect_true (screen.cur.col < ncol - 1)) |
955 | if (ecb_likely (screen.cur.col < ncol - 1)) |
938 | screen.cur.col++; |
956 | screen.cur.col++; |
939 | else |
957 | else |
940 | { |
958 | { |
941 | line->l = ncol; |
959 | line->l = ncol; |
942 | if (screen.flags & Screen_Autowrap) |
960 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
945 | goto end_of_line; |
963 | goto end_of_line; |
946 | } |
964 | } |
947 | |
965 | |
948 | c = NOCHAR; |
966 | c = NOCHAR; |
949 | } |
967 | } |
950 | while (expect_false (--width > 0)); |
968 | while (ecb_unlikely (--width > 0)); |
951 | |
969 | |
952 | // pad with spaces when overwriting wide character with smaller one |
970 | // 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++) |
971 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
954 | { |
972 | { |
955 | line->t[c] = ' '; |
973 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
974 | line->r[c] = rend; |
957 | } |
975 | } |
958 | |
976 | |
… | |
… | |
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1965 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1948 | #endif |
1966 | #endif |
1949 | } |
1967 | } |
1950 | |
1968 | |
1951 | /* ------------------------------------------------------------------------- */ |
1969 | /* ------------------------------------------------------------------------- */ |
1952 | /* ARGSUSED */ |
|
|
1953 | void |
1970 | void |
1954 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1971 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | { |
1972 | { |
1956 | #ifdef PRINTPIPE |
1973 | #ifdef PRINTPIPE |
1957 | int nrows, row_start; |
1974 | int nrows, row_start; |
… | |
… | |
2235 | continue; |
2252 | continue; |
2236 | |
2253 | |
2237 | // redraw one or more characters |
2254 | // redraw one or more characters |
2238 | |
2255 | |
2239 | // seek to the beginning of wide characters |
2256 | // seek to the beginning of wide characters |
2240 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2257 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2241 | --col; |
2258 | --col; |
2242 | |
2259 | |
2243 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2260 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2244 | text_t *text = stp + col; |
2261 | text_t *text = stp + col; |
2245 | int count = 1; |
2262 | int count = 1; |
… | |
… | |
2283 | |
2300 | |
2284 | col--; /* went one too far. move back */ |
2301 | col--; /* went one too far. move back */ |
2285 | count -= i; /* dump any matching trailing chars */ |
2302 | count -= i; /* dump any matching trailing chars */ |
2286 | |
2303 | |
2287 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2304 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | while (expect_false (i && text[count] == NOCHAR)) |
2305 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2289 | count++, i--; |
2306 | count++, i--; |
2290 | |
2307 | |
2291 | /* |
2308 | /* |
2292 | * Determine the attributes for the string |
2309 | * Determine the attributes for the string |
2293 | */ |
2310 | */ |
2294 | int fore = fgcolor_of (rend); // desired foreground |
2311 | int fore = fgcolor_of (rend); // desired foreground |
2295 | int back = bgcolor_of (rend); // desired background |
2312 | int back = bgcolor_of (rend); // desired background |
2296 | |
2313 | |
2297 | // only do special processing if any attributes are set, which is unlikely |
2314 | // only do special processing if any attributes are set, which is unlikely |
2298 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2315 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2299 | { |
2316 | { |
2300 | bool invert = rend & RS_RVid; |
2317 | bool invert = rend & RS_RVid; |
2301 | |
2318 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2319 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | if (rend & RS_Bold && fore == Color_fg) |
2320 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2392 | /* |
2409 | /* |
2393 | * Actually do the drawing of the string here |
2410 | * Actually do the drawing of the string here |
2394 | */ |
2411 | */ |
2395 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2412 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2396 | |
2413 | |
2397 | if (expect_true (have_bg && back == Color_bg)) |
2414 | if (ecb_likely (have_bg && back == Color_bg)) |
2398 | { |
2415 | { |
2399 | // this is very ugly, maybe push it into ->draw? |
2416 | // this is very ugly, maybe push it into ->draw? |
2400 | |
2417 | |
2401 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2418 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2402 | if (text[i] != ' ') |
2419 | if (text[i] != ' ') |
… | |
… | |
2409 | did_clear: ; |
2426 | did_clear: ; |
2410 | } |
2427 | } |
2411 | else |
2428 | else |
2412 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2429 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2413 | |
2430 | |
2414 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2431 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2415 | { |
2432 | { |
2416 | #if ENABLE_FRILLS |
2433 | #if ENABLE_FRILLS |
2417 | if (ISSET_PIXCOLOR (Color_underline)) |
2434 | if (ISSET_PIXCOLOR (Color_underline)) |
2418 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2435 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2419 | else |
2436 | else |