Skip to content

Commit

Permalink
avoid cnorm on certain terminals (helix-editor#10769)
Browse files Browse the repository at this point in the history
using a terminfo's cnorm doesn't reset the cursor for many terminals,
see issue: helix-editor#10089
  • Loading branch information
cjbayliss authored and Schuyler Mortimer committed Jul 10, 2024
1 parent 16356db commit ffc7c70
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions helix-tui/src/backend/crossterm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,33 @@ use std::{
fmt,
io::{self, Write},
};
use termini::TermInfo;

fn term_program() -> Option<String> {
std::env::var("TERM_PROGRAM").ok()
// Some terminals don't set $TERM_PROGRAM
match std::env::var("TERM_PROGRAM") {
Err(_) => std::env::var("TERM").ok(),
Ok(term_program) => Some(term_program),
}
}
fn vte_version() -> Option<usize> {
std::env::var("VTE_VERSION").ok()?.parse().ok()
}
fn reset_cursor_approach(terminfo: TermInfo) -> String {
let mut reset_str = "\x1B[0 q".to_string();

if let Some(termini::Value::Utf8String(se_str)) = terminfo.extended_cap("Se") {
reset_str.push_str(se_str);
};

reset_str.push_str(
terminfo
.utf8_string_cap(termini::StringCapability::CursorNormal)
.unwrap_or(""),
);

reset_str
}

/// Describes terminal capabilities like extended underline, truecolor, etc.
#[derive(Clone, Debug)]
Expand Down Expand Up @@ -69,10 +89,7 @@ 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(),
reset_cursor_command: reset_cursor_approach(t),
},
}
}
Expand Down

0 comments on commit ffc7c70

Please sign in to comment.