summaryrefslogtreecommitdiffstats
path: root/src/event
diff options
context:
space:
mode:
authorJeff Zhao <jeff.no.zhao@gmail.com>2022-05-26 19:49:16 -0400
committerJeff Zhao <jeff.no.zhao@gmail.com>2022-05-26 19:52:43 -0400
commit3181c6d61b5a71c7e408263e85c4d9b67463aa5e (patch)
tree42925b1ae6da24d2ccee2d64cd55b4204c449ef1 /src/event
parentc73ada8cd4bb709c9fdd6d2f4b6c9081d762a659 (diff)
split up keymaps into different modes
Diffstat (limited to 'src/event')
-rw-r--r--src/event/process_event.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/event/process_event.rs b/src/event/process_event.rs
index 7e89225..0b7ed8d 100644
--- a/src/event/process_event.rs
+++ b/src/event/process_event.rs
@@ -6,7 +6,7 @@ use termion::event::{Event, Key, MouseButton, MouseEvent};
use tui::layout::{Constraint, Direction, Layout};
use crate::commands::{cursor_move, parent_cursor_move, reload};
-use crate::config::AppKeyMapping;
+use crate::config::{AppKeyMapping, KeyMapping};
use crate::context::AppContext;
use crate::event::AppEvent;
use crate::fs::JoshutoDirList;
@@ -21,7 +21,7 @@ use crate::util::format;
pub fn get_input_while_composite<'a>(
backend: &mut ui::TuiBackend,
context: &mut AppContext,
- keymap: &'a AppKeyMapping,
+ keymap: &'a KeyMapping,
) -> Option<&'a Command> {
let mut keymap = keymap;
@@ -35,9 +35,9 @@ pub fn get_input_while_composite<'a>(
AppEvent::Termion(event) => {
match event {
Event::Key(Key::Esc) => return None,
- event => match keymap.as_ref().get(&event) {
+ event => match keymap.get(&event) {
Some(CommandKeybind::SimpleKeybind(s)) => {
- return Some(s);
+ return Some(&s);
}
Some(CommandKeybind::CompositeKeybind(m)) => {
keymap = m;