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.400 by sf-exg, Tue Nov 15 02:24:25 2011 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

… …
49 if (option (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
50 view_start = 0 50 view_start = 0
51#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
52 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
53 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
54#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_SELECTION_MARK() \
55 selection.beg.row = selection.beg.col \
56 = selection.mark.row = selection.mark.col \
57 = selection.end.row = selection.end.col = 0 55 selection.mark.row = selection.mark.col = 0
58 56
59#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
60 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 58 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
61#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
62 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 60 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
405 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
406 404
407 for (int col = ncol; col--; ) 405 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
409 407
410 CLEAR_ALL_SELECTION (); 408 CLEAR_SELECTION ();
409 CLEAR_SELECTION_MARK ();
411 410
412 prev_nrow = nrow; 411 prev_nrow = nrow;
413 prev_ncol = ncol; 412 prev_ncol = ncol;
414 413
415 tt_winch (); 414 tt_winch ();
… …
682 else 681 else
683 scr_blank_screen_mem (l, rstyle); 682 scr_blank_screen_mem (l, rstyle);
684 } 683 }
685 684
686 // move and/or clear selection, if any 685 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen
687 && selection.beg.row <= row2)
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
… …
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1) 713 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2)) 714 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 { 715 {
716 CLEAR_ALL_SELECTION (); 716 CLEAR_SELECTION ();
717 selection.op = SELECTION_CLEAR; 717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
718 CLEAR_SELECTION_MARK ();
718 } 719 }
719 else if (selection.end.row >= row1 && selection.end.row <= row2) 720 else if (selection.end.row >= row1 && selection.end.row <= row2)
720 { 721 {
721 /* move selected region too */ 722 /* move selected region too */
722 selection.beg.row -= count; 723 selection.beg.row -= count;
… …
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;
… …
2041 * A: set up vars 2042 * A: set up vars
2042 */ 2043 */
2043 refresh_count = 0; 2044 refresh_count = 0;
2044 2045
2045 unsigned int old_screen_flags = screen.flags; 2046 unsigned int old_screen_flags = screen.flags;
2046 char have_bg = 0; 2047 bool have_bg = 0;
2047#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2048 have_bg = bg_pixmap != None; 2049 have_bg = bg_pixmap != None;
2049#endif 2050#endif
2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2051 2052
… …
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
… …
2697 2698
2698 row_col_t pos; 2699 row_col_t pos;
2699 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2700 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.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2704 || (check_more == 1
2705 && current_screen == selection.screen 2705 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2708 || (check_more == 2 2708 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3 2711 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos))) 2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2713 CLEAR_ALL_SELECTION (); 2713 CLEAR_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2714} 2717}
2715 2718
2716/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2717/* 2720/*
2718 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd

Diff Legend

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