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: adapt to a wider range of terminal cursor management through DECSET and DECRQM requests again

Browse source
This commit is contained in:
sxyazi 2024-07-26 09:15:20 +08:00
parent c086f2f34d
commit bf206fcf31
No known key found for this signature in database
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use std::{io::{self, stderr, BufWriter, Stderr}, ops::{Deref, DerefMut}, sync::atomic::{AtomicBool, AtomicU8, Ordering}}; use std::{io::{self, stderr, BufWriter, Stderr}, ops::{Deref, DerefMut}, sync::atomic::{AtomicBool, AtomicU8, Ordering}};
use anyhow::Result; use anyhow::Result;
use crossterm::{cursor::{RestorePosition, SavePosition}, event::{DisableBracketedPaste, EnableBracketedPaste, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags}, execute, queue, style::Print, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen, SetTitle}}; use crossterm::{event::{DisableBracketedPaste, EnableBracketedPaste, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags}, execute, queue, style::Print, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen, SetTitle}};
use cursor::RestoreCursor; use cursor::RestoreCursor;
use ratatui::{backend::CrosstermBackend, buffer::Buffer, layout::Rect, CompletedFrame, Frame, Terminal}; use ratatui::{backend::CrosstermBackend, buffer::Buffer, layout::Rect, CompletedFrame, Frame, Terminal};
use yazi_adapter::Emulator; use yazi_adapter::Emulator;
@ -28,14 +28,12 @@ impl Term {
enable_raw_mode()?; enable_raw_mode()?;
execute!( execute!(
BufWriter::new(stderr()), BufWriter::new(stderr()),
EnterAlternateScreen,
EnableBracketedPaste,
mouse::SetMouse(true),
SavePosition,
Print("\x1b[?12$p"), // Request cursor blink status (DECSET) Print("\x1b[?12$p"), // Request cursor blink status (DECSET)
Print("\x1bP$q q\x1b\\"), // Request cursor shape (DECRQM) Print("\x1bP$q q\x1b\\"), // Request cursor shape (DECRQM)
Print("\x1b[?u\x1b[c"), // Request keyboard enhancement flags (CSI u) Print("\x1b[?u\x1b[c"), // Request keyboard enhancement flags (CSI u)
RestorePosition EnterAlternateScreen,
EnableBracketedPaste,
mouse::SetMouse(true),
)?; )?;
if let Ok(s) = futures::executor::block_on(Emulator::read_until_da1()) { if let Ok(s) = futures::executor::block_on(Emulator::read_until_da1()) {
@ -45,9 +43,11 @@ impl Term {
s.split_once("\x1bP1$r") s.split_once("\x1bP1$r")
.and_then(|(_, s)| s.bytes().next()) .and_then(|(_, s)| s.bytes().next())
.filter(|&b| matches!(b, b'0'..=b'6')) .filter(|&b| matches!(b, b'0'..=b'6'))
.map_or(0, |b| b - b'0'), .map_or(u8::MAX, |b| b - b'0'),
Ordering::Relaxed, Ordering::Relaxed,
); );
} else {
SHAPE.store(u8::MAX, Ordering::Relaxed);
} }
if CSI_U.load(Ordering::Relaxed) { if CSI_U.load(Ordering::Relaxed) {
@ -74,9 +74,9 @@ impl Term {
execute!( execute!(
stderr(), stderr(),
mouse::SetMouse(false), mouse::SetMouse(false),
RestoreCursor,
DisableBracketedPaste, DisableBracketedPaste,
LeaveAlternateScreen, LeaveAlternateScreen,
RestoreCursor,
)?; )?;
self.show_cursor()?; self.show_cursor()?;
@ -90,11 +90,11 @@ impl Term {
execute!( execute!(
stderr(), stderr(),
SetTitle(""),
mouse::SetMouse(false), mouse::SetMouse(false),
RestoreCursor,
SetTitle(""),
DisableBracketedPaste, DisableBracketedPaste,
LeaveAlternateScreen, LeaveAlternateScreen,
RestoreCursor,
crossterm::cursor::Show crossterm::cursor::Show
) )
.ok(); .ok();
@ -219,17 +219,20 @@ mod cursor {
impl crossterm::Command for RestoreCursor { impl crossterm::Command for RestoreCursor {
fn write_ansi(&self, f: &mut impl std::fmt::Write) -> std::fmt::Result { fn write_ansi(&self, f: &mut impl std::fmt::Write) -> std::fmt::Result {
let shape = SHAPE.load(Ordering::Relaxed).max(1); let (shape, shape_blink) = match SHAPE.load(Ordering::Relaxed) {
let blink = BLINK.load(Ordering::Relaxed) ^ (shape & 1 == 0); u8::MAX => (0, false),
n => ((n.max(1) + 1) / 2, n.max(1) & 1 == 1),
};
Ok(match (shape + 1) / 2 { let blink = BLINK.load(Ordering::Relaxed) ^ shape_blink;
1 if blink => SetCursorStyle::BlinkingBlock.write_ansi(f)?, Ok(match shape {
1 if !blink => SetCursorStyle::SteadyBlock.write_ansi(f)?,
2 if blink => SetCursorStyle::BlinkingUnderScore.write_ansi(f)?, 2 if blink => SetCursorStyle::BlinkingUnderScore.write_ansi(f)?,
2 if !blink => SetCursorStyle::SteadyUnderScore.write_ansi(f)?, 2 if !blink => SetCursorStyle::SteadyUnderScore.write_ansi(f)?,
3 if blink => SetCursorStyle::BlinkingBar.write_ansi(f)?, 3 if blink => SetCursorStyle::BlinkingBar.write_ansi(f)?,
3 if !blink => SetCursorStyle::SteadyBar.write_ansi(f)?, 3 if !blink => SetCursorStyle::SteadyBar.write_ansi(f)?,
_ => tracing::error!("Terminal didn't respond to the cursor shape request: {shape}"), _ if blink => SetCursorStyle::DefaultUserShape.write_ansi(f)?,
_ if !blink => SetCursorStyle::SteadyBlock.write_ansi(f)?,
_ => unreachable!(),
}) })
} }