mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 18:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

TUI: use stdio names instead of magic numbers #11410

Browse Source
This commit is contained in:
erw7
2019-11-18 05:58:58 +09:00
committed by Justin M. Keyes
parent 1f0fc4e452
commit 91f4bb0aee
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/os/tty.c
View File

@@ -6,6 +6,7 @@
// //
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/os/tty.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "os/tty.c.generated.h" # include "os/tty.c.generated.h"

8
src/nvim/tui/input.c
View File

@@ -26,7 +26,7 @@ void tinput_init(TermInput *input, Loop *loop)
{ {
input->loop = loop; input->loop = loop;
input->paste = 0; input->paste = 0;
input->in_fd = 0; input->in_fd = STDIN_FILENO;
input->waiting_for_bg_response = 0; input->waiting_for_bg_response = 0;
input->key_buffer = rbuffer_new(KEY_BUFFER_SIZE); input->key_buffer = rbuffer_new(KEY_BUFFER_SIZE);
uv_mutex_init(&input->key_buffer_mutex); uv_mutex_init(&input->key_buffer_mutex);
@@ -36,7 +36,7 @@ void tinput_init(TermInput *input, Loop *loop)
// echo q | nvim -es // echo q | nvim -es
// ls *.md | xargs nvim // ls *.md | xargs nvim
#ifdef WIN32 #ifdef WIN32
if (!os_isatty(0)) { if (!os_isatty(input->in_fd)) {
const HANDLE conin_handle = CreateFile("CONIN$", const HANDLE conin_handle = CreateFile("CONIN$",
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -46,8 +46,8 @@ void tinput_init(TermInput *input, Loop *loop)
assert(input->in_fd != -1); assert(input->in_fd != -1);
} }
#else #else
if (!os_isatty(0) && os_isatty(2)) { if (!os_isatty(input->in_fd) && os_isatty(STDERR_FILENO)) {
input->in_fd = 2; input->in_fd = STDERR_FILENO;
} }
#endif #endif
input_global_fd_init(input->in_fd); input_global_fd_init(input->in_fd);

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

@@ -220,7 +220,7 @@ static void terminfo_start(UI *ui)
data->unibi_ext.reset_cursor_style = -1; data->unibi_ext.reset_cursor_style = -1;
data->unibi_ext.get_bg = -1; data->unibi_ext.get_bg = -1;
data->unibi_ext.set_underline_color = -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); data->out_isatty = os_isatty(data->out_fd);
const char *term = os_getenv("TERM"); const char *term = os_getenv("TERM");