h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 19:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Enable color theme reporting again on tmux >= 3.7

Browse Source 
Color theme reporting has race conditions, so we might want to disable
it until we have fixed those. Not sure.

At least the tmux-specific issue hsa been fixed,
so treat new tmux like other terminals.
See https://github.com/tmux/tmux/issues/4787#issuecomment-3716135010

See #12261
This commit is contained in:
Johannes Altmanninger
2026-01-07 06:50:27 +01:00
parent f924a880c8
commit 99109278a6
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/tty_handoff.rs
View File

@@ -65,7 +65,7 @@ pub enum TtyQuirks {
// Running in iTerm2 before 3.5.12, which causes issues when using the kitty keyboard protocol.
PreKittyIterm2,
// Whether we are running under tmux.
Tmux,
Tmux((u32, u32)),
// Whether we are running under WezTerm.
Wezterm,
}
@@ -80,8 +80,8 @@ fn detect(vars: &dyn Environment, xtversion: &wstr) -> Self {
PreCsiMidnightCommander
} else if get_iterm2_version(xtversion).is_some_and(|v| v < (3, 5, 12)) {
PreKittyIterm2
} else if xtversion.starts_with(L!("tmux ")) {
Tmux
} else if let Some(version) = get_tmux_version(xtversion) {
Tmux(version)
} else if xtversion.starts_with(L!("WezTerm ")) {
Wezterm
} else {
@@ -180,13 +180,15 @@ fn get_protocols(self) -> TtyProtocolsSet {
let mut off_chain = vec![];
// Enable focus reporting under tmux
if self == TtyQuirks::Tmux {
if matches!(self, TtyQuirks::Tmux(_)) {
on_chain.push(DecsetFocusReporting);
off_chain.push(DecrstFocusReporting);
}
on_chain.push(DecsetBracketedPaste);
off_chain.push(DecrstBracketedPaste);
if self != TtyQuirks::Tmux {
if !matches!(
self, TtyQuirks::Tmux(version) if version < (3, 7)
) {
on_chain.push(DecsetColorThemeReporting);
off_chain.push(DecrstColorThemeReporting);
}
@@ -585,15 +587,24 @@ fn drop(&mut self) {
fn get_iterm2_version(xtversion: &wstr) -> Option<(u32, u32, u32)> {
// TODO split_once
let mut xtversion = xtversion.split(' ');
let name = xtversion.next().unwrap();
let version = xtversion.next()?;
if name != "iTerm2" {
if xtversion.next().unwrap() != "iTerm2" {
return None;
}
let mut parts = version.split('.');
let mut version = xtversion.next()?.split('.');
Some((
wcstoi(parts.next()?).ok()?,
wcstoi(parts.next()?).ok()?,
wcstoi(parts.next()?).ok()?,
wcstoi(version.next()?).ok()?,
wcstoi(version.next()?).ok()?,
wcstoi(version.next()?).ok()?,
))
}
// If we are running under iTerm2, get the version as a tuple of (major, minor, patch).
fn get_tmux_version(xtversion: &wstr) -> Option<(u32, u32)> {
// TODO split_once
let mut xtversion = xtversion.split(' ');
if xtversion.next().unwrap() != "tmux" {
return None;
}
let mut version = xtversion.next()?.split('.');
Some((wcstoi(version.next()?).ok()?, wcstoi(version.next()?).ok()?))
}

10
tests/checks/tmux-reporting.fish Normal file
View File

@@ -0,0 +1,10 @@
#RUN: %fish %s
#REQUIRES: command -v tmux
isolated-tmux-start \; \
set-option -gw window-active-style 'bg=#f0f0f0' \; \
send-keys ' cat -v' Enter
tmux-sleep
isolated-tmux capture-pane -p
# CHECK: cat -v
# CHECK: prompt 0> cat -v