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.390 by sf-exg, Fri Jul 8 20:54:31 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 ();
… …
644 643
645 top_row = max (top_row - count, -saveLines); 644 top_row = max (top_row - count, -saveLines);
646 645
647 // sever bottommost line 646 // sever bottommost line
648 { 647 {
649 line_t &l = ROW(row2 - 1); 648 line_t &l = ROW(row2);
650 l.is_longer (0); 649 l.is_longer (0);
651 l.touch (); 650 l.touch ();
652 } 651 }
653 652
654 // scroll everything up 'count' lines 653 // scroll everything up 'count' lines
… …
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
693 if (selection.beg.row < top_row 693 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 } 694 }
701 695
702 // finally move the view window, if desired 696 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 698 && view_start != 0
… …
717 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
718 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
719 || (selection.end.row - count < row1 && selection.end.row >= row1) 713 || (selection.end.row - count < row1 && selection.end.row >= row1)
720 || (selection.end.row - count > row2 && selection.end.row <= row2)) 714 || (selection.end.row - count > row2 && selection.end.row <= row2))
721 { 715 {
722 CLEAR_ALL_SELECTION (); 716 CLEAR_SELECTION ();
723 selection.op = SELECTION_CLEAR; 717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
718 CLEAR_SELECTION_MARK ();
724 } 719 }
725 else if (selection.end.row >= row1 && selection.end.row <= row2) 720 else if (selection.end.row >= row1 && selection.end.row <= row2)
726 { 721 {
727 /* move selected region too */ 722 /* move selected region too */
728 selection.beg.row -= count; 723 selection.beg.row -= count;
… …
761 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
762 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
763 758
764 // sever bottommost line 759 // sever bottommost line
765 { 760 {
766 line_t &l = ROW(row2 - 1); 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;
… …
2048 * A: set up vars 2042 * A: set up vars
2049 */ 2043 */
2050 refresh_count = 0; 2044 refresh_count = 0;
2051 2045
2052 unsigned int old_screen_flags = screen.flags; 2046 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0; 2047 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2055 have_bg = bg_pixmap != None; 2049 have_bg = bg_pixmap != None;
2056#endif 2050#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2052
… …
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)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2704 || (check_more == 1
2712 && current_screen == selection.screen 2705 && current_screen == selection.screen
2713 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2715 || (check_more == 2 2708 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2718 || (check_more == 3 2711 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && 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 (); 2713 CLEAR_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2724} 2717}
2725 2718
2726/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2727/* 2720/*
2728 * 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