… | |
… | |
49 | if (option (Opt_scrollTtyOutput)) \ |
49 | if (option (Opt_scrollTtyOutput)) \ |
50 | view_start = 0 |
50 | view_start = 0 |
51 | #define CLEAR_SELECTION() \ |
51 | #define CLEAR_SELECTION() \ |
52 | selection.beg.row = selection.beg.col \ |
52 | selection.beg.row = selection.beg.col \ |
53 | = selection.end.row = selection.end.col = 0 |
53 | = selection.end.row = selection.end.col = 0 |
54 | #define CLEAR_ALL_SELECTION() \ |
54 | #define CLEAR_SELECTION_MARK() \ |
55 | selection.beg.row = selection.beg.col \ |
|
|
56 | = selection.mark.row = selection.mark.col \ |
|
|
57 | = selection.end.row = selection.end.col = 0 |
55 | selection.mark.row = selection.mark.col = 0 |
58 | |
56 | |
59 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
57 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
60 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
58 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
61 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
59 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
62 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
60 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
… | |
… | |
405 | tabs = (char *)rxvt_malloc (ncol); |
403 | tabs = (char *)rxvt_malloc (ncol); |
406 | |
404 | |
407 | for (int col = ncol; col--; ) |
405 | for (int col = ncol; col--; ) |
408 | tabs [col] = col % TABSIZE == 0; |
406 | tabs [col] = col % TABSIZE == 0; |
409 | |
407 | |
410 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_SELECTION (); |
|
|
409 | CLEAR_SELECTION_MARK (); |
411 | |
410 | |
412 | prev_nrow = nrow; |
411 | prev_nrow = nrow; |
413 | prev_ncol = ncol; |
412 | prev_ncol = ncol; |
414 | |
413 | |
415 | tt_winch (); |
414 | tt_winch (); |
… | |
… | |
682 | else |
681 | else |
683 | scr_blank_screen_mem (l, rstyle); |
682 | scr_blank_screen_mem (l, rstyle); |
684 | } |
683 | } |
685 | |
684 | |
686 | // move and/or clear selection, if any |
685 | // move and/or clear selection, if any |
687 | if (selection.op && current_screen == selection.screen) |
686 | if (selection.op && current_screen == selection.screen |
|
|
687 | && selection.beg.row <= row2) |
688 | { |
688 | { |
689 | selection.beg.row -= count; |
689 | selection.beg.row -= count; |
690 | selection.end.row -= count; |
690 | selection.end.row -= count; |
691 | selection.mark.row -= count; |
691 | selection.mark.row -= count; |
692 | |
692 | |
693 | if (selection.beg.row < top_row |
693 | selection_check (0); |
694 | || selection.end.row < top_row |
|
|
695 | || selection.mark.row < top_row) |
|
|
696 | { |
|
|
697 | CLEAR_ALL_SELECTION (); |
|
|
698 | selection.op = SELECTION_CLEAR; |
|
|
699 | } |
|
|
700 | } |
694 | } |
701 | |
695 | |
702 | // finally move the view window, if desired |
696 | // finally move the view window, if desired |
703 | if (option (Opt_scrollWithBuffer) |
697 | if (option (Opt_scrollWithBuffer) |
704 | && view_start != 0 |
698 | && view_start != 0 |
… | |
… | |
717 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
711 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
718 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
712 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
719 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
713 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
720 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
714 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
721 | { |
715 | { |
722 | CLEAR_ALL_SELECTION (); |
716 | CLEAR_SELECTION (); |
723 | selection.op = SELECTION_CLEAR; |
717 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
|
|
718 | CLEAR_SELECTION_MARK (); |
724 | } |
719 | } |
725 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
720 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
726 | { |
721 | { |
727 | /* move selected region too */ |
722 | /* move selected region too */ |
728 | selection.beg.row -= count; |
723 | selection.beg.row -= count; |
… | |
… | |
780 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
775 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
781 | { |
776 | { |
782 | if (len <= 0) /* sanity */ |
777 | if (len <= 0) /* sanity */ |
783 | return; |
778 | return; |
784 | |
779 | |
785 | unsigned char checksel; |
780 | bool checksel; |
786 | unicode_t c; |
781 | unicode_t c; |
787 | int ncol = this->ncol; |
782 | int ncol = this->ncol; |
788 | const wchar_t *strend = str + len; |
783 | const wchar_t *strend = str + len; |
789 | |
784 | |
790 | want_refresh = 1; |
785 | want_refresh = 1; |
… | |
… | |
2047 | * A: set up vars |
2042 | * A: set up vars |
2048 | */ |
2043 | */ |
2049 | refresh_count = 0; |
2044 | refresh_count = 0; |
2050 | |
2045 | |
2051 | unsigned int old_screen_flags = screen.flags; |
2046 | unsigned int old_screen_flags = screen.flags; |
2052 | char have_bg = 0; |
2047 | bool have_bg = 0; |
2053 | #ifdef HAVE_BG_PIXMAP |
2048 | #ifdef HAVE_BG_PIXMAP |
2054 | have_bg = bg_pixmap != None; |
2049 | have_bg = bg_pixmap != None; |
2055 | #endif |
2050 | #endif |
2056 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2051 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2057 | |
2052 | |
… | |
… | |
2063 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2064 | #if ENABLE_OVERLAY |
2059 | #if ENABLE_OVERLAY |
2065 | scr_swap_overlay (); |
2060 | scr_swap_overlay (); |
2066 | #endif |
2061 | #endif |
2067 | |
2062 | |
2068 | char showcursor = screen.flags & Screen_VisibleCursor; |
2063 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2069 | |
2064 | |
2070 | /* |
2065 | /* |
2071 | * C: set the cursor character (s) |
2066 | * C: set the cursor character (s) |
2072 | */ |
2067 | */ |
2073 | { |
2068 | { |
2074 | unsigned char setoldcursor; |
2069 | bool setoldcursor; |
2075 | |
2070 | |
2076 | #ifdef CURSOR_BLINK |
2071 | #ifdef CURSOR_BLINK |
2077 | if (hidden_cursor) |
2072 | if (hidden_cursor) |
2078 | showcursor = 0; |
2073 | showcursor = 0; |
2079 | #endif |
2074 | #endif |
… | |
… | |
2696 | * CHARACTER SELECTION * |
2691 | * CHARACTER SELECTION * |
2697 | * ------------------------------------------------------------------------- */ |
2692 | * ------------------------------------------------------------------------- */ |
2698 | void |
2693 | void |
2699 | rxvt_term::selection_check (int check_more) NOTHROW |
2694 | rxvt_term::selection_check (int check_more) NOTHROW |
2700 | { |
2695 | { |
2701 | row_col_t pos; |
|
|
2702 | |
|
|
2703 | if (!selection.op) |
2696 | if (!selection.op) |
2704 | return; |
2697 | return; |
2705 | |
2698 | |
|
|
2699 | row_col_t pos; |
2706 | pos.row = pos.col = 0; |
2700 | pos.row = pos.col = 0; |
|
|
2701 | |
2707 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2702 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2708 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
|
|
2709 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2703 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2710 | || (check_more == 1 |
2704 | || (check_more == 1 |
2711 | && current_screen == selection.screen |
2705 | && current_screen == selection.screen |
2712 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2706 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2713 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2707 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2714 | || (check_more == 2 |
2708 | || (check_more == 2 |
2715 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2709 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2716 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2710 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2717 | || (check_more == 3 |
2711 | || (check_more == 3 |
2718 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2712 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2719 | || (check_more == 4 /* screen width change */ |
|
|
2720 | && (selection.beg.row != selection.end.row |
|
|
2721 | || selection.end.col > ncol))) |
|
|
2722 | CLEAR_SELECTION (); |
2713 | CLEAR_SELECTION (); |
|
|
2714 | |
|
|
2715 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
|
|
2716 | CLEAR_SELECTION_MARK (); |
2723 | } |
2717 | } |
2724 | |
2718 | |
2725 | /* ------------------------------------------------------------------------- */ |
2719 | /* ------------------------------------------------------------------------- */ |
2726 | /* |
2720 | /* |
2727 | * Paste a selection direct to the command fd |
2721 | * Paste a selection direct to the command fd |