Merge 2036833405 into 2dabb934f7

Cargo.lock

@@ -425,7 +425,6 @@ dependencies = [
  "tree-sitter-highlight",
  "tui-term",
  "unicode-width 0.2.0",
- "vt100-ctt",
  "zips",
 ]
 
@@ -1097,6 +1096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72af159125ce32b02ceaced6cffae6394b0e6b6dfd4dc164a6c59a2db9b3c0b0"
 dependencies = [
  "ratatui",
+ "vt100",
 ]
 
 [[package]]
@@ -1147,9 +1147,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
-name = "vt100-ctt"
+name = "vt100"
-version = "0.15.3"
+version = "0.15.2"
-source = "git+https://github.com/ChrisTitusTech/vt100-rust#39136a6232d043d8447afa7d47805b6f6baa09ee"
+source = "git+https://github.com/ChrisTitusTech/vt100-rust#e41fb3d8fb5fd01dd2d076c9a25823a31656012f"
 dependencies = [
  "itoa",
  "log",

Cargo.toml

@@ -8,6 +8,9 @@ members = ["tui", "core", "xtask"]
 default-members = ["tui", "core"]
 resolver = "2"
 
+[patch.crates-io]
+vt100 = { git = "https://github.com/ChrisTitusTech/vt100-rust" }
+
 [profile.release]
 opt-level = "z"
 debug = false

tui/Cargo.toml

@@ -18,7 +18,7 @@ clap = { version = "4.5.20", features = ["derive", "std"], default-features = fa
 oneshot = { version = "0.1.8", features = ["std"], default-features = false }
 portable-pty = "0.8.1"
 ratatui = { version = "0.29.0", features = ["crossterm"], default-features = false }
-tui-term = { version = "0.2.0", default-features = false }
+tui-term = "0.2.0"
 temp-dir = "0.1.14"
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros"], default-features = false }
 unicode-width = { version = "0.2.0", default-features = false }
@@ -31,7 +31,6 @@ anstyle = { version = "1.0.8", default-features = false }
 ansi-to-tui = { version = "7.0.0", default-features = false }
 zips = "0.1.7"
 nix = { version = "0.29.0", features = [ "user" ] }
-vt100-ctt = { git = "https://github.com/ChrisTitusTech/vt100-rust" }
 
 [[bin]]
 name = "linutil"

tui/src/running_command.rs

@@ -18,9 +18,10 @@ use std::{
     thread::JoinHandle,
 };
 use time::{macros::format_description, OffsetDateTime};
-use tui_term::widget::PseudoTerminal;
+use tui_term::{
-use vt100_ctt::{Parser, Screen};
+    vt100::{self, Screen},
-
+    widget::PseudoTerminal,
+};
 pub struct RunningCommand {
     /// A buffer to save all the command output (accumulates, until the command exits)
     buffer: Arc<Mutex<Vec<u8>>>,
@@ -284,7 +285,7 @@ impl RunningCommand {
         // Process the buffer with a parser with the current screen size
         // We don't actually need to create a new parser every time, but it is so much easier this
         // way, and doesn't cost that much
-        let mut parser = Parser::new(size.height, size.width, 1000);
+        let mut parser = vt100::Parser::new(size.height, size.width, 1000);
         let mutex = self.buffer.lock();
         let buffer = mutex.as_ref().unwrap();
         parser.process(buffer);