GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-17 01:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): start flush earlier (#26463)

Browse Source 
Problem:  TUI flush (start sync or hide cursor) only starts on a "flush"
          event, which is too late.
Solution: Start the next flush when anything will be drawn.
This commit is contained in:
zeertzjq
2023-12-08 10:25:38 +08:00
committed by GitHub
parent 3bb5d2f219
commit 999e167a52
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/tui/tui.c
View File

@ -76,8 +76,9 @@ struct TUIData {
size_t bufpos; size_t bufpos;
TermInput input; TermInput input;
uv_loop_t write_loop; uv_loop_t write_loop;
bool dirty; ///< whether there has been drawing since the last tui_flush()
unibi_term *ut; unibi_term *ut;
char *term; // value of $TERM char *term; ///< value of $TERM
union { union {
uv_tty_t tty; uv_tty_t tty;
uv_pipe_t pipe; uv_pipe_t pipe;
@ -900,6 +901,8 @@ static void print_cell_at_pos(TUIData *tui, int row, int col, UCell *cell, bool
return; return;
} }
tui_set_dirty(tui);
cursor_goto(tui, row, col); cursor_goto(tui, row, col);
char buf[MAX_SCHAR_SIZE]; char buf[MAX_SCHAR_SIZE];
@ -925,6 +928,8 @@ static void clear_region(TUIData *tui, int top, int bot, int left, int right, in
{ {
UGrid *grid = &tui->grid; UGrid *grid = &tui->grid;
tui_set_dirty(tui);
update_attrs(tui, attr_id); update_attrs(tui, attr_id);
// Background is set to the default color and the right edge matches the // Background is set to the default color and the right edge matches the
@ -1242,6 +1247,8 @@ void tui_grid_scroll(TUIData *tui, Integer g, Integer startrow, Integer endrow,
|| tui->can_set_left_right_margin))); || tui->can_set_left_right_margin)));
if (can_scroll) { if (can_scroll) {
tui_set_dirty(tui);
// Change terminal scroll region and move cursor to the top // Change terminal scroll region and move cursor to the top
if (!tui->scroll_region_is_full_screen) { if (!tui->scroll_region_is_full_screen) {
set_scroll_region(tui, top, bot, left, right); set_scroll_region(tui, top, bot, left, right);
@ -1311,6 +1318,15 @@ void tui_default_colors_set(TUIData *tui, Integer rgb_fg, Integer rgb_bg, Intege
invalidate(tui, 0, tui->grid.height, 0, tui->grid.width); invalidate(tui, 0, tui->grid.height, 0, tui->grid.width);
} }
static void tui_set_dirty(TUIData *tui)
FUNC_ATTR_NONNULL_ALL
{
if (!tui->dirty) {
tui->dirty = true;
tui_flush_start(tui);
}
}
/// Begin flushing the TUI. If 'termsync' is set and the terminal supports synchronized updates, /// Begin flushing the TUI. If 'termsync' is set and the terminal supports synchronized updates,
/// begin a synchronized update. Otherwise, hide the cursor to avoid cursor jumping. /// begin a synchronized update. Otherwise, hide the cursor to avoid cursor jumping.
static void tui_flush_start(TUIData *tui) static void tui_flush_start(TUIData *tui)
@ -1360,7 +1376,7 @@ void tui_flush(TUIData *tui)
tui_busy_stop(tui); // avoid hidden cursor tui_busy_stop(tui); // avoid hidden cursor
} }
tui_flush_start(tui); tui_set_dirty(tui);
while (kv_size(tui->invalid_regions)) { while (kv_size(tui->invalid_regions)) {
Rect r = kv_pop(tui->invalid_regions); Rect r = kv_pop(tui->invalid_regions);
@ -1389,9 +1405,10 @@ void tui_flush(TUIData *tui)
cursor_goto(tui, tui->row, tui->col); cursor_goto(tui, tui->row, tui->col);
assert(tui->dirty);
tui_flush_end(tui); tui_flush_end(tui);
flush_buf(tui); flush_buf(tui);
tui->dirty = false;
} }
/// Dumps termcap info to the messages area, if 'verbose' >= 3. /// Dumps termcap info to the messages area, if 'verbose' >= 3.