Skip to content

Commit

Permalink
Use terminfo to reset terminal cursor style (helix-editor#8591)
Browse files Browse the repository at this point in the history
  • Loading branch information
rmehri01 authored and Vulpesx committed Jun 7, 2024
1 parent 919d288 commit 45b0027
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions helix-tui/src/backend/crossterm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,21 @@ fn vte_version() -> Option<usize> {
}

/// Describes terminal capabilities like extended underline, truecolor, etc.
#[derive(Copy, Clone, Debug, Default)]
#[derive(Clone, Debug)]
struct Capabilities {
/// Support for undercurled, underdashed, etc.
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 {
Expand All @@ -54,6 +65,10 @@ impl Capabilities {
|| t.extended_cap("Su").is_some()
|| vte_version() >= Some(5102)
|| matches!(term_program().as_deref(), Some("WezTerm")),
reset_cursor_command: t
.utf8_string_cap(termini::StringCapability::CursorNormal)
.unwrap_or("\x1B[0 q")
.to_string(),
},
}
}
Expand Down Expand Up @@ -154,7 +169,8 @@ where

fn restore(&mut self, config: Config) -> io::Result<()> {
// 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 {
execute!(self.buffer, DisableMouseCapture)?;
}
Expand Down

0 comments on commit 45b0027

Please sign in to comment.