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.388 by root, Fri Jul 8 00:08:40 2011 UTC vs.
Revision 1.401 by sf-exg, Tue Nov 15 18:20:38 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
… …
644 644
645 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
646 646
647 // sever bottommost line 647 // sever bottommost line
648 { 648 {
649 line_t &l = ROW(row2 - 1); 649 line_t &l = ROW(row2);
650 l.is_longer (0); 650 l.is_longer (0);
651 l.touch (); 651 l.touch ();
652 } 652 }
653 653
654 // scroll everything up 'count' lines 654 // scroll everything up 'count' lines
… …
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 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 && selection.beg.row < row2)
688 { 689 {
689 selection.beg.row -= count; 690 selection.beg.row -= count;
690 selection.end.row -= count; 691 selection.end.row -= count;
691 selection.mark.row -= count; 692 selection.mark.row -= count;
692 693
693 if (selection.beg.row < top_row 694 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 695 }
701 696
702 // finally move the view window, if desired 697 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 699 && view_start != 0
… …
734 } 729 }
735 730
736 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
737 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
738 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
739 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
740 743
741 min_it (count, rows); 744 min_it (count, rows);
742 745
743 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 747
745 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
746 { 749 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 751
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 754 }
752 755
753 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
754 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
755 } 765 }
756 766
757 return count; 767 return count;
758} 768}
759 769
… …
2548 { 2558 {
2549 if (transparent) 2559 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2561 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2553 scrollBar.state = STATE_IDLE; 2563 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2564 scrollBar.show (0);
2555 } 2565 }
2556 2566
2557 if (refresh) 2567 if (refresh)
2558 { 2568 {
… …
2681 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2683void 2693void
2684rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2685{ 2695{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2696 if (!selection.op)
2689 return; 2697 return;
2690 2698
2699 row_col_t pos;
2691 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2705 || (check_more == 1
2696 && current_screen == selection.screen 2706 && current_screen == selection.screen
… …
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2699 || (check_more == 2 2709 || (check_more == 2
2700 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2701 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 3 2712 || (check_more == 3
2703 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && 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 (); 2714 CLEAR_ALL_SELECTION ();
2708} 2715}
2709 2716
2710/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2711/* 2718/*
2712 * Paste a selection direct to the command fd 2719 * Paste a selection direct to the command fd

Diff Legend

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