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.389 by root, Fri Jul 8 00:23:22 2011 UTC vs.
Revision 1.396 by root, Wed Nov 2 10:53:12 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
… …
688 { 688 {
689 selection.beg.row -= count; 689 selection.beg.row -= count;
690 selection.end.row -= count; 690 selection.end.row -= count;
691 selection.mark.row -= count; 691 selection.mark.row -= count;
692 692
693 if (selection.beg.row < top_row 693 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 } 694 }
701 695
702 // finally move the view window, if desired 696 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 698 && view_start != 0
… …
746 740
747 int rows = row2 - row1 + 1; 741 int rows = row2 - row1 + 1;
748 742
749 min_it (count, rows); 743 min_it (count, rows);
750 744
751 line_t *temp_buf = row_buf + total_rows; 745 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
752 746
753 for (int row = 0; row < rows; row++) 747 for (int row = 0; row < rows; row++)
754 { 748 {
755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 749 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
756 750
… …
761 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
762 ROW(row1 + row) = temp_buf [row]; 756 ROW(row1 + row) = temp_buf [row];
763 757
764 // sever bottommost line 758 // sever bottommost line
765 { 759 {
766 line_t &l = ROW(row2 - 1); 760 line_t &l = ROW(row2);
767 l.is_longer (0); 761 l.is_longer (0);
768 l.touch (); 762 l.touch ();
769 } 763 }
770
771 } 764 }
772 765
773 return count; 766 return count;
774} 767}
775 768
… …
2564 { 2557 {
2565 if (transparent) 2558 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2560 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2569 scrollBar.state = STATE_IDLE; 2562 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2563 scrollBar.show (0);
2571 } 2564 }
2572 2565
2573 if (refresh) 2566 if (refresh)
2574 { 2567 {
… …
2718 || (check_more == 3 2711 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos))
2720 || (check_more == 4 /* screen width change */ 2713 || (check_more == 4 /* screen width change */
2721 && (selection.beg.row != selection.end.row 2714 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol))) 2715 || selection.end.col > ncol)))
2723 CLEAR_SELECTION (); 2716 CLEAR_ALL_SELECTION ();
2724} 2717}
2725 2718
2726/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2727/* 2720/*
2728 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd

Diff Legend

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