From 3a92d03b3c47926b0eeaac8f301833b23d68a6ec Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 9 Mar 2021 02:06:33 -0500 Subject: simplify --- Cargo.toml | 2 +- examples/tmux.rs | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4ef7ca5..0ce270f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" itoa = "0.4" nix = "0.20" terminal_size = "0.1" -vt100 = "0.11" +vt100 = "0.12" blocking = { version = "1.0", optional = true } futures-lite = { version = "1.11", optional = true } diff --git a/examples/tmux.rs b/examples/tmux.rs index 720b8c9..5d1578b 100644 --- a/examples/tmux.rs +++ b/examples/tmux.rs @@ -215,9 +215,7 @@ impl State { let window = self.current_window(); tm.clear(); let new_screen = window.vt.lock_arc().await.screen().clone(); - tm.write(&new_screen.contents_formatted()); - tm.write(&new_screen.input_mode_formatted()); - tm.write(&new_screen.title_formatted()); + tm.write(&new_screen.state_formatted()); self.draw_notifications(tm, &new_screen); tm.refresh().await.unwrap(); } @@ -226,15 +224,9 @@ impl State { let window = self.current_window(); let old_screen = window.screen.clone(); let new_screen = window.vt.lock_arc().await.screen().clone(); - let contents_diff = new_screen.contents_diff(&old_screen); - let input_mode_diff = new_screen.input_mode_diff(&old_screen); - let title_diff = new_screen.title_diff(&old_screen); - let bells_diff = new_screen.bells_diff(&old_screen); + let diff = new_screen.state_diff(&old_screen); self.clear_notifications(tm, &old_screen); - tm.write(&contents_diff); - tm.write(&input_mode_diff); - tm.write(&title_diff); - tm.write(&bells_diff); + tm.write(&diff); self.draw_notifications(tm, &new_screen); tm.refresh().await.unwrap(); self.current_window_mut().screen = new_screen; -- cgit v1.2.3-54-g00ecf