few changes

src/lib.rs

@@ -1,8 +1,15 @@
 pub mod console;
 pub mod rsx;
+pub mod state;
 pub mod utils;
 pub mod widgets;
 
+pub mod prelude {
+    pub use crate::*;
+    pub use console::Event;
+    pub use crossterm::event::{KeyCode, KeyEvent};
+}
+
 pub use std::io::Result;
 
 pub type Element = std::sync::Arc<dyn Fn(&Frame) -> crate::Result<()>>;
@@ -28,8 +35,6 @@ pub struct Frame {
     pub area: Area,
 }
 
-pub struct State<T>(*mut T);
-
 impl Frame {
     pub fn draw<W>(&self, w: &W, mut props: Area) -> Result<()>
     where
@@ -147,84 +152,6 @@ impl Default for Area {
     }
 }
 
-impl<T: std::fmt::Display> std::fmt::Display for State<T> {
+pub fn use_state<T>(v: T) -> state::State<T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    state::State(Box::into_raw(Box::new(v)))
-        write!(f, "{}", unsafe { &*self.0 })
-    }
-}
-
-impl<T: std::fmt::Debug> std::fmt::Debug for State<T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "State({:?})", unsafe { &*self.0 })
-    }
-}
-
-//// State ops ////
-
-impl<T: std::ops::Add<Output = T> + Clone> std::ops::Add<T> for State<T> {
-    type Output = T;
-
-    fn add(self, rhs: T) -> Self::Output {
-        unsafe {
-            let lhs = &mut *self.0;
-            lhs.clone() + rhs
-        }
-    }
-}
-
-impl<T: std::ops::Sub<Output = T> + Clone> std::ops::Sub<T> for State<T> {
-    type Output = T;
-
-    fn sub(self, rhs: T) -> Self::Output {
-        unsafe {
-            let lhs = &mut *self.0;
-            lhs.clone() - rhs
-        }
-    }
-}
-
-impl<T: std::ops::Div<Output = T> + Clone> std::ops::Div<T> for State<T> {
-    type Output = T;
-
-    fn div(self, rhs: T) -> Self::Output {
-        unsafe {
-            let lhs = &mut *self.0;
-            lhs.clone() / rhs
-        }
-    }
-}
-
-impl<T: std::ops::AddAssign + Clone> std::ops::AddAssign<T> for State<T> {
-    fn add_assign(&mut self, rhs: T) {
-        unsafe { *self.0 += rhs }
-    }
-}
-
-impl<T: std::ops::SubAssign + Clone> std::ops::SubAssign<T> for State<T> {
-    fn sub_assign(&mut self, rhs: T) {
-        unsafe { *self.0 -= rhs }
-    }
-}
-
-impl<T> std::ops::Deref for State<T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*self.0 }
-    }
-}
-
-impl<T> std::ops::DerefMut for State<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        unsafe { &mut *self.0 }
-    }
-}
-
-impl<T> State<T> {
-    pub fn copy_state(&self) -> Self {
-        Self(self.0)
-    }
-}
-
-pub fn use_state<T>(v: T) -> State<T> {
-    State(Box::into_raw(Box::new(v)))
 }

src/main.rs

@@ -1,4 +1,4 @@
-use osui::*;
+use osui::prelude::*;
 
 fn main() -> osui::Result<()> {
     let con = console::init()?;
@@ -10,14 +10,18 @@ fn main() -> osui::Result<()> {
         let mut count1 = count.copy_state();
         con.draw(std::sync::Arc::clone(&ui))?;
 
-        console::read()?;
+        if let Event::Key(KeyEvent { code, .. }) = console::read()? {
+            if code == KeyCode::Char('q') {
+                break;
+            }
+        }
         count1 += 1;
     }
 
     console::end()
 }
 
-pub fn app() -> (Element, State<i32>) {
+pub fn app() -> (Element, state::State<i32>) {
     let count = use_state(0);
     let count1 = count.copy_state();