… | |
… | |
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 | |
… | |
… | |
644 | |
644 | |
645 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
646 | |
646 | |
647 | // sever bottommost line |
647 | // sever bottommost line |
648 | { |
648 | { |
649 | line_t &l = ROW(row2 - 1); |
649 | line_t &l = ROW(row2); |
650 | l.is_longer (0); |
650 | l.is_longer (0); |
651 | l.touch (); |
651 | l.touch (); |
652 | } |
652 | } |
653 | |
653 | |
654 | // scroll everything up 'count' lines |
654 | // scroll everything up 'count' lines |
… | |
… | |
682 | else |
682 | else |
683 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
684 | } |
684 | } |
685 | |
685 | |
686 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
687 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen |
|
|
688 | && selection.beg.row <= row2) |
688 | { |
689 | { |
689 | selection.beg.row -= count; |
690 | selection.beg.row -= count; |
690 | selection.end.row -= count; |
691 | selection.end.row -= count; |
691 | selection.mark.row -= count; |
692 | selection.mark.row -= count; |
692 | |
693 | |
693 | if (selection.beg.row < top_row |
694 | 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 | } |
695 | } |
701 | |
696 | |
702 | // finally move the view window, if desired |
697 | // finally move the view window, if desired |
703 | if (option (Opt_scrollWithBuffer) |
698 | if (option (Opt_scrollWithBuffer) |
704 | && view_start != 0 |
699 | && view_start != 0 |
… | |
… | |
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; |
… | |
… | |
1316 | ZERO_SCROLLBACK (); |
1326 | ZERO_SCROLLBACK (); |
1317 | |
1327 | |
1318 | switch (mode) |
1328 | switch (mode) |
1319 | { |
1329 | { |
1320 | case 0: /* erase to end of screen */ |
1330 | case 0: /* erase to end of screen */ |
1321 | selection_check (1); |
|
|
1322 | scr_erase_line (0); |
1331 | scr_erase_line (0); |
1323 | row = screen.cur.row + 1; /* possible OOB */ |
1332 | row = screen.cur.row + 1; /* possible OOB */ |
1324 | num = nrow - row; |
1333 | num = nrow - row; |
1325 | break; |
1334 | break; |
1326 | case 1: /* erase to beginning of screen */ |
1335 | case 1: /* erase to beginning of screen */ |
1327 | selection_check (3); |
|
|
1328 | scr_erase_line (1); |
1336 | scr_erase_line (1); |
1329 | row = 0; |
1337 | row = 0; |
1330 | num = screen.cur.row; |
1338 | num = screen.cur.row; |
1331 | break; |
1339 | break; |
1332 | case 2: /* erase whole screen */ |
1340 | case 2: /* erase whole screen */ |
1333 | selection_check (3); |
|
|
1334 | row = 0; |
1341 | row = 0; |
1335 | num = nrow; |
1342 | num = nrow; |
1336 | break; |
1343 | break; |
1337 | default: |
1344 | default: |
1338 | return; |
1345 | return; |
… | |
… | |
2032 | * A: set up vars |
2039 | * A: set up vars |
2033 | */ |
2040 | */ |
2034 | refresh_count = 0; |
2041 | refresh_count = 0; |
2035 | |
2042 | |
2036 | unsigned int old_screen_flags = screen.flags; |
2043 | unsigned int old_screen_flags = screen.flags; |
2037 | char have_bg = 0; |
2044 | bool have_bg = 0; |
2038 | #ifdef HAVE_BG_PIXMAP |
2045 | #ifdef HAVE_BG_PIXMAP |
2039 | have_bg = bg_pixmap != None; |
2046 | have_bg = bg_pixmap != None; |
2040 | #endif |
2047 | #endif |
2041 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2048 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2042 | |
2049 | |
… | |
… | |
2048 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2055 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2049 | #if ENABLE_OVERLAY |
2056 | #if ENABLE_OVERLAY |
2050 | scr_swap_overlay (); |
2057 | scr_swap_overlay (); |
2051 | #endif |
2058 | #endif |
2052 | |
2059 | |
2053 | char showcursor = screen.flags & Screen_VisibleCursor; |
2060 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2054 | |
2061 | |
2055 | /* |
2062 | /* |
2056 | * C: set the cursor character (s) |
2063 | * C: set the cursor character (s) |
2057 | */ |
2064 | */ |
2058 | { |
2065 | { |
2059 | unsigned char setoldcursor; |
2066 | bool setoldcursor; |
2060 | |
2067 | |
2061 | #ifdef CURSOR_BLINK |
2068 | #ifdef CURSOR_BLINK |
2062 | if (hidden_cursor) |
2069 | if (hidden_cursor) |
2063 | showcursor = 0; |
2070 | showcursor = 0; |
2064 | #endif |
2071 | #endif |
… | |
… | |
2548 | { |
2555 | { |
2549 | if (transparent) |
2556 | if (transparent) |
2550 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2557 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2551 | else |
2558 | else |
2552 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2559 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2553 | scrollBar.state = STATE_IDLE; |
2560 | scrollBar.state = SB_STATE_IDLE; |
2554 | scrollBar.show (0); |
2561 | scrollBar.show (0); |
2555 | } |
2562 | } |
2556 | |
2563 | |
2557 | if (refresh) |
2564 | if (refresh) |
2558 | { |
2565 | { |
… | |
… | |
2681 | * CHARACTER SELECTION * |
2688 | * CHARACTER SELECTION * |
2682 | * ------------------------------------------------------------------------- */ |
2689 | * ------------------------------------------------------------------------- */ |
2683 | void |
2690 | void |
2684 | rxvt_term::selection_check (int check_more) NOTHROW |
2691 | rxvt_term::selection_check (int check_more) NOTHROW |
2685 | { |
2692 | { |
2686 | row_col_t pos; |
|
|
2687 | |
|
|
2688 | if (!selection.op) |
2693 | if (!selection.op) |
2689 | return; |
2694 | return; |
2690 | |
2695 | |
|
|
2696 | row_col_t pos; |
2691 | pos.row = pos.col = 0; |
2697 | pos.row = pos.col = 0; |
|
|
2698 | |
2692 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2699 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2693 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2700 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2694 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2701 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2695 | || (check_more == 1 |
2702 | || (check_more == 1 |
2696 | && current_screen == selection.screen |
2703 | && current_screen == selection.screen |
… | |
… | |
2698 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2705 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2699 | || (check_more == 2 |
2706 | || (check_more == 2 |
2700 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2707 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2701 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2708 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2702 | || (check_more == 3 |
2709 | || (check_more == 3 |
2703 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2710 | && 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 (); |
2711 | CLEAR_ALL_SELECTION (); |
2708 | } |
2712 | } |
2709 | |
2713 | |
2710 | /* ------------------------------------------------------------------------- */ |
2714 | /* ------------------------------------------------------------------------- */ |
2711 | /* |
2715 | /* |
2712 | * Paste a selection direct to the command fd |
2716 | * Paste a selection direct to the command fd |