From f16fd889e47caeeb4d52275a057ced5574db90a3 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Tue, 7 Aug 2018 16:14:06 +0300 Subject: [PATCH] Add deleting in ex mode --- src/bin.rs | 3 +-- ui/src/components/utilities.rs | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/bin.rs b/src/bin.rs index 65aabc69..ea1b58fc 100644 --- a/src/bin.rs +++ b/src/bin.rs @@ -171,11 +171,10 @@ fn main() { state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ChangeMode(UIMode::Normal)}); state.redraw(); }, - k @ Key::Char(_) => { + k => { state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ExInput(k)}); state.redraw(); }, - _ => {}, } }, UIMode::Fork => { diff --git a/ui/src/components/utilities.rs b/ui/src/components/utilities.rs index e41d8826..97a0b623 100644 --- a/ui/src/components/utilities.rs +++ b/ui/src/components/utilities.rs @@ -453,10 +453,12 @@ impl Component for StatusBar { match m { UIMode::Normal => { self.height = 1; - context.replies.push_back(UIEvent { - id: 0, - event_type: UIEventType::Command(self.ex_buffer.clone()), - }); + if !self.ex_buffer.is_empty() { + context.replies.push_back(UIEvent { + id: 0, + event_type: UIEventType::Command(self.ex_buffer.clone()), + }); + } self.ex_buffer.clear() } UIMode::Execute => { @@ -469,6 +471,14 @@ impl Component for StatusBar { self.dirty = true; self.ex_buffer.push(*c); } + UIEventType::ExInput(Key::Ctrl('u')) => { + self.dirty = true; + self.ex_buffer.clear(); + } + UIEventType::ExInput(Key::Backspace) | UIEventType::ExInput(Key::Ctrl('h')) => { + self.dirty = true; + self.ex_buffer.pop(); + } UIEventType::Resize => { self.dirty = true; }