… | |
… | |
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 | { |
… | |
… | |
799 | |
801 | |
800 | while (str < strend) |
802 | while (str < strend) |
801 | { |
803 | { |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
804 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
803 | |
805 | |
804 | if (expect_false (c < 0x20)) |
806 | if (ecb_unlikely (c < 0x20)) |
805 | if (c == C0_LF) |
807 | if (c == C0_LF) |
806 | { |
808 | { |
807 | max_it (line->l, screen.cur.col); |
809 | max_it (line->l, screen.cur.col); |
808 | |
810 | |
809 | screen.flags &= ~Screen_WrapNext; |
811 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
828 | { |
830 | { |
829 | scr_tab (1, true); |
831 | scr_tab (1, true); |
830 | continue; |
832 | continue; |
831 | } |
833 | } |
832 | |
834 | |
833 | if (expect_false ( |
835 | if (ecb_unlikely ( |
834 | checksel /* see if we're writing within selection */ |
836 | checksel /* see if we're writing within selection */ |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
837 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
838 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
837 | )) |
839 | )) |
838 | { |
840 | { |
… | |
… | |
843 | * should be a similar check. |
845 | * should be a similar check. |
844 | */ |
846 | */ |
845 | CLEAR_SELECTION (); |
847 | CLEAR_SELECTION (); |
846 | } |
848 | } |
847 | |
849 | |
848 | if (expect_false (screen.flags & Screen_WrapNext)) |
850 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
849 | { |
851 | { |
850 | scr_do_wrap (); |
852 | scr_do_wrap (); |
851 | |
853 | |
852 | line->l = ncol; |
854 | line->l = ncol; |
853 | line->is_longer (1); |
855 | line->is_longer (1); |
… | |
… | |
855 | row = screen.cur.row; |
857 | row = screen.cur.row; |
856 | line = &ROW(row); /* _must_ refresh */ |
858 | line = &ROW(row); /* _must_ refresh */ |
857 | } |
859 | } |
858 | |
860 | |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
861 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
862 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
861 | c = 0xfffd; |
863 | c = 0xfffd; |
862 | |
864 | |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
865 | // rely on wcwidth to tell us the character width, do wcwidth before |
864 | // further replacements, as wcwidth might return -1 for the line |
866 | // further replacements, as wcwidth might return -1 for the line |
865 | // drawing characters below as they might be invalid in the current |
867 | // drawing characters below as they might be invalid in the current |
866 | // locale. |
868 | // locale. |
867 | int width = WCWIDTH (c); |
869 | int width = WCWIDTH (c); |
868 | |
870 | |
869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
871 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
870 | { |
872 | { |
871 | // vt100 special graphics and line drawing |
873 | // vt100 special graphics and line drawing |
872 | // 5f-7e standard vt100 |
874 | // 5f-7e standard vt100 |
873 | // 40-5e rxvt extension for extra curses acs chars |
875 | // 40-5e rxvt extension for extra curses acs chars |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
876 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
887 | c = vt100_0[c - 0x41]; |
889 | c = vt100_0[c - 0x41]; |
888 | width = 1; // vt100 line drawing characters are always single-width |
890 | width = 1; // vt100 line drawing characters are always single-width |
889 | } |
891 | } |
890 | } |
892 | } |
891 | |
893 | |
892 | if (expect_false (screen.flags & Screen_Insert)) |
894 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
893 | scr_insdel_chars (width, INSERT); |
895 | scr_insdel_chars (width, INSERT); |
894 | |
896 | |
895 | if (width != 0) |
897 | if (width != 0) |
896 | { |
898 | { |
897 | #if !UNICODE_3 |
899 | #if !UNICODE_3 |
… | |
… | |
905 | #endif |
907 | #endif |
906 | |
908 | |
907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
909 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
908 | |
910 | |
909 | // if the character doesn't fit into the remaining columns... |
911 | // if the character doesn't fit into the remaining columns... |
910 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
912 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
911 | { |
913 | { |
912 | if (screen.flags & Screen_Autowrap) |
914 | if (screen.flags & Screen_Autowrap) |
913 | { |
915 | { |
914 | // ... artificially enlargen the previous one |
916 | // ... artificially enlargen the previous one |
915 | c = NOCHAR; |
917 | c = NOCHAR; |
… | |
… | |
922 | |
924 | |
923 | // nuke the character at this position, if required |
925 | // nuke the character at this position, if required |
924 | // due to wonderful coincidences everywhere else in this loop |
926 | // due to wonderful coincidences everywhere else in this loop |
925 | // we never have to check for overwriting a wide char itself, |
927 | // we never have to check for overwriting a wide char itself, |
926 | // only its tail. |
928 | // only its tail. |
927 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
929 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
928 | scr_kill_char (*line, screen.cur.col); |
930 | scr_kill_char (*line, screen.cur.col); |
929 | |
931 | |
930 | line->touch (); |
932 | line->touch (); |
931 | |
933 | |
932 | do |
934 | do |
933 | { |
935 | { |
934 | line->t[screen.cur.col] = c; |
936 | line->t[screen.cur.col] = c; |
935 | line->r[screen.cur.col] = rend; |
937 | line->r[screen.cur.col] = rend; |
936 | |
938 | |
937 | if (expect_true (screen.cur.col < ncol - 1)) |
939 | if (ecb_likely (screen.cur.col < ncol - 1)) |
938 | screen.cur.col++; |
940 | screen.cur.col++; |
939 | else |
941 | else |
940 | { |
942 | { |
941 | line->l = ncol; |
943 | line->l = ncol; |
942 | if (screen.flags & Screen_Autowrap) |
944 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
945 | goto end_of_line; |
947 | goto end_of_line; |
946 | } |
948 | } |
947 | |
949 | |
948 | c = NOCHAR; |
950 | c = NOCHAR; |
949 | } |
951 | } |
950 | while (expect_false (--width > 0)); |
952 | while (ecb_unlikely (--width > 0)); |
951 | |
953 | |
952 | // pad with spaces when overwriting wide character with smaller one |
954 | // 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++) |
955 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
954 | { |
956 | { |
955 | line->t[c] = ' '; |
957 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
958 | line->r[c] = rend; |
957 | } |
959 | } |
958 | |
960 | |
… | |
… | |
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1949 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1948 | #endif |
1950 | #endif |
1949 | } |
1951 | } |
1950 | |
1952 | |
1951 | /* ------------------------------------------------------------------------- */ |
1953 | /* ------------------------------------------------------------------------- */ |
1952 | /* ARGSUSED */ |
|
|
1953 | void |
1954 | void |
1954 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | { |
1956 | { |
1956 | #ifdef PRINTPIPE |
1957 | #ifdef PRINTPIPE |
1957 | int nrows, row_start; |
1958 | int nrows, row_start; |
… | |
… | |
2235 | continue; |
2236 | continue; |
2236 | |
2237 | |
2237 | // redraw one or more characters |
2238 | // redraw one or more characters |
2238 | |
2239 | |
2239 | // seek to the beginning of wide characters |
2240 | // seek to the beginning of wide characters |
2240 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2241 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2241 | --col; |
2242 | --col; |
2242 | |
2243 | |
2243 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2244 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2244 | text_t *text = stp + col; |
2245 | text_t *text = stp + col; |
2245 | int count = 1; |
2246 | int count = 1; |
… | |
… | |
2283 | |
2284 | |
2284 | col--; /* went one too far. move back */ |
2285 | col--; /* went one too far. move back */ |
2285 | count -= i; /* dump any matching trailing chars */ |
2286 | count -= i; /* dump any matching trailing chars */ |
2286 | |
2287 | |
2287 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | while (expect_false (i && text[count] == NOCHAR)) |
2289 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2289 | count++, i--; |
2290 | count++, i--; |
2290 | |
2291 | |
2291 | /* |
2292 | /* |
2292 | * Determine the attributes for the string |
2293 | * Determine the attributes for the string |
2293 | */ |
2294 | */ |
2294 | int fore = fgcolor_of (rend); // desired foreground |
2295 | int fore = fgcolor_of (rend); // desired foreground |
2295 | int back = bgcolor_of (rend); // desired background |
2296 | int back = bgcolor_of (rend); // desired background |
2296 | |
2297 | |
2297 | // only do special processing if any attributes are set, which is unlikely |
2298 | // only do special processing if any attributes are set, which is unlikely |
2298 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2299 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2299 | { |
2300 | { |
2300 | bool invert = rend & RS_RVid; |
2301 | bool invert = rend & RS_RVid; |
2301 | |
2302 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | if (rend & RS_Bold && fore == Color_fg) |
2304 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2392 | /* |
2393 | /* |
2393 | * Actually do the drawing of the string here |
2394 | * Actually do the drawing of the string here |
2394 | */ |
2395 | */ |
2395 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2396 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2396 | |
2397 | |
2397 | if (expect_true (have_bg && back == Color_bg)) |
2398 | if (ecb_likely (have_bg && back == Color_bg)) |
2398 | { |
2399 | { |
2399 | // this is very ugly, maybe push it into ->draw? |
2400 | // this is very ugly, maybe push it into ->draw? |
2400 | |
2401 | |
2401 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2402 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2402 | if (text[i] != ' ') |
2403 | if (text[i] != ' ') |
… | |
… | |
2409 | did_clear: ; |
2410 | did_clear: ; |
2410 | } |
2411 | } |
2411 | else |
2412 | else |
2412 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2413 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2413 | |
2414 | |
2414 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2415 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2415 | { |
2416 | { |
2416 | #if ENABLE_FRILLS |
2417 | #if ENABLE_FRILLS |
2417 | if (ISSET_PIXCOLOR (Color_underline)) |
2418 | if (ISSET_PIXCOLOR (Color_underline)) |
2418 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2419 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2419 | else |
2420 | else |
… | |
… | |
2736 | tt_paste (data, len); |
2737 | tt_paste (data, len); |
2737 | } |
2738 | } |
2738 | |
2739 | |
2739 | /* ------------------------------------------------------------------------- */ |
2740 | /* ------------------------------------------------------------------------- */ |
2740 | /* |
2741 | /* |
2741 | * Request the current selection: |
2742 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2742 | * Order: > internal selection if available |
2743 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2743 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2744 | * 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 |
2745 | * EXT: button 2 release |
2748 | */ |
2746 | */ |
2749 | void |
2747 | void |
2750 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2748 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2751 | { |
2749 | { |
… | |
… | |
3405 | * EXT: SelectionRequest |
3403 | * EXT: SelectionRequest |
3406 | */ |
3404 | */ |
3407 | void |
3405 | void |
3408 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3406 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3409 | { |
3407 | { |
|
|
3408 | Atom property = rq.property == None ? rq.target : rq.property; |
3410 | XSelectionEvent ev; |
3409 | XSelectionEvent ev; |
3411 | |
3410 | |
3412 | ev.type = SelectionNotify; |
3411 | ev.type = SelectionNotify; |
3413 | ev.property = None; |
3412 | ev.property = None; |
3414 | ev.display = rq.display; |
3413 | ev.display = rq.display; |
… | |
… | |
3429 | *target++ = xa[XA_COMPOUND_TEXT]; |
3428 | *target++ = xa[XA_COMPOUND_TEXT]; |
3430 | #if X_HAVE_UTF8_STRING |
3429 | #if X_HAVE_UTF8_STRING |
3431 | *target++ = xa[XA_UTF8_STRING]; |
3430 | *target++ = xa[XA_UTF8_STRING]; |
3432 | #endif |
3431 | #endif |
3433 | |
3432 | |
3434 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3433 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3435 | 32, PropModeReplace, |
3434 | 32, PropModeReplace, |
3436 | (unsigned char *)target_list, target - target_list); |
3435 | (unsigned char *)target_list, target - target_list); |
3437 | ev.property = rq.property; |
3436 | ev.property = property; |
3438 | } |
3437 | } |
3439 | #if TODO // TODO |
3438 | #if TODO // TODO |
3440 | else if (rq.target == xa[XA_MULTIPLE]) |
3439 | else if (rq.target == xa[XA_MULTIPLE]) |
3441 | { |
3440 | { |
3442 | /* TODO: Handle MULTIPLE */ |
3441 | /* TODO: Handle MULTIPLE */ |
3443 | } |
3442 | } |
3444 | #endif |
3443 | #endif |
3445 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3444 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3446 | { |
3445 | { |
3447 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3446 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3448 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3447 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3449 | ev.property = rq.property; |
3448 | ev.property = property; |
3450 | } |
3449 | } |
3451 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3450 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3452 | { |
3451 | { |
3453 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3452 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3454 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3453 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3455 | ev.property = rq.property; |
3454 | ev.property = property; |
3456 | } |
3455 | } |
3457 | else if (rq.target == XA_STRING |
3456 | else if (rq.target == XA_STRING |
3458 | || rq.target == xa[XA_TEXT] |
3457 | || rq.target == xa[XA_TEXT] |
3459 | || rq.target == xa[XA_COMPOUND_TEXT] |
3458 | || rq.target == xa[XA_COMPOUND_TEXT] |
3460 | || rq.target == xa[XA_UTF8_STRING] |
3459 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3531 | ct.value = (unsigned char *)cl; |
3530 | ct.value = (unsigned char *)cl; |
3532 | ct.nitems = selectlen; |
3531 | ct.nitems = selectlen; |
3533 | ct.encoding = target; |
3532 | ct.encoding = target; |
3534 | } |
3533 | } |
3535 | |
3534 | |
3536 | XChangeProperty (dpy, rq.requestor, rq.property, |
3535 | XChangeProperty (dpy, rq.requestor, property, |
3537 | ct.encoding, 8, PropModeReplace, |
3536 | ct.encoding, 8, PropModeReplace, |
3538 | ct.value, (int)ct.nitems); |
3537 | ct.value, (int)ct.nitems); |
3539 | ev.property = rq.property; |
3538 | ev.property = property; |
3540 | |
3539 | |
3541 | if (freect) |
3540 | if (freect) |
3542 | XFree (ct.value); |
3541 | XFree (ct.value); |
3543 | } |
3542 | } |
3544 | |
3543 | |