diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-10-25 22:05:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-25 22:05:03 +0100 |
| commit | 4ba5b4a8646106252531610c46afffc3b021efcd (patch) | |
| tree | 271bbe48b76382d59203e97bf10da33423a9320d | |
| parent | 7fef16e1d6c106af57039c0620d77db917b12078 (diff) | |
| parent | 2e70fee1e9da6ed044b207e9ec03bb5950846ef1 (diff) | |
| download | rneovim-4ba5b4a8646106252531610c46afffc3b021efcd.tar.gz rneovim-4ba5b4a8646106252531610c46afffc3b021efcd.tar.bz2 rneovim-4ba5b4a8646106252531610c46afffc3b021efcd.zip | |
Merge pull request #13084 from erw7/fix-tui-cooked-mode
tui: fix problem that TTY does not go into raw mode
| -rw-r--r-- | src/nvim/tui/tui.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 2ef9bf5a2e..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); @@ -1102,6 +1108,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; |