aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrooks J Rady <b.j.rady@gmail.com>2021-01-07 10:49:43 +0000
committerBrooks J Rady <b.j.rady@gmail.com>2021-01-07 10:49:43 +0000
commit25356a592c0c989b4f4087dad84b382b412018a4 (patch)
tree71fab78380d55b439236b895ccd0165fb929effe /src
parentBump version (diff)
downloadsl0ppij-25356a592c0c989b4f4087dad84b382b412018a4.tar.gz
sl0ppij-25356a592c0c989b4f4087dad84b382b412018a4.tar.xz
sl0ppij-25356a592c0c989b4f4087dad84b382b412018a4.zip
Change to the Termion Key enum
Diffstat (limited to 'src')
-rw-r--r--src/keys.rs37
-rw-r--r--src/lib.rs4
-rw-r--r--src/shim.rs26
3 files changed, 25 insertions, 42 deletions
diff --git a/src/keys.rs b/src/keys.rs
deleted file mode 100644
index ed44554a..00000000
--- a/src/keys.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Copy, Hash, Serialize, Deserialize)]
-pub struct KeyEvent {
- pub code: KeyCode,
- pub modifiers: KeyModifiers,
-}
-
-#[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Copy, Hash, Serialize, Deserialize)]
-pub struct KeyModifiers {
- pub bits: u8,
- //pub shift: bool,
- //pub ctrl: bool,
- //pub alt: bool,
-}
-
-#[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Copy, Hash, Serialize, Deserialize)]
-pub enum KeyCode {
- Backspace,
- Enter,
- Left,
- Right,
- Up,
- Down,
- Home,
- End,
- PageUp,
- PageDown,
- Tab,
- BackTab,
- Delete,
- Insert,
- F(u8),
- Char(char),
- Null,
- Esc,
-}
diff --git a/src/lib.rs b/src/lib.rs
index 1d1673fc..a1e4f1fd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,13 +1,11 @@
-mod keys;
mod shim;
-pub use keys::*;
pub use shim::*;
pub trait MosaicTile {
fn init(&mut self);
fn draw(&mut self, rows: usize, cols: usize);
- fn handle_key(&mut self, key: KeyEvent);
+ fn handle_key(&mut self, key: Key);
}
#[macro_export]
diff --git a/src/shim.rs b/src/shim.rs
index 850d1668..070b6d2b 100644
--- a/src/shim.rs
+++ b/src/shim.rs
@@ -1,7 +1,29 @@
-use crate::keys::KeyEvent;
+use serde::{Deserialize, Serialize};
use std::{io, path::Path};
-pub fn get_key() -> KeyEvent {
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum Key {
+ Backspace,
+ Left,
+ Right,
+ Up,
+ Down,
+ Home,
+ End,
+ PageUp,
+ PageDown,
+ BackTab,
+ Delete,
+ Insert,
+ F(u8),
+ Char(char),
+ Alt(char),
+ Ctrl(char),
+ Null,
+ Esc,
+}
+
+pub fn get_key() -> Key {
let mut json = String::new();
io::stdin().read_line(&mut json).unwrap();
serde_json::from_str(&json).unwrap()