Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Retry writing some escape sequences on EINTR

Browse source 
Cherry-picked from bc26481558.
This commit is contained in:
Johannes Altmanninger 2024-12-29 14:36:11 +01:00
parent 33fe575112
commit 620eed466b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/input_common.rs
View file

@ -2,7 +2,7 @@ use libc::STDOUT_FILENO;
use crate::common::{ use crate::common::{
fish_reserved_codepoint, is_windows_subsystem_for_linux, read_blocked, shell_modes, fish_reserved_codepoint, is_windows_subsystem_for_linux, read_blocked, shell_modes,
str2wcstring, WSL, str2wcstring, write_loop, WSL,
}; };
use crate::env::{EnvStack, Environment}; use crate::env::{EnvStack, Environment};
use crate::fd_readable_set::FdReadableSet; use crate::fd_readable_set::FdReadableSet;
@ -18,7 +18,7 @@ use crate::threads::{iothread_port, is_main_thread};
use crate::universal_notifier::default_notifier; use crate::universal_notifier::default_notifier;
use crate::wchar::{encode_byte_to_char, prelude::*}; use crate::wchar::{encode_byte_to_char, prelude::*};
use crate::wutil::encoding::{mbrtowc, mbstate_t, zero_mbstate}; use crate::wutil::encoding::{mbrtowc, mbstate_t, zero_mbstate};
use crate::wutil::{fish_wcstol, write_to_fd}; use crate::wutil::fish_wcstol;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::ops::ControlFlow; use std::ops::ControlFlow;
use std::os::fd::RawFd; use std::os::fd::RawFd;
@ -495,9 +495,9 @@ pub fn terminal_protocols_enable_ifn() {
) )
}; };
FLOG!(term_protocols, "Enabling extended keys and bracketed paste"); FLOG!(term_protocols, "Enabling extended keys and bracketed paste");
let _ = write_to_fd(sequences.as_bytes(), STDOUT_FILENO); let _ = write_loop(&STDOUT_FILENO, sequences.as_bytes());
if IS_TMUX.load() { if IS_TMUX.load() {
let _ = write_to_fd("\x1b[?1004h".as_bytes(), STDOUT_FILENO); let _ = write_loop(&STDOUT_FILENO, "\x1b[?1004h".as_bytes());
} }
reader_current_data().map(|data| data.save_screen_state()); reader_current_data().map(|data| data.save_screen_state());
} }
@ -522,9 +522,9 @@ pub(crate) fn terminal_protocols_disable_ifn() {
term_protocols, term_protocols,
"Disabling extended keys and bracketed paste" "Disabling extended keys and bracketed paste"
); );
let _ = write_to_fd(sequences.as_bytes(), STDOUT_FILENO); let _ = write_loop(&STDOUT_FILENO, sequences.as_bytes());
if IS_TMUX.load() { if IS_TMUX.load() {
let _ = write_to_fd("\x1b[?1004l".as_bytes(), STDOUT_FILENO); let _ = write_loop(&STDOUT_FILENO, "\x1b[?1004l".as_bytes());
} }
if is_main_thread() { if is_main_thread() {
reader_current_data().map(|data| data.save_screen_state()); reader_current_data().map(|data| data.save_screen_state());