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: allow-passthrough must be set to on to prevent tmux from forwarding the real terminal's response to the inactive pane (#2052)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2024-12-16 09:07:56 +08:00 • committed by GitHub
parent 6e1948e7e1
commit f4eef99f7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
yazi-adapter/src/lib.rs
View file

@ -25,6 +25,18 @@ pub static WSL: RoCell<bool> = RoCell::new();
pub static NVIM: RoCell<bool> = RoCell::new(); pub static NVIM: RoCell<bool> = RoCell::new();
pub fn init() -> anyhow::Result<()> { pub fn init() -> anyhow::Result<()> {
init_default();
EMULATOR.init(Emulator::detect());
yazi_config::init_flavor(EMULATOR.light)?;
ADAPTOR.init(Adapter::matches(*EMULATOR));
ADAPTOR.start();
Ok(())
}
pub fn init_default() {
// Tmux support // Tmux support
TMUX.init(Mux::tmux_passthrough()); TMUX.init(Mux::tmux_passthrough());
ESCAPE.init(if *TMUX == 2 { "\x1b\x1b" } else { "\x1b" }); ESCAPE.init(if *TMUX == 2 { "\x1b\x1b" } else { "\x1b" });
@ -36,12 +48,4 @@ pub fn init() -> anyhow::Result<()> {
// Neovim support // Neovim support
NVIM.init(env_exists("NVIM_LOG_FILE") && env_exists("NVIM")); NVIM.init(env_exists("NVIM_LOG_FILE") && env_exists("NVIM"));
EMULATOR.init(Emulator::detect());
yazi_config::init_flavor(EMULATOR.light)?;
ADAPTOR.init(Adapter::matches(*EMULATOR));
ADAPTOR.start();
Ok(())
} }

6
yazi-adapter/src/mux.rs
View file

@ -25,7 +25,7 @@ impl Mux {
} }
let child = std::process::Command::new("tmux") let child = std::process::Command::new("tmux")
.args(["set", "-p", "allow-passthrough", "all"]) .args(["set", "-p", "allow-passthrough", "on"])
.stdin(std::process::Stdio::null()) .stdin(std::process::Stdio::null())
.stdout(std::process::Stdio::null()) .stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::piped()) .stderr(std::process::Stdio::piped())
@ -35,13 +35,13 @@ impl Mux {
Ok(output) if output.status.success() => return 2, Ok(output) if output.status.success() => return 2,
Ok(output) => { Ok(output) => {
error!( error!(
"Running `tmux set -p allow-passthrough all` failed: {:?}, {}", "Running `tmux set -p allow-passthrough on` failed: {:?}, {}",
output.status, output.status,
String::from_utf8_lossy(&output.stderr) String::from_utf8_lossy(&output.stderr)
); );
} }
Err(err) => { Err(err) => {
error!("Failed to spawn `tmux set -p allow-passthrough all`: {err}"); error!("Failed to spawn `tmux set -p allow-passthrough on`: {err}");
} }
} }
1 1

6
yazi-fm/src/term.rs
View file

@ -26,13 +26,17 @@ impl Term {
}; };
enable_raw_mode()?; enable_raw_mode()?;
if *yazi_adapter::TMUX != 0 {
yazi_adapter::Mux::tmux_passthrough();
}
execute!( execute!(
BufWriter::new(stderr()), BufWriter::new(stderr()),
EnterAlternateScreen,
Print(Mux::csi("\x1bP$q q\x1b\\")), // Request cursor shape (DECRQM) Print(Mux::csi("\x1bP$q q\x1b\\")), // Request cursor shape (DECRQM)
Print(Mux::csi("\x1b[?12$p")), // Request cursor blink status (DECSET) Print(Mux::csi("\x1b[?12$p")), // Request cursor blink status (DECSET)
Print("\x1b[?u"), // Request keyboard enhancement flags (CSI u) Print("\x1b[?u"), // Request keyboard enhancement flags (CSI u)
Print(Mux::csi("\x1b[0c")), // Request device attributes Print(Mux::csi("\x1b[0c")), // Request device attributes
EnterAlternateScreen,
EnableBracketedPaste, EnableBracketedPaste,
mouse::SetMouse(true), mouse::SetMouse(true),
)?; )?;