mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): add various missing redraws

Browse Source 
Problem: missing redraws when restoring saved cursorline/column, plus missing
statusline and mode redraws when not updating the screen in terminal mode.

Solution: schedule the redraws in a similar manner to other modes and remove
some now unnecessary redrawing logic. Redraw if cursorline-related options
change from entering terminal mode. This fixes test failures in later commits.

WTF: TextChangedT triggers based on must_redraw, which is... fun...? Try to
preserve its behaviour as much as we can for now.
This commit is contained in:
Sean Dewar
2025-02-27 12:46:56 +00:00
parent 5e521c3b5a
commit ad1dfc92a0
3 changed files with 177 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/terminal.c
View File

@@ -705,18 +705,19 @@ bool terminal_enter(void)
} else {
curwin->w_p_cul = false;
}
if (curwin->w_p_cuc) {
redraw_later(curwin, UPD_SOME_VALID);
}
curwin->w_p_cuc = false;
curwin->w_p_so = 0;
curwin->w_p_siso = 0;
if (curwin->w_p_cuc != save_w_p_cuc) {
redraw_later(curwin, UPD_SOME_VALID);
} else if (curwin->w_p_cul != save_w_p_cul
|| (curwin->w_p_cul && curwin->w_p_culopt_flags != save_w_p_culopt_flags)) {
redraw_later(curwin, UPD_VALID);
}
s->term->pending.cursor = true; // Update the cursor shape table
adjust_topline(s->term, buf, 0); // scroll to end
showmode();
curwin->w_redr_status = true; // For mode() in statusline. #8323
redraw_custom_title_later();
ui_cursor_shape();
apply_autocmds(EVENT_TERMENTER, NULL, NULL, false, curbuf);
may_trigger_modechanged();
@@ -744,6 +745,12 @@ bool terminal_enter(void)
(void)parse_shape_opt(SHAPE_CURSOR);
if (save_curwin == curwin->handle) { // Else: window was closed.
if (save_w_p_cuc != curwin->w_p_cuc) {
redraw_later(curwin, UPD_SOME_VALID);
} else if (save_w_p_cul != curwin->w_p_cul
|| (save_w_p_cul && save_w_p_culopt_flags != curwin->w_p_culopt_flags)) {
redraw_later(curwin, UPD_VALID);
}
curwin->w_p_cul = save_w_p_cul;
if (save_w_p_culopt) {
free_string_option(curwin->w_p_culopt);
@@ -808,10 +815,18 @@ static int terminal_check(VimState *state)
assert(s->term == curbuf->terminal);
terminal_check_cursor();
validate_cursor(curwin);
const bool text_changed = must_redraw != 0;
show_cursor_info_later(false);
if (must_redraw) {
update_screen();
} else {
redraw_statuslines();
if (clear_cmdline || redraw_cmdline || redraw_mode) {
showmode(); // clear cmdline and show mode
}
}
if (text_changed) {
// Make sure an invoked autocmd doesn't delete the buffer (and the
// terminal) under our fingers.
curbuf->b_locked++;
@@ -827,10 +842,6 @@ static int terminal_check(VimState *state)
may_trigger_win_scrolled_resized();
if (need_maketitle) { // Update title in terminal-mode. #7248
maketitle();
}
setcursor();
refresh_cursor(s->term, &s->cursor_visible);
ui_flush();