From 921fc0bdae2ecf358c3a1a147ac2e1e2bfa21334 Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Sun, 1 Sep 2024 11:56:21 -0700 Subject: [PATCH] Update so that WindowsTerminal uses sixel for images previews --- yazi-adapter/src/adapter.rs | 15 +++++++++------ yazi-adapter/src/emulator.rs | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/yazi-adapter/src/adapter.rs b/yazi-adapter/src/adapter.rs index e77d72a4..f5a4a779 100644 --- a/yazi-adapter/src/adapter.rs +++ b/yazi-adapter/src/adapter.rs @@ -82,14 +82,17 @@ impl Adapter { impl Adapter { pub fn matches() -> Self { - let mut protocols = Emulator::detect().adapters(); + let emulator = Emulator::detect(); + let mut protocols = emulator.clone().adapters(); #[cfg(windows)] - protocols.retain(|p| *p == Self::Iterm2); - if env_exists("ZELLIJ_SESSION_NAME") { - protocols.retain(|p| *p == Self::Sixel); - } else if *TMUX { - protocols.retain(|p| *p != Self::KittyOld); + if !matches!(emulator, Emulator::WindowsTerminal) { + protocols.retain(|p| *p == Self::Iterm2); + if env_exists("ZELLIJ_SESSION_NAME") { + protocols.retain(|p| *p == Self::Sixel); + } else if *TMUX { + protocols.retain(|p| *p != Self::KittyOld); + } } if let Some(p) = protocols.first() { return *p; diff --git a/yazi-adapter/src/emulator.rs b/yazi-adapter/src/emulator.rs index a201121e..4b5a8ddc 100644 --- a/yazi-adapter/src/emulator.rs +++ b/yazi-adapter/src/emulator.rs @@ -26,6 +26,7 @@ pub enum Emulator { Neovim, Apple, Urxvt, + WindowsTerminal } impl Emulator { @@ -46,6 +47,7 @@ impl Emulator { Self::Neovim => vec![], Self::Apple => vec![], Self::Urxvt => vec![], + Self::WindowsTerminal => vec![Adapter::Sixel] } } } @@ -64,6 +66,7 @@ impl Emulator { ("GHOSTTY_RESOURCES_DIR", Self::Ghostty), ("VSCODE_INJECTION", Self::VSCode), ("TABBY_CONFIG_DIRECTORY", Self::Tabby), + ("WT_Session", Self::WindowsTerminal), ]; match vars.into_iter().find(|v| env_exists(v.0)) { Some(var) => return var.1,