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.396 by root, Wed Nov 2 10:53:12 2011 UTC vs.
Revision 1.402 by root, Tue Nov 15 18:23:46 2011 UTC

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
2690 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2691 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2692void 2693void
2693rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2694{ 2695{
2695 row_col_t pos;
2696
2697 if (!selection.op) 2696 if (!selection.op)
2698 return; 2697 return;
2699 2698
2699 row_col_t pos;
2700 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2701 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2702 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2705 || (check_more == 1
2705 && current_screen == selection.screen 2706 && current_screen == selection.screen
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2708 || (check_more == 2 2709 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3 2712 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2713 || (check_more == 4 /* screen width change */
2714 && (selection.beg.row != selection.end.row
2715 || selection.end.col > ncol)))
2716 CLEAR_ALL_SELECTION (); 2714 CLEAR_ALL_SELECTION ();
2717} 2715}
2718 2716
2719/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2720/* 2718/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines