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 PR #3546 'Fix some regressions'

Browse Source
This commit is contained in:
Thiago de Arruda 2015-10-29 10:06:05 -03:00
commit 58962d89c8
3 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,9 +82,11 @@ static void cursorhold_event(void **argv)
static void create_cursorhold_event(void)
{
// If the queue had any items, this function should not have been
// called(inbuf_poll would return kInputAvail)
assert(queue_empty(loop.events));
// If events are enabled and the queue has any items, this function should not
// have been called(inbuf_poll would return kInputAvail)
// TODO(tarruda): Cursorhold should be implemented as a timer set during the
// `state_check` callback for the states where it can be triggered.
assert(!events_enabled || queue_empty(loop.events));
queue_put(loop.events, cursorhold_event, 0);
}

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

@ -43,7 +43,11 @@ typedef struct {
TermInput input;
uv_loop_t write_loop;
unibi_term *ut;
uv_tty_t output_handle;
union {
uv_tty_t tty;
uv_pipe_t pipe;
} output_handle;
bool out_isatty;
SignalWatcher winch_handle, cont_handle;
bool cont_received;
// Event scheduled by the ui bridge. Since the main thread suspends until
@ -116,8 +120,8 @@ static void terminfo_start(UI *ui)
data->unibi_ext.enter_insert_mode = -1;
data->unibi_ext.enter_replace_mode = -1;
data->unibi_ext.exit_insert_mode = -1;
// write output to stderr if stdout is not a tty
data->out_fd = os_isatty(1) ? 1 : (os_isatty(2) ? 2 : 1);
data->out_fd = 1;
data->out_isatty = os_isatty(data->out_fd);
// setup unibilium
data->ut = unibi_from_env();
if (!data->ut) {
@ -132,8 +136,13 @@ static void terminfo_start(UI *ui)
// Enable bracketed paste
unibi_out(ui, data->unibi_ext.enable_bracketed_paste);
uv_loop_init(&data->write_loop);
uv_tty_init(&data->write_loop, &data->output_handle, data->out_fd, 0);
uv_tty_set_mode(&data->output_handle, UV_TTY_MODE_RAW);
if (data->out_isatty) {
uv_tty_init(&data->write_loop, &data->output_handle.tty, data->out_fd, 0);
uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW);
} else {
uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0);
uv_pipe_open(&data->output_handle.pipe, data->out_fd);
}
}
static void terminfo_stop(UI *ui)
@ -677,7 +686,8 @@ static void update_size(UI *ui)
}
// 2 - try from a system call(ioctl/TIOCGWINSZ on unix)
if (!uv_tty_get_winsize(&data->output_handle, &width, &height)) {
if (data->out_isatty &&
!uv_tty_get_winsize(&data->output_handle.tty, &width, &height)) {
goto end;
}

24
test/functional/terminal/tui_spec.lua
View File

@ -149,3 +149,27 @@ describe('tui', function()
]])
end)
end)
describe('tui with non-tty file descriptors', function()
before_each(helpers.clear)
after_each(function()
os.remove('testF') -- ensure test file is removed
end)
it('can handle pipes as stdout and stderr', function()
local screen = thelpers.screen_setup(0, '"'..helpers.nvim_prog..' -u NONE -i NONE --cmd \'set noswapfile\' --cmd \'normal iabc\' > /dev/null 2>&1 && cat testF && rm testF"')
screen:set_default_attr_ids({})
screen:set_default_attr_ignore(true)
feed(':w testF\n:q\n')
screen:expect([[
:w testF |
:q |
abc |
|
[Program exited, press any key to close] |
|
-- TERMINAL -- |
]])
end)
end)