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.407 by sf-exg, Wed Nov 16 18:52:17 2011 UTC

… …
549 return; 549 return;
550 550
551 want_refresh = 1; 551 want_refresh = 1;
552 view_start = 0; 552 view_start = 0;
553 553
554 selection_check (2); /* check for boundary cross */ 554 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
555 560
556 current_screen = scrn; 561 current_screen = scrn;
557 562
558#if NSCREENS 563#if NSCREENS
559 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
… …
682 else 687 else
683 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
684 } 689 }
685 690
686 // move and/or clear selection, if any 691 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
688 { 694 {
689 selection.beg.row -= count; 695 selection.beg.row -= count;
690 selection.end.row -= count; 696 selection.end.row -= count;
691 selection.mark.row -= count; 697 selection.mark.row -= count;
692 698
693 if (selection.beg.row < top_row 699 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 } 700 }
701 701
702 // finally move the view window, if desired 702 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 704 && view_start != 0
… …
780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
781{ 781{
782 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
783 return; 783 return;
784 784
785 unsigned char checksel; 785 bool checksel;
786 unicode_t c; 786 unicode_t c;
787 int ncol = this->ncol; 787 int ncol = this->ncol;
788 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
789 789
790 want_refresh = 1; 790 want_refresh = 1;
… …
1331 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1332 1332
1333 switch (mode) 1333 switch (mode)
1334 { 1334 {
1335 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1336 selection_check (1);
1337 scr_erase_line (0); 1336 scr_erase_line (0);
1338 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1339 num = nrow - row; 1338 num = nrow - row;
1340 break; 1339 break;
1341 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1342 selection_check (3);
1343 scr_erase_line (1); 1341 scr_erase_line (1);
1344 row = 0; 1342 row = 0;
1345 num = screen.cur.row; 1343 num = screen.cur.row;
1346 break; 1344 break;
1347 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1348 selection_check (3);
1349 row = 0; 1346 row = 0;
1350 num = nrow; 1347 num = nrow;
1351 break; 1348 break;
1352 default: 1349 default:
1353 return; 1350 return;
… …
1424 1421
1425 want_refresh = 1; 1422 want_refresh = 1;
1426 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1427 1424
1428 num_scr_allow = 0; 1425 num_scr_allow = 0;
1429 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1430 1431
1431 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1432 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1433 { 1434 {
1434 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
2047 * A: set up vars 2048 * A: set up vars
2048 */ 2049 */
2049 refresh_count = 0; 2050 refresh_count = 0;
2050 2051
2051 unsigned int old_screen_flags = screen.flags; 2052 unsigned int old_screen_flags = screen.flags;
2052 char have_bg = 0; 2053 bool have_bg = 0;
2053#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2054 have_bg = bg_pixmap != None; 2055 have_bg = bg_pixmap != None;
2055#endif 2056#endif
2056 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2057 2058
… …
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2065 scr_swap_overlay (); 2066 scr_swap_overlay ();
2066#endif 2067#endif
2067 2068
2068 char showcursor = screen.flags & Screen_VisibleCursor; 2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2069 2070
2070 /* 2071 /*
2071 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2072 */ 2073 */
2073 { 2074 {
2074 unsigned char setoldcursor; 2075 bool setoldcursor;
2075 2076
2076#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2077 if (hidden_cursor) 2078 if (hidden_cursor)
2078 showcursor = 0; 2079 showcursor = 0;
2079#endif 2080#endif
… …
2696 * CHARACTER SELECTION * 2697 * CHARACTER SELECTION *
2697 * ------------------------------------------------------------------------- */ 2698 * ------------------------------------------------------------------------- */
2698void 2699void
2699rxvt_term::selection_check (int check_more) NOTHROW 2700rxvt_term::selection_check (int check_more) NOTHROW
2700{ 2701{
2701 row_col_t pos;
2702
2703 if (!selection.op) 2702 if (!selection.op)
2704 return; 2703 return;
2705 2704
2706 pos.row = pos.col = 0;
2707 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2705 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2708 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2706 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2707 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2710 || (check_more == 1 2708 || (check_more == 1
2711 && current_screen == selection.screen 2709 && current_screen == selection.screen
2712 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2710 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2713 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2711 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2714 || (check_more == 2
2715 && ROWCOL_IS_BEFORE (selection.beg, pos)
2716 && ROWCOL_IS_AFTER (selection.end, pos))
2717 || (check_more == 3
2718 && 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 (); 2712 CLEAR_ALL_SELECTION ();
2723} 2713}
2724 2714
2725/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2726/* 2716/*
2727 * Paste a selection direct to the command fd 2717 * Paste a selection direct to the command fd

Diff Legend

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