Add support for some additional keys in interactive mode (#634)

* Ignore tab key in interactive mode * Support home and end keys in interactive mode * Support delete key in interactive mode
atuinsh · Dec 3, 2022 · 1d9ce94 · 1d9ce94
1 parent 478af1f
commit 1d9ce94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/command/client/search/cursor.rs b/src/command/client/search/cursor.rs
@@ -57,13 +57,17 @@ impl Cursor {
         self.index += c.len_utf8();
     }
 
-    pub fn remove(&mut self) -> char {
-        self.source.remove(self.index)
+    pub fn remove(&mut self) -> Option<char> {
+        if self.index < self.source.len() {
+            Some(self.source.remove(self.index))
+        } else {
+            None
+        }
     }
 
     pub fn back(&mut self) -> Option<char> {
         if self.left() {
-            Some(self.remove())
+            self.remove()
         } else {
             None
         }

diff --git a/src/command/client/search/interactive.rs b/src/command/client/search/interactive.rs
@@ -69,6 +69,7 @@ impl State {
         len: usize,
     ) -> Option<usize> {
         match input {
+            TermEvent::Key(Key::Char('\t')) => {}
             TermEvent::Key(Key::Ctrl('c' | 'd' | 'g')) => return Some(RETURN_ORIGINAL),
             TermEvent::Key(Key::Esc) => {
                 return Some(match settings.exit_mode {
@@ -87,12 +88,15 @@ impl State {
                 self.input.left();
             }
             TermEvent::Key(Key::Right | Key::Ctrl('l')) => self.input.right(),
-            TermEvent::Key(Key::Ctrl('a')) => self.input.start(),
-            TermEvent::Key(Key::Ctrl('e')) => self.input.end(),
+            TermEvent::Key(Key::Ctrl('a') | Key::Home) => self.input.start(),
+            TermEvent::Key(Key::Ctrl('e') | Key::End) => self.input.end(),
             TermEvent::Key(Key::Char(c)) => self.input.insert(*c),
             TermEvent::Key(Key::Backspace) => {
                 self.input.back();
             }
+            TermEvent::Key(Key::Delete) => {
+                self.input.remove();
+            }
             TermEvent::Key(Key::Ctrl('w')) => {
                 // remove the first batch of whitespace
                 while matches!(self.input.back(), Some(c) if c.is_whitespace()) {}