From 1f60b43f616ff49ddd8187bcca8d31e9b6597cec Mon Sep 17 00:00:00 2001
From: facile pop culture reference <donotem@ilme.no>
Date: Mon, 6 Jul 2026 20:40:52 +0300
Subject: [PATCH] reorganize, add Azimuth

---
 dizzle                        |   2 +-
 src/draw.rs                   |  76 ++---
 src/draw/align.rs             |  31 ++
 src/{layout => draw}/area.rs  |   0
 src/draw/azimuth.rs           |  12 +
 src/{ => draw}/color.rs       |   7 +
 src/{space => draw}/coord.rs  |   0
 src/{space => draw}/iter.rs   |   0
 src/{ => draw}/layout.rs      |   4 -
 src/{space => draw}/lrtb.rs   |   2 +-
 src/draw/origin.rs            |  42 +++
 src/{space => draw}/sizer.rs  |   4 +-
 src/draw/space.rs             |   2 +
 src/{layout => draw}/split.rs |   7 +-
 src/draw/thunk.rs             |  48 +++
 src/{space => draw}/xywh.rs   |  24 --
 src/eval.rs                   |  56 +++-
 src/layout/align.rs           |  15 -
 src/lib.rs                    |   5 +-
 src/origin.rs                 |   0
 src/space.rs                  |   8 -
 src/term.rs                   | 540 +++++-----------------------------
 src/term/border.rs            |   2 +-
 src/term/input.rs             |  39 +++
 src/term/output.rs            | 343 +++++++++++++++++++++
 src/text.rs                   |   2 +-
 26 files changed, 677 insertions(+), 594 deletions(-)
 create mode 100644 src/draw/align.rs
 rename src/{layout => draw}/area.rs (100%)
 create mode 100644 src/draw/azimuth.rs
 rename src/{ => draw}/color.rs (99%)
 rename src/{space => draw}/coord.rs (100%)
 rename src/{space => draw}/iter.rs (100%)
 rename src/{ => draw}/layout.rs (94%)
 rename src/{space => draw}/lrtb.rs (98%)
 create mode 100644 src/draw/origin.rs
 rename src/{space => draw}/sizer.rs (82%)
 create mode 100644 src/draw/space.rs
 rename src/{layout => draw}/split.rs (95%)
 create mode 100644 src/draw/thunk.rs
 rename src/{space => draw}/xywh.rs (93%)
 delete mode 100644 src/layout/align.rs
 create mode 100644 src/origin.rs
 delete mode 100644 src/space.rs
 create mode 100644 src/term/input.rs
 create mode 100644 src/term/output.rs

diff --git a/dizzle b/dizzle
index f8e310b..af2a107 160000
--- a/dizzle
+++ b/dizzle
@@ -1 +1 @@
-Subproject commit f8e310b477afc1aab4701fdc52da474143d78a28
+Subproject commit af2a10751f87caef8e5526d1f692c941b8de8357
diff --git a/src/draw.rs b/src/draw.rs
index 6675132..c5e895a 100644
--- a/src/draw.rs
+++ b/src/draw.rs
@@ -1,5 +1,4 @@
 use crate::*;
-pub use crate::space::*;
 
 /// Output target.
 ///
@@ -70,14 +69,16 @@ pub trait Screen: Xy<Self::Unit> + Wh<Self::Unit> + Send + Sync + Sized {
 /// }
 /// ```
 pub trait Draw<S: Screen> {
-    fn draw (self, to: &mut S) -> Perhaps<XYWH<S::Unit>>;
-    fn layout (&self, area: XYWH<S::Unit>) -> Perhaps<XYWH<S::Unit>> {
+    fn draw (self, to: &mut S) -> Drawn<S::Unit>;
+    fn layout (&self, area: XYWH<S::Unit>) -> Drawn<S::Unit> {
         Ok(Some(area))
     }
 }
 
+pub type Drawn<U> = Perhaps<XYWH<U>>;
+
 impl<S: Screen> Draw<S> for () {
-    fn draw (self, _: &mut S) -> Perhaps<XYWH<S::Unit>> {
+    fn draw (self, _: &mut S) -> Drawn<S::Unit> {
         Ok(None)
     }
 }
@@ -87,7 +88,7 @@ impl_draw!(<S: Screen, D: Draw<S>,>|self: Option<D>, to: S|{
 });
 
 //impl<S: Screen, D: Draw<S>> Draw<S> for RwLock<D> {
-    //fn draw (self, __: &mut S) -> Perhaps<XYWH<S::Unit>> {
+    //fn draw (self, __: &mut S) -> Drawn<S::Unit> {
         //todo!()
     //}
 //}
@@ -111,52 +112,21 @@ impl<T: Screen, V: View<T>> Draw<T> for &V {
     }
 }
 
-/// Because we can't implement [Draw] for `F: FnOnce...` without conflicts.
-pub struct Thunk<T: Screen, F: FnOnce(&mut T)->Perhaps<XYWH<T::Unit>>>(
-    pub F,
-    std::marker::PhantomData<T>
-);
-
-impl<T: Screen, F: FnOnce(&mut T)->Perhaps<XYWH<T::Unit>>> Draw<T> for Thunk<T, F> {
-    fn draw (self, to: &mut T) -> Perhaps<XYWH<T::Unit>> {
-        (self.0)(to)
-    }
-}
-
-/// Basic [Draw]able closure.
-///
-/// ```
-/// # use tengri::{draw::*, term::*};
-/// # fn test () -> impl tengri::draw::Draw<tengri::term::Tui> {
-///     thunk(|to: &mut Tui|Ok(to.1))
-/// # }
-/// ```
-pub const fn thunk <T: Screen, F: FnOnce(&mut T)->Perhaps<XYWH<T::Unit>>> (
-    draw: F
-) -> Thunk<T, F> {
-    Thunk(draw, std::marker::PhantomData)
-}
-
-/// Only render when condition is true.
-///
-/// ```
-/// # use tengri::{draw::*, term::*};
-/// # fn test () -> impl tengri::draw::Draw<tengri::term::Tui> {
-///     when(true, "Yes")
-/// # }
-/// ```
-pub const fn when <T: Screen> (condition: bool, draw: impl Draw<T>) -> impl Draw<T> {
-    thunk(move|to: &mut T|if condition { draw.draw(to) } else { Ok(Default::default()) })
-}
-
-/// Render one thing if a condition is true and another false.
-///
-/// ```
-/// # use tengri::{draw::*, term::*};
-/// # fn test () -> impl tengri::draw::Draw<tengri::term::Tui> {
-///     either(true, "Yes", "No")
-/// # }
-/// ```
-pub const fn either <T: Screen> (condition: bool, a: impl Draw<T>, b: impl Draw<T>) -> impl Draw<T> {
-    thunk(move|to: &mut T|if condition { a.draw(to) } else { b.draw(to) })
+features! {
+    "draw": [
+        align,
+        area,
+        azimuth,
+        color,
+        coord,
+        iter,
+        layout,
+        lrtb,
+        origin,
+        sizer,
+        space,
+        split,
+        thunk,
+        xywh
+    ]
 }
diff --git a/src/draw/align.rs b/src/draw/align.rs
new file mode 100644
index 0000000..8e4ebb1
--- /dev/null
+++ b/src/draw/align.rs
@@ -0,0 +1,31 @@
+use crate::*;
+
+pub struct Align<T>(Option<Azimuth>, T);
+
+impl_draw!(<S: Screen, T: Draw<S>,>|self: Align<T>, to: S|{
+    todo!()
+});
+
+/// ```
+/// use tengri::*;
+/// let _ = align(None, "unaligned");
+/// let _ = align(Azimuth::SE, "southeast");
+/// let _ = align(Some(Azimuth::SE), "southeast");
+/// ```
+pub fn align <S: Screen, T: Draw<S>, U: Into<Option<Azimuth>>> (origin: U, it: T) -> Align<T> {
+    Align(origin.into(), it)
+}
+
+pub fn align_c <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::C), it) }
+pub fn align_x <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::X), it) }
+pub fn align_y <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::Y), it) }
+
+pub fn align_n <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::N), it) }
+pub fn align_s <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::S), it) }
+pub fn align_e <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::E), it) }
+pub fn align_w <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::W), it) }
+
+pub fn align_ne <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::NE), it) }
+pub fn align_se <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::SE), it) }
+pub fn align_nw <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::NW), it) }
+pub fn align_sw <S: Screen, T: Draw<S>> (it: T) -> Align<T> { Align(Some(Azimuth::SW), it) }
diff --git a/src/layout/area.rs b/src/draw/area.rs
similarity index 100%
rename from src/layout/area.rs
rename to src/draw/area.rs
diff --git a/src/draw/azimuth.rs b/src/draw/azimuth.rs
new file mode 100644
index 0000000..de72abc
--- /dev/null
+++ b/src/draw/azimuth.rs
@@ -0,0 +1,12 @@
+use crate::*;
+
+/// Where is [0, 0] located?
+///
+/// ```
+/// use tengri::draw::Azimuth;
+/// let _ = Azimuth::NW.align(());
+/// ```
+#[cfg_attr(test, derive(Arbitrary))]
+#[derive(Debug, Copy, Clone, Default)] pub enum Azimuth {
+    #[default] C, X, Y, NW, N, NE, E, SE, S, SW, W
+}
diff --git a/src/color.rs b/src/draw/color.rs
similarity index 99%
rename from src/color.rs
rename to src/draw/color.rs
index 82bdc70..ccea5e6 100644
--- a/src/color.rs
+++ b/src/draw/color.rs
@@ -29,6 +29,7 @@ pub fn rgb_to_okhsl (color: Color) -> Okhsl<f32> {
 }
 
 pub trait HasColor { fn color (&self) -> ItemColor; }
+
 #[macro_export] macro_rules! has_color {
     (|$self:ident:$Struct:ident$(<$($L:lifetime),*$($T:ident$(:$U:path)?),*>)?|$cb:expr) => {
         impl $(<$($L),*$($T $(: $U)?),*>)? HasColor for $Struct $(<$($L),*$($T),*>)? {
@@ -42,8 +43,11 @@ pub struct ItemColor {
     pub term: Color,
     pub okhsl: Okhsl<f32>
 }
+
 impl_from!(ItemColor: |term: Color|       Self { term, okhsl: rgb_to_okhsl(term)  });
+
 impl_from!(ItemColor: |okhsl: Okhsl<f32>| Self { okhsl, term: okhsl_to_rgb(okhsl) });
+
 // A single color within item theme parameters, in OKHSL and RGB representations.
 impl ItemColor {
     #[cfg(feature = "term")] pub const fn from_tui (term: Color) -> Self {
@@ -80,8 +84,11 @@ pub struct ItemTheme {
     pub darker: ItemColor,
     pub darkest: ItemColor,
 }
+
 impl_from!(ItemTheme: |base: ItemColor|   Self::from_item_color(base));
+
 impl_from!(ItemTheme: |base: Color|       Self::from_tui_color(base));
+
 impl ItemTheme {
     #[cfg(feature = "term")] pub const G: [Self;256] = {
         let mut builder = dizzle::konst::array::ArrayBuilder::new();
diff --git a/src/space/coord.rs b/src/draw/coord.rs
similarity index 100%
rename from src/space/coord.rs
rename to src/draw/coord.rs
diff --git a/src/space/iter.rs b/src/draw/iter.rs
similarity index 100%
rename from src/space/iter.rs
rename to src/draw/iter.rs
diff --git a/src/layout.rs b/src/draw/layout.rs
similarity index 94%
rename from src/layout.rs
rename to src/draw/layout.rs
index 3f0173f..5db0b5b 100644
--- a/src/layout.rs
+++ b/src/draw/layout.rs
@@ -1,9 +1,5 @@
 use crate::*;
 
-mod align; pub use self::align::*;
-mod area; pub use self::area::*;
-mod split; pub use self::split::*;
-
 pub enum Layout<T: Screen, X: Into<Option<T::Unit>>, I: Draw<T>> {
     __(PhantomData<T>),
     MinW(X, I),
diff --git a/src/space/lrtb.rs b/src/draw/lrtb.rs
similarity index 98%
rename from src/space/lrtb.rs
rename to src/draw/lrtb.rs
index a905e89..7f8b182 100644
--- a/src/space/lrtb.rs
+++ b/src/draw/lrtb.rs
@@ -1,5 +1,5 @@
 use crate::*;
-use Origin::*;
+use Azimuth::*;
 
 impl<N: Coord, T: Xywh<N>> Lrtb<N> for T {}
 
diff --git a/src/draw/origin.rs b/src/draw/origin.rs
new file mode 100644
index 0000000..da47996
--- /dev/null
+++ b/src/draw/origin.rs
@@ -0,0 +1,42 @@
+use crate::*;
+
+pub struct Origin<T>(Option<Azimuth>, T);
+
+impl_draw!(<S: Screen, T: Draw<S>,>|self: Origin<T>, to: S|{
+    todo!()
+});
+
+/// ```
+/// use tengri::*;
+/// let _ = origin(None, "origin unspecified");
+/// let _ = origin(Azimuth::SE, "southeast");
+/// let _ = origin(Some(Azimuth::SE), "southeast");
+/// ```
+pub fn origin <S: Screen, T: Draw<S>, U: Into<Option<Azimuth>>> (origin: U, it: T) -> Origin<T> {
+    Origin(origin.into(), it)
+}
+
+pub fn origin_c <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::C), it) }
+pub fn origin_x <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::X), it) }
+pub fn origin_y <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::Y), it) }
+
+pub fn origin_n <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::N), it) }
+pub fn origin_s <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::S), it) }
+pub fn origin_e <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::E), it) }
+pub fn origin_w <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::W), it) }
+
+pub fn origin_ne <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::NE), it) }
+pub fn origin_se <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::SE), it) }
+pub fn origin_nw <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::NW), it) }
+pub fn origin_sw <S: Screen, T: Draw<S>> (it: T) -> Origin<T> { Origin(Some(Azimuth::SW), it) }
+
+/// Something that has `[0, 0]` at a particular point.
+pub trait HasOrigin {
+    fn origin (&self) -> Azimuth;
+}
+
+impl<T: AsRef<Azimuth>> HasOrigin for T {
+    fn origin (&self) -> Azimuth {
+        *self.as_ref()
+    }
+}
diff --git a/src/space/sizer.rs b/src/draw/sizer.rs
similarity index 82%
rename from src/space/sizer.rs
rename to src/draw/sizer.rs
index 90d09bf..7ff5ed5 100644
--- a/src/space/sizer.rs
+++ b/src/draw/sizer.rs
@@ -23,8 +23,8 @@ impl Sizer {
     pub const fn of <T: Screen> (&self, of: impl Draw<T>) -> impl Draw<T> {
         thunk(move|to: &mut T|{
             let area = of.draw(to)?;
-            self.0.store(area.w().into(), Relaxed);
-            self.1.store(area.h().into(), Relaxed);
+            self.0.store(area.map(|a|a.w()).unwrap_or(T::Unit::zero()).into(), Relaxed);
+            self.1.store(area.map(|a|a.h()).unwrap_or(T::Unit::zero()).into(), Relaxed);
             Ok(area)
         })
     }
diff --git a/src/draw/space.rs b/src/draw/space.rs
new file mode 100644
index 0000000..6576b44
--- /dev/null
+++ b/src/draw/space.rs
@@ -0,0 +1,2 @@
+use crate::*;
+
diff --git a/src/layout/split.rs b/src/draw/split.rs
similarity index 95%
rename from src/layout/split.rs
rename to src/draw/split.rs
index 2c9bd62..3d64a75 100644
--- a/src/layout/split.rs
+++ b/src/draw/split.rs
@@ -1,4 +1,5 @@
 use super::*;
+use Azimuth::*;
 
 pub const fn east <T: Screen> (a: impl Draw<T>, b: impl Draw<T>) -> impl Draw<T> {
     Split::East.half(a, b)
@@ -62,7 +63,7 @@ impl Split {
                     to.show(area(area_b, b))?;
                 }
             }
-            Ok(to.xywh()) // FIXME: compute and return actually used area
+            Ok(Some(to.xywh())) // FIXME: compute and return actually used area
         })
     }
 
@@ -82,8 +83,8 @@ impl Split {
     ///
     /// */
     /// ```
-    const fn origins (&self) -> (Origin, Origin) {
-        use Origin::*;
+    const fn origins (&self) -> (Azimuth, Azimuth) {
+        use Azimuth::*;
         match self {
             Self::South => (S, N),
             Self::East  => (E, W),
diff --git a/src/draw/thunk.rs b/src/draw/thunk.rs
new file mode 100644
index 0000000..7e98b20
--- /dev/null
+++ b/src/draw/thunk.rs
@@ -0,0 +1,48 @@
+use crate::*;
+
+/// Because we can't implement [Draw] for `F: FnOnce...` without conflicts.
+pub struct Thunk<T: Screen, F>(pub F, std::marker::PhantomData<T>);
+
+impl<T: Screen, F: FnOnce(&mut T)->Perhaps<XYWH<T::Unit>>> Draw<T> for Thunk<T, F> {
+    fn draw (self, to: &mut T) -> Perhaps<XYWH<T::Unit>> {
+        (self.0)(to)
+    }
+}
+
+/// Basic [Draw]able closure.
+///
+/// ```
+/// # use tengri::{draw::*, term::*};
+/// # fn test () -> impl tengri::draw::Draw<tengri::term::Tui> {
+///     thunk(|to: &mut Tui|Ok(to.1))
+/// # }
+/// ```
+pub const fn thunk <T: Screen, F: FnOnce(&mut T)->Perhaps<XYWH<T::Unit>>> (
+    draw: F
+) -> Thunk<T, F> {
+    Thunk(draw, std::marker::PhantomData)
+}
+
+/// Only render when condition is true.
+///
+/// ```
+/// # use tengri::{draw::*, term::*};
+/// # fn test () -> impl tengri::draw::Draw<tengri::term::Tui> {
+///     when(true, "Yes")
+/// # }
+/// ```
+pub const fn when <T: Screen> (condition: bool, draw: impl Draw<T>) -> impl Draw<T> {
+    thunk(move|to: &mut T|if condition { draw.draw(to) } else { Ok(Default::default()) })
+}
+
+/// Render one thing if a condition is true and another false.
+///
+/// ```
+/// # use tengri::{draw::*, term::*};
+/// # fn test () -> impl tengri::draw::Draw<tengri::term::Tui> {
+///     either(true, "Yes", "No")
+/// # }
+/// ```
+pub const fn either <T: Screen> (condition: bool, a: impl Draw<T>, b: impl Draw<T>) -> impl Draw<T> {
+    thunk(move|to: &mut T|if condition { a.draw(to) } else { b.draw(to) })
+}
diff --git a/src/space/xywh.rs b/src/draw/xywh.rs
similarity index 93%
rename from src/space/xywh.rs
rename to src/draw/xywh.rs
index fa2cc8c..c831d14 100644
--- a/src/space/xywh.rs
+++ b/src/draw/xywh.rs
@@ -1,29 +1,6 @@
 use super::*;
-use Origin::*;
 use Split::*;
 
-/// Where is [0, 0] located?
-///
-/// ```
-/// use tengri::draw::Origin;
-/// let _ = Origin::NW.align(());
-/// ```
-#[cfg_attr(test, derive(Arbitrary))]
-#[derive(Debug, Copy, Clone, Default)] pub enum Origin {
-    #[default] C, X, Y, NW, N, NE, E, SE, S, SW, W
-}
-
-/// Something that has `[0, 0]` at a particular point.
-pub trait HasOrigin {
-    fn origin (&self) -> Origin;
-}
-
-impl<T: AsRef<Origin>> HasOrigin for T {
-    fn origin (&self) -> Origin {
-        *self.as_ref()
-    }
-}
-
 pub trait Xy<N: Coord> {
     fn x (&self) -> N;
     fn y (&self) -> N;
@@ -262,4 +239,3 @@ pub const fn y_push <T: Screen> (x: T::Unit, a: impl Draw<T>) -> impl Draw<T> {
 pub const fn y_pull <T: Screen> (x: T::Unit, a: impl Draw<T>) -> impl Draw<T> {
     a
 }
-
diff --git a/src/eval.rs b/src/eval.rs
index 63c579c..b3d0a4f 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -1,4 +1,5 @@
-use crate::{*, term::*, draw::*, space::*, lang::*, ratatui::prelude::*};
+use crate::{*, lang::*};
+use ratatui::style::Color;
 
 /// Some layout operations exist in XY, X, and Y variants that take 3 or 2 arguments.
 /// Their handling in [eval_view] is uniform and goes like this:
@@ -78,7 +79,7 @@ macro_rules! eval_enum ((
 pub fn eval_view <'a, O: Screen + 'a, S> (
     state: &S, output: &mut O, expr: &'a impl Expression
 ) -> Perhaps<XYWH<O::Unit>> where
-    S: Interpret<O, XYWH<O::Unit>>
+    S: Interpret<O, Option<XYWH<O::Unit>>>
         + for<'b> Namespace<'b, bool>
         + for<'b> Namespace<'b, O::Unit>
         + for<'b> Namespace<'b, Option<O::Unit>>
@@ -100,35 +101,58 @@ pub fn eval_view <'a, O: Screen + 'a, S> (
     let arg2  = tail1.head();
 
     // First `frags.next()` calls returns the namespace.
-    Some(match frags.next() {
+    match frags.next() {
 
         Some("when") => when(
             state.namespace(arg0?)?.unwrap(),
-            thunk(move|output: &mut O|state.interpret(output, &arg1))
+            thunk(move|output: &mut O|{
+                state.interpret(output, &arg1)
+            })
         ).draw(output),
 
         Some("either") => either(
             state.namespace(arg0?)?.unwrap(),
-            thunk(move|output: &mut O|state.interpret(output, &arg1)),
-            thunk(move|output: &mut O|state.interpret(output, &arg2)),
+            thunk(move|output: &mut O|{
+                state.interpret(output, &arg1)
+            }),
+            thunk(move|output: &mut O|{
+                state.interpret(output, &arg2)
+            }),
         ).draw(output),
 
         // Second `frags.next()` calls returns the namespace member.
         Some("bsp") => {
             let direction = eval_enum!("bsp", output, state, frags.next(), arg0, Split {
-                "n" => North, "s" => South, "e" => East, "w" => West, "a" => Above, "b" => Below
+                "n" => North,
+                "s" => South,
+                "e" => East,
+                "w" => West,
+                "a" => Above,
+                "b" => Below
             });
             direction.half(
-                thunk(move|output: &mut O|state.interpret(output, &arg0)),
-                thunk(move|output: &mut O|state.interpret(output, &arg1)),
+                thunk(move|output: &mut O|{
+                    state.interpret(output, &arg0)
+                }),
+                thunk(move|output: &mut O|{
+                    state.interpret(output, &arg1)
+                }),
             ).draw(output)
         },
 
         Some("align") => {
-            let alignment = eval_enum!("align", output, state, frags.next(), arg0, Origin {
-                "c" => C, "n" => N, "s" => S, "e" => E, "w" => W, "x" => X, "y" => Y
+            let alignment = eval_enum!("align", output, state, frags.next(), arg0, Azimuth {
+                "c" => C,
+                "n" => N,
+                "s" => S,
+                "e" => E,
+                "w" => W,
+                "x" => X,
+                "y" => Y
+            });
+            let content = thunk(move|output: &mut O|{
+                state.interpret(output, &arg0)
             });
-            let content = thunk(move|output: &mut O|state.interpret(output, &arg0));
             align(alignment, content).draw(output)
         },
 
@@ -154,7 +178,7 @@ pub fn eval_view <'a, O: Screen + 'a, S> (
 
         _ => return Ok(None)
 
-    }).transpose()
+    }
 }
 
 /// Interpret TUI-specific layout operation.
@@ -180,7 +204,7 @@ pub fn eval_view <'a, O: Screen + 'a, S> (
 pub fn eval_view_tui <'a, S> (
     state: &S, output: &mut Tui, expr: impl Expression + 'a
 ) -> Perhaps<XYWH<u16>> where
-    S: Interpret<Tui, XYWH<u16>>
+    S: Interpret<Tui, Option<XYWH<u16>>>
         + for<'b>Namespace<'b, bool>
         + for<'b>Namespace<'b, u16>
         + for<'b>Namespace<'b, Color>
@@ -208,7 +232,7 @@ pub fn eval_view_tui <'a, S> (
             output.show(fg(color, thunk(move|output: &mut Tui|{
                 state.interpret(output, &arg1)?;
                 // FIXME?: don't max out the used area?
-                Ok(output.area().into())
+                Ok(Some(output.area().into()))
             })))
         },
 
@@ -218,7 +242,7 @@ pub fn eval_view_tui <'a, S> (
             output.show(bg(color, thunk(move|output: &mut Tui|{
                 state.interpret(output, &arg1)?;
                 // FIXME?: don't max out the used area?
-                Ok(output.area().into())
+                Ok(Some(output.area().into()))
             })))
         },
 
diff --git a/src/layout/align.rs b/src/layout/align.rs
deleted file mode 100644
index 74af5c6..0000000
--- a/src/layout/align.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::*;
-
-/// ```
-/// use tengri::*;
-/// let _ = align(None, "unaligned");
-/// let _ = align(Origin::SE, "southeast");
-/// let _ = align(Some(Origin::SE), "southeast");
-/// ```
-pub fn align <S: Screen, T: Draw<S>, U: Into<Option<Origin>>> (origin: U, it: T) -> Align<T> {
-    Align(origin.into(), it)
-}
-
-pub struct Align<T>(Option<Origin>, T);
-
-impl_draw!(<S: Screen, T: Draw<S>,>|self: Align<T>, to: S|{ todo!() });
diff --git a/src/lib.rs b/src/lib.rs
index d0ddf0e..f42030b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,6 +18,7 @@ pub extern crate unicode_width;
 #[cfg(feature = "term")] pub extern crate crossterm;
 #[cfg(feature = "lang")] pub extern crate dizzle as lang;
 #[cfg(test)] #[macro_use] pub extern crate proptest;
+#[cfg(test)] pub(crate) use proptest_derive::Arbitrary;
 
 pub(crate) use ::{
     atomic_float::AtomicF64,
@@ -47,9 +48,9 @@ features! {
     "time": [ time ],
     "play": [ exit, task ],
     "sing": [ sing ],
-    "draw": [ draw, space, layout, color ],
     "text": [ text ],
-    "term": [ term ]
+    "term": [ term ],
+    "draw": [ draw ]
 }
 
 /// Define a trait an implement it for various mutation-enabled wrapper types. */
diff --git a/src/origin.rs b/src/origin.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/space.rs b/src/space.rs
deleted file mode 100644
index 985dd15..0000000
--- a/src/space.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use crate::*;
-#[cfg(test)] use proptest_derive::Arbitrary;
-
-mod coord;  pub use self::coord::*;
-mod iter;   pub use self::iter::*;
-mod sizer;  pub use self::sizer::*;
-mod xywh;   pub use self::xywh::*;
-mod lrtb;   pub use self::lrtb::*;
diff --git a/src/term.rs b/src/term.rs
index 7571155..fb2b207 100644
--- a/src/term.rs
+++ b/src/term.rs
@@ -1,10 +1,15 @@
-mod border;
-pub use self::border::*;
+use crate::{*, lang::*};
+
+mod border; pub use self::border::*;
+mod event;  pub use self::event::*;
+mod keys;   pub use self::keys::*;
+mod buffer; pub use self::buffer::*;
+mod input;  pub use self::input::*;
+mod output; pub use self::output::*;
 
-use crate::{*, lang::*, draw::*, task::*, exit::*};
 //use unicode_width::{UnicodeWidthStr, UnicodeWidthChar};
 //use rand::distributions::uniform::UniformSampler;
-use ::{
+pub(crate) use ::{
     std::{
         io::{stdout, Write},
         time::Duration,
@@ -27,6 +32,74 @@ use ::{
     },
 };
 
+/// Terminal output.
+pub struct Tui(
+    /// Ratatui buffer; area is screen size
+    pub Buffer,
+    /// Current draw area
+    pub XYWH<u16>
+);
+
+impl Deref         for Tui { type Target = Buffer; fn deref (&self) -> &Buffer { &self.0 } }
+impl DerefMut      for Tui { fn deref_mut (&mut self) -> &mut Buffer { &mut self.0 } }
+impl AsMut<Buffer> for Tui { fn as_mut (&mut self) -> &mut Buffer { &mut self.0 } }
+impl Wide<u16>     for Tui { fn w (&self) -> u16 { self.1.2 } }
+impl Tall<u16>     for Tui { fn h (&self) -> u16 { self.1.3 } }
+impl HasOrigin     for Tui { fn origin (&self) -> Azimuth { Azimuth::NW } }
+impl Xy<u16>       for Tui { fn x (&self) -> u16 { self.1.0 } fn y (&self) -> u16 { self.1.1 } }
+
+impl Tui {
+    pub fn new (width: u16, height: u16) -> Self {
+        Self(Buffer::empty(Rect { x: 0, y: 0, width, height }), XYWH(0, 0, width, height))
+    }
+    pub fn resize <W: Write> (&mut self, back: &mut CrosstermBackend<W>, width: u16, height: u16) {
+        let size = Rect { x: 0, y: 0, width, height };
+        if self.0.area != size {
+            back.clear_region(ClearType::All).unwrap();
+            self.0.resize(size);
+            self.0.reset();
+        }
+    }
+    pub fn redraw <'b, W: Write> (&'b mut self, back: &mut CrosstermBackend<W>, mut next: &'b mut Self) {
+        let updates = self.0.diff(&next.0);
+        back.draw(updates.into_iter()).expect("failed to render");
+        Backend::flush(back).expect("failed to flush output new");
+        std::mem::swap(self, &mut next);
+        next.0.reset();
+    }
+}
+
+impl Tui {
+    pub fn update (&mut self, callback: &impl Fn(&mut Cell, u16, u16)) -> XYWH<u16> {
+        for row in 0..self.h() {
+            let y = self.y() + row;
+            for col in 0..self.w() {
+                let x = self.x() + col;
+                if x < self.0.area.width && y < self.0.area.height {
+                    if let Some(cell) = self.0.cell_mut(Position { x, y }) {
+                        callback(cell, col, row);
+                    }
+                }
+            }
+        }
+        self.xywh()
+    }
+    pub fn tint_all (&mut self, fg: Color, bg: Color, modifier: Modifier) {
+        for cell in self.0.content.iter_mut() {
+            cell.fg = fg;
+            cell.bg = bg;
+            cell.modifier = modifier;
+        }
+    }
+    pub fn blit (&mut self, text: &impl AsRef<str>, x: u16, y: u16, style: Option<Style>) {
+        let text = text.as_ref();
+        let style = style.unwrap_or(Style::default());
+        if x < self.0.area.width && y < self.0.area.height {
+            self.0.set_string(x, y, text, style);
+        }
+    }
+}
+
 /// Implement standard [main] entrypoint for TUI apps.
 #[macro_export] macro_rules! tui_main {
     ($state:expr) => {
@@ -34,24 +107,6 @@ use ::{
     }
 }
 
-/// Enable TUI keyboard input for main state struct.
-#[macro_export] macro_rules! tui_keys {
-    (|$self:ident:$State:ty,$input:ident|$body:block) => {
-        impl Apply<TuiEvent, Usually<()>> for $State {
-            fn apply (&mut $self, $input: &TuiEvent) -> Usually<()> $body
-        }
-    };
-}
-
-/// Enable TUI output for state struct.
-#[macro_export] macro_rules! tui_view {
-    (|$self:ident: $State:ty|$body:block) => {
-        impl View<Tui> for $State {
-            fn view (&$self) -> impl Draw<Tui> $body
-        }
-    }
-}
-
 pub fn tui_run_main <T> (state: Arc<RwLock<T>>) -> Usually<()> where
     T: View<Tui> + Apply<TuiEvent, Usually<()>> + Send + Sync + 'static
 {
@@ -98,444 +153,3 @@ pub fn tui_io <
     let terminal = tui_output(exited, state, sleep, output)?;
     Ok((keyboard, terminal))
 }
-
-/// Spawn the TUI input thread which reads keys from the terminal.
-pub fn tui_input <T: Apply<TuiEvent, Usually<()>> + Send + Sync + 'static> (
-    exited: &Arc<AtomicBool>, state: &Arc<RwLock<T>>, poll: Duration
-) -> Result<Task, std::io::Error> {
-    let exited = exited.clone();
-    let state = state.clone();
-    Task::new_poll(exited.clone(), poll, move |_| {
-        let event = read().unwrap();
-        match event {
-
-            // Hardcoded exit.
-            Event::Key(KeyEvent {
-                modifiers: KeyModifiers::CONTROL,
-                code:      KeyCode::Char('c'),
-                kind:      KeyEventKind::Press,
-                state:     KeyEventState::NONE
-            }) => { exited.store(true, Relaxed); },
-
-            // Handle all other events by the state:
-            event => {
-                if let Err(e) = state.write().unwrap().apply(&TuiEvent(event)) {
-                    panic!("{e}")
-                }
-            },
-
-        }
-    })
-}
-
-/// Spawn the TUI output thread which writes colored characters to the terminal.
-///
-/// ```
-/// let state = Arc::new(RwLock::new(()));
-/// Exit::run(|exit|tui_output(exit, state, sleep, stdout()))
-/// ```
-pub fn tui_output <
-    W: Write + Send + Sync + 'static, T: View<Tui> + Send + Sync + 'static
-> (
-    exited: &Arc<AtomicBool>,
-    state:  &Arc<RwLock<T>>,
-    sleep:  Duration,
-    output: W,
-) -> Usually<Task> {
-    let state = state.clone();
-    stdout().execute(EnterAlternateScreen)?;
-    CrosstermBackend::new(stdout()).hide_cursor()?;
-    enable_raw_mode()?;
-    let mut backend = CrosstermBackend::new(output);
-    let Size { width, height } = backend.size().expect("get size failed");
-    let mut prev = Tui::new(width, height);
-    let mut next = Tui::new(width, height);
-    Ok(Task::new_sleep(exited.clone(), sleep, move |perf| {
-        let Size { width, height } = backend.size().expect("get size failed");
-        if let Ok(state) = state.try_read() {
-            prev.resize(&mut backend, width, height);
-            state.view().draw(&mut next).expect("draw failed"); // TODO draw error
-            prev.redraw(&mut backend, &mut next);
-        }
-        let timer = format!("{:>3.3}ms", perf.used.load(Relaxed));
-        prev.set_string(0, 0, &timer, Style::default());
-    })?)
-}
-
-/// Terminal output.
-pub struct Tui(
-    /// Ratatui buffer; area is screen size
-    pub Buffer,
-    /// Current draw area
-    pub XYWH<u16>
-);
-
-impl Tui {
-    pub fn new (width: u16, height: u16) -> Self {
-        Self(Buffer::empty(Rect { x: 0, y: 0, width, height }), XYWH(0, 0, width, height))
-    }
-    pub fn resize <W: Write> (&mut self, back: &mut CrosstermBackend<W>, width: u16, height: u16) {
-        let size = Rect { x: 0, y: 0, width, height };
-        if self.0.area != size {
-            back.clear_region(ClearType::All).unwrap();
-            self.0.resize(size);
-            self.0.reset();
-        }
-    }
-    pub fn redraw <'b, W: Write> (&'b mut self, back: &mut CrosstermBackend<W>, mut next: &'b mut Self) {
-        let updates = self.0.diff(&next.0);
-        back.draw(updates.into_iter()).expect("failed to render");
-        Backend::flush(back).expect("failed to flush output new");
-        std::mem::swap(self, &mut next);
-        next.0.reset();
-    }
-}
-
-impl Screen for Tui {
-    type Unit = u16;
-    /// Render drawable in subarea specified by `area`
-    fn show <'t, T: Draw<Self>> (&mut self, content: T) -> Perhaps<XYWH<u16>> {
-        let previous_area = self.1;
-        if let Some(area) = content.layout(self.1)? {
-            self.1 = area;
-            if let Some(result_area) = content.draw(self)? {
-                self.1 = previous_area;
-                result_area
-            } else {
-                Ok(None)
-            }
-        } else {
-            Ok(None)
-        }
-    }
-}
-
-impl Deref         for Tui { type Target = Buffer; fn deref (&self) -> &Buffer { &self.0 } }
-impl DerefMut      for Tui { fn deref_mut (&mut self) -> &mut Buffer { &mut self.0 } }
-impl AsMut<Buffer> for Tui { fn as_mut (&mut self) -> &mut Buffer { &mut self.0 } }
-impl Wide<u16> for Tui { fn w (&self) -> u16 { self.1.2 } }
-impl Tall<u16> for Tui { fn h (&self) -> u16 { self.1.3 } }
-impl HasOrigin for Tui { fn origin (&self) -> Origin { Origin::NW } }
-impl Xy<u16> for Tui {
-    fn x (&self) -> u16 { self.1.0 }
-    fn y (&self) -> u16 { self.1.1 }
-}
-
-impl Tui {
-    pub fn update (&mut self, callback: &impl Fn(&mut Cell, u16, u16)) -> XYWH<u16> {
-        for row in 0..self.h() {
-            let y = self.y() + row;
-            for col in 0..self.w() {
-                let x = self.x() + col;
-                if x < self.0.area.width && y < self.0.area.height {
-                    if let Some(cell) = self.0.cell_mut(Position { x, y }) {
-                        callback(cell, col, row);
-                    }
-                }
-            }
-        }
-        self.xywh()
-    }
-    pub fn tint_all (&mut self, fg: Color, bg: Color, modifier: Modifier) {
-        for cell in self.0.content.iter_mut() {
-            cell.fg = fg;
-            cell.bg = bg;
-            cell.modifier = modifier;
-        }
-    }
-    pub fn blit (&mut self, text: &impl AsRef<str>, x: u16, y: u16, style: Option<Style>) {
-        let text = text.as_ref();
-        let style = style.unwrap_or(Style::default());
-        if x < self.0.area.width && y < self.0.area.height {
-            self.0.set_string(x, y, text, style);
-        }
-    }
-}
-
-/// Apply foreground color.
-pub const fn fg (fg: Color, draw: impl Draw<Tui>) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        to.update(&|cell,_,_|{ cell.set_fg(fg); });
-        draw.draw(to)
-    })
-}
-
-/// Apply background color.
-pub const fn bg (bg: Color, draw: impl Draw<Tui>) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        to.update(&|cell,_,_|{ cell.set_bg(bg); });
-        draw.draw(to)
-    })
-}
-
-pub const fn fg_bg (fg: Color, bg: Color, draw: impl Draw<Tui>) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        to.update(&|cell,_,_|{ cell.set_fg(fg); cell.set_bg(bg); });
-        draw.draw(to)
-    })
-}
-
-pub const fn fill_char (c: char) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|Ok(to.update(&|cell,_,_|{
-        cell.set_char(c);
-    })))
-}
-
-/// Draw contents with modifier applied.
-pub const fn modify (on: bool, modifier: Modifier, draw: impl Draw<Tui>) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        fill_mod(on, modifier).draw(to)?;
-        draw.draw(to)
-    })
-}
-
-pub const fn fill_mod (on: bool, modifier: Modifier) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|Ok({
-        if on {
-            to.update(&|cell,_,_|cell.modifier.insert(modifier))
-        } else {
-            to.update(&|cell,_,_|cell.modifier.remove(modifier))
-        }
-    }))
-}
-
-/// Draw contents with bold modifier applied.
-pub const fn bold (on: bool, draw: impl Draw<Tui>) -> impl Draw<Tui> {
-    modify(on, Modifier::BOLD, draw)
-}
-
-pub const fn fill_ul (color: Option<Color>) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|Ok(if let Some(color) = color {
-        to.update(&|cell,_,_|{
-            cell.modifier.insert(Modifier::UNDERLINED);
-            cell.underline_color = color;
-        })
-    } else {
-        to.update(&|cell,_,_|{
-            cell.modifier.remove(Modifier::UNDERLINED);
-            cell.underline_color = Reset;
-        })
-    }))
-}
-
-/// TUI works in u16 coordinates.
-impl Coord for u16 {
-    fn plus (self, other: Self) -> Self {
-        self.saturating_add(other)
-    }
-}
-
-impl_draw!(|self: u64, _to: Tui|{ todo!() });
-impl_draw!(|self: f64, _to: Tui|{ todo!() });
-
-mod phat {
-    use super::*;
-    pub const LO: &'static str = "▄";
-    pub const HI: &'static str = "▀";
-    /// A phat line
-    pub fn lo (fg: Color, bg: Color) -> impl Draw<Tui> {
-        h_exact(1, fg_bg(fg, bg, x_repeat(self::phat::LO)))
-    }
-    /// A phat line
-    pub fn hi (fg: Color, bg: Color) -> impl Draw<Tui> {
-        h_exact(1, fg_bg(fg, bg, x_repeat(self::phat::HI)))
-    }
-}
-
-mod scroll {
-    pub const ICON_DEC_V: &[char] = &['▲'];
-    pub const ICON_INC_V: &[char] = &['▼'];
-    pub const ICON_DEC_H: &[char] = &[' ', '🞀', ' '];
-    pub const ICON_INC_H: &[char] = &[' ', '🞂', ' '];
-}
-
-pub const fn x_repeat (c: &str) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        let XYWH(x, y, w, h) = to.xywh();
-        for x in x..x+w {
-            if let Some(cell) = to.0.cell_mut(Position::from((x, y))) {
-                cell.set_symbol(&c);
-            }
-        }
-        Ok(XYWH(x, y, w, 1))
-    })
-}
-
-pub const fn y_repeat (c: &str) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        let XYWH(x, y, w, h) = to.xywh();
-        for y in y..y+h {
-            if let Some(cell) = to.0.cell_mut(Position::from((x, y))) {
-                cell.set_symbol(&c);
-            }
-        }
-        Ok(XYWH(x, y, 1, h))
-    })
-}
-
-pub const fn xy_repeat (c: &str) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|{
-        let XYWH(x, y, w, h) = to.xywh();
-        let a = c.len();
-        for (_v, y) in (y..y+h).enumerate() {
-            for (u, x) in (x..x+w).enumerate() {
-                if let Some(cell) = to.0.cell_mut(Position::from((x, y))) {
-                    let u = u % a;
-                    cell.set_symbol(&c[u..u+1]);
-                }
-            }
-        }
-        Ok(XYWH(x, y, w, h))
-    })
-}
-
-/// ```
-/// let _ = tengri::button_2("", "", true);
-/// let _ = tengri::button_2("", "", false);
-/// ```
-pub const fn button_2 <'a> (key: impl Draw<Tui>, label: impl Draw<Tui>, hide: bool) -> impl Draw<Tui> {
-    let c1 = tui_orange();
-    let c2 = tui_g(0);
-    let c3 = tui_g(96);
-    let c4 = tui_g(255);
-    bold(true, fg_bg(c1, c2, east(fg(c2, east(key, fg(c3, "▐"))), when(!hide, fg_bg(c4, c3, label)))))
-}
-
-/// ```
-/// let _ = tengri::button_3("", "", "", true);
-/// let _ = tengri::button_3("", "", "", false);
-/// ```
-pub const fn button_3 <'a> (
-    key: impl Draw<Tui>, label: impl Draw<Tui>, value: impl Draw<Tui>, editing: bool,
-) -> impl Draw<Tui> {
-    bold(true, east(
-        fg_bg(tui_orange(), tui_g(0),
-            east(fg(tui_g(0), "▐"), east(key, fg(if editing { tui_g(128) } else { tui_g(96) }, "▐")))),
-        east(
-            when(!editing, east(fg_bg(tui_g(255), tui_g(96), label), fg_bg(tui_g(128), tui_g(96), "▐"),)),
-            east(fg_bg(tui_g(224), tui_g(128), value), fg_bg(tui_g(128), Reset, "▌"), ))))
-}
-
-/// Stackably padded.
-///
-/// ```
-/// /// TODO
-/// ```
-pub fn phat (w: u16, h: u16, [fg, bg, hi, lo]: [Color;4], draw: impl Draw<Tui>) -> impl Draw<Tui> {
-    let top = w_exact(1, self::phat::lo(bg, hi));
-    let low = w_exact(1, self::phat::hi(bg, lo));
-    let draw = fg_bg(fg, bg, draw);
-    wh_min(Some(w), Some(h), south(top, north(low, draw)))
-}
-
-fn x_scroll () -> impl Draw<Tui> {
-    thunk(|Tui(buf, XYWH(x1, y1, w, h)): &mut Tui|{
-        let x2 = *x1 + *w;
-        for (i, x) in (*x1..=x2).enumerate() {
-            if let Some(cell) = buf.cell_mut(Position::from((x, *y1))) {
-                if i < (self::scroll::ICON_DEC_H.len()) {
-                    cell.set_fg(Rgb(255, 255, 255));
-                    cell.set_bg(Rgb(0, 0, 0));
-                    cell.set_char(self::scroll::ICON_DEC_H[i as usize]);
-                } else if i > (*w as usize - self::scroll::ICON_INC_H.len()) {
-                    cell.set_fg(Rgb(255, 255, 255));
-                    cell.set_bg(Rgb(0, 0, 0));
-                    cell.set_char(self::scroll::ICON_INC_H[*w as usize - i]);
-                } else if false {
-                    cell.set_fg(Rgb(255, 255, 255));
-                    cell.set_bg(Reset);
-                    cell.set_char('━');
-                } else {
-                    cell.set_fg(Rgb(0, 0, 0));
-                    cell.set_bg(Reset);
-                    cell.set_char('╌');
-                }
-            }
-        }
-        Ok(XYWH(*x1, *y1, *w, 1))
-    })
-}
-
-fn y_scroll () -> impl Draw<Tui> {
-    thunk(|Tui(buf, XYWH(x1, y1, w, h)): &mut Tui|{
-        let y2 = *y1 + *h;
-        for (i, y) in (*y1..=y2).enumerate() {
-            if let Some(cell) = buf.cell_mut(Position::from((*x1, y))) {
-                if (i as usize) < (self::scroll::ICON_DEC_V.len()) {
-                    cell.set_fg(Rgb(255, 255, 255));
-                    cell.set_bg(Rgb(0, 0, 0));
-                    cell.set_char(self::scroll::ICON_DEC_V[i as usize]);
-                } else if (i as usize) > (*h as usize - self::scroll::ICON_INC_V.len()) {
-                    cell.set_fg(Rgb(255, 255, 255));
-                    cell.set_bg(Rgb(0, 0, 0));
-                    cell.set_char(self::scroll::ICON_INC_V[*h as usize - i]);
-                } else if false {
-                    cell.set_fg(Rgb(255, 255, 255));
-                    cell.set_bg(Reset);
-                    cell.set_char('‖'); // ━
-                } else {
-                    cell.set_fg(Rgb(0, 0, 0));
-                    cell.set_bg(Reset);
-                    cell.set_char('╎'); // ━
-                }
-            }
-        }
-        Ok(XYWH(*x1, *y1, 1, *h))
-    })
-}
-
-pub fn tui_update (
-    Tui(buf, ..): &mut Tui,
-    area: XYWH<u16>,
-    callback: &impl Fn(&mut Cell, u16, u16)
-) {
-}
-
-/// Draw TUI content or its error message.
-///
-/// ```
-/// let _ = tengri::term::catcher(Ok(Some("hello")));
-/// let _ = tengri::term::catcher(Ok(None));
-/// let _ = tengri::term::catcher(Err("draw fail".into()));
-/// ```
-pub fn catcher <T: Draw<Tui>> (result: Usually<T>) -> impl Draw<Tui> {
-    thunk(move|to: &mut Tui|match result {
-        Ok(content) => content.draw(to),
-        Err(e) => {
-            let err_fg = Color::Rgb(255,224,244);
-            let err_bg = Color::Rgb(96, 24, 24);
-            let title  = east(bold(true, "upsi daisy. "), "rendering failed.");
-            let error  = east("\"why?\" ", bold(true, format!("{e}")));
-            fg(err_fg, bg(err_bg, south(title, error))).draw(to)
-        }
-    })
-}
-
-mod event;  pub use self::event::*;
-mod keys;   pub use self::keys::*;
-mod buffer; pub use self::buffer::*;
-
-use self::colors::*; mod colors {
-    use ratatui::prelude::Color;
-    pub const fn tui_color_bg () -> Color { Color::Rgb(28, 35, 25) }
-    pub const fn tui_bg0 () -> Color { Color::Rgb(20, 20, 20) }
-    pub const fn tui_bo1 () -> Color { Color::Rgb(100, 110, 40) }
-    pub const fn tui_bo2 () -> Color { Color::Rgb(70, 80, 50) }
-    pub const fn tui_border_bg () -> Color { Color::Rgb(40, 50, 30) }
-    pub const fn tui_border_fg (f: bool) -> Color { if f { tui_bo1() } else { tui_bo2() } }
-    pub const fn tui_brown () -> Color { Color::Rgb(128,255,0) }
-    pub const fn tui_electric () -> Color { Color::Rgb(0,255,128) }
-    pub const fn tui_g (g: u8) -> Color { Color::Rgb(g, g, g) }
-    pub const fn tui_green () -> Color { Color::Rgb(0,255,0) }
-    pub const fn tui_mode_bg () -> Color { Color::Rgb(150, 160, 90) }
-    pub const fn tui_mode_fg () -> Color { Color::Rgb(255, 255, 255) }
-    pub const fn tui_null () -> Color { Color::Reset }
-    pub const fn tui_orange () -> Color { Color::Rgb(255,128,0) }
-    pub const fn tui_red () -> Color { Color::Rgb(255,0,  0) }
-    pub const fn tui_separator_fg (_: bool) -> Color { Color::Rgb(0, 0, 0) }
-    pub const fn tui_status_bar_bg () -> Color { Color::Rgb(28, 35, 25) }
-    pub const fn tui_ti1 () -> Color { Color::Rgb(150, 160, 90) }
-    pub const fn tui_ti2 () -> Color { Color::Rgb(120, 130, 100) }
-    pub const fn tui_title_fg (f: bool) -> Color { if f { tui_ti1() } else { tui_ti2() } }
-    pub const fn tui_yellow () -> Color { Color::Rgb(255,255,0) }
-}
diff --git a/src/term/border.rs b/src/term/border.rs
index 837445a..e8c984a 100644
--- a/src/term/border.rs
+++ b/src/term/border.rs
@@ -49,7 +49,7 @@ macro_rules! border {
         //impl Layout<Tui> for $T {}
         impl Draw<Tui> for $T {
             fn draw (self, to: &mut Tui) -> Perhaps<XYWH<u16>> {
-                when(self.enabled(), thunk(|to: &mut Tui|BorderStyle::draw(self, to))).draw(to)
+                when(self.enabled(), thunk(|to: &mut Tui|BorderStyle::draw(self, to).map(Some))).draw(to)
             }
         }
     )+}
diff --git a/src/term/input.rs b/src/term/input.rs
new file mode 100644
index 0000000..62ecafe
--- /dev/null
+++ b/src/term/input.rs
@@ -0,0 +1,39 @@
+use crate::{*, lang::*};
+
+/// Enable TUI keyboard input for main state struct.
+#[macro_export] macro_rules! tui_keys {
+    (|$self:ident:$State:ty,$input:ident|$body:block) => {
+        impl Apply<TuiEvent, Usually<()>> for $State {
+            fn apply (&mut $self, $input: &TuiEvent) -> Usually<()> $body
+        }
+    };
+}
+
+/// Spawn the TUI input thread which reads keys from the terminal.
+pub fn tui_input <T: Apply<TuiEvent, Usually<()>> + Send + Sync + 'static> (
+    exited: &Arc<AtomicBool>, state: &Arc<RwLock<T>>, poll: Duration
+) -> Result<Task, std::io::Error> {
+    let exited = exited.clone();
+    let state = state.clone();
+    Task::new_poll(exited.clone(), poll, move |_| {
+        let event = read().unwrap();
+        match event {
+
+            // Hardcoded exit.
+            Event::Key(KeyEvent {
+                modifiers: KeyModifiers::CONTROL,
+                code:      KeyCode::Char('c'),
+                kind:      KeyEventKind::Press,
+                state:     KeyEventState::NONE
+            }) => { exited.store(true, Relaxed); },
+
+            // Handle all other events by the state:
+            event => {
+                if let Err(e) = state.write().unwrap().apply(&TuiEvent(event)) {
+                    panic!("{e}")
+                }
+            },
+
+        }
+    })
+}
diff --git a/src/term/output.rs b/src/term/output.rs
new file mode 100644
index 0000000..eefb9e8
--- /dev/null
+++ b/src/term/output.rs
@@ -0,0 +1,343 @@
+use crate::{*, lang::*};
+use ratatui::{prelude::{Style, Position, Backend, Color}};
+
+/// TUI works in u16 coordinates.
+impl Coord for u16 { fn plus (self, other: Self) -> Self { self.saturating_add(other) } }
+impl_draw!(|self: u64, _to: Tui|{ todo!() });
+impl_draw!(|self: f64, _to: Tui|{ todo!() });
+
+impl Screen for Tui {
+    type Unit = u16;
+    /// Render drawable in subarea specified by `area`
+    fn show <'t, T: Draw<Self>> (&mut self, content: T) -> Perhaps<XYWH<u16>> {
+        let previous_area = self.1;
+        Ok(if let Some(area) = content.layout(self.1)? {
+            self.1 = area;
+            if let Some(result_area) = content.draw(self)? {
+                self.1 = previous_area;
+                Some(result_area)
+            } else {
+                None
+            }
+        } else {
+            None
+        })
+    }
+}
+
+/// Enable TUI output for state struct.
+#[macro_export] macro_rules! tui_view {
+    (|$self:ident: $State:ty|$body:block) => {
+        impl View<Tui> for $State {
+            fn view (&$self) -> impl Draw<Tui> $body
+        }
+    }
+}
+
+/// Spawn the TUI output thread which writes colored characters to the terminal.
+///
+/// ```
+/// let state = Arc::new(RwLock::new(()));
+/// Exit::run(|exit|tui_output(exit, state, sleep, stdout()))
+/// ```
+pub fn tui_output <
+    W: Write + Send + Sync + 'static, T: View<Tui> + Send + Sync + 'static
+> (
+    exited: &Arc<AtomicBool>,
+    state:  &Arc<RwLock<T>>,
+    sleep:  Duration,
+    output: W,
+) -> Usually<Task> {
+    let state = state.clone();
+    stdout().execute(EnterAlternateScreen)?;
+    CrosstermBackend::new(stdout()).hide_cursor()?;
+    enable_raw_mode()?;
+    let mut backend = CrosstermBackend::new(output);
+    let Size { width, height } = backend.size().expect("get size failed");
+    let mut prev = Tui::new(width, height);
+    let mut next = Tui::new(width, height);
+    Ok(Task::new_sleep(exited.clone(), sleep, move |perf| {
+        let Size { width, height } = backend.size().expect("get size failed");
+        if let Ok(state) = state.try_read() {
+            prev.resize(&mut backend, width, height);
+            state.view().draw(&mut next).expect("draw failed"); // TODO draw error
+            prev.redraw(&mut backend, &mut next);
+        }
+        let timer = format!("{:>3.3}ms", perf.used.load(Relaxed));
+        prev.set_string(0, 0, &timer, Style::default());
+    })?)
+}
+
+use self::colors::*; mod colors {
+    use ratatui::prelude::Color;
+    pub const fn tui_color_bg () -> Color { Color::Rgb(28, 35, 25) }
+    pub const fn tui_bg0 () -> Color { Color::Rgb(20, 20, 20) }
+    pub const fn tui_bo1 () -> Color { Color::Rgb(100, 110, 40) }
+    pub const fn tui_bo2 () -> Color { Color::Rgb(70, 80, 50) }
+    pub const fn tui_border_bg () -> Color { Color::Rgb(40, 50, 30) }
+    pub const fn tui_border_fg (f: bool) -> Color { if f { tui_bo1() } else { tui_bo2() } }
+    pub const fn tui_brown () -> Color { Color::Rgb(128,255,0) }
+    pub const fn tui_electric () -> Color { Color::Rgb(0,255,128) }
+    pub const fn tui_g (g: u8) -> Color { Color::Rgb(g, g, g) }
+    pub const fn tui_green () -> Color { Color::Rgb(0,255,0) }
+    pub const fn tui_mode_bg () -> Color { Color::Rgb(150, 160, 90) }
+    pub const fn tui_mode_fg () -> Color { Color::Rgb(255, 255, 255) }
+    pub const fn tui_null () -> Color { Color::Reset }
+    pub const fn tui_orange () -> Color { Color::Rgb(255,128,0) }
+    pub const fn tui_red () -> Color { Color::Rgb(255,0,  0) }
+    pub const fn tui_separator_fg (_: bool) -> Color { Color::Rgb(0, 0, 0) }
+    pub const fn tui_status_bar_bg () -> Color { Color::Rgb(28, 35, 25) }
+    pub const fn tui_ti1 () -> Color { Color::Rgb(150, 160, 90) }
+    pub const fn tui_ti2 () -> Color { Color::Rgb(120, 130, 100) }
+    pub const fn tui_title_fg (f: bool) -> Color { if f { tui_ti1() } else { tui_ti2() } }
+    pub const fn tui_yellow () -> Color { Color::Rgb(255,255,0) }
+}
+
+/// Apply foreground color.
+pub const fn fg (fg: Color, draw: impl Draw<Tui>) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        to.update(&|cell,_,_|{ cell.set_fg(fg); });
+        draw.draw(to)
+    })
+}
+
+/// Apply background color.
+pub const fn bg (bg: Color, draw: impl Draw<Tui>) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        to.update(&|cell,_,_|{ cell.set_bg(bg); });
+        draw.draw(to)
+    })
+}
+
+pub const fn fg_bg (fg: Color, bg: Color, draw: impl Draw<Tui>) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        to.update(&|cell,_,_|{ cell.set_fg(fg); cell.set_bg(bg); });
+        draw.draw(to)
+    })
+}
+
+pub const fn fill_char (c: char) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|Ok(Some(to.update(&|cell,_,_|{
+        cell.set_char(c);
+    }))))
+}
+
+/// Draw contents with modifier applied.
+pub const fn modify (on: bool, modifier: Modifier, draw: impl Draw<Tui>) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        fill_mod(on, modifier).draw(to)?;
+        draw.draw(to)
+    })
+}
+
+pub const fn fill_mod (on: bool, modifier: Modifier) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|Ok(Some({
+        if on {
+            to.update(&|cell,_,_|cell.modifier.insert(modifier))
+        } else {
+            to.update(&|cell,_,_|cell.modifier.remove(modifier))
+        }
+    })))
+}
+
+/// Draw contents with bold modifier applied.
+pub const fn bold (on: bool, draw: impl Draw<Tui>) -> impl Draw<Tui> {
+    modify(on, Modifier::BOLD, draw)
+}
+
+pub const fn fill_ul (color: Option<Color>) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|Ok(Some(if let Some(color) = color {
+        to.update(&|cell,_,_|{
+            cell.modifier.insert(Modifier::UNDERLINED);
+            cell.underline_color = color;
+        })
+    } else {
+        to.update(&|cell,_,_|{
+            cell.modifier.remove(Modifier::UNDERLINED);
+            cell.underline_color = Reset;
+        })
+    })))
+}
+
+mod phat {
+    use super::*;
+    pub const LO: &'static str = "▄";
+    pub const HI: &'static str = "▀";
+    /// A phat line
+    pub fn lo (fg: Color, bg: Color) -> impl Draw<Tui> {
+        h_exact(1, fg_bg(fg, bg, x_repeat(self::phat::LO)))
+    }
+    /// A phat line
+    pub fn hi (fg: Color, bg: Color) -> impl Draw<Tui> {
+        h_exact(1, fg_bg(fg, bg, x_repeat(self::phat::HI)))
+    }
+}
+
+mod scroll {
+    pub const ICON_DEC_V: &[char] = &['▲'];
+    pub const ICON_INC_V: &[char] = &['▼'];
+    pub const ICON_DEC_H: &[char] = &[' ', '🞀', ' '];
+    pub const ICON_INC_H: &[char] = &[' ', '🞂', ' '];
+}
+
+pub const fn x_repeat (c: &str) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        let XYWH(x, y, w, _h) = to.xywh();
+        for x in x..x+w {
+            if let Some(cell) = to.0.cell_mut(Position::from((x, y))) {
+                cell.set_symbol(&c);
+            }
+        }
+        Ok(Some(XYWH(x, y, w, 1)))
+    })
+}
+
+pub const fn y_repeat (c: &str) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        let XYWH(x, y, _w, h) = to.xywh();
+        for y in y..y+h {
+            if let Some(cell) = to.0.cell_mut(Position::from((x, y))) {
+                cell.set_symbol(&c);
+            }
+        }
+        Ok(Some(XYWH(x, y, 1, h)))
+    })
+}
+
+pub const fn xy_repeat (c: &str) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|{
+        let XYWH(x, y, w, h) = to.xywh();
+        let a = c.len();
+        for (_v, y) in (y..y+h).enumerate() {
+            for (u, x) in (x..x+w).enumerate() {
+                if let Some(cell) = to.0.cell_mut(Position::from((x, y))) {
+                    let u = u % a;
+                    cell.set_symbol(&c[u..u+1]);
+                }
+            }
+        }
+        Ok(Some(XYWH(x, y, w, h)))
+    })
+}
+
+/// ```
+/// let _ = tengri::button_2("", "", true);
+/// let _ = tengri::button_2("", "", false);
+/// ```
+pub const fn button_2 <'a> (key: impl Draw<Tui>, label: impl Draw<Tui>, hide: bool) -> impl Draw<Tui> {
+    let c1 = tui_orange();
+    let c2 = tui_g(0);
+    let c3 = tui_g(96);
+    let c4 = tui_g(255);
+    bold(true, fg_bg(c1, c2, east(fg(c2, east(key, fg(c3, "▐"))), when(!hide, fg_bg(c4, c3, label)))))
+}
+
+/// ```
+/// let _ = tengri::button_3("", "", "", true);
+/// let _ = tengri::button_3("", "", "", false);
+/// ```
+pub const fn button_3 <'a> (
+    key: impl Draw<Tui>, label: impl Draw<Tui>, value: impl Draw<Tui>, editing: bool,
+) -> impl Draw<Tui> {
+    bold(true, east(
+        fg_bg(tui_orange(), tui_g(0),
+            east(fg(tui_g(0), "▐"), east(key, fg(if editing { tui_g(128) } else { tui_g(96) }, "▐")))),
+        east(
+            when(!editing, east(fg_bg(tui_g(255), tui_g(96), label), fg_bg(tui_g(128), tui_g(96), "▐"),)),
+            east(fg_bg(tui_g(224), tui_g(128), value), fg_bg(tui_g(128), Reset, "▌"), ))))
+}
+
+/// Stackably padded.
+///
+/// ```
+/// /// TODO
+/// ```
+pub fn phat (w: u16, h: u16, [fg, bg, hi, lo]: [Color;4], draw: impl Draw<Tui>) -> impl Draw<Tui> {
+    let top = w_exact(1, self::phat::lo(bg, hi));
+    let low = w_exact(1, self::phat::hi(bg, lo));
+    let draw = fg_bg(fg, bg, draw);
+    wh_min(Some(w), Some(h), south(top, north(low, draw)))
+}
+
+fn x_scroll () -> impl Draw<Tui> {
+    thunk(|Tui(buf, XYWH(x1, y1, w, h)): &mut Tui|{
+        let x2 = *x1 + *w;
+        for (i, x) in (*x1..=x2).enumerate() {
+            if let Some(cell) = buf.cell_mut(Position::from((x, *y1))) {
+                if i < (self::scroll::ICON_DEC_H.len()) {
+                    cell.set_fg(Rgb(255, 255, 255));
+                    cell.set_bg(Rgb(0, 0, 0));
+                    cell.set_char(self::scroll::ICON_DEC_H[i as usize]);
+                } else if i > (*w as usize - self::scroll::ICON_INC_H.len()) {
+                    cell.set_fg(Rgb(255, 255, 255));
+                    cell.set_bg(Rgb(0, 0, 0));
+                    cell.set_char(self::scroll::ICON_INC_H[*w as usize - i]);
+                } else if false {
+                    cell.set_fg(Rgb(255, 255, 255));
+                    cell.set_bg(Reset);
+                    cell.set_char('━');
+                } else {
+                    cell.set_fg(Rgb(0, 0, 0));
+                    cell.set_bg(Reset);
+                    cell.set_char('╌');
+                }
+            }
+        }
+        Ok(Some(XYWH(*x1, *y1, *w, 1)))
+    })
+}
+
+fn y_scroll () -> impl Draw<Tui> {
+    thunk(|Tui(buf, XYWH(x1, y1, w, h)): &mut Tui|{
+        let y2 = *y1 + *h;
+        for (i, y) in (*y1..=y2).enumerate() {
+            if let Some(cell) = buf.cell_mut(Position::from((*x1, y))) {
+                if (i as usize) < (self::scroll::ICON_DEC_V.len()) {
+                    cell.set_fg(Rgb(255, 255, 255));
+                    cell.set_bg(Rgb(0, 0, 0));
+                    cell.set_char(self::scroll::ICON_DEC_V[i as usize]);
+                } else if (i as usize) > (*h as usize - self::scroll::ICON_INC_V.len()) {
+                    cell.set_fg(Rgb(255, 255, 255));
+                    cell.set_bg(Rgb(0, 0, 0));
+                    cell.set_char(self::scroll::ICON_INC_V[*h as usize - i]);
+                } else if false {
+                    cell.set_fg(Rgb(255, 255, 255));
+                    cell.set_bg(Reset);
+                    cell.set_char('‖'); // ━
+                } else {
+                    cell.set_fg(Rgb(0, 0, 0));
+                    cell.set_bg(Reset);
+                    cell.set_char('╎'); // ━
+                }
+            }
+        }
+        Ok(Some(XYWH(*x1, *y1, 1, *h)))
+    })
+}
+
+pub fn tui_update (
+    Tui(buf, ..): &mut Tui,
+    area: XYWH<u16>,
+    callback: &impl Fn(&mut Cell, u16, u16)
+) {
+}
+
+/// Draw TUI content or its error message.
+///
+/// ```
+/// let _ = tengri::term::catcher(Ok(Some("hello")));
+/// let _ = tengri::term::catcher(Ok(None));
+/// let _ = tengri::term::catcher(Err("draw fail".into()));
+/// ```
+pub fn catcher <T: Draw<Tui>> (result: Usually<T>) -> impl Draw<Tui> {
+    thunk(move|to: &mut Tui|match result {
+        Ok(content) => content.draw(to),
+        Err(e) => {
+            let err_fg = Color::Rgb(255,224,244);
+            let err_bg = Color::Rgb(96, 24, 24);
+            let title  = east(bold(true, "upsi daisy. "), "rendering failed.");
+            let error  = east("\"why?\" ", bold(true, format!("{e}")));
+            fg(err_fg, bg(err_bg, south(title, error))).draw(to)
+        }
+    })
+}
diff --git a/src/text.rs b/src/text.rs
index e79ae55..3fd8806 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -1,4 +1,4 @@
-use crate::{Usually, draw::Draw, space::*};
+use crate::*;
 pub(crate) use ::unicode_width::*;
 
 #[cfg(feature = "term")] mod impl_term {