From 3a597cb1a0c28480b8bf468339152252bcdf2c11 Mon Sep 17 00:00:00 2001 From: erw7 Date: Sun, 11 Oct 2020 10:59:44 +0900 Subject: [PATCH 1/2] tui: fix problem that TTY does not go into raw mode fixes #13073. --- src/nvim/tui/tui.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 2ef9bf5a2e..3158aa0589 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -1102,6 +1102,15 @@ static void tui_set_mode(UI *ui, ModeShape mode) static void tui_mode_change(UI *ui, String mode, Integer mode_idx) { TUIData *data = ui->data; +#ifdef UNIX + // If stdin is not a TTY, the LHS of pipe may change the state of the TTY + // after calling uv_tty_set_mode. So, set the mode of the TTY again here. + // #13073 + if (data->is_starting && data->input.in_fd == STDERR_FILENO) { + uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_NORMAL); + uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO); + } +#endif tui_set_mode(ui, (ModeShape)mode_idx); data->is_starting = false; // mode entered, no longer starting data->showing_mode = (ModeShape)mode_idx; From 2e70fee1e9da6ed044b207e9ec03bb5950846ef1 Mon Sep 17 00:00:00 2001 From: erw7 Date: Mon, 12 Oct 2020 10:09:36 +0900 Subject: [PATCH 2/2] tui: fix problem with uv_tty_set_mode failing due to signal fixes #12322. --- src/nvim/tui/tui.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 3158aa0589..62d7dc8b18 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -316,7 +316,13 @@ static void terminfo_start(UI *ui) #ifdef WIN32 uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW); #else - uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO); + int retry_count = 10; + // A signal may cause uv_tty_set_mode() to fail (e.g., SIGCONT). Retry a + // few times. #12322 + while (uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO) == UV_EINTR + && retry_count > 0) { + retry_count--; + } #endif } else { uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0);