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

Merge pull request #13084 from erw7/fix-tui-cooked-mode

Browse Source 
tui: fix problem that TTY does not go into raw mode
This commit is contained in:
Matthieu Coudron 2020-10-25 22:05:03 +01:00 committed by GitHub
commit 4ba5b4a864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,13 @@ static void terminfo_start(UI *ui)
#ifdef WIN32 #ifdef WIN32
uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW); uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW);
#else #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 #endif
} else { } else {
uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0); 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) static void tui_mode_change(UI *ui, String mode, Integer mode_idx)
{ {
TUIData *data = ui->data; 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); tui_set_mode(ui, (ModeShape)mode_idx);
data->is_starting = false; // mode entered, no longer starting data->is_starting = false; // mode entered, no longer starting
data->showing_mode = (ModeShape)mode_idx; data->showing_mode = (ModeShape)mode_idx;