diff --git a/Cargo.lock b/Cargo.lock index 4ed4bf7ce..3aa51b46d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,6 +395,7 @@ dependencies = [ "tree-sitter-highlight", "tui-term", "unicode-width 0.2.0", + "vt100-ctt", ] [[package]] @@ -1043,7 +1044,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72af159125ce32b02ceaced6cffae6394b0e6b6dfd4dc164a6c59a2db9b3c0b0" dependencies = [ "ratatui", - "vt100", ] [[package]] @@ -1094,21 +1094,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "vt100" -version = "0.15.2" -source = "git+https://github.com/ChrisTitusTech/vt100-rust#e41fb3d8fb5fd01dd2d076c9a25823a31656012f" +name = "vt100-ctt" +version = "0.16.0" +source = "git+https://github.com/ChrisTitusTech/vt100-rust?rev=b660c85faaa32323892c3154835c2bc901d7bf57#b660c85faaa32323892c3154835c2bc901d7bf57" dependencies = [ "itoa", "log", - "unicode-width 0.1.14", + "ratatui", + "tui-term", + "unicode-width 0.2.0", "vte", ] [[package]] name = "vte" -version = "0.11.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ "arrayvec", "utf8parse", diff --git a/Cargo.toml b/Cargo.toml index 1c032ad41..27b31878c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,6 @@ 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 diff --git a/tui/Cargo.toml b/tui/Cargo.toml index 563443330..b4eb7b691 100644 --- a/tui/Cargo.toml +++ b/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 = "0.2.0" +tui-term = { version = "0.2.0", default-features = false } time = { version = "0.3.36", features = ["formatting", "local-offset", "macros"], default-features = false } unicode-width = { version = "0.2.0", default-features = false } rand = { version = "0.8.5", optional = true } @@ -26,6 +26,7 @@ linutil_core = { version = "24.10.31", path = "../core" } tree-sitter-highlight = "0.24.4" tree-sitter-bash = "0.23.3" nix = { version = "0.29.0", features = [ "user" ] } +vt100-ctt = { git = "https://github.com/ChrisTitusTech/vt100-rust", rev = "b660c85faaa32323892c3154835c2bc901d7bf57" } [[bin]] name = "linutil" diff --git a/tui/src/running_command.rs b/tui/src/running_command.rs index a3248c95d..d2342826a 100644 --- a/tui/src/running_command.rs +++ b/tui/src/running_command.rs @@ -17,10 +17,8 @@ use std::{ thread::JoinHandle, }; use time::{macros::format_description, OffsetDateTime}; -use tui_term::{ - vt100::{Parser, Screen}, - widget::PseudoTerminal, -}; +use tui_term::widget::PseudoTerminal; +use vt100_ctt::{Parser, Screen}; pub struct RunningCommand { /// A buffer to save all the command output (accumulates, until the command exits)