… | |
… | |
681 | } |
681 | } |
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 |
|
|
687 | if (selection.op && current_screen == selection.screen) |
|
|
688 | { |
|
|
689 | selection.beg.row -= count; |
|
|
690 | selection.end.row -= count; |
|
|
691 | selection.mark.row -= count; |
|
|
692 | |
|
|
693 | if (selection.beg.row < top_row |
|
|
694 | || selection.end.row < top_row |
|
|
695 | || selection.mark.row < top_row) |
|
|
696 | { |
|
|
697 | CLEAR_ALL_SELECTION (); |
|
|
698 | selection.op = SELECTION_CLEAR; |
|
|
699 | } |
|
|
700 | } |
|
|
701 | |
|
|
702 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
703 | if (option (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
704 | && view_start != 0 |
688 | && view_start != 0 |
705 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
706 | scr_page (UP, count); |
690 | scr_page (UP, count); |
… | |
… | |
708 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
709 | 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)); |
710 | } |
694 | } |
711 | else |
695 | else |
712 | { |
696 | { |
713 | if (selection.op && current_screen == selection.screen) |
|
|
714 | { |
|
|
715 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
716 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
717 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
718 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
719 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
720 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
721 | { |
|
|
722 | CLEAR_ALL_SELECTION (); |
|
|
723 | selection.op = SELECTION_CLEAR; |
|
|
724 | } |
|
|
725 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
726 | { |
|
|
727 | /* move selected region too */ |
|
|
728 | selection.beg.row -= count; |
|
|
729 | selection.end.row -= count; |
|
|
730 | selection.mark.row -= count; |
|
|
731 | |
|
|
732 | selection_check (0); |
|
|
733 | } |
|
|
734 | } |
|
|
735 | |
|
|
736 | // use a simple and robust scrolling algorithm, this |
697 | // use a simple and robust scrolling algorithm, this |
737 | // part of scr_scroll_text is not time-critical. |
698 | // part of scr_scroll_text is not time-critical. |
738 | |
699 | |
739 | // sever line above scroll region |
700 | // sever line above scroll region |
740 | if (row1) |
701 | if (row1) |
… | |
… | |
765 | { |
726 | { |
766 | line_t &l = ROW(row2); |
727 | line_t &l = ROW(row2); |
767 | l.is_longer (0); |
728 | l.is_longer (0); |
768 | l.touch (); |
729 | l.touch (); |
769 | } |
730 | } |
|
|
731 | } |
770 | |
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 | } |
771 | } |
752 | } |
772 | |
753 | |
773 | return count; |
754 | return count; |
774 | } |
755 | } |
775 | |
756 | |
… | |
… | |
2564 | { |
2545 | { |
2565 | if (transparent) |
2546 | if (transparent) |
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2547 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2567 | else |
2548 | else |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2569 | scrollBar.state = STATE_IDLE; |
2550 | scrollBar.state = SB_STATE_IDLE; |
2570 | scrollBar.show (0); |
2551 | scrollBar.show (0); |
2571 | } |
2552 | } |
2572 | |
2553 | |
2573 | if (refresh) |
2554 | if (refresh) |
2574 | { |
2555 | { |
… | |
… | |
2697 | * CHARACTER SELECTION * |
2678 | * CHARACTER SELECTION * |
2698 | * ------------------------------------------------------------------------- */ |
2679 | * ------------------------------------------------------------------------- */ |
2699 | void |
2680 | void |
2700 | rxvt_term::selection_check (int check_more) NOTHROW |
2681 | rxvt_term::selection_check (int check_more) NOTHROW |
2701 | { |
2682 | { |
2702 | row_col_t pos; |
|
|
2703 | |
|
|
2704 | if (!selection.op) |
2683 | if (!selection.op) |
2705 | return; |
2684 | return; |
2706 | |
2685 | |
|
|
2686 | row_col_t pos; |
2707 | pos.row = pos.col = 0; |
2687 | pos.row = pos.col = 0; |
|
|
2688 | |
2708 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2689 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2709 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2690 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2710 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2711 | || (check_more == 1 |
2692 | || (check_more == 1 |
2712 | && current_screen == selection.screen |
2693 | && current_screen == selection.screen |
… | |
… | |
2714 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2695 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2715 | || (check_more == 2 |
2696 | || (check_more == 2 |
2716 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2697 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2717 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2698 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2718 | || (check_more == 3 |
2699 | || (check_more == 3 |
2719 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2700 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2720 | || (check_more == 4 /* screen width change */ |
|
|
2721 | && (selection.beg.row != selection.end.row |
|
|
2722 | || selection.end.col > ncol))) |
|
|
2723 | CLEAR_SELECTION (); |
2701 | CLEAR_ALL_SELECTION (); |
2724 | } |
2702 | } |
2725 | |
2703 | |
2726 | /* ------------------------------------------------------------------------- */ |
2704 | /* ------------------------------------------------------------------------- */ |
2727 | /* |
2705 | /* |
2728 | * Paste a selection direct to the command fd |
2706 | * Paste a selection direct to the command fd |