new key binding macro

engine/src/tui/tui_input.rs

@@ -1,14 +1,15 @@
 use crate::{*, tui::*};
+pub use crossterm::event::Event;
 
 #[derive(Debug, Clone)]
 pub struct TuiIn {
     pub(crate) exited: Arc<AtomicBool>,
-    pub(crate) event: crossterm::event::Event,
+    pub(crate) event:  Event,
 }
 
 impl Input<Tui> for TuiIn {
-    type Event = crossterm::event::Event;
-    fn event (&self) -> &crossterm::event::Event {
+    type Event = Event;
+    fn event (&self) -> &Event {
         &self.event
     }
     fn is_done (&self) -> bool {
@@ -19,6 +20,47 @@ impl Input<Tui> for TuiIn {
     }
 }
 
+/// Define a key
+pub const fn key (code: KeyCode) -> Event {
+    let modifiers = KeyModifiers::NONE;
+    let kind      = KeyEventKind::Press;
+    let state     = KeyEventState::NONE;
+    Event::Key(KeyEvent { code, modifiers, kind, state })
+}
+
+/// Add Ctrl modifier to key
+pub const fn ctrl (event: Event) -> Event {
+    match event {
+        Event::Key(mut event) => {
+            event.modifiers = event.modifiers.union(KeyModifiers::CONTROL)
+        },
+        _ => {}
+    }
+    event
+}
+
+/// Add Alt modifier to key
+pub const fn alt (event: Event) -> Event {
+    match event {
+        Event::Key(mut event) => {
+            event.modifiers = event.modifiers.union(KeyModifiers::ALT)
+        },
+        _ => {}
+    }
+    event
+}
+
+/// Add Shift modifier to key
+pub const fn shift (event: Event) -> Event {
+    match event {
+        Event::Key(mut event) => {
+            event.modifiers = event.modifiers.union(KeyModifiers::SHIFT)
+        },
+        _ => {}
+    }
+    event
+}
+
 #[macro_export] macro_rules! key_pat {
     (Ctrl-Alt-$code:pat) => { key_event_pat!($code, KeyModifiers::CONTROL | KeyModifiers::ALT) };
     (Ctrl-$code:pat)     => { key_event_pat!($code, KeyModifiers::CONTROL) };
@@ -86,65 +128,3 @@ impl Input<Tui> for TuiIn {
         })
     };
 }
-
-/// Define a key
-pub const fn key (code: KeyCode) -> KeyEvent {
-    let modifiers = KeyModifiers::NONE;
-    let kind      = KeyEventKind::Press;
-    let state     = KeyEventState::NONE;
-    KeyEvent { code, modifiers, kind, state }
-}
-
-/// Add Ctrl modifier to key
-pub const fn ctrl (key: KeyEvent) -> KeyEvent {
-    KeyEvent { modifiers: key.modifiers.union(KeyModifiers::CONTROL), ..key }
-}
-
-/// Add Alt modifier to key
-pub const fn alt (key: KeyEvent) -> KeyEvent {
-    KeyEvent { modifiers: key.modifiers.union(KeyModifiers::ALT), ..key }
-}
-
-/// Add Shift modifier to key
-pub const fn shift (key: KeyEvent) -> KeyEvent {
-    KeyEvent { modifiers: key.modifiers.union(KeyModifiers::SHIFT), ..key }
-}
-
-/*
-/// Define a keymap
-#[macro_export] macro_rules! keymap {
-    ($T:ty { $([$k:ident $(($char:literal))?, $m:ident, $n: literal, $d: literal, $f: expr]),* $(,)? }) => {
-        &[
-            $((KeyCode::$k $(($char))?, KeyModifiers::$m, $n, $d, &$f as KeyHandler<$T>)),*
-        ] as &'static [KeyBinding<$T>]
-    }
-}
-
-*/
-
-/*
-
-impl TuiIn {
-    // TODO remove
-    pub fn handle_keymap <T> (&self, state: &mut T, keymap: &KeyMap<T>) -> Usually<bool> {
-        match self.event() {
-            TuiEvent::Input(Key(event)) => {
-                for (code, modifiers, _, _, command) in keymap.iter() {
-                    if *code == event.code && modifiers.bits() == event.modifiers.bits() {
-                        return command(state)
-                    }
-                }
-            },
-            _ => {}
-        };
-        Ok(false)
-    }
-}
-
-pub type KeyHandler<T> = &'static dyn Fn(&mut T)->Usually<bool>;
-
-pub type KeyBinding<T> = (KeyCode, KeyModifiers, &'static str, &'static str, KeyHandler<T>);
-
-pub type KeyMap<T> = [KeyBinding<T>];
-
-*/