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.392 by root, Sun Jul 10 00:40:10 2011 UTC vs.
Revision 1.403 by sf-exg, Tue Nov 15 19:54:30 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
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
… …
765 { 760 {
766 line_t &l = ROW(row2); 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
… …
781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
782{ 776{
783 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
784 return; 778 return;
785 779
786 unsigned char checksel; 780 bool checksel;
787 unicode_t c; 781 unicode_t c;
788 int ncol = this->ncol; 782 int ncol = this->ncol;
789 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
790 784
791 want_refresh = 1; 785 want_refresh = 1;
… …
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2066 scr_swap_overlay (); 2060 scr_swap_overlay ();
2067#endif 2061#endif
2068 2062
2069 char showcursor = screen.flags & Screen_VisibleCursor; 2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2070 2064
2071 /* 2065 /*
2072 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2073 */ 2067 */
2074 { 2068 {
2075 unsigned char setoldcursor; 2069 bool setoldcursor;
2076 2070
2077#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2072 if (hidden_cursor)
2079 showcursor = 0; 2073 showcursor = 0;
2080#endif 2074#endif
… …
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