Skip to content

Commit

Permalink
avoid cnorm on certain terminals
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 committed May 22, 2024
1 parent e76020d commit a15ab09
Showing 1 changed file with 21 additions and 5 deletions.
26 changes: 21 additions & 5 deletions helix-tui/src/backend/crossterm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,32 @@ 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 Some(termini::Value::Utf8String(se_str)) = terminfo.extended_cap("Se") else {
return "".to_string();
};

format!(
"{}{}{}",
"\x1B[0 q",
se_str,
terminfo
.utf8_string_cap(termini::StringCapability::CursorNormal)
.unwrap()
)
}

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

Please sign in to comment.