Use terminfo to reset terminal cursor style (#8591)

pull/8583/head
Ryan Mehri 1 year ago committed by GitHub
parent 9eec9adb8f
commit 553ffbcaa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -32,10 +32,21 @@ fn vte_version() -> Option<usize> {
} }
/// Describes terminal capabilities like extended underline, truecolor, etc. /// Describes terminal capabilities like extended underline, truecolor, etc.
#[derive(Copy, Clone, Debug, Default)] #[derive(Clone, Debug)]
struct Capabilities { struct Capabilities {
/// Support for undercurled, underdashed, etc. /// Support for undercurled, underdashed, etc.
has_extended_underlines: bool, has_extended_underlines: bool,
/// Support for resetting the cursor style back to normal.
reset_cursor_command: String,
}
impl Default for Capabilities {
fn default() -> Self {
Self {
has_extended_underlines: false,
reset_cursor_command: "\x1B[0 q".to_string(),
}
}
} }
impl Capabilities { impl Capabilities {
@ -54,6 +65,10 @@ impl Capabilities {
|| t.extended_cap("Su").is_some() || t.extended_cap("Su").is_some()
|| vte_version() >= Some(5102) || vte_version() >= Some(5102)
|| matches!(term_program().as_deref(), Some("WezTerm")), || matches!(term_program().as_deref(), Some("WezTerm")),
reset_cursor_command: t
.utf8_string_cap(termini::StringCapability::CursorNormal)
.unwrap_or("\x1B[0 q")
.to_string(),
}, },
} }
} }
@ -154,7 +169,8 @@ where
fn restore(&mut self, config: Config) -> io::Result<()> { fn restore(&mut self, config: Config) -> io::Result<()> {
// reset cursor shape // reset cursor shape
write!(self.buffer, "\x1B[0 q")?; self.buffer
.write_all(self.capabilities.reset_cursor_command.as_bytes())?;
if config.enable_mouse_capture { if config.enable_mouse_capture {
execute!(self.buffer, DisableMouseCapture)?; execute!(self.buffer, DisableMouseCapture)?;
} }

Loading…
Cancel
Save