ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.385 by sf-exg, Wed Jul 6 00:40:10 2011 UTC vs.
Revision 1.394 by sf-exg, Thu Sep 1 08:11:27 2011 UTC

… …
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
… …
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 632{
633 if (count == 0 || (row1 > row2)) 633 if (count == 0 || (row1 > row2))
634 return 0; 634 return 0;
635 635
636 int rows = row2 - row1 + 1;
637
638 min_it (count, rows);
639
640 want_refresh = 1; 636 want_refresh = 1;
641 num_scr += count; 637 num_scr += count;
642 638
643 if (count > 0 639 if (count > 0
644 && row1 == 0 640 && row1 == 0
645 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
646 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
647 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
648
649 // scroll everything up 'count' lines
650 term_start = (term_start + count) % total_rows;
651 646
652 // sever bottommost line 647 // sever bottommost line
653 { 648 {
654 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
655 l.is_longer (0); 650 l.is_longer (0);
656 l.touch (); 651 l.touch ();
657 } 652 }
658 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
659 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
660 for (int i = count; i--; ) 670 for (int i = count; i--; )
661 { 671 {
662 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
663 673
664 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
665 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
666 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)))
667 { 677 {
668 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
669 l.l = 0; 679 l.l = 0;
670 l.f = 0; 680 l.f = 0;
671 } 681 }
672 else 682 else
673 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
674 }
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 } 684 }
687 685
688 // move and/or clear selection, if any 686 // move and/or clear selection, if any
689 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
690 { 688 {
… …
736 } 734 }
737 735
738 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
739 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
740 738
741 line_t *temp_buf = row_buf + total_rows; 739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
747 int rows = row2 - row1 + 1;
748
749 min_it (count, rows);
750
751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 752
743 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
744 { 754 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 756
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 759 }
750 760
751 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2);
767 l.is_longer (0);
768 l.touch ();
769 }
753 } 770 }
754 771
755 return count; 772 return count;
756} 773}
757 774
… …
2546 { 2563 {
2547 if (transparent) 2564 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else 2566 else
2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2551 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2552 scrollBar.show (0); 2569 scrollBar.show (0);
2553 } 2570 }
2554 2571
2555 if (refresh) 2572 if (refresh)
2556 { 2573 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines