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.386 by root, Thu Jul 7 23:15:44 2011 UTC vs.
Revision 1.399 by sf-exg, Thu Nov 3 10:42:17 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
… …
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);
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 {
… …
669 } 681 }
670 else 682 else
671 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
672 } 684 }
673 685
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 }
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
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
739 int rows = row2 - row1 + 1; 708 int rows = row2 - row1 + 1;
740 709
741 min_it (count, rows); 710 min_it (count, rows);
742 711
743 line_t *temp_buf = row_buf + total_rows; 712 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 713
745 for (int row = 0; row < rows; row++) 714 for (int row = 0; row < rows; row++)
746 { 715 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 716 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 717
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 719 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 720 }
752 721
753 for (int row = 0; row < rows; row++) 722 for (int row = 0; row < rows; row++)
754 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 }
755 } 752 }
756 753
757 return count; 754 return count;
758} 755}
759 756
… …
2548 { 2545 {
2549 if (transparent) 2546 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2548 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2553 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2551 scrollBar.show (0);
2555 } 2552 }
2556 2553
2557 if (refresh) 2554 if (refresh)
2558 { 2555 {
… …
2681 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2683void 2680void
2684rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2685{ 2682{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2683 if (!selection.op)
2689 return; 2684 return;
2690 2685
2686 row_col_t pos;
2691 pos.row = pos.col = 0; 2687 pos.row = pos.col = 0;
2688
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2692 || (check_more == 1
2696 && current_screen == selection.screen 2693 && current_screen == selection.screen
… …
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2699 || (check_more == 2 2696 || (check_more == 2
2700 && ROWCOL_IS_BEFORE (selection.beg, pos) 2697 && ROWCOL_IS_BEFORE (selection.beg, pos)
2701 && ROWCOL_IS_AFTER (selection.end, pos)) 2698 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 3 2699 || (check_more == 3
2703 && ROWCOL_IS_AFTER (selection.end, pos)) 2700 && 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 (); 2701 CLEAR_ALL_SELECTION ();
2708} 2702}
2709 2703
2710/* ------------------------------------------------------------------------- */ 2704/* ------------------------------------------------------------------------- */
2711/* 2705/*
2712 * Paste a selection direct to the command fd 2706 * Paste a selection direct to the command fd

Diff Legend

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