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.394 by sf-exg, Thu Sep 1 08:11:27 2011 UTC vs.
Revision 1.406 by sf-exg, Wed Nov 16 18:26:47 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
… …
780rxvt_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
781{ 776{
782 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
783 return; 778 return;
784 779
785 unsigned char checksel; 780 bool checksel;
786 unicode_t c; 781 unicode_t c;
787 int ncol = this->ncol; 782 int ncol = this->ncol;
788 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
789 784
790 want_refresh = 1; 785 want_refresh = 1;
… …
1331 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1332 1327
1333 switch (mode) 1328 switch (mode)
1334 { 1329 {
1335 case 0: /* erase to end of screen */ 1330 case 0: /* erase to end of screen */
1336 selection_check (1);
1337 scr_erase_line (0); 1331 scr_erase_line (0);
1338 row = screen.cur.row + 1; /* possible OOB */ 1332 row = screen.cur.row + 1; /* possible OOB */
1339 num = nrow - row; 1333 num = nrow - row;
1340 break; 1334 break;
1341 case 1: /* erase to beginning of screen */ 1335 case 1: /* erase to beginning of screen */
1342 selection_check (3);
1343 scr_erase_line (1); 1336 scr_erase_line (1);
1344 row = 0; 1337 row = 0;
1345 num = screen.cur.row; 1338 num = screen.cur.row;
1346 break; 1339 break;
1347 case 2: /* erase whole screen */ 1340 case 2: /* erase whole screen */
1348 selection_check (3);
1349 row = 0; 1341 row = 0;
1350 num = nrow; 1342 num = nrow;
1351 break; 1343 break;
1352 default: 1344 default:
1353 return; 1345 return;
… …
2047 * A: set up vars 2039 * A: set up vars
2048 */ 2040 */
2049 refresh_count = 0; 2041 refresh_count = 0;
2050 2042
2051 unsigned int old_screen_flags = screen.flags; 2043 unsigned int old_screen_flags = screen.flags;
2052 char have_bg = 0; 2044 bool have_bg = 0;
2053#ifdef HAVE_BG_PIXMAP 2045#ifdef HAVE_BG_PIXMAP
2054 have_bg = bg_pixmap != None; 2046 have_bg = bg_pixmap != None;
2055#endif 2047#endif
2056 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2048 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2057 2049
… …
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2065 scr_swap_overlay (); 2057 scr_swap_overlay ();
2066#endif 2058#endif
2067 2059
2068 char showcursor = screen.flags & Screen_VisibleCursor; 2060 bool showcursor = screen.flags & Screen_VisibleCursor;
2069 2061
2070 /* 2062 /*
2071 * C: set the cursor character (s) 2063 * C: set the cursor character (s)
2072 */ 2064 */
2073 { 2065 {
2074 unsigned char setoldcursor; 2066 bool setoldcursor;
2075 2067
2076#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
2077 if (hidden_cursor) 2069 if (hidden_cursor)
2078 showcursor = 0; 2070 showcursor = 0;
2079#endif 2071#endif
… …
2696 * CHARACTER SELECTION * 2688 * CHARACTER SELECTION *
2697 * ------------------------------------------------------------------------- */ 2689 * ------------------------------------------------------------------------- */
2698void 2690void
2699rxvt_term::selection_check (int check_more) NOTHROW 2691rxvt_term::selection_check (int check_more) NOTHROW
2700{ 2692{
2701 row_col_t pos;
2702
2703 if (!selection.op) 2693 if (!selection.op)
2704 return; 2694 return;
2705 2695
2696 row_col_t pos;
2706 pos.row = pos.col = 0; 2697 pos.row = pos.col = 0;
2698
2707 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2699 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2708 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2700 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2701 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2710 || (check_more == 1 2702 || (check_more == 1
2711 && current_screen == selection.screen 2703 && current_screen == selection.screen
… …
2713 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2705 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2714 || (check_more == 2 2706 || (check_more == 2
2715 && ROWCOL_IS_BEFORE (selection.beg, pos) 2707 && ROWCOL_IS_BEFORE (selection.beg, pos)
2716 && ROWCOL_IS_AFTER (selection.end, pos)) 2708 && ROWCOL_IS_AFTER (selection.end, pos))
2717 || (check_more == 3 2709 || (check_more == 3
2718 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos)))
2719 || (check_more == 4 /* screen width change */
2720 && (selection.beg.row != selection.end.row
2721 || selection.end.col > ncol)))
2722 CLEAR_SELECTION (); 2711 CLEAR_ALL_SELECTION ();
2723} 2712}
2724 2713
2725/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2726/* 2715/*
2727 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd

Diff Legend

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