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

tui: flush ui buffer in tui_terminal_after_startup (#11083)

Browse Source 
This avoids having a dummy event to tickle the main loop.

Confirmed using `nvim -u NONE -c 'au FocusGained * q'` in tmux (with
`:set -g focus-events on`): without the flushing it would only exit
after pressing a key.

Moves the flushing done recently in 3626d2107.
`nvim -u NONE -cq` is still working (i.e. consuming the response for the
terminal background query itself), and the flickering mentioned in
3626d2107 is reduced again.

Reverts part of bfb21f3e0 (#7729).
This commit is contained in:
Daniel Hahler 2019-09-24 08:34:00 +02:00 committed by GitHub
parent 6d213593ed
commit 445f2f4096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/event/loop.c
View File

@ -162,10 +162,6 @@ size_t loop_size(Loop *loop)
return rv; return rv;
} }
void loop_dummy_event(void **argv)
{
}
static void async_cb(uv_async_t *handle) static void async_cb(uv_async_t *handle)
{ {
Loop *l = handle->loop->data; Loop *l = handle->loop->data;

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

@ -312,7 +312,6 @@ static void terminfo_start(UI *ui)
uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0); uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0);
uv_pipe_open(&data->output_handle.pipe, data->out_fd); uv_pipe_open(&data->output_handle.pipe, data->out_fd);
} }
flush_buf(ui);
} }
static void terminfo_stop(UI *ui) static void terminfo_stop(UI *ui)
@ -364,6 +363,7 @@ static void tui_terminal_after_startup(UI *ui)
// Emit this after Nvim startup, not during. This works around a tmux // Emit this after Nvim startup, not during. This works around a tmux
// 2.3 bug(?) which caused slow drawing during startup. #7649 // 2.3 bug(?) which caused slow drawing during startup. #7649
unibi_out_ext(ui, data->unibi_ext.enable_focus_reporting); unibi_out_ext(ui, data->unibi_ext.enable_focus_reporting);
flush_buf(ui);
} }
static void tui_terminal_stop(UI *ui) static void tui_terminal_stop(UI *ui)
@ -431,9 +431,6 @@ static void tui_main(UIBridgeData *bridge, UI *ui)
} }
if (!tui_is_stopped(ui)) { if (!tui_is_stopped(ui)) {
tui_terminal_after_startup(ui); tui_terminal_after_startup(ui);
// Tickle `main_loop` with a dummy event, else the initial "focus-gained"
// terminal response may not get processed until user hits a key.
loop_schedule_deferred(&main_loop, event_create(loop_dummy_event, 0));
} }
// "Passive" (I/O-driven) loop: TUI thread "main loop". // "Passive" (I/O-driven) loop: TUI thread "main loop".
while (!tui_is_stopped(ui)) { while (!tui_is_stopped(ui)) {