show sequencer with arranger

crates/tek_core/src/lib.rs

@@ -43,8 +43,9 @@ use crossterm::terminal::{
 
 submod! {
     exit
-    render
     handle
+    render
+    render_split
     time_base
     time_note
     time_tick

crates/tek_core/src/render.rs

@@ -241,101 +241,6 @@ impl<'a> Render for IfElse<'a> {
     }
 }
 
-#[derive(Copy, Clone)]
-pub enum Direction { Down, Right }
-
-impl Direction {
-    pub fn split <'a, const N: usize> (&self, items: [&'a (dyn Render + Sync);N]) -> Split<'a, N> {
-        Split(*self, items)
-    }
-    pub fn split_focus <'a> (&self, index: usize, items: Renderables<'a>, style: Style) -> SplitFocus<'a> {
-        SplitFocus(*self, index, items, style)
-    }
-    pub fn is_down (&self) -> bool {
-        match self { Self::Down => true, _ => false }
-    }
-    pub fn is_right (&self) -> bool {
-        match self { Self::Right => true, _ => false }
-    }
-}
-
-pub struct Split<'a, const N: usize>(
-    pub Direction, pub [&'a (dyn Render + Sync);N]
-);
-
-impl<'a, const N: usize> Split<'a, N> {
-    pub fn down (items: [&'a (dyn Render + Sync);N]) -> Self {
-        Self(Direction::Down, items)
-    }
-    pub fn right (items: [&'a (dyn Render + Sync);N]) -> Self {
-        Self(Direction::Right, items)
-    }
-    pub fn render_areas (&self, buf: &mut Buffer, area: Rect) -> Usually<(Rect, Vec<Rect>)> {
-        let Rect { mut x, mut y, mut width, mut height } = area;
-        let mut areas = vec![];
-        for item in self.1 {
-            if width == 0 || height == 0 {
-                break
-            }
-            let result = item.render(buf, Rect { x, y, width, height })?;
-            match self.0 {
-                Direction::Down => {
-                    y = y + result.height;
-                    height = height.saturating_sub(result.height);
-                },
-                Direction::Right => {
-                    x = x + result.width;
-                    width = width.saturating_sub(result.width);
-                },
-            };
-            areas.push(area);
-        }
-        Ok((area, areas))
-    }
-}
-
-impl<'a, const N: usize> Render for Split<'a, N> {
-    fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
-        Ok(self.render_areas(buf, area)?.0)
-    }
-}
-
-type Renderables<'a> = &'a [&'a (dyn Render + Send + Sync)];
-
-pub struct SplitFocus<'a>(pub Direction, pub usize, pub Renderables<'a>, pub Style);
-
-impl<'a> SplitFocus<'a> {
-    pub fn render_areas (&self, buf: &mut Buffer, area: Rect) -> Usually<(Rect, Vec<Rect>)> {
-        let Rect { mut x, mut y, mut width, mut height } = area;
-        let mut areas = vec![];
-        for item in self.2.iter() {
-            if width == 0 || height == 0 {
-                break
-            }
-            let result = item.render(buf, Rect { x, y, width, height })?;
-            areas.push(result);
-            match self.0 {
-                Direction::Down => {
-                    y = y + result.height;
-                    height = height.saturating_sub(result.height);
-                },
-                Direction::Right => {
-                    x = x + result.width;
-                    width = width.saturating_sub(result.width);
-                },
-            }
-            Lozenge(self.3).draw(buf, result)?;
-        }
-        Ok((area, areas))
-    }
-}
-
-impl<'a> Render for SplitFocus<'a> {
-    fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
-        Ok(self.render_areas(buf, area)?.0)
-    }
-}
-
 pub trait Theme {
     const BG0:    Color;
     const BG1:    Color;

crates/tek_core/src/render_split.rs

@@ -0,0 +1,104 @@
+use crate::*;
+
+#[derive(Copy, Clone)]
+pub enum Direction {
+    Up,
+    Down,
+    Left,
+    Right
+}
+
+impl Direction {
+    pub fn split <'a, const N: usize> (&self, items: [&'a (dyn Render + Sync);N]) -> Split<'a, N> {
+        Split(*self, items)
+    }
+    pub fn split_focus <'a> (&self, index: usize, items: Renderables<'a>, style: Style) -> SplitFocus<'a> {
+        SplitFocus(*self, index, items, style)
+    }
+    pub fn is_down (&self) -> bool {
+        match self { Self::Down => true, _ => false }
+    }
+    pub fn is_right (&self) -> bool {
+        match self { Self::Right => true, _ => false }
+    }
+}
+
+pub struct Split<'a, const N: usize>(
+    pub Direction, pub [&'a (dyn Render + Sync);N]
+);
+
+impl<'a, const N: usize> Split<'a, N> {
+    pub fn down (items: [&'a (dyn Render + Sync);N]) -> Self {
+        Self(Direction::Down, items)
+    }
+    pub fn right (items: [&'a (dyn Render + Sync);N]) -> Self {
+        Self(Direction::Right, items)
+    }
+    pub fn render_areas (&self, buf: &mut Buffer, area: Rect) -> Usually<(Rect, Vec<Rect>)> {
+        let Rect { mut x, mut y, mut width, mut height } = area;
+        let mut areas = vec![];
+        for item in self.1 {
+            if width == 0 || height == 0 {
+                break
+            }
+            let result = item.render(buf, Rect { x, y, width, height })?;
+            match self.0 {
+                Direction::Down => {
+                    y = y + result.height;
+                    height = height.saturating_sub(result.height);
+                },
+                Direction::Right => {
+                    x = x + result.width;
+                    width = width.saturating_sub(result.width);
+                },
+                _ => unimplemented!()
+            };
+            areas.push(area);
+        }
+        Ok((area, areas))
+    }
+}
+
+impl<'a, const N: usize> Render for Split<'a, N> {
+    fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
+        Ok(self.render_areas(buf, area)?.0)
+    }
+}
+
+type Renderables<'a> = &'a [&'a (dyn Render + Send + Sync)];
+
+pub struct SplitFocus<'a>(pub Direction, pub usize, pub Renderables<'a>, pub Style);
+
+impl<'a> SplitFocus<'a> {
+    pub fn render_areas (&self, buf: &mut Buffer, area: Rect) -> Usually<(Rect, Vec<Rect>)> {
+        let Rect { mut x, mut y, mut width, mut height } = area;
+        let mut areas = vec![];
+        for item in self.2.iter() {
+            if width == 0 || height == 0 {
+                break
+            }
+            let result = item.render(buf, Rect { x, y, width, height })?;
+            areas.push(result);
+            match self.0 {
+                Direction::Down => {
+                    y = y + result.height;
+                    height = height.saturating_sub(result.height);
+                },
+                Direction::Right => {
+                    x = x + result.width;
+                    width = width.saturating_sub(result.width);
+                },
+                _ => unimplemented!()
+            }
+            Lozenge(self.3).draw(buf, result)?;
+        }
+        Ok((area, areas))
+    }
+}
+
+impl<'a> Render for SplitFocus<'a> {
+    fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
+        Ok(self.render_areas(buf, area)?.0)
+    }
+}
+