switch to termini for terminfo

kleinweby · Oct 6, 2022 · 114610f · 114610f
1 parent 71ee589
commit 114610f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
@@ -20,7 +20,7 @@ bitflags = "1.3"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
 crossterm = { version = "0.25", optional = true }
-cxterminfo = "0.2"
+termini = "0.1"
 serde = { version = "1", "optional" = true, features = ["derive"]}
 helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
 helix-core = { version = "0.6", path = "../helix-core" }
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
@@ -27,13 +27,13 @@ impl Capabilities {
     /// on the $TERM environment variable. If detection fails, returns
     /// a default value where no capability is supported.
     pub fn from_env_or_default() -> Self {
-        match cxterminfo::terminfo::TermInfo::from_env() {
+        match termini::TermInfo::from_env() {
             Err(_) => Capabilities::default(),
             Ok(t) => Capabilities {
                 // Smulx, VTE: https://unix.stackexchange.com/a/696253/246284
                 // Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines
-                has_extended_underlines: t.get_ext_string("Smulx").is_some()
-                    || *t.get_ext_bool("Su").unwrap_or(&false)
+                has_extended_underlines: t.extended_cap("Smulx").is_some()
+                    || t.extended_cap("Su").is_some()
                     || vte_version() >= Some(5102),
             },
         }