aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set

Browse Source 
Problem:    Moving the cursor is slow when 'relativenumber' is set.
Solution:   Only redraw the number column, not all lines.
This commit is contained in:
Bram Moolenaar
2018-09-12 23:15:48 +02:00
parent 1b7fefcbce
commit bd9a53c06c
3 changed files with 210 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/move.c
View File

@@ -145,21 +145,25 @@ redraw_for_cursorline(win_T *wp)
# endif # endif
) )
{ {
#ifdef FEAT_SYN_HL if (wp->w_p_rnu)
if (!wp->w_p_rnu && wp->w_redr_type <= VALID && last_cursorline != 0) // win_line() will redraw the number column only.
{
// "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);
redraw_win_later(wp, VALID); redraw_win_later(wp, VALID);
}
else
#endif
redraw_win_later(wp, SOME_VALID);
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
last_cursorline = wp->w_cursor.lnum; if (wp->w_p_cul)
{
if (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);
redraw_win_later(wp, VALID);
}
else
redraw_win_later(wp, SOME_VALID);
last_cursorline = wp->w_cursor.lnum;
}
#endif #endif
} }
} }

366
src/screen.c
View File

@@ -132,7 +132,7 @@ static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T
static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum);
static void copy_text_attr(int off, char_u *buf, int len, int attr); static void copy_text_attr(int off, char_u *buf, int len, int attr);
#endif #endif
static int win_line(win_T *, linenr_T, int, int, int nochange); static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only);
static int char_needs_redraw(int off_from, int off_to, int cols); static int char_needs_redraw(int off_from, int off_to, int cols);
static void draw_vsep_win(win_T *wp, int row); static void draw_vsep_win(win_T *wp, int row);
#ifdef FEAT_STL_OPT #ifdef FEAT_STL_OPT
@@ -971,7 +971,8 @@ update_single_line(win_T *wp, linenr_T lnum)
start_search_hl(); start_search_hl();
prepare_search_hl(wp, lnum); prepare_search_hl(wp, lnum);
# endif # endif
win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE); win_line(wp, lnum, row, row + wp->w_lines[j].wl_size,
FALSE, FALSE);
# if defined(FEAT_SEARCH_EXTRA) # if defined(FEAT_SEARCH_EXTRA)
end_search_hl(); end_search_hl();
# endif # endif
@@ -1881,7 +1882,7 @@ win_update(win_T *wp)
/* /*
* Update a line when it is in an area that needs updating, when it * Update a line when it is in an area that needs updating, when it
* has changes or w_lines[idx] is invalid. * has changes or w_lines[idx] is invalid.
* bot_start may be halfway a wrapped line after using * "bot_start" may be halfway a wrapped line after using
* win_del_lines(), check if the current line includes it. * win_del_lines(), check if the current line includes it.
* When syntax folding is being used, the saved syntax states will * When syntax folding is being used, the saved syntax states will
* already have been updated, we can't see where the syntax state is * already have been updated, we can't see where the syntax state is
@@ -2140,7 +2141,8 @@ win_update(win_T *wp)
/* /*
* Display one line. * Display one line.
*/ */
row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); row = win_line(wp, lnum, srow, wp->w_height,
mod_top == 0, FALSE);
#ifdef FEAT_FOLDING #ifdef FEAT_FOLDING
wp->w_lines[idx].wl_folded = FALSE; wp->w_lines[idx].wl_folded = FALSE;
@@ -2177,7 +2179,14 @@ win_update(win_T *wp)
} }
else else
{ {
/* This line does not need updating, advance to the next one */ if (wp->w_p_rnu)
{
// 'relativenumber' set: The text doesn't need to be drawn, but
// the number column nearly always does.
(void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE);
}
// This line does not need to be drawn, advance to the next one.
row += wp->w_lines[idx++].wl_size; row += wp->w_lines[idx++].wl_size;
if (row > wp->w_height) /* past end of screen */ if (row > wp->w_height) /* past end of screen */
break; break;
@@ -3058,7 +3067,8 @@ win_line(
linenr_T lnum, linenr_T lnum,
int startrow, int startrow,
int endrow, int endrow,
int nochange UNUSED) /* not updating for changed text */ int nochange UNUSED, // not updating for changed text
int number_only) // only update the number column
{ {
int col = 0; /* visual column on screen */ int col = 0; /* visual column on screen */
unsigned off; /* offset in ScreenLines/ScreenAttrs */ unsigned off; /* offset in ScreenLines/ScreenAttrs */
@@ -3253,212 +3263,215 @@ win_line(
row = startrow; row = startrow;
screen_row = row + W_WINROW(wp); screen_row = row + W_WINROW(wp);
/* if (!number_only)
* To speed up the loop below, set extra_check when there is linebreak, {
* trailing white space and/or syntax processing to be done. /*
*/ * To speed up the loop below, set extra_check when there is linebreak,
* trailing white space and/or syntax processing to be done.
*/
#ifdef FEAT_LINEBREAK #ifdef FEAT_LINEBREAK
extra_check = wp->w_p_lbr; extra_check = wp->w_p_lbr;
#else #else
extra_check = 0; extra_check = 0;
#endif #endif
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
if (syntax_present(wp) && !wp->w_s->b_syn_error if (syntax_present(wp) && !wp->w_s->b_syn_error
# ifdef SYN_TIME_LIMIT # ifdef SYN_TIME_LIMIT
&& !wp->w_s->b_syn_slow && !wp->w_s->b_syn_slow
# endif # endif
) )
{
/* Prepare for syntax highlighting in this line. When there is an
* error, stop syntax highlighting. */
save_did_emsg = did_emsg;
did_emsg = FALSE;
syntax_start(wp, lnum);
if (did_emsg)
wp->w_s->b_syn_error = TRUE;
else
{ {
did_emsg = save_did_emsg; /* Prepare for syntax highlighting in this line. When there is an
#ifdef SYN_TIME_LIMIT * error, stop syntax highlighting. */
if (!wp->w_s->b_syn_slow) save_did_emsg = did_emsg;
#endif did_emsg = FALSE;
syntax_start(wp, lnum);
if (did_emsg)
wp->w_s->b_syn_error = TRUE;
else
{ {
has_syntax = TRUE; did_emsg = save_did_emsg;
extra_check = TRUE; #ifdef SYN_TIME_LIMIT
if (!wp->w_s->b_syn_slow)
#endif
{
has_syntax = TRUE;
extra_check = TRUE;
}
} }
} }
}
/* Check for columns to display for 'colorcolumn'. */ /* Check for columns to display for 'colorcolumn'. */
color_cols = wp->w_p_cc_cols; color_cols = wp->w_p_cc_cols;
if (color_cols != NULL) if (color_cols != NULL)
draw_color_col = advance_color_col(VCOL_HLC, &color_cols); draw_color_col = advance_color_col(VCOL_HLC, &color_cols);
#endif #endif
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL
if (term_show_buffer(wp->w_buffer)) if (term_show_buffer(wp->w_buffer))
{ {
extra_check = TRUE; extra_check = TRUE;
get_term_attr = TRUE; get_term_attr = TRUE;
term_attr = term_get_attr(wp->w_buffer, lnum, -1); term_attr = term_get_attr(wp->w_buffer, lnum, -1);
} }
#endif #endif
#ifdef FEAT_SPELL #ifdef FEAT_SPELL
if (wp->w_p_spell if (wp->w_p_spell
&& *wp->w_s->b_p_spl != NUL && *wp->w_s->b_p_spl != NUL
&& wp->w_s->b_langp.ga_len > 0 && wp->w_s->b_langp.ga_len > 0
&& *(char **)(wp->w_s->b_langp.ga_data) != NULL) && *(char **)(wp->w_s->b_langp.ga_data) != NULL)
{
/* Prepare for spell checking. */
has_spell = TRUE;
extra_check = TRUE;
/* Get the start of the next line, so that words that wrap to the next
* line are found too: "et<line-break>al.".
* Trick: skip a few chars for C/shell/Vim comments */
nextline[SPWORDLEN] = NUL;
if (lnum < wp->w_buffer->b_ml.ml_line_count)
{ {
line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); /* Prepare for spell checking. */
spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); has_spell = TRUE;
extra_check = TRUE;
/* Get the start of the next line, so that words that wrap to the next
* line are found too: "et<line-break>al.".
* Trick: skip a few chars for C/shell/Vim comments */
nextline[SPWORDLEN] = NUL;
if (lnum < wp->w_buffer->b_ml.ml_line_count)
{
line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE);
spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN);
}
/* When a word wrapped from the previous line the start of the current
* line is valid. */
if (lnum == checked_lnum)
cur_checked_col = checked_col;
checked_lnum = 0;
/* When there was a sentence end in the previous line may require a
* word starting with capital in this line. In line 1 always check
* the first word. */
if (lnum != capcol_lnum)
cap_col = -1;
if (lnum == 1)
cap_col = 0;
capcol_lnum = 0;
} }
/* When a word wrapped from the previous line the start of the current
* line is valid. */
if (lnum == checked_lnum)
cur_checked_col = checked_col;
checked_lnum = 0;
/* When there was a sentence end in the previous line may require a
* word starting with capital in this line. In line 1 always check
* the first word. */
if (lnum != capcol_lnum)
cap_col = -1;
if (lnum == 1)
cap_col = 0;
capcol_lnum = 0;
}
#endif #endif
/* /*
* handle visual active in this window * handle visual active in this window
*/ */
fromcol = -10; fromcol = -10;
tocol = MAXCOL; tocol = MAXCOL;
if (VIsual_active && wp->w_buffer == curwin->w_buffer) if (VIsual_active && wp->w_buffer == curwin->w_buffer)
{
/* Visual is after curwin->w_cursor */
if (LTOREQ_POS(curwin->w_cursor, VIsual))
{ {
top = &curwin->w_cursor; /* Visual is after curwin->w_cursor */
bot = &VIsual; if (LTOREQ_POS(curwin->w_cursor, VIsual))
}
else /* Visual is before curwin->w_cursor */
{
top = &VIsual;
bot = &curwin->w_cursor;
}
lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum);
if (VIsual_mode == Ctrl_V) /* block mode */
{
if (lnum_in_visual_area)
{ {
fromcol = wp->w_old_cursor_fcol; top = &curwin->w_cursor;
tocol = wp->w_old_cursor_lcol; bot = &VIsual;
} }
} else /* Visual is before curwin->w_cursor */
else /* non-block mode */
{
if (lnum > top->lnum && lnum <= bot->lnum)
fromcol = 0;
else if (lnum == top->lnum)
{ {
if (VIsual_mode == 'V') /* linewise */ top = &VIsual;
bot = &curwin->w_cursor;
}
lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum);
if (VIsual_mode == Ctrl_V) /* block mode */
{
if (lnum_in_visual_area)
{
fromcol = wp->w_old_cursor_fcol;
tocol = wp->w_old_cursor_lcol;
}
}
else /* non-block mode */
{
if (lnum > top->lnum && lnum <= bot->lnum)
fromcol = 0; fromcol = 0;
else else if (lnum == top->lnum)
{ {
getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); if (VIsual_mode == 'V') /* linewise */
if (gchar_pos(top) == NUL) fromcol = 0;
tocol = fromcol + 1;
}
}
if (VIsual_mode != 'V' && lnum == bot->lnum)
{
if (*p_sel == 'e' && bot->col == 0
#ifdef FEAT_VIRTUALEDIT
&& bot->coladd == 0
#endif
)
{
fromcol = -10;
tocol = MAXCOL;
}
else if (bot->col == MAXCOL)
tocol = MAXCOL;
else
{
pos = *bot;
if (*p_sel == 'e')
getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL);
else else
{ {
getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL);
++tocol; if (gchar_pos(top) == NUL)
tocol = fromcol + 1;
}
}
if (VIsual_mode != 'V' && lnum == bot->lnum)
{
if (*p_sel == 'e' && bot->col == 0
#ifdef FEAT_VIRTUALEDIT
&& bot->coladd == 0
#endif
)
{
fromcol = -10;
tocol = MAXCOL;
}
else if (bot->col == MAXCOL)
tocol = MAXCOL;
else
{
pos = *bot;
if (*p_sel == 'e')
getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL);
else
{
getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol);
++tocol;
}
} }
} }
} }
}
/* Check if the character under the cursor should not be inverted */ /* Check if the character under the cursor should not be inverted */
if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin
#ifdef FEAT_GUI #ifdef FEAT_GUI
&& !gui.in_use && !gui.in_use
#endif #endif
) )
noinvcur = TRUE; noinvcur = TRUE;
/* if inverting in this line set area_highlighting */ /* if inverting in this line set area_highlighting */
if (fromcol >= 0) if (fromcol >= 0)
{ {
area_highlighting = TRUE; area_highlighting = TRUE;
attr = HL_ATTR(HLF_V); attr = HL_ATTR(HLF_V);
#if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
if ((clip_star.available && !clip_star.owned if ((clip_star.available && !clip_star.owned
&& clip_isautosel_star()) && clip_isautosel_star())
|| (clip_plus.available && !clip_plus.owned || (clip_plus.available && !clip_plus.owned
&& clip_isautosel_plus())) && clip_isautosel_plus()))
attr = HL_ATTR(HLF_VNC); attr = HL_ATTR(HLF_VNC);
#endif #endif
}
} }
}
/* /*
* handle 'incsearch' and ":s///c" highlighting * handle 'incsearch' and ":s///c" highlighting
*/ */
else if (highlight_match else if (highlight_match
&& wp == curwin && wp == curwin
&& lnum >= curwin->w_cursor.lnum && lnum >= curwin->w_cursor.lnum
&& lnum <= curwin->w_cursor.lnum + search_match_lines) && lnum <= curwin->w_cursor.lnum + search_match_lines)
{
if (lnum == curwin->w_cursor.lnum)
getvcol(curwin, &(curwin->w_cursor),
(colnr_T *)&fromcol, NULL, NULL);
else
fromcol = 0;
if (lnum == curwin->w_cursor.lnum + search_match_lines)
{ {
pos.lnum = lnum; if (lnum == curwin->w_cursor.lnum)
pos.col = search_match_endcol; getvcol(curwin, &(curwin->w_cursor),
getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); (colnr_T *)&fromcol, NULL, NULL);
else
fromcol = 0;
if (lnum == curwin->w_cursor.lnum + search_match_lines)
{
pos.lnum = lnum;
pos.col = search_match_endcol;
getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL);
}
else
tocol = MAXCOL;
/* do at least one character; happens when past end of line */
if (fromcol == tocol)
tocol = fromcol + 1;
area_highlighting = TRUE;
attr = HL_ATTR(HLF_I);
} }
else
tocol = MAXCOL;
/* do at least one character; happens when past end of line */
if (fromcol == tocol)
tocol = fromcol + 1;
area_highlighting = TRUE;
attr = HL_ATTR(HLF_I);
} }
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
@@ -3504,7 +3517,7 @@ win_line(
ptr = line; ptr = line;
#ifdef FEAT_SPELL #ifdef FEAT_SPELL
if (has_spell) if (has_spell && !number_only)
{ {
/* For checking first word with a capital skip white space. */ /* For checking first word with a capital skip white space. */
if (cap_col == 0) if (cap_col == 0)
@@ -3564,7 +3577,7 @@ win_line(
v = wp->w_skipcol; v = wp->w_skipcol;
else else
v = wp->w_leftcol; v = wp->w_leftcol;
if (v > 0) if (v > 0 && !number_only)
{ {
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
char_u *prev_ptr = ptr; char_u *prev_ptr = ptr;
@@ -3707,7 +3720,7 @@ win_line(
*/ */
cur = wp->w_match_head; cur = wp->w_match_head;
shl_flag = FALSE; shl_flag = FALSE;
while (cur != NULL || shl_flag == FALSE) while ((cur != NULL || shl_flag == FALSE) && !number_only)
{ {
if (shl_flag == FALSE) if (shl_flag == FALSE)
{ {
@@ -4068,13 +4081,16 @@ win_line(
} }
} }
/* When still displaying '$' of change command, stop at cursor */ // When still displaying '$' of change command, stop at cursor.
if (dollar_vcol >= 0 && wp == curwin // When only displaying the (relative) line number and that's done,
// stop here.
if ((dollar_vcol >= 0 && wp == curwin
&& lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
&& filler_todo <= 0 && filler_todo <= 0
#endif #endif
) )
|| (number_only && draw_state > WL_NR))
{ {
screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width,
HAS_RIGHTLEFT(wp->w_p_rl)); HAS_RIGHTLEFT(wp->w_p_rl));

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
374,
/**/ /**/
373, 373,
/**/ /**/