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.390 by sf-exg, Fri Jul 8 20:54:31 2011 UTC vs.
Revision 1.400 by sf-exg, Tue Nov 15 02:24:25 2011 UTC

… …
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
… …
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 {
… …
2697 * CHARACTER SELECTION * 2690 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2691 * ------------------------------------------------------------------------- */
2699void 2692void
2700rxvt_term::selection_check (int check_more) NOTHROW 2693rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2694{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2695 if (!selection.op)
2705 return; 2696 return;
2706 2697
2698 row_col_t pos;
2707 pos.row = pos.col = 0; 2699 pos.row = pos.col = 0;
2700
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2701 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2702 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2704 || (check_more == 1
2712 && current_screen == selection.screen 2705 && current_screen == selection.screen
… …
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2715 || (check_more == 2 2708 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
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 */
2721 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol)))
2723 CLEAR_SELECTION (); 2713 CLEAR_ALL_SELECTION ();
2724} 2714}
2725 2715
2726/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2727/* 2717/*
2728 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd

Diff Legend

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