github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 12:52:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Limit iTerm2 CSI u workaround to iTerm<=3.5.3

Browse Source 
Looks like 3.5.4 will include
9cd0241afd
so the need for the workaround is gone.

See #10653
This commit is contained in:
Johannes Altmanninger 2024-08-10 07:55:44 +02:00
parent 09b8b94025
commit 4664a0b52f
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_common.rs
View File

@ -436,7 +436,7 @@ static TERMINAL_PROTOCOLS: MainThread<RefCell<Option<TerminalProtocols>>> =
pub(crate) static IS_TMUX: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
pub(crate) static IN_MIDNIGHT_COMMANDER: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
pub(crate) static IN_ITERM: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
pub(crate) static IN_ITERM_PRE_CSI_U: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
pub fn terminal_protocols_enable_ifn() {
if IN_MIDNIGHT_COMMANDER.load() {
@ -463,7 +463,7 @@ struct TerminalProtocols {}
impl TerminalProtocols {
fn new() -> Self {
let sequences = if IN_ITERM.load() {
let sequences = if IN_ITERM_PRE_CSI_U.load() {
concat!("\x1b[?2004h", "\x1b[>4;1m", "\x1b[>5u", "\x1b=",)
} else {
concat!(
@ -491,7 +491,7 @@ impl TerminalProtocols {
impl Drop for TerminalProtocols {
fn drop(&mut self) {
let sequences = if IN_ITERM.load() {
let sequences = if IN_ITERM_PRE_CSI_U.load() {
concat!("\x1b[?2004l", "\x1b[>4;0m", "\x1b[<1u", "\x1b>",)
} else {
concat!(

42
src/reader.rs
View File

@ -70,7 +70,7 @@ use crate::history::{
SearchType,
};
use crate::input::init_input;
use crate::input_common::IN_ITERM;
use crate::input_common::IN_ITERM_PRE_CSI_U;
use crate::input_common::IN_MIDNIGHT_COMMANDER;
use crate::input_common::{
terminal_protocols_disable_ifn, terminal_protocols_enable_ifn, CharEvent, CharInputStyle,
@ -122,6 +122,7 @@ use crate::wcstringutil::{
string_prefixes_string_case_insensitive, StringFuzzyMatch,
};
use crate::wildcard::wildcard_has;
use crate::wutil::fish_wcstol;
use crate::wutil::{fstat, perror, write_to_fd};
use crate::{abbrs, event, function, history};
@ -3850,16 +3851,51 @@ fn reader_interactive_init(parser: &Parser) {
.vars()
.set_one(L!("_"), EnvMode::GLOBAL, L!("fish").to_owned());
interactive_hacks(parser);
}
fn interactive_hacks(parser: &Parser) {
IS_TMUX.store(parser.vars().get_unless_empty(L!("TMUX")).is_some());
IN_MIDNIGHT_COMMANDER.store(parser.vars().get_unless_empty(L!("MC_TMPDIR")).is_some());
IN_ITERM.store(
IN_ITERM_PRE_CSI_U.store(
parser
.vars()
.get(L!("LC_TERMINAL"))
.is_some_and(|term| term.as_list() == [L!("iTerm2")]),
.is_some_and(|term| term.as_list() == [L!("iTerm2")])
&& parser
.vars()
.get(L!("LC_TERMINAL_VERSION"))
.is_some_and(|version| {
if version.as_list().is_empty() {
return false;
}
let Some(version) = parse_version(&version.as_list()[0]) else {
return false;
};
version < (3, 5, 4)
}),
);
}
fn parse_version(version: &wstr) -> Option<(i64, i64, i64)> {
let mut numbers = version.split('.');
let major = fish_wcstol(numbers.next()?).ok()?;
let minor = fish_wcstol(numbers.next()?).ok()?;
let patch = numbers.next()?;
let patch = &patch[..patch
.chars()
.position(|c| !c.is_ascii_digit())
.unwrap_or(patch.len())];
let patch = fish_wcstol(patch).ok()?;
Some((major, minor, patch))
}
#[test]
fn test_parse_version() {
assert_eq!(parse_version(L!("3.5.2")), Some((3, 5, 2)));
assert_eq!(parse_version(L!("3.5.3beta")), Some((3, 5, 3)));
}
/// Destroy data for interactive use.
fn reader_interactive_destroy() {
Outputter::stdoutput()