mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: reserve a hack for Zellij to force an image adapter (#2441)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2025-03-04 23:57:11 +08:00 • committed by GitHub
parent 51de941f79
commit 3606bc7a1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
yazi-adapter/src/brand.rs
View file

@ -44,6 +44,7 @@ impl Brand {
pub fn from_env() -> Option<Self> { pub fn from_env() -> Option<Self> {
use Brand as B; use Brand as B;
let (term, program) = B::env();
let vars = [ let vars = [
("KITTY_WINDOW_ID", B::Kitty), ("KITTY_WINDOW_ID", B::Kitty),
("KONSOLE_VERSION", B::Konsole), ("KONSOLE_VERSION", B::Konsole),
@ -54,12 +55,16 @@ impl Brand {
("VSCODE_INJECTION", B::VSCode), ("VSCODE_INJECTION", B::VSCode),
("TABBY_CONFIG_DIRECTORY", B::Tabby), ("TABBY_CONFIG_DIRECTORY", B::Tabby),
]; ];
match vars.into_iter().find(|&(s, _)| env_exists(s)) {
Some((_, brand)) => return Some(brand),
None => warn!("[Adapter] No special environment variables detected"),
}
let (term, program) = B::env(); match term.as_str() {
"xterm-kitty" => return Some(B::Kitty),
"foot" => return Some(B::Foot),
"foot-extra" => return Some(B::Foot),
"xterm-ghostty" => return Some(B::Ghostty),
"rio" => return Some(B::Rio),
"rxvt-unicode-256color" => return Some(B::Urxvt),
_ => warn!("[Adapter] Unknown TERM: {term}"),
}
match program.as_str() { match program.as_str() {
"iTerm.app" => return Some(B::Iterm2), "iTerm.app" => return Some(B::Iterm2),
"WezTerm" => return Some(B::WezTerm), "WezTerm" => return Some(B::WezTerm),
@ -73,15 +78,11 @@ impl Brand {
"Apple_Terminal" => return Some(B::Apple), "Apple_Terminal" => return Some(B::Apple),
_ => warn!("[Adapter] Unknown TERM_PROGRAM: {program}"), _ => warn!("[Adapter] Unknown TERM_PROGRAM: {program}"),
} }
match term.as_str() { match vars.into_iter().find(|&(s, _)| env_exists(s)) {
"xterm-kitty" => return Some(B::Kitty), Some((_, brand)) => return Some(brand),
"foot" => return Some(B::Foot), None => warn!("[Adapter] No special environment variables detected"),
"foot-extra" => return Some(B::Foot),
"xterm-ghostty" => return Some(B::Ghostty),
"rio" => return Some(B::Rio),
"rxvt-unicode-256color" => return Some(B::Urxvt),
_ => warn!("[Adapter] Unknown TERM: {term}"),
} }
None None
} }