IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

screen: avoid redrawing windows immediately when debug signs are placed.

Browse Source
This commit is contained in:
Björn Linse 2019-01-08 20:29:12 +01:00
parent aadfea7159
commit ead222d2cd
2 changed files with 21 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/ex_cmds.c
View File

@ -5759,7 +5759,7 @@ void ex_sign(exarg_T *eap)
id = buf_findsign_id(curwin->w_buffer, curwin->w_cursor.lnum);
if (id > 0) {
buf_delsign(curwin->w_buffer, id);
update_debug_sign(curwin->w_buffer, curwin->w_cursor.lnum);
redraw_buf_line_later(curwin->w_buffer, curwin->w_cursor.lnum);
} else {
EMSG(_("E159: Missing sign number"));
}
@ -5788,7 +5788,7 @@ void ex_sign(exarg_T *eap)
// ":sign unplace {id}": remove placed sign by number
FOR_ALL_BUFFERS(buf) {
if ((lnum = buf_delsign(buf, id)) != 0) {
update_debug_sign(buf, lnum);
redraw_buf_line_later(buf, lnum);
}
}
return;
@ -5888,7 +5888,7 @@ void ex_sign(exarg_T *eap)
} else {
// ":sign unplace {id} file={fname}"
lnum = buf_delsign(buf, id);
update_debug_sign(buf, lnum);
redraw_buf_line_later(buf, lnum);
}
} else if (sign_name != NULL) {
// idx == SIGNCMD_PLACE
@ -5910,7 +5910,7 @@ void ex_sign(exarg_T *eap)
lnum = buf_change_sign_type(buf, id, sp->sn_typenr);
}
if (lnum > 0) {
update_debug_sign(buf, lnum);
redraw_buf_line_later(buf, lnum);
} else {
EMSG2(_("E885: Not possible to change sign %s"), sign_name);
}

74
src/nvim/screen.c
View File

@ -214,6 +214,15 @@ void redraw_buf_later(buf_T *buf, int type)
}
}
void redraw_buf_line_later(buf_T *buf, linenr_T line)
{
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_buffer == buf) {
redrawWinline(wp, line, false);
}
}
}
/*
* Changed something in the current window, at buffer line "lnum", that
* requires that line and possibly other lines to be redrawn.
@ -231,6 +240,8 @@ redrawWinline(
{
int i;
if (lnum >= wp->w_topline
&& lnum < wp->w_botline) {
if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) {
wp->w_redraw_top = lnum;
}
@ -239,11 +250,12 @@ redrawWinline(
}
redraw_win_later(wp, VALID);
if (invalid) {
// A w_lines[] entry for this lnum has become invalid.
i = find_wl_entry(wp, lnum);
if (i >= 0) {
wp->w_lines[i].wl_valid = false;
if (invalid) {
// A w_lines[] entry for this lnum has become invalid.
i = find_wl_entry(wp, lnum);
if (i >= 0) {
wp->w_lines[i].wl_valid = false;
}
}
}
}
@ -569,58 +581,6 @@ void update_single_line(win_T *wp, linenr_T lnum)
need_cursor_line_redraw = false;
}
void update_debug_sign(const buf_T *const buf, const linenr_T lnum)
{
bool doit = false;
win_foldinfo.fi_level = 0;
// update/delete a specific mark
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (buf != NULL && lnum > 0) {
if (wp->w_buffer == buf && lnum >= wp->w_topline
&& lnum < wp->w_botline) {
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);
}
} else {
redraw_win_later(wp, VALID);
}
if (wp->w_redr_type != 0) {
doit = true;
}
}
// Return when there is nothing to do, screen updating is already
// happening (recursive call), messages on the screen or still starting up.
if (!doit
|| updating_screen
|| State == ASKMORE
|| State == HITRETURN
|| msg_scrolled
|| starting) {
return;
}
// update all windows that need updating
update_prepare();
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_redr_type != 0) {
update_window_hl(wp, wp->w_redr_type >= NOT_VALID);
win_update(wp);
}
if (wp->w_redr_status) {
win_redr_status(wp, false);
}
}
update_finish();
}
/*
* Update a single window.