From 26ffc667d7bae5fa356e609939f5c0d9eaae06c8 Mon Sep 17 00:00:00 2001
From: Christopher Bayliss <cjbdev@icloud.com>
Date: Thu, 16 May 2024 08:20:05 +1000
Subject: [PATCH] avoid cnorm on certain terminals

using a terminfo's cnorm doesn't reset the cursor for many terminals,
see issue: #10089
---
 helix-tui/src/backend/crossterm.rs | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index c5c95bff0b838..fc7de50aa0ce1 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -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(""),
+    );
+
+    return reset_str;
+}
 
 /// Describes terminal capabilities like extended underline, truecolor, etc.
 #[derive(Clone, Debug)]
@@ -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),
             },
         }
     }