2
0

fix: draw TUI to /dev/tty instead of stdout for subshell compat

This commit is contained in:
ai
2026-04-03 13:13:25 +00:00
parent c02718c4f2
commit 5e5b9a8e72

View File

@@ -4,7 +4,7 @@
use std::collections::HashSet; use std::collections::HashSet;
use std::env; use std::env;
use std::io::{Read, Write, stdout, stdin}; use std::io::{Read, Write, stdin};
use std::process::Command; use std::process::Command;
fn main() { fn main() {
@@ -261,25 +261,37 @@ fn fuzzy_match(item: &str, query: &str) -> bool {
.all(|w| lower.contains(&w.to_lowercase())) .all(|w| lower.contains(&w.to_lowercase()))
} }
fn open_tty() -> Option<std::fs::File> {
std::fs::OpenOptions::new()
.read(true)
.write(true)
.open("/dev/tty")
.ok()
}
fn fuzzy_select(items: &[String], label: &str) -> Option<String> { fn fuzzy_select(items: &[String], label: &str) -> Option<String> {
let mut tty = match open_tty() {
Some(f) => f,
None => return None,
};
let mut query = String::new(); let mut query = String::new();
let mut cursor: usize = 0; let mut cursor: usize = 0;
// save terminal state and enter raw mode // save terminal state and enter raw mode via /dev/tty
let _ = Command::new("stty") let _ = Command::new("stty")
.args(["-echo", "raw"]) .args(["-echo", "raw"])
.stdin(std::process::Stdio::inherit()) .stdin(std::process::Stdio::from(tty.try_clone().unwrap()))
.status(); .status();
let result = run_select_loop(items, label, &mut query, &mut cursor); let result = run_select_loop(items, label, &mut query, &mut cursor, &mut tty);
// restore terminal // restore terminal
let _ = Command::new("stty") let _ = Command::new("stty")
.args(["echo", "-raw"]) .args(["echo", "-raw"])
.stdin(std::process::Stdio::inherit()) .stdin(std::process::Stdio::from(tty.try_clone().unwrap()))
.status(); .status();
print!("\x1b[2J\x1b[H"); let _ = write!(tty, "\x1b[2J\x1b[H");
let _ = stdout().flush(); let _ = tty.flush();
result result
} }
@@ -289,6 +301,7 @@ fn run_select_loop(
label: &str, label: &str,
query: &mut String, query: &mut String,
cursor: &mut usize, cursor: &mut usize,
tty: &mut std::fs::File,
) -> Option<String> { ) -> Option<String> {
loop { loop {
let filtered: Vec<&String> = items.iter().filter(|i| fuzzy_match(i, query)).collect(); let filtered: Vec<&String> = items.iter().filter(|i| fuzzy_match(i, query)).collect();
@@ -299,12 +312,11 @@ fn run_select_loop(
*cursor = filtered.len() - 1; *cursor = filtered.len() - 1;
} }
// draw // draw to /dev/tty (not stdout, which may be captured by subshell)
let mut out = stdout(); let _ = write!(tty, "\x1b[2J\x1b[H");
let _ = write!(out, "\x1b[2J\x1b[H"); let _ = write!(tty, "\x1b[33m{}\x1b[0m> {}\r\n", label, query);
let _ = write!(out, "\x1b[33m{}\x1b[0m> {}\r\n", label, query);
let _ = write!( let _ = write!(
out, tty,
"\x1b[90m{} items\x1b[0m\r\n", "\x1b[90m{} items\x1b[0m\r\n",
filtered.len() filtered.len()
); );
@@ -312,25 +324,21 @@ fn run_select_loop(
let max_show = 20; let max_show = 20;
for (i, item) in filtered.iter().enumerate().take(max_show) { for (i, item) in filtered.iter().enumerate().take(max_show) {
if i == *cursor { if i == *cursor {
let _ = write!(out, "\x1b[7m {}\x1b[0m\r\n", item); let _ = write!(tty, "\x1b[7m {}\x1b[0m\r\n", item);
} else { } else {
let _ = write!(out, " {}\r\n", item); let _ = write!(tty, " {}\r\n", item);
} }
} }
if filtered.len() > max_show { if filtered.len() > max_show {
let _ = write!( let _ = write!(
out, tty,
" \x1b[90m+{} more\x1b[0m\r\n", " \x1b[90m+{} more\x1b[0m\r\n",
filtered.len() - max_show filtered.len() - max_show
); );
} }
let _ = out.flush(); let _ = tty.flush();
// read key from /dev/tty (works even when stdin is piped) // read key from /dev/tty
let mut tty = match std::fs::File::open("/dev/tty") {
Ok(f) => f,
Err(_) => return None,
};
let mut buf = [0u8; 3]; let mut buf = [0u8; 3];
let n = tty.read(&mut buf).unwrap_or(0); let n = tty.read(&mut buf).unwrap_or(0);
if n == 0 { if n == 0 {