diff options
| author | erw7 <erw7.github@gmail.com> | 2019-11-18 05:58:58 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-11-17 12:58:58 -0800 |
| commit | 91f4bb0aeec0b2ae983ea310ada73be5f35f7c5c (patch) | |
| tree | 5498833ba0b49dd63464cab4c68d556bf6c8e91f | |
| parent | 1f0fc4e452e6f7ce07253946b0de21232b21ab9a (diff) | |
| download | rneovim-91f4bb0aeec0b2ae983ea310ada73be5f35f7c5c.tar.gz rneovim-91f4bb0aeec0b2ae983ea310ada73be5f35f7c5c.tar.bz2 rneovim-91f4bb0aeec0b2ae983ea310ada73be5f35f7c5c.zip | |
TUI: use stdio names instead of magic numbers #11410
| -rw-r--r-- | src/nvim/os/tty.c | 1 | ||||
| -rw-r--r-- | src/nvim/tui/input.c | 8 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/os/tty.c b/src/nvim/os/tty.c index bd5b9b4506..4f525bed9a 100644 --- a/src/nvim/os/tty.c +++ b/src/nvim/os/tty.c @@ -6,6 +6,7 @@ // #include "nvim/os/os.h" +#include "nvim/os/tty.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "os/tty.c.generated.h" diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c index 844bc0db40..c71378463f 100644 --- a/src/nvim/tui/input.c +++ b/src/nvim/tui/input.c @@ -26,7 +26,7 @@ void tinput_init(TermInput *input, Loop *loop) { input->loop = loop; input->paste = 0; - input->in_fd = 0; + input->in_fd = STDIN_FILENO; input->waiting_for_bg_response = 0; input->key_buffer = rbuffer_new(KEY_BUFFER_SIZE); uv_mutex_init(&input->key_buffer_mutex); @@ -36,7 +36,7 @@ void tinput_init(TermInput *input, Loop *loop) // echo q | nvim -es // ls *.md | xargs nvim #ifdef WIN32 - if (!os_isatty(0)) { + if (!os_isatty(input->in_fd)) { const HANDLE conin_handle = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -46,8 +46,8 @@ void tinput_init(TermInput *input, Loop *loop) assert(input->in_fd != -1); } #else - if (!os_isatty(0) && os_isatty(2)) { - input->in_fd = 2; + if (!os_isatty(input->in_fd) && os_isatty(STDERR_FILENO)) { + input->in_fd = STDERR_FILENO; } #endif input_global_fd_init(input->in_fd); diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 11746441aa..60e1353000 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -220,7 +220,7 @@ static void terminfo_start(UI *ui) data->unibi_ext.reset_cursor_style = -1; data->unibi_ext.get_bg = -1; data->unibi_ext.set_underline_color = -1; - data->out_fd = 1; + data->out_fd = STDOUT_FILENO; data->out_isatty = os_isatty(data->out_fd); const char *term = os_getenv("TERM"); |