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

Simplify the code

Browse source
This commit is contained in:
sxyazi 2025-09-04 21:51:47 +08:00
parent 7259a116d6
commit ab0afe2e7d
No known key found for this signature in database
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,21 +6,10 @@ use base64::{Engine, engine::general_purpose};
use crossterm::{cursor::MoveTo, queue}; use crossterm::{cursor::MoveTo, queue};
use image::DynamicImage; use image::DynamicImage;
use ratatui::layout::Rect; use ratatui::layout::Rect;
use yazi_shared::SyncCell;
use crate::{CLOSE, ESCAPE, Emulator, START, adapter::Adapter, image::Image}; use crate::{CLOSE, ESCAPE, Emulator, START, adapter::Adapter, image::Image};
// Generate unique image ID per Yazi instance to prevent tmux overlap
// This ID is encoded in the foreground color of Unicode placeholders
static INSTANCE_ID: OnceLock<u32> = OnceLock::new();
fn get_image_id() -> u32 {
*INSTANCE_ID.get_or_init(|| {
// Use PID to get unique ID per instance
// Limit to 24-bit RGB color space (0xFFFFFF)
(std::process::id() % 0xFFFFFE) + 1
})
}
static DIACRITICS: [char; 297] = [ static DIACRITICS: [char; 297] = [
'\u{0305}', '\u{0305}',
'\u{030D}', '\u{030D}',
@ -348,8 +337,7 @@ impl Kgp {
write!(w, "{s}")?; write!(w, "{s}")?;
} }
// Delete only this instance's image by ID write!(w, "{START}_Gq=2,a=d,d=i,i={}{ESCAPE}\\{CLOSE}", Self::image_id())?;
write!(w, "{START}_Gq=2,a=d,d=i,i={}{ESCAPE}\\{CLOSE}", get_image_id())?;
Ok(()) Ok(())
}) })
} }
@ -364,7 +352,7 @@ impl Kgp {
write!( write!(
buf, buf,
"{START}_Gq=2,a=T,i={},C=1,U=1,f={format},s={},v={},m={};{}{ESCAPE}\\{CLOSE}", "{START}_Gq=2,a=T,i={},C=1,U=1,f={format},s={},v={},m={};{}{ESCAPE}\\{CLOSE}",
get_image_id(), Kgp::image_id(),
size.0, size.0,
size.1, size.1,
it.peek().is_some() as u8, it.peek().is_some() as u8,
@ -393,12 +381,11 @@ 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);
// Encode the image ID in the foreground color (RGB values)
let id = get_image_id(); let id = Self::image_id();
let r = (id >> 16) & 0xFF; let (r, g, b) = ((id >> 16) & 0xff, (id >> 8) & 0xff, id & 0xff);
let g = (id >> 8) & 0xFF; write!(buf, "\x1b[38;2;{r};{g};{b}m")?;
let b = id & 0xFF;
write!(buf, "\x1b[38;2;{};{};{}m", r, g, b)?;
for y in 0..area.height { for y in 0..area.height {
write!(buf, "\x1b[{};{}H", 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 {
@ -409,4 +396,16 @@ impl Kgp {
} }
Ok(buf) Ok(buf)
} }
fn image_id() -> u32 {
static CACHE: SyncCell<Option<u32>> = SyncCell::new(None);
match CACHE.get() {
Some(n) => n,
None => {
let n = std::process::id() % (0xffffff + 1);
CACHE.set(Some(n));
n
}
}
}
} }