| … | |
… | |
| 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, row2 + total_rows); |
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
| 644 | |
644 | |
| 645 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
| 646 | |
|
|
| 647 | // scroll everything up 'count' lines |
|
|
| 648 | term_start = (term_start + count) % total_rows; |
|
|
| 649 | |
646 | |
| 650 | // sever bottommost line |
647 | // sever bottommost line |
| 651 | { |
648 | { |
| 652 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2 - 1); |
| 653 | l.is_longer (0); |
650 | l.is_longer (0); |
| 654 | l.touch (); |
651 | l.touch (); |
| 655 | } |
652 | } |
| 656 | |
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 | |
| 657 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
| 658 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
| 659 | { |
671 | { |
| 660 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
| 661 | |
673 | |
| 662 | // optimise if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
| 663 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
| 664 | 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))) |
| 665 | { |
677 | { |
| … | |
… | |
| 667 | l.l = 0; |
679 | l.l = 0; |
| 668 | l.f = 0; |
680 | l.f = 0; |
| 669 | } |
681 | } |
| 670 | else |
682 | else |
| 671 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
| 672 | } |
|
|
| 673 | |
|
|
| 674 | // now copy lines below the scroll region bottom to the |
|
|
| 675 | // bottom of the screen again, so they look as if they |
|
|
| 676 | // hadn't moved. |
|
|
| 677 | for (int i = nrow; --i > row2; ) |
|
|
| 678 | { |
|
|
| 679 | line_t &l1 = ROW(i - count); |
|
|
| 680 | line_t &l2 = ROW(i); |
|
|
| 681 | |
|
|
| 682 | ::swap (l1, l2); |
|
|
| 683 | l2.touch (); |
|
|
| 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 | { |
688 | { |
