… | |
… | |
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)))) |
… | |
… | |
203 | term_start = 0; |
201 | term_start = 0; |
204 | |
202 | |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
207 | |
205 | |
208 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
211 | |
209 | |
212 | for (int row = nrow; row--; ) |
210 | for (int row = nrow; row--; ) |
213 | { |
211 | { |
… | |
… | |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
273 | 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); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
275 | } |
278 | |
276 | |
279 | line_t *old_buf = row_buf; |
277 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
278 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
281 | |
279 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
285 | |
283 | |
… | |
… | |
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 (); |
… | |
… | |
644 | |
643 | |
645 | top_row = max (top_row - count, -saveLines); |
644 | top_row = max (top_row - count, -saveLines); |
646 | |
645 | |
647 | // sever bottommost line |
646 | // sever bottommost line |
648 | { |
647 | { |
649 | line_t &l = ROW(row2 - 1); |
648 | line_t &l = ROW(row2); |
650 | l.is_longer (0); |
649 | l.is_longer (0); |
651 | l.touch (); |
650 | l.touch (); |
652 | } |
651 | } |
653 | |
652 | |
654 | // scroll everything up 'count' lines |
653 | // scroll everything up 'count' lines |
… | |
… | |
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; |
… | |
… | |
734 | } |
729 | } |
735 | |
730 | |
736 | // use a simple and robust scrolling algorithm, this |
731 | // use a simple and robust scrolling algorithm, this |
737 | // part of scr_scroll_text is not time-critical. |
732 | // part of scr_scroll_text is not time-critical. |
738 | |
733 | |
|
|
734 | // sever line above scroll region |
|
|
735 | if (row1) |
|
|
736 | { |
|
|
737 | line_t &l = ROW(row1 - 1); |
|
|
738 | l.is_longer (0); |
|
|
739 | l.touch (); |
|
|
740 | } |
|
|
741 | |
739 | int rows = row2 - row1 + 1; |
742 | int rows = row2 - row1 + 1; |
740 | |
743 | |
741 | min_it (count, rows); |
744 | min_it (count, rows); |
742 | |
745 | |
743 | line_t *temp_buf = row_buf + total_rows; |
746 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
744 | |
747 | |
745 | for (int row = 0; row < rows; row++) |
748 | for (int row = 0; row < rows; row++) |
746 | { |
749 | { |
747 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
750 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
748 | |
751 | |
… | |
… | |
750 | scr_blank_screen_mem (temp_buf [row], rstyle); |
753 | scr_blank_screen_mem (temp_buf [row], rstyle); |
751 | } |
754 | } |
752 | |
755 | |
753 | for (int row = 0; row < rows; row++) |
756 | for (int row = 0; row < rows; row++) |
754 | ROW(row1 + row) = temp_buf [row]; |
757 | ROW(row1 + row) = temp_buf [row]; |
|
|
758 | |
|
|
759 | // sever bottommost line |
|
|
760 | { |
|
|
761 | line_t &l = ROW(row2); |
|
|
762 | l.is_longer (0); |
|
|
763 | l.touch (); |
|
|
764 | } |
755 | } |
765 | } |
756 | |
766 | |
757 | return count; |
767 | return count; |
758 | } |
768 | } |
759 | |
769 | |
… | |
… | |
765 | 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 |
766 | { |
776 | { |
767 | if (len <= 0) /* sanity */ |
777 | if (len <= 0) /* sanity */ |
768 | return; |
778 | return; |
769 | |
779 | |
770 | unsigned char checksel; |
780 | bool checksel; |
771 | unicode_t c; |
781 | unicode_t c; |
772 | int ncol = this->ncol; |
782 | int ncol = this->ncol; |
773 | const wchar_t *strend = str + len; |
783 | const wchar_t *strend = str + len; |
774 | |
784 | |
775 | want_refresh = 1; |
785 | want_refresh = 1; |
… | |
… | |
2032 | * A: set up vars |
2042 | * A: set up vars |
2033 | */ |
2043 | */ |
2034 | refresh_count = 0; |
2044 | refresh_count = 0; |
2035 | |
2045 | |
2036 | unsigned int old_screen_flags = screen.flags; |
2046 | unsigned int old_screen_flags = screen.flags; |
2037 | char have_bg = 0; |
2047 | bool have_bg = 0; |
2038 | #ifdef HAVE_BG_PIXMAP |
2048 | #ifdef HAVE_BG_PIXMAP |
2039 | have_bg = bg_pixmap != None; |
2049 | have_bg = bg_pixmap != None; |
2040 | #endif |
2050 | #endif |
2041 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2051 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2042 | |
2052 | |
… | |
… | |
2048 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2049 | #if ENABLE_OVERLAY |
2059 | #if ENABLE_OVERLAY |
2050 | scr_swap_overlay (); |
2060 | scr_swap_overlay (); |
2051 | #endif |
2061 | #endif |
2052 | |
2062 | |
2053 | char showcursor = screen.flags & Screen_VisibleCursor; |
2063 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2054 | |
2064 | |
2055 | /* |
2065 | /* |
2056 | * C: set the cursor character (s) |
2066 | * C: set the cursor character (s) |
2057 | */ |
2067 | */ |
2058 | { |
2068 | { |
2059 | unsigned char setoldcursor; |
2069 | bool setoldcursor; |
2060 | |
2070 | |
2061 | #ifdef CURSOR_BLINK |
2071 | #ifdef CURSOR_BLINK |
2062 | if (hidden_cursor) |
2072 | if (hidden_cursor) |
2063 | showcursor = 0; |
2073 | showcursor = 0; |
2064 | #endif |
2074 | #endif |
… | |
… | |
2548 | { |
2558 | { |
2549 | if (transparent) |
2559 | if (transparent) |
2550 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2560 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2551 | else |
2561 | else |
2552 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2562 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2553 | scrollBar.state = STATE_IDLE; |
2563 | scrollBar.state = SB_STATE_IDLE; |
2554 | scrollBar.show (0); |
2564 | scrollBar.show (0); |
2555 | } |
2565 | } |
2556 | |
2566 | |
2557 | if (refresh) |
2567 | if (refresh) |
2558 | { |
2568 | { |
… | |
… | |
2681 | * CHARACTER SELECTION * |
2691 | * CHARACTER SELECTION * |
2682 | * ------------------------------------------------------------------------- */ |
2692 | * ------------------------------------------------------------------------- */ |
2683 | void |
2693 | void |
2684 | rxvt_term::selection_check (int check_more) NOTHROW |
2694 | rxvt_term::selection_check (int check_more) NOTHROW |
2685 | { |
2695 | { |
2686 | row_col_t pos; |
|
|
2687 | |
|
|
2688 | if (!selection.op) |
2696 | if (!selection.op) |
2689 | return; |
2697 | return; |
2690 | |
2698 | |
|
|
2699 | row_col_t pos; |
2691 | pos.row = pos.col = 0; |
2700 | pos.row = pos.col = 0; |
|
|
2701 | |
2692 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2702 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2693 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
|
|
2694 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2703 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2695 | || (check_more == 1 |
2704 | || (check_more == 1 |
2696 | && current_screen == selection.screen |
2705 | && current_screen == selection.screen |
2697 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2706 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2698 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2707 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2699 | || (check_more == 2 |
2708 | || (check_more == 2 |
2700 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2709 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2701 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2710 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2702 | || (check_more == 3 |
2711 | || (check_more == 3 |
2703 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2712 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2704 | || (check_more == 4 /* screen width change */ |
|
|
2705 | && (selection.beg.row != selection.end.row |
|
|
2706 | || selection.end.col > ncol))) |
|
|
2707 | CLEAR_SELECTION (); |
2713 | CLEAR_SELECTION (); |
|
|
2714 | |
|
|
2715 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
|
|
2716 | CLEAR_SELECTION_MARK (); |
2708 | } |
2717 | } |
2709 | |
2718 | |
2710 | /* ------------------------------------------------------------------------- */ |
2719 | /* ------------------------------------------------------------------------- */ |
2711 | /* |
2720 | /* |
2712 | * Paste a selection direct to the command fd |
2721 | * Paste a selection direct to the command fd |