… | |
… | |
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 | |
… | |
… | |
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); |
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; |
… | |
… | |
667 | } |
681 | } |
668 | else |
682 | else |
669 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
670 | } |
684 | } |
671 | |
685 | |
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 | } |
|
|
683 | |
|
|
684 | // move and/or clear selection, if any |
|
|
685 | if (selection.op && current_screen == selection.screen) |
|
|
686 | { |
|
|
687 | selection.beg.row -= count; |
|
|
688 | selection.end.row -= count; |
|
|
689 | selection.mark.row -= count; |
|
|
690 | |
|
|
691 | if (selection.beg.row < top_row |
|
|
692 | || selection.end.row < top_row |
|
|
693 | || selection.mark.row < top_row) |
|
|
694 | { |
|
|
695 | CLEAR_ALL_SELECTION (); |
|
|
696 | selection.op = SELECTION_CLEAR; |
|
|
697 | } |
|
|
698 | } |
|
|
699 | |
|
|
700 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
701 | if (option (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
702 | && view_start != 0 |
688 | && view_start != 0 |
703 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
704 | scr_page (UP, count); |
690 | scr_page (UP, count); |
… | |
… | |
706 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
707 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
693 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
708 | } |
694 | } |
709 | else |
695 | else |
710 | { |
696 | { |
711 | if (selection.op && current_screen == selection.screen) |
|
|
712 | { |
|
|
713 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
714 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
715 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
716 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
717 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
718 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
719 | { |
|
|
720 | CLEAR_ALL_SELECTION (); |
|
|
721 | selection.op = SELECTION_CLEAR; |
|
|
722 | } |
|
|
723 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
724 | { |
|
|
725 | /* move selected region too */ |
|
|
726 | selection.beg.row -= count; |
|
|
727 | selection.end.row -= count; |
|
|
728 | selection.mark.row -= count; |
|
|
729 | |
|
|
730 | selection_check (0); |
|
|
731 | } |
|
|
732 | } |
|
|
733 | |
|
|
734 | // use a simple and robust scrolling algorithm, this |
697 | // use a simple and robust scrolling algorithm, this |
735 | // part of scr_scroll_text is not time-critical. |
698 | // part of scr_scroll_text is not time-critical. |
736 | |
699 | |
|
|
700 | // sever line above scroll region |
|
|
701 | if (row1) |
|
|
702 | { |
|
|
703 | line_t &l = ROW(row1 - 1); |
|
|
704 | l.is_longer (0); |
|
|
705 | l.touch (); |
|
|
706 | } |
|
|
707 | |
737 | int rows = row2 - row1 + 1; |
708 | int rows = row2 - row1 + 1; |
738 | |
709 | |
739 | min_it (count, rows); |
710 | min_it (count, rows); |
740 | |
711 | |
741 | line_t *temp_buf = row_buf + total_rows; |
712 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
742 | |
713 | |
743 | for (int row = 0; row < rows; row++) |
714 | for (int row = 0; row < rows; row++) |
744 | { |
715 | { |
745 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
716 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
746 | |
717 | |
… | |
… | |
748 | scr_blank_screen_mem (temp_buf [row], rstyle); |
719 | scr_blank_screen_mem (temp_buf [row], rstyle); |
749 | } |
720 | } |
750 | |
721 | |
751 | for (int row = 0; row < rows; row++) |
722 | for (int row = 0; row < rows; row++) |
752 | ROW(row1 + row) = temp_buf [row]; |
723 | ROW(row1 + row) = temp_buf [row]; |
|
|
724 | |
|
|
725 | // sever bottommost line |
|
|
726 | { |
|
|
727 | line_t &l = ROW(row2); |
|
|
728 | l.is_longer (0); |
|
|
729 | l.touch (); |
|
|
730 | } |
|
|
731 | } |
|
|
732 | |
|
|
733 | // move and/or clear selection, if any |
|
|
734 | if (selection.op && current_screen == selection.screen) |
|
|
735 | { |
|
|
736 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
737 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
738 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
739 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
740 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
741 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
742 | CLEAR_ALL_SELECTION (); |
|
|
743 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
744 | { |
|
|
745 | /* move selected region too */ |
|
|
746 | selection.beg.row -= count; |
|
|
747 | selection.end.row -= count; |
|
|
748 | selection.mark.row -= count; |
|
|
749 | |
|
|
750 | selection_check (0); |
|
|
751 | } |
753 | } |
752 | } |
754 | |
753 | |
755 | return count; |
754 | return count; |
756 | } |
755 | } |
757 | |
756 | |
… | |
… | |
2546 | { |
2545 | { |
2547 | if (transparent) |
2546 | if (transparent) |
2548 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2547 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2549 | else |
2548 | else |
2550 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2551 | scrollBar.state = STATE_IDLE; |
2550 | scrollBar.state = SB_STATE_IDLE; |
2552 | scrollBar.show (0); |
2551 | scrollBar.show (0); |
2553 | } |
2552 | } |
2554 | |
2553 | |
2555 | if (refresh) |
2554 | if (refresh) |
2556 | { |
2555 | { |
… | |
… | |
2679 | * CHARACTER SELECTION * |
2678 | * CHARACTER SELECTION * |
2680 | * ------------------------------------------------------------------------- */ |
2679 | * ------------------------------------------------------------------------- */ |
2681 | void |
2680 | void |
2682 | rxvt_term::selection_check (int check_more) NOTHROW |
2681 | rxvt_term::selection_check (int check_more) NOTHROW |
2683 | { |
2682 | { |
2684 | row_col_t pos; |
|
|
2685 | |
|
|
2686 | if (!selection.op) |
2683 | if (!selection.op) |
2687 | return; |
2684 | return; |
2688 | |
2685 | |
|
|
2686 | row_col_t pos; |
2689 | pos.row = pos.col = 0; |
2687 | pos.row = pos.col = 0; |
|
|
2688 | |
2690 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2689 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2690 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2692 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2693 | || (check_more == 1 |
2692 | || (check_more == 1 |
2694 | && current_screen == selection.screen |
2693 | && current_screen == selection.screen |
… | |
… | |
2696 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2695 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2697 | || (check_more == 2 |
2696 | || (check_more == 2 |
2698 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2697 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2699 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2698 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2700 | || (check_more == 3 |
2699 | || (check_more == 3 |
2701 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2700 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2702 | || (check_more == 4 /* screen width change */ |
|
|
2703 | && (selection.beg.row != selection.end.row |
|
|
2704 | || selection.end.col > ncol))) |
|
|
2705 | CLEAR_SELECTION (); |
2701 | CLEAR_ALL_SELECTION (); |
2706 | } |
2702 | } |
2707 | |
2703 | |
2708 | /* ------------------------------------------------------------------------- */ |
2704 | /* ------------------------------------------------------------------------- */ |
2709 | /* |
2705 | /* |
2710 | * Paste a selection direct to the command fd |
2706 | * Paste a selection direct to the command fd |