mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-05-28 09:31:16 -03:00
Compare commits
3 Commits
4.4.0
...
torn-seque
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
65556ac2ae | ||
|
|
25e5cc23c1 | ||
|
|
4012345ba9 |
@@ -12,7 +12,7 @@
|
|||||||
use crate::reader::{reader_save_screen_state, reader_test_and_clear_interrupted};
|
use crate::reader::{reader_save_screen_state, reader_test_and_clear_interrupted};
|
||||||
use crate::terminal::{Capability, SCROLL_FORWARD_SUPPORTED, SCROLL_FORWARD_TERMINFO_CODE};
|
use crate::terminal::{Capability, SCROLL_FORWARD_SUPPORTED, SCROLL_FORWARD_TERMINFO_CODE};
|
||||||
use crate::threads::iothread_port;
|
use crate::threads::iothread_port;
|
||||||
use crate::tty_handoff::set_kitty_keyboard_capability;
|
use crate::tty_handoff::{get_kitty_keyboard_capability, set_kitty_keyboard_capability};
|
||||||
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};
|
||||||
@@ -21,7 +21,6 @@
|
|||||||
use std::collections::VecDeque;
|
use std::collections::VecDeque;
|
||||||
use std::mem::MaybeUninit;
|
use std::mem::MaybeUninit;
|
||||||
use std::os::fd::RawFd;
|
use std::os::fd::RawFd;
|
||||||
use std::ptr;
|
|
||||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
@@ -513,8 +512,35 @@ enum ReadbResult {
|
|||||||
NothingToRead,
|
NothingToRead,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn readb(in_fd: RawFd, blocking: bool) -> ReadbResult {
|
fn readb(in_fd: RawFd, blocking: bool, pasting: bool) -> ReadbResult {
|
||||||
|
let do_readb = || {
|
||||||
|
let mut arr: [u8; 1] = [0];
|
||||||
|
if read_blocked(in_fd, &mut arr) != Ok(1) {
|
||||||
|
// The terminal has been closed.
|
||||||
|
return ReadbResult::Eof;
|
||||||
|
}
|
||||||
|
let c = arr[0];
|
||||||
|
FLOG!(reader, "Read byte", char_to_symbol(char::from(c), true));
|
||||||
|
// The common path is to return a u8.
|
||||||
|
return ReadbResult::Byte(c);
|
||||||
|
};
|
||||||
assert!(in_fd >= 0, "Invalid in fd");
|
assert!(in_fd >= 0, "Invalid in fd");
|
||||||
|
if !blocking {
|
||||||
|
return if check_fd_readable(
|
||||||
|
in_fd,
|
||||||
|
Duration::from_millis(
|
||||||
|
if pasting || get_kitty_keyboard_capability() == Capability::Supported {
|
||||||
|
300
|
||||||
|
} else {
|
||||||
|
1
|
||||||
|
},
|
||||||
|
),
|
||||||
|
) {
|
||||||
|
do_readb()
|
||||||
|
} else {
|
||||||
|
ReadbResult::NothingToRead
|
||||||
|
};
|
||||||
|
}
|
||||||
let mut fdset = FdReadableSet::new();
|
let mut fdset = FdReadableSet::new();
|
||||||
loop {
|
loop {
|
||||||
fdset.clear();
|
fdset.clear();
|
||||||
@@ -532,11 +558,7 @@ fn readb(in_fd: RawFd, blocking: bool) -> ReadbResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Here's where we call select().
|
// Here's where we call select().
|
||||||
let select_res = fdset.check_readable(if blocking {
|
let select_res = fdset.check_readable(Timeout::Forever);
|
||||||
Timeout::Forever
|
|
||||||
} else {
|
|
||||||
Timeout::Duration(Duration::from_millis(1))
|
|
||||||
});
|
|
||||||
if select_res < 0 {
|
if select_res < 0 {
|
||||||
let err = errno::errno().0;
|
let err = errno::errno().0;
|
||||||
if err == libc::EINTR || err == libc::EAGAIN {
|
if err == libc::EINTR || err == libc::EAGAIN {
|
||||||
@@ -548,32 +570,18 @@ fn readb(in_fd: RawFd, blocking: bool) -> ReadbResult {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if blocking {
|
// select() did not return an error, so we may have a readable fd.
|
||||||
// select() did not return an error, so we may have a readable fd.
|
// The priority order is: uvars, stdin, ioport.
|
||||||
// The priority order is: uvars, stdin, ioport.
|
// Check to see if we want a universal variable barrier.
|
||||||
// Check to see if we want a universal variable barrier.
|
if let Some(notifier_fd) = notifier_fd {
|
||||||
if let Some(notifier_fd) = notifier_fd {
|
if fdset.test(notifier_fd) && notifier.notification_fd_became_readable(notifier_fd) {
|
||||||
if fdset.test(notifier_fd) && notifier.notification_fd_became_readable(notifier_fd)
|
return ReadbResult::UvarNotified;
|
||||||
{
|
|
||||||
return ReadbResult::UvarNotified;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check stdin.
|
// Check stdin.
|
||||||
if fdset.test(in_fd) {
|
if fdset.test(in_fd) {
|
||||||
let mut arr: [u8; 1] = [0];
|
return do_readb();
|
||||||
if read_blocked(in_fd, &mut arr) != Ok(1) {
|
|
||||||
// The terminal has been closed.
|
|
||||||
return ReadbResult::Eof;
|
|
||||||
}
|
|
||||||
let c = arr[0];
|
|
||||||
FLOG!(reader, "Read byte", char_to_symbol(char::from(c), true));
|
|
||||||
// The common path is to return a u8.
|
|
||||||
return ReadbResult::Byte(c);
|
|
||||||
}
|
|
||||||
if !blocking {
|
|
||||||
return ReadbResult::NothingToRead;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for iothread completions only if there is no data to be read from the stdin.
|
// Check for iothread completions only if there is no data to be read from the stdin.
|
||||||
@@ -584,6 +592,55 @@ fn readb(in_fd: RawFd, blocking: bool) -> ReadbResult {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn check_fd_readable(in_fd: RawFd, timeout: Duration) -> bool {
|
||||||
|
use std::ptr;
|
||||||
|
// We are not prepared to handle a signal immediately; we only want to know if we get input on
|
||||||
|
// our fd before the timeout. Use pselect to block all signals; we will handle signals
|
||||||
|
// before the next call to readch().
|
||||||
|
let mut sigs = MaybeUninit::uninit();
|
||||||
|
let mut sigs = unsafe {
|
||||||
|
libc::sigfillset(sigs.as_mut_ptr());
|
||||||
|
sigs.assume_init()
|
||||||
|
};
|
||||||
|
|
||||||
|
// pselect expects timeouts in nanoseconds.
|
||||||
|
const NSEC_PER_MSEC: u64 = 1000 * 1000;
|
||||||
|
const NSEC_PER_SEC: u64 = NSEC_PER_MSEC * 1000;
|
||||||
|
let wait_nsec: u64 = (timeout.as_millis() as u64) * NSEC_PER_MSEC;
|
||||||
|
let timeout = libc::timespec {
|
||||||
|
tv_sec: (wait_nsec / NSEC_PER_SEC).try_into().unwrap(),
|
||||||
|
tv_nsec: (wait_nsec % NSEC_PER_SEC).try_into().unwrap(),
|
||||||
|
};
|
||||||
|
|
||||||
|
// We have one fd of interest.
|
||||||
|
let mut fdset = MaybeUninit::uninit();
|
||||||
|
let mut fdset = unsafe {
|
||||||
|
libc::FD_ZERO(fdset.as_mut_ptr());
|
||||||
|
fdset.assume_init()
|
||||||
|
};
|
||||||
|
unsafe {
|
||||||
|
libc::FD_SET(in_fd, &mut fdset);
|
||||||
|
}
|
||||||
|
|
||||||
|
let res = unsafe {
|
||||||
|
libc::pselect(
|
||||||
|
in_fd + 1,
|
||||||
|
&mut fdset,
|
||||||
|
ptr::null_mut(),
|
||||||
|
ptr::null_mut(),
|
||||||
|
&timeout,
|
||||||
|
&sigs,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Prevent signal starvation on WSL causing the `torn_escapes.py` test to fail
|
||||||
|
if is_windows_subsystem_for_linux(WSL::V1) {
|
||||||
|
// Merely querying the current thread's sigmask is sufficient to deliver a pending signal
|
||||||
|
let _ = unsafe { libc::pthread_sigmask(0, ptr::null(), &mut sigs) };
|
||||||
|
}
|
||||||
|
res > 0
|
||||||
|
}
|
||||||
|
|
||||||
// Update the wait_on_escape_ms value in response to the fish_escape_delay_ms user variable being
|
// Update the wait_on_escape_ms value in response to the fish_escape_delay_ms user variable being
|
||||||
// set.
|
// set.
|
||||||
pub fn update_wait_on_escape_ms(vars: &EnvStack) {
|
pub fn update_wait_on_escape_ms(vars: &EnvStack) {
|
||||||
@@ -757,7 +814,7 @@ fn try_readch(&mut self, blocking: bool) -> Option<CharEvent> {
|
|||||||
return Some(mevt);
|
return Some(mevt);
|
||||||
}
|
}
|
||||||
|
|
||||||
let rr = readb(self.get_in_fd(), blocking);
|
let rr = readb(self.get_in_fd(), blocking, /*pasting=*/ false);
|
||||||
match rr {
|
match rr {
|
||||||
ReadbResult::Eof => {
|
ReadbResult::Eof => {
|
||||||
return Some(CharEvent::Implicit(ImplicitEvent::Eof));
|
return Some(CharEvent::Implicit(ImplicitEvent::Eof));
|
||||||
@@ -800,10 +857,16 @@ fn try_readch(&mut self, blocking: bool) -> Option<CharEvent> {
|
|||||||
let mut i = 0;
|
let mut i = 0;
|
||||||
let ok = loop {
|
let ok = loop {
|
||||||
if i == buffer.len() {
|
if i == buffer.len() {
|
||||||
buffer.push(match readb(self.get_in_fd(), /*blocking=*/ true) {
|
buffer.push(
|
||||||
ReadbResult::Byte(b) => b,
|
match readb(
|
||||||
_ => 0,
|
self.get_in_fd(),
|
||||||
});
|
/*blocking=*/ true,
|
||||||
|
/*pasting=*/ false,
|
||||||
|
) {
|
||||||
|
ReadbResult::Byte(b) => b,
|
||||||
|
_ => 0,
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
match decode_input_byte(
|
match decode_input_byte(
|
||||||
&mut seq,
|
&mut seq,
|
||||||
@@ -882,7 +945,11 @@ fn try_readch(&mut self, blocking: bool) -> Option<CharEvent> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn try_readb(&mut self, buffer: &mut Vec<u8>) -> Option<u8> {
|
fn try_readb(&mut self, buffer: &mut Vec<u8>) -> Option<u8> {
|
||||||
let ReadbResult::Byte(next) = readb(self.get_in_fd(), /*blocking=*/ false) else {
|
let ReadbResult::Byte(next) = readb(
|
||||||
|
self.get_in_fd(),
|
||||||
|
/*blocking=*/ false,
|
||||||
|
self.paste_is_buffering(),
|
||||||
|
) else {
|
||||||
return None;
|
return None;
|
||||||
};
|
};
|
||||||
buffer.push(next);
|
buffer.push(next);
|
||||||
@@ -1403,48 +1470,11 @@ fn readch_timed(&mut self, wait_time_ms: usize) -> Option<CharEvent> {
|
|||||||
return Some(evt);
|
return Some(evt);
|
||||||
}
|
}
|
||||||
|
|
||||||
// We are not prepared to handle a signal immediately; we only want to know if we get input on
|
check_fd_readable(
|
||||||
// our fd before the timeout. Use pselect to block all signals; we will handle signals
|
self.get_in_fd(),
|
||||||
// before the next call to readch().
|
Duration::from_millis(u64::try_from(wait_time_ms).unwrap()),
|
||||||
let mut sigs = MaybeUninit::uninit();
|
)
|
||||||
unsafe { libc::sigfillset(sigs.as_mut_ptr()) };
|
.then(|| self.readch())
|
||||||
|
|
||||||
// pselect expects timeouts in nanoseconds.
|
|
||||||
const NSEC_PER_MSEC: u64 = 1000 * 1000;
|
|
||||||
const NSEC_PER_SEC: u64 = NSEC_PER_MSEC * 1000;
|
|
||||||
let wait_nsec: u64 = (wait_time_ms as u64) * NSEC_PER_MSEC;
|
|
||||||
let timeout = libc::timespec {
|
|
||||||
tv_sec: (wait_nsec / NSEC_PER_SEC).try_into().unwrap(),
|
|
||||||
tv_nsec: (wait_nsec % NSEC_PER_SEC).try_into().unwrap(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// We have one fd of interest.
|
|
||||||
let mut fdset = MaybeUninit::uninit();
|
|
||||||
let in_fd = self.get_in_fd();
|
|
||||||
unsafe {
|
|
||||||
libc::FD_ZERO(fdset.as_mut_ptr());
|
|
||||||
libc::FD_SET(in_fd, fdset.as_mut_ptr());
|
|
||||||
};
|
|
||||||
let res = unsafe {
|
|
||||||
libc::pselect(
|
|
||||||
in_fd + 1,
|
|
||||||
fdset.as_mut_ptr(),
|
|
||||||
ptr::null_mut(),
|
|
||||||
ptr::null_mut(),
|
|
||||||
&timeout,
|
|
||||||
sigs.as_ptr(),
|
|
||||||
)
|
|
||||||
};
|
|
||||||
|
|
||||||
// Prevent signal starvation on WSL causing the `torn_escapes.py` test to fail
|
|
||||||
if is_windows_subsystem_for_linux(WSL::V1) {
|
|
||||||
// Merely querying the current thread's sigmask is sufficient to deliver a pending signal
|
|
||||||
let _ = unsafe { libc::pthread_sigmask(0, ptr::null(), sigs.as_mut_ptr()) };
|
|
||||||
}
|
|
||||||
if res > 0 {
|
|
||||||
return Some(self.readch());
|
|
||||||
}
|
|
||||||
None
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return the fd from which to read.
|
/// Return the fd from which to read.
|
||||||
|
|||||||
Reference in New Issue
Block a user