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.397 by root, Wed Nov 2 11:56:52 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
774rxvt_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
775{ 776{
776 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
777 return; 778 return;
778 779
779 unsigned char checksel; 780 bool checksel;
780 unicode_t c; 781 unicode_t c;
781 int ncol = this->ncol; 782 int ncol = this->ncol;
782 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
783 784
784 want_refresh = 1; 785 want_refresh = 1;
2057 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2058#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2059 scr_swap_overlay (); 2060 scr_swap_overlay ();
2060#endif 2061#endif
2061 2062
2062 char showcursor = screen.flags & Screen_VisibleCursor; 2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2063 2064
2064 /* 2065 /*
2065 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2066 */ 2067 */
2067 { 2068 {
2068 unsigned char setoldcursor; 2069 bool setoldcursor;
2069 2070
2070#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2071 if (hidden_cursor) 2072 if (hidden_cursor)
2072 showcursor = 0; 2073 showcursor = 0;
2073#endif 2074#endif
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