Attempt to exit the alternate buffer at close

oxidecomputer · Feb 8, 2024 · 76d5a8d · 76d5a8d
1 parent 29cf54e
commit 76d5a8d
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 futures = "0.3.28"
 libc = "0.2"
 regex = "1"
+terminfo = "0.8.0"
 thiserror = "1"
 tokio = { version = "1", features = ["io-std", "io-util", "macros", "rt", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-tungstenite = "0.20.1"

diff --git a/src/raw.rs b/src/raw.rs
@@ -147,6 +147,13 @@ mod platform_impl {
             if r == -1 {
                 Err::<(), _>(std::io::Error::last_os_error()).unwrap();
             }
+            // if we have a terminfo database and this terminal is in it,
+            // try to exit the alternate buffer in case we were left there.
+            if let Ok(info) = terminfo::Database::from_env() {
+                if let Some(rmcup) = info.get::<terminfo::capability::ExitCaMode>() {
+                    rmcup.expand().to(std::io::stdout()).unwrap();
+                }
+            }
         }
     }
 }