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.402 by root, Tue Nov 15 18:23:46 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
… …
746 741
747 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
748 743
749 min_it (count, rows); 744 min_it (count, rows);
750 745
751 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
752 747
753 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
754 { 749 {
755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
756 751
… …
761 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
762 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
763 758
764 // sever bottommost line 759 // sever bottommost line
765 { 760 {
766 line_t &l = ROW(row2 - 1); 761 line_t &l = ROW(row2);
767 l.is_longer (0); 762 l.is_longer (0);
768 l.touch (); 763 l.touch ();
769 } 764 }
770
771 } 765 }
772 766
773 return count; 767 return count;
774} 768}
775 769
… …
2564 { 2558 {
2565 if (transparent) 2559 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2561 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2569 scrollBar.state = STATE_IDLE; 2563 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2564 scrollBar.show (0);
2571 } 2565 }
2572 2566
2573 if (refresh) 2567 if (refresh)
2574 { 2568 {
… …
2697 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2699void 2693void
2700rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2695{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2696 if (!selection.op)
2705 return; 2697 return;
2706 2698
2699 row_col_t pos;
2707 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2705 || (check_more == 1
2712 && current_screen == selection.screen 2706 && current_screen == selection.screen
… …
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2715 || (check_more == 2 2709 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2718 || (check_more == 3 2712 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2720 || (check_more == 4 /* screen width change */
2721 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol)))
2723 CLEAR_SELECTION (); 2714 CLEAR_ALL_SELECTION ();
2724} 2715}
2725 2716
2726/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2727/* 2718/*
2728 * 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