switchable edn example

edn/examples/edn01.rs

@@ -1,27 +1,45 @@
 use tek_tui::{*, tek_layout::{*, tek_engine::*}};
 use tek_edn::*;
 use std::sync::{Arc, RwLock};
+use crossterm::event::{*, KeyCode::*};
 
-const EDN: &'static str = include_str!("edn01.edn");
+const EDN: &'static [&'static str] = &[
+    include_str!("edn01.edn"),
+    include_str!("edn02.edn"),
+];
 
 fn main () -> Usually<()> {
-    let state = Arc::new(RwLock::new(Example));
+    let state = Arc::new(RwLock::new(Example(0)));
     Tui::new().unwrap().run(&state)?;
     Ok(())
 }
 
-pub struct Example;
+pub struct Example(usize);
 
-impl EdnLayout<Tui> for &Example {
+impl EdnViewData<Tui> for &Example {
     fn get_content <'a> (&'a self, sym: &'a str) -> RenderBox<'a, Tui> {
-        Box::new(Thunk::new(move||if sym == ":hello-world" { "Hello world!" } else { "" }))
+        Box::new(Thunk::new(move||match sym {
+            ":hello-world" => "Hello world!",
+            ":hello" => "Hello",
+            ":world" => "world",
+            _ => ""
+        }))
     }
 }
 
 impl Content<Tui> for Example {
     fn content (&self) -> impl Render<Tui> {
-        EdnView::new(self, EDN).unwrap()
+        EdnView::new(self, EDN[self.0]).unwrap()
     }
 }
 
-impl Handle<Tui> for Example {}
+impl Handle<Tui> for Example {
+    fn handle (&mut self, input: &TuiIn) -> Perhaps<bool> {
+        match input.event() {
+            kpat!(Right) => self.0 = (self.0 + 1) % EDN.len(),
+            kpat!(Left) => self.0 = if self.0 > 0 { self.0 - 1 } else { EDN.len() - 1 },
+            _ => return Ok(None)
+        }
+        Ok(Some(true))
+    }
+}

edn/examples/edn02.rs

@@ -12,7 +12,7 @@ fn main () -> Usually<()> {
 
 pub struct Example;
 
-impl EdnLayout<Tui> for &Example {
+impl EdnViewData<Tui> for &Example {
     fn get_content <'a> (&'a self, sym: &'a str) -> RenderBox<'a, Tui> {
         Box::new(Thunk::new(move||match sym {
             ":hello" => "Hello",

edn/examples/edn03.edn

@@ -0,0 +1,73 @@
+(align/c (bg/behind :bg0 (margin/xy 1 1 (col
+  (bg/behind :bg1 (border/around :border1 (margin/xy 2 1 :label1)))
+  (bg/behind :bg2 (border/around :border2 (margin/xy 4 2 :label2)))
+  (bg/behind :bg3 (border/around :border3 (margin/xy 6 3 :label3)))))))
+
+    fn content (&self) -> dyn Render<Engine = Tui> {
+        let border_style = Style::default().fg(Color::Rgb(0,0,0));
+        Align::Center(Layers::new(move|add|{
+
+            add(&Background(Color::Rgb(0,128,128)))?;
+
+            add(&Margin::XY(1, 1, Stack::down(|add|{
+
+                add(&Layers::new(|add|{
+                    add(&Background(Color::Rgb(128,96,0)))?;
+                    add(&Border(Square(border_style)))?;
+                    add(&Margin::XY(2, 1, "..."))?;
+                    Ok(())
+                }).debug())?;
+
+                add(&Layers::new(|add|{
+                    add(&Background(Color::Rgb(128,64,0)))?;
+                    add(&Border(Lozenge(border_style)))?;
+                    add(&Margin::XY(4, 2, "---"))?;
+                    Ok(())
+                }).debug())?;
+
+                add(&Layers::new(|add|{
+                    add(&Background(Color::Rgb(96,64,0)))?;
+                    add(&Border(SquareBold(border_style)))?;
+                    add(&Margin::XY(6, 3, "~~~"))?;
+                    Ok(())
+                }).debug())?;
+
+                Ok(())
+            })).debug())?;
+
+            Ok(())
+
+        }))
+        //Align::Center(Margin::X(1, Layers::new(|add|{
+            //add(&Background(Color::Rgb(128,0,0)))?;
+            //add(&Stack::down(|add|{
+                //add(&Margin::Y(1, Layers::new(|add|{
+                    //add(&Background(Color::Rgb(0,128,0)))?;
+                    //add(&Align::Center("12345"))?;
+                    //add(&Align::Center("FOO"))
+                //})))?;
+                //add(&Margin::XY(1, 1, Layers::new(|add|{
+                    //add(&Align::Center("1234567"))?;
+                    //add(&Align::Center("BAR"))?;
+                    //add(&Background(Color::Rgb(0,0,128)))
+                //})))
+            //}))
+        //})))
+
+        //Align::Y(Layers::new(|add|{
+            //add(&Background(Color::Rgb(128,0,0)))?;
+            //add(&Margin::X(1, Align::Center(Stack::down(|add|{
+                //add(&Align::X(Margin::Y(1, Layers::new(|add|{
+                    //add(&Background(Color::Rgb(0,128,0)))?;
+                    //add(&Align::Center("12345"))?;
+                    //add(&Align::Center("FOO"))
+                //})))?;
+                //add(&Margin::XY(1, 1, Layers::new(|add|{
+                    //add(&Align::Center("1234567"))?;
+                    //add(&Align::Center("BAR"))?;
+                    //add(&Background(Color::Rgb(0,0,128)))
+                //})))?;
+                //Ok(())
+            //})))))
+        //}))
+    }

edn/src/edn_main.rs

@@ -1,6 +0,0 @@
-#[macro_export] macro_rules! run_tek_edn {
-    ($source:expr) => {
-        struct EdnRunner;
-        impl<E: Engine> EdnLayout<E> for EdnRunner;
-    }
-}

edn/src/edn_view.rs

@@ -9,7 +9,7 @@ pub type EdnCallback<'a, Engine, State> =
 pub type EdnRenderCallback<'a, Engine, State> =
     Box<EdnCallback<'a, Engine, State>>;
 
-pub trait EdnLayout<E: Engine> {
+pub trait EdnViewData<E: Engine> {
     fn get_bool    (&self,    _sym: &str) -> bool { false }
     fn get_unit    (&self,    _sym: &str) -> E::Unit { 0.into() }
     fn get_usize   (&self,    _sym: &str) -> usize { 0 }
@@ -17,21 +17,21 @@ pub trait EdnLayout<E: Engine> {
 }
 
 /// Renders from EDN source and context.
-pub struct EdnView<E: Engine, T: EdnLayout<E>> {
+pub struct EdnView<E: Engine, T: EdnViewData<E>> {
     _engine: PhantomData<E>,
     context: T,
     layout:  EdnItem<String>
     //render: Box<dyn Fn(&'a T)->Box<dyn Render<E> + Send + Sync + 'a> + Send + Sync + 'a>
 }
 
-impl<E: Engine, T: EdnLayout<E>> EdnView<E, T> {
+impl<E: Engine, T: EdnViewData<E>> EdnView<E, T> {
     pub fn new (context: T, source: &str) -> Usually<Self> {
         let layout = EdnItem::read_one(&source)?.0;
         Ok(Self { _engine: Default::default(), context, layout, })
     }
 }
 
-impl<E: Engine, T: EdnLayout<E> + Send + Sync> Content<E> for EdnView<E, T> {
+impl<E: Engine, T: EdnViewData<E> + Send + Sync> Content<E> for EdnView<E, T> {
     fn content (&self) -> impl Render<E> {
         use EdnItem::*;
         match &self.layout {

edn/src/lib.rs

@@ -9,7 +9,6 @@ pub use ::tek_layout;
 mod edn_error; pub use self::edn_error::*;
 mod edn_item;  pub use self::edn_item::*;
 mod edn_iter;  pub use self::edn_iter::*;
-mod edn_main;  pub use self::edn_main::*;
 mod edn_token; pub use self::edn_token::*;
 mod edn_view;  pub use self::edn_view::*;
 
@@ -38,6 +37,6 @@ mod edn_view;  pub use self::edn_view::*;
     EdnItem::<String>::read_all(include_str!("../examples/edn01.edn"))?;
     EdnItem::<String>::read_all(include_str!("../examples/edn02.edn"))?;
     //panic!("{layout:?}");
-    //let content = <dyn EdnLayout<::tek_engine::tui::Tui>>::from(&layout);
+    //let content = <dyn EdnViewData<::tek_engine::tui::Tui>>::from(&layout);
     Ok(())
 }

src/groovebox.rs

@@ -61,7 +61,7 @@ impl Groovebox {
 
 has_clock!(|self: Groovebox|self.player.clock());
 
-impl EdnLayout<Tui> for Groovebox {
+impl EdnViewData<Tui> for Groovebox {
     fn get_bool (&self, item: &str) -> bool { todo!() }
     fn get_unit (&self, item: &str) -> u16 {
         use EdnItem::*;