Skip to content

Commit

Permalink
use terminfo to reset terminal cursor style
Browse files Browse the repository at this point in the history
  • Loading branch information
rmehri01 committed Oct 23, 2023
1 parent 31f50bf commit 8309d8c
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions helix-tui/src/backend/crossterm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ fn vte_version() -> Option<usize> {
}

/// Describes terminal capabilities like extended underline, truecolor, etc.
#[derive(Copy, Clone, Debug, Default)]
#[derive(Clone, Debug, Default)]
struct Capabilities {
/// Support for undercurled, underdashed, etc.
has_extended_underlines: bool,
/// Support for resetting the cursor style back to normal.
cursor_normal: Option<String>,
}

impl Capabilities {
Expand All @@ -54,6 +56,9 @@ impl Capabilities {
|| t.extended_cap("Su").is_some()
|| vte_version() >= Some(5102)
|| matches!(term_program().as_deref(), Some("WezTerm")),
cursor_normal: t
.utf8_string_cap(termini::StringCapability::CursorNormal)
.map(|s| s.to_string()),
},
}
}
Expand Down Expand Up @@ -154,7 +159,12 @@ where

fn restore(&mut self, config: Config) -> io::Result<()> {
// reset cursor shape
write!(self.buffer, "\x1B[0 q")?;
let cursor_normal = self
.capabilities
.cursor_normal
.as_deref()
.unwrap_or("\x1B[0 q");
write!(self.buffer, "{cursor_normal}")?;
if config.enable_mouse_capture {
execute!(self.buffer, DisableMouseCapture)?;
}
Expand Down

0 comments on commit 8309d8c

Please sign in to comment.