Mercurial > vim
changeset 14720:a9665096074b v8.1.0372
patch 8.1.0372: screen updating slow when 'cursorline' is set
commit https://github.com/vim/vim/commit/90a997987dbbe43af3c15118a35f658f0f037d1d
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Sep 12 21:52:18 2018 +0200
patch 8.1.0372: screen updating slow when 'cursorline' is set
Problem: Screen updating slow when 'cursorline' is set.
Solution: Only redraw the old and new cursor line, not all lines.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 12 Sep 2018 22:00:07 +0200 |
| parents | d5bfff0b5ebe |
| children | 9ba31aa02b02 |
| files | src/edit.c src/move.c src/proto/screen.pro src/screen.c src/version.c |
| diffstat | 5 files changed, 34 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -1966,7 +1966,7 @@ edit_unputchar(void) if (pc_status == PC_STATUS_RIGHT) ++curwin->w_wcol; if (pc_status == PC_STATUS_RIGHT || pc_status == PC_STATUS_LEFT) - redrawWinline(curwin->w_cursor.lnum, FALSE); + redrawWinline(curwin, curwin->w_cursor.lnum, FALSE); else #endif screen_puts(pc_bytes, pc_row - msg_scrolled, pc_col, pc_attr); @@ -2017,7 +2017,7 @@ undisplay_dollar(void) if (dollar_vcol >= 0) { dollar_vcol = -1; - redrawWinline(curwin->w_cursor.lnum, FALSE); + redrawWinline(curwin, curwin->w_cursor.lnum, FALSE); } } @@ -7079,7 +7079,7 @@ check_spell_redraw(void) linenr_T lnum = spell_redraw_lnum; spell_redraw_lnum = 0; - redrawWinline(lnum, FALSE); + redrawWinline(curwin, lnum, FALSE); } }
--- a/src/move.c +++ b/src/move.c @@ -123,6 +123,10 @@ comp_botline(win_T *wp) set_empty_rows(wp, done); } +#ifdef FEAT_SYN_HL +static linenr_T last_cursorline = 0; +#endif + /* * Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is * set. @@ -140,7 +144,22 @@ redraw_for_cursorline(win_T *wp) && !pum_visible() # endif ) - redraw_win_later(wp, SOME_VALID); + { +#ifdef FEAT_SYN_HL + if (!wp->w_p_rnu && wp->w_redr_type <= VALID && last_cursorline != 0) + { + // "last_cursorline" may be set for another window, worst case we + // redraw too much. This is optimized for moving the cursor around + // in the same window. + redrawWinline(wp, last_cursorline, FALSE); + redrawWinline(wp, wp->w_cursor.lnum, FALSE); + last_cursorline = wp->w_cursor.lnum; + redraw_win_later(wp, VALID); + } + else +#endif + redraw_win_later(wp, SOME_VALID); + } } /*
--- a/src/proto/screen.pro +++ b/src/proto/screen.pro @@ -8,7 +8,7 @@ void redraw_buf_later(buf_T *buf, int ty void redraw_buf_and_status_later(buf_T *buf, int type); int redraw_asap(int type); void redraw_after_callback(int call_update_screen); -void redrawWinline(linenr_T lnum, int invalid); +void redrawWinline(win_T *wp, linenr_T lnum, int invalid); void reset_updating_screen(int may_resize_shell); void update_curbuf(int type); int update_screen(int type_arg);
--- a/src/screen.c +++ b/src/screen.c @@ -496,6 +496,7 @@ redraw_after_callback(int call_update_sc */ void redrawWinline( + win_T *wp, linenr_T lnum, int invalid UNUSED) /* window line height is invalid now */ { @@ -503,19 +504,19 @@ redrawWinline( int i; #endif - if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) - curwin->w_redraw_top = lnum; - if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) - curwin->w_redraw_bot = lnum; - redraw_later(VALID); + if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) + wp->w_redraw_top = lnum; + if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) + wp->w_redraw_bot = lnum; + redraw_win_later(wp, VALID); #ifdef FEAT_FOLDING if (invalid) { /* A w_lines[] entry for this lnum has become invalid. */ - i = find_wl_entry(curwin, lnum); + i = find_wl_entry(wp, lnum); if (i >= 0) - curwin->w_lines[i].wl_valid = FALSE; + wp->w_lines[i].wl_valid = FALSE; } #endif }