Merge 03d70b12b3 into 2301430e37

helix-tui/src/backend/crossterm.rs

@@ -23,13 +23,42 @@ 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, fallback: &str) -> String {
+    let mut reset_str: String = Default::default();
+    if let termini::Value::Utf8String(reset_str_se) = terminfo
+        .extended_cap("Se")
+        .unwrap_or(termini::Value::Utf8String(fallback))
+    {
+        reset_str.push_str(reset_str_se);
+    }
+
+    reset_str.push_str(
+        terminfo
+            .utf8_string_cap(termini::StringCapability::CursorNormal)
+            .unwrap(),
+    );
+
+    match term_program().as_deref() {
+        // some terminals don't reset the cursor with either cnorm or Se
+        Some("tmux") => {
+            reset_str.push_str(fallback);
+            reset_str
+        }
+        _ => reset_str,
+    }
+}
 
 /// Describes terminal capabilities like extended underline, truecolor, etc.
 #[derive(Clone, Debug)]
@@ -69,10 +98,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, "\x1B[0 q"),
             },
         }
     }