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.384 by sf-exg, Mon May 30 18:39:04 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))))
… …
203 term_start = 0; 201 term_start = 0;
204 202
205 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207 205
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 209
212 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
213 { 211 {
… …
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
… …
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 ();
… …
638 637
639 if (count > 0 638 if (count > 0
640 && row1 == 0 639 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 640 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 641 {
642 min_it (count, total_rows - (nrow - (row2 + 1)));
643
643 top_row = max (top_row - count, -saveLines); 644 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 645
648 // sever bottommost line 646 // sever bottommost line
649 { 647 {
650 line_t &l = ROW(row2 - count); 648 line_t &l = ROW(row2);
651 l.is_longer (0); 649 l.is_longer (0);
652 l.touch (); 650 l.touch ();
653 } 651 }
654 652
653 // scroll everything up 'count' lines
654 term_start = (term_start + count) % total_rows;
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
655 // erase newly scrolled-in lines 668 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 669 for (int i = count; i--; )
657 { 670 {
658 line_t &l = ROW(nrow - 1 - i); 671 line_t &l = ROW(row2 - i);
659 672
660 // optimize if already cleared, can be significant on slow machines 673 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 674 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 675 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 676 {
664 scr_blank_line (l, 0, l.l, rstyle); 677 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 678 l.l = 0;
… …
667 } 680 }
668 else 681 else
669 scr_blank_screen_mem (l, rstyle); 682 scr_blank_screen_mem (l, rstyle);
670 } 683 }
671 684
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 685 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen
687 && selection.beg.row <= row2)
686 { 688 {
687 selection.beg.row -= count; 689 selection.beg.row -= count;
688 selection.end.row -= count; 690 selection.end.row -= count;
689 selection.mark.row -= count; 691 selection.mark.row -= count;
690 692
691 if (selection.beg.row < top_row 693 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 694 }
699 695
700 // finally move the view window, if desired 696 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 698 && view_start != 0
… …
715 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
716 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
717 || (selection.end.row - count < row1 && selection.end.row >= row1) 713 || (selection.end.row - count < row1 && selection.end.row >= row1)
718 || (selection.end.row - count > row2 && selection.end.row <= row2)) 714 || (selection.end.row - count > row2 && selection.end.row <= row2))
719 { 715 {
720 CLEAR_ALL_SELECTION (); 716 CLEAR_SELECTION ();
721 selection.op = SELECTION_CLEAR; 717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
718 CLEAR_SELECTION_MARK ();
722 } 719 }
723 else if (selection.end.row >= row1 && selection.end.row <= row2) 720 else if (selection.end.row >= row1 && selection.end.row <= row2)
724 { 721 {
725 /* move selected region too */ 722 /* move selected region too */
726 selection.beg.row -= count; 723 selection.beg.row -= count;
… …
732 } 729 }
733 730
734 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
736 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
737 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
738 743
739 min_it (count, rows); 744 min_it (count, rows);
740 745
741 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 747
743 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
744 { 749 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 751
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 754 }
750 755
751 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
753 } 765 }
754 766
755 return count; 767 return count;
756} 768}
757 769
… …
763rxvt_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
764{ 776{
765 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
766 return; 778 return;
767 779
768 unsigned char checksel; 780 bool checksel;
769 unicode_t c; 781 unicode_t c;
770 int ncol = this->ncol; 782 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
772 784
773 want_refresh = 1; 785 want_refresh = 1;
… …
2030 * A: set up vars 2042 * A: set up vars
2031 */ 2043 */
2032 refresh_count = 0; 2044 refresh_count = 0;
2033 2045
2034 unsigned int old_screen_flags = screen.flags; 2046 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2047 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2037 have_bg = bg_pixmap != None; 2049 have_bg = bg_pixmap != None;
2038#endif 2050#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2052
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2060 scr_swap_overlay ();
2049#endif 2061#endif
2050 2062
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2064
2053 /* 2065 /*
2054 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2055 */ 2067 */
2056 { 2068 {
2057 unsigned char setoldcursor; 2069 bool setoldcursor;
2058 2070
2059#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2072 if (hidden_cursor)
2061 showcursor = 0; 2073 showcursor = 0;
2062#endif 2074#endif
… …
2546 { 2558 {
2547 if (transparent) 2559 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else 2561 else
2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2551 scrollBar.state = STATE_IDLE; 2563 scrollBar.state = SB_STATE_IDLE;
2552 scrollBar.show (0); 2564 scrollBar.show (0);
2553 } 2565 }
2554 2566
2555 if (refresh) 2567 if (refresh)
2556 { 2568 {
… …
2679 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2680 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2681void 2693void
2682rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2683{ 2695{
2684 row_col_t pos;
2685
2686 if (!selection.op) 2696 if (!selection.op)
2687 return; 2697 return;
2688 2698
2699 row_col_t pos;
2689 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2693 || (check_more == 1 2704 || (check_more == 1
2694 && current_screen == selection.screen 2705 && current_screen == selection.screen
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2697 || (check_more == 2 2708 || (check_more == 2
2698 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2699 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2700 || (check_more == 3 2711 || (check_more == 3
2701 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2702 || (check_more == 4 /* screen width change */
2703 && (selection.beg.row != selection.end.row
2704 || selection.end.col > ncol)))
2705 CLEAR_SELECTION (); 2713 CLEAR_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2706} 2717}
2707 2718
2708/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2709/* 2720/*
2710 * 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