github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 08:46:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set tty to shell mode before running fish_prompt

Browse Source 
Prior to this change, we would run fish_prompt and then afterwards set
the shell modes. For users with an initially slow prompt, this would
mean that characters would be echoed to the tty until after the prompt
completes.

Reorder these so that we set the tty mode first. This implies we will
run the prompt in shell mode, but this was already the case up until
2a3677b386598.

Fixes #7489. Note that the prior commit e0cedd4ad266adcaf is also necessary
here, as that fixed an extra prompt execution.
This commit is contained in:
ridiculousfish 2020-11-26 16:47:08 -08:00
parent e0cedd4ad2
commit 30c7a17302
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/reader.cpp
View File

@ -3654,7 +3654,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
using rl = readline_cmd_t;
readline_loop_state_t rls{};
struct termios old_modes;
// Suppress fish_trace during executing key bindings.
// This is simply to reduce noise.
@ -3672,6 +3671,23 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
history_search.reset();
// Get the current terminal modes. These will be restored when the function returns.
struct termios old_modes{};
if (tcgetattr(conf.in, &old_modes) == -1 && errno == EIO) redirect_tty_output();
// Set the new modes.
if (tcsetattr(conf.in, TCSANOW, &shell_modes) == -1) {
int err = errno;
if (err == EIO) redirect_tty_output();
// This check is required to work around certain issues with fish's approach to
// terminal control when launching interactive processes while in non-interactive
// mode. See #4178 for one such example.
if (err != ENOTTY || session_interactivity() != session_interactivity_t::not_interactive) {
wperror(L"tcsetattr");
}
}
s_reset_abandoning_line(&screen, termsize_last().width);
event_fire_generic(parser(), L"fish_prompt");
exec_prompt();
@ -3689,23 +3705,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
// Start out as initially dirty.
force_exec_prompt_and_repaint = true;
// Get the current terminal modes. These will be restored when the function returns.
if (tcgetattr(conf.in, &old_modes) == -1 && errno == EIO) redirect_tty_output();
// Set the new modes.
if (tcsetattr(conf.in, TCSANOW, &shell_modes) == -1) {
int err = errno;
if (err == EIO) {
redirect_tty_output();
}
// This check is required to work around certain issues with fish's approach to
// terminal control when launching interactive processes while in non-interactive
// mode. See #4178 for one such example.
if (err != ENOTTY || session_interactivity() != session_interactivity_t::not_interactive) {
wperror(L"tcsetattr");
}
}
while (!rls.finished && !check_exit_loop_maybe_warning(this)) {
// Perhaps update the termsize. This is cheap if it has not changed.
update_termsize();