1 files changed, 45 insertions, 15 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 75aaa1b..b610486 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,25 +1,16 @@
-mod keyboard_input;
-mod press_state;
-mod program_controller;
-mod render_hint;
-mod render_request;
+mod render;
 mod window;
 mod window_controller;
 mod window_manager;
 
-use window::Window;
-
-pub use keyboard_input::KeyboardInput;
-pub use press_state::PressState;
-pub use program_controller::{DefaultProgramController, ProgramController};
-pub use render_hint::RenderHint;
-pub use render_request::RenderRequest;
-pub use window_controller::WindowController;
-pub use window_manager::WindowManager;
+pub use render::*;
+pub use window::*;
+pub use window_controller::*;
+pub use window_manager::*;
 
 pub use buffer::{Buffer, Colour};
 pub use winit::{
-    event::ModifiersState,
+    event::{ModifiersState, ElementState},
     event::VirtualKeyCode as KeyCode,
     window::CursorIcon,
 };
@@ -27,3 +18,42 @@ pub use winit::{
 pub type Point = geometry::Point<i32>;
 pub type Dimensions = geometry::Dimensions<u32>;
 pub type Rect = geometry::Rect<i32, u32>;
+
+// -----------------------------------------------------------------------------
+
+#[derive(Copy, Clone)]
+pub struct KeyboardInput {
+    pub action: Action,
+    pub key: KeyCode,
+}
+
+impl TryFrom<winit::event::KeyboardInput> for KeyboardInput {
+    type Error = ();
+
+    fn try_from(input: winit::event::KeyboardInput) -> Result<Self, ()> {
+        if let Some(key) = input.virtual_keycode {
+            Ok( Self { action: input.state.into(), key } )
+        } else {
+            Err(())
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+#[derive(Clone, Copy, PartialEq, Debug)]
+pub enum Action { Pressed, Released }
+
+impl Action {
+    pub fn is_pressed(&self)  -> bool { *self == Self::Pressed  }
+    pub fn is_released(&self) -> bool { *self == Self::Released }
+}
+
+impl From<ElementState> for Action {
+    fn from(value: ElementState) -> Self {
+        match value {
+            ElementState::Pressed => Action::Pressed,
+            ElementState::Released => Action::Released,
+        }
+    }
+}