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

Parse Terminal.app version only if needed

Browse Source
This commit is contained in:
Johannes Altmanninger
2025-09-23 12:57:06 +02:00
parent a6f975a7e3
commit 4c1da3b2d3
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/env_dispatch.rs
View File

@@ -173,28 +173,24 @@ pub fn guess_emoji_width(vars: &EnvStack) {
.get(L!("TERM_PROGRAM"))
.map(|v| v.as_string())
.unwrap_or_else(WString::new);
// The format and contents of $TERM_PROGRAM_VERSION depend on $TERM_PROGRAM. Under
// Apple_Terminal, this is an integral value in the hundreds corresponding to the
// CFBundleVersion of Terminal.app; under iTerm, this is the version number which can contain
// multiple periods (e.g 3.4.19). Currently we only care about Apple_Terminal but the C++ code
// used wcstod() to parse at least the major.minor value of cases like the latter.
//
// TODO: Move this inside the Apple_Terminal branch and use i32::FromStr (i.e. str::parse())
// instead.
let version = vars
.get(L!("TERM_PROGRAM_VERSION"))
.map(|v| v.as_string())
.and_then(|v| {
let mut consumed = 0;
crate::wutil::wcstod::wcstod(&v, '.', &mut consumed).ok()
})
.unwrap_or(0.0);
#[allow(renamed_and_removed_lints)] // for old clippy
#[allow(clippy::blocks_in_if_conditions)] // for old clippy
if xtversion().unwrap().starts_with(L!("iTerm2 ")) {
// iTerm2 now defaults to Unicode 9 sizes for anything after macOS 10.12
FISH_EMOJI_WIDTH.store(2, Ordering::Relaxed);
FLOG!(term_support, "default emoji width 2 for iTerm2");
} else if term_program == "Apple_Terminal" && version as i32 >= 400 {
} else if term_program == "Apple_Terminal" && {
let version = vars
.get(L!("TERM_PROGRAM_VERSION"))
.map(|v| v.as_string())
.and_then(|v| {
let mut consumed = 0;
crate::wutil::wcstod::wcstod(&v, '.', &mut consumed).ok()
})
.unwrap_or(0.0);
version as i32 >= 400
} {
// Apple Terminal on High Sierra
FISH_EMOJI_WIDTH.store(2, Ordering::Relaxed);
FLOG!(term_support, "default emoji width: 2 for", term_program);