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: avoid tmux interfering with kitty graphical sequences (#2734)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2025-05-07 09:54:20 +08:00 • committed by GitHub
parent db60951783
commit 4e2a8bdf51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yazi-adapter/src/drivers/kgp.rs
View file

@ -379,14 +379,14 @@ impl Kgp {
fn place(area: &Rect) -> Result<Vec<u8>> { fn place(area: &Rect) -> Result<Vec<u8>> {
let mut buf = Vec::with_capacity(area.width as usize * area.height as usize * 3 + 50); let mut buf = Vec::with_capacity(area.width as usize * area.height as usize * 3 + 50);
write!(buf, "\x1b[38;2;0;0;1m")?;
for y in 0..area.height { for y in 0..area.height {
write!(buf, "\x1b[{};{}H\x1b[38;5;1m", area.y + y + 1, area.x + 1)?; write!(buf, "\x1b[{};{}H", area.y + y + 1, area.x + 1)?;
for x in 0..area.width { for x in 0..area.width {
write!(buf, "\u{10EEEE}")?; write!(buf, "\u{10EEEE}")?;
write!(buf, "{}", *DIACRITICS.get(y as usize).unwrap_or(&DIACRITICS[0]))?; write!(buf, "{}", *DIACRITICS.get(y as usize).unwrap_or(&DIACRITICS[0]))?;
write!(buf, "{}", *DIACRITICS.get(x as usize).unwrap_or(&DIACRITICS[0]))?; write!(buf, "{}", *DIACRITICS.get(x as usize).unwrap_or(&DIACRITICS[0]))?;
} }
write!(buf, "\x1b[0m")?;
} }
Ok(buf) Ok(buf)
} }

2
yazi-adapter/src/emulator.rs
View file

@ -88,7 +88,7 @@ impl Emulator {
{ {
use std::{io::Write, thread, time::Duration}; use std::{io::Write, thread, time::Duration};
use crossterm::{cursor::{Hide, MoveTo, RestorePosition, SavePosition, Show}, queue}; use crossterm::{cursor::{Hide, MoveTo, Show}, queue};
let mut w = TTY.lockout(); let mut w = TTY.lockout();

8
yazi-core/src/tab/commands/arrow.rs
View file

@ -28,12 +28,8 @@ impl Tab {
// Visual selection // Visual selection
if let Some((start, items)) = self.mode.visual_mut() { if let Some((start, items)) = self.mode.visual_mut() {
let after = self.current.cursor; let end = self.current.cursor;
*items = (start.min(end)..=end.max(start)).collect();
items.clear();
for i in start.min(after)..=after.max(start) {
items.insert(i);
}
} }
self.hover(None); self.hover(None);

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

@ -32,12 +32,12 @@ impl Term {
execute!( execute!(
TTY.writer(), TTY.writer(),
yazi_term::If(TMUX.get(), EnterAlternateScreen), yazi_term::If(!TMUX.get(), EnterAlternateScreen),
Print("\x1bP$q q\x1b\\"), // Request cursor shape (DECRQSS query for DECSCUSR) Print("\x1bP$q q\x1b\\"), // Request cursor shape (DECRQSS query for DECSCUSR)
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
yazi_term::If(!TMUX.get(), EnterAlternateScreen), yazi_term::If(TMUX.get(), EnterAlternateScreen),
EnableBracketedPaste, EnableBracketedPaste,
yazi_term::If(!YAZI.mgr.mouse_events.is_empty(), EnableMouseCapture), yazi_term::If(!YAZI.mgr.mouse_events.is_empty(), EnableMouseCapture),
)?; )?;