diff options
| author | Daniel Hahler <git@thequod.de> | 2019-09-24 08:34:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 08:34:00 +0200 |
| commit | 445f2f409676f6e788861af439ce0b823aab3f37 (patch) | |
| tree | 2adc407b7bae7f215b17639e22a115fc6147edd4 | |
| parent | 6d213593ed0af948d23e9d0e8c6d993577344b48 (diff) | |
| download | rneovim-445f2f409676f6e788861af439ce0b823aab3f37.tar.gz rneovim-445f2f409676f6e788861af439ce0b823aab3f37.tar.bz2 rneovim-445f2f409676f6e788861af439ce0b823aab3f37.zip | |
tui: flush ui buffer in tui_terminal_after_startup (#11083)
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).
| -rw-r--r-- | src/nvim/event/loop.c | 4 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/nvim/event/loop.c b/src/nvim/event/loop.c index a01bbc9888..c2be472acd 100644 --- a/src/nvim/event/loop.c +++ b/src/nvim/event/loop.c @@ -162,10 +162,6 @@ size_t loop_size(Loop *loop) return rv; } -void loop_dummy_event(void **argv) -{ -} - static void async_cb(uv_async_t *handle) { Loop *l = handle->loop->data; diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 0b3bed1c76..55c4a955c2 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -312,7 +312,6 @@ static void terminfo_start(UI *ui) uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0); uv_pipe_open(&data->output_handle.pipe, data->out_fd); } - flush_buf(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 // 2.3 bug(?) which caused slow drawing during startup. #7649 unibi_out_ext(ui, data->unibi_ext.enable_focus_reporting); + flush_buf(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)) { 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". while (!tui_is_stopped(ui)) { |