wip: modularize once again

tui/src/lib.rs

@@ -17,8 +17,9 @@ mod tui_color;  pub use self::tui_color::*;
 mod tui_style;  pub use self::tui_style::*;
 mod tui_theme;  pub use self::tui_theme::*;
 mod tui_border; pub use self::tui_border::*;
+mod tui_field;  pub use self::tui_field::*;
 
-pub(crate) use std::sync::{Arc, RwLock, atomic::{AtomicBool, Ordering::*}};
+pub(crate) use std::sync::{Arc, RwLock, atomic::{AtomicUsize, AtomicBool, Ordering::*}};
 pub(crate) use std::io::{stdout, Stdout};
 pub(crate) use std::error::Error;
 
@@ -38,6 +39,37 @@ pub type Perhaps<T> = Result<Option<T>, Box<dyn Error>>;
     };
 }
 
+pub trait Gettable<T> {
+    /// Returns current value
+    fn get (&self) -> T;
+}
+
+pub trait Mutable<T>: Gettable<T> {
+    /// Sets new value, returns old
+    fn set (&mut self, value: T) -> T;
+}
+
+pub trait InteriorMutable<T>: Gettable<T> {
+    /// Sets new value, returns old
+    fn set (&self, value: T) -> T;
+}
+
+impl Gettable<bool> for AtomicBool {
+    fn get (&self) -> bool { self.load(Relaxed) }
+}
+
+impl InteriorMutable<bool> for AtomicBool {
+    fn set (&self, value: bool) -> bool { self.swap(value, Relaxed) }
+}
+
+impl Gettable<usize> for AtomicUsize {
+    fn get (&self) -> usize { self.load(Relaxed) }
+}
+
+impl InteriorMutable<usize> for AtomicUsize {
+    fn set (&self, value: usize) -> usize { self.swap(value, Relaxed) }
+}
+
 pub use ::better_panic; pub(crate) use better_panic::{Settings, Verbosity};
 pub use ::palette; pub(crate) use ::palette::{*, convert::*, okhsl::*};
 

tui/src/tui_field.rs

@@ -0,0 +1,36 @@
+use crate::*;
+
+pub struct Field<T, U>(pub ItemPalette, pub T, pub U)
+    where T: AsRef<str> + Send + Sync, U: AsRef<str> + Send + Sync;
+
+impl<T, U> Content<TuiOut> for Field<T, U>
+    where T: AsRef<str> + Send + Sync, U: AsRef<str> + Send + Sync
+{
+    fn content (&self) -> impl Render<TuiOut> {
+        let ItemPalette { darkest, dark, lighter, lightest, .. } = self.0;
+        row!(
+            Tui::fg_bg(dark.rgb, darkest.rgb, "▐"),
+            Tui::fg_bg(lighter.rgb, dark.rgb, Tui::bold(true, format!("{}", self.1.as_ref()))),
+            Tui::fg_bg(dark.rgb, darkest.rgb, "▌"),
+            Tui::fg_bg(lightest.rgb, darkest.rgb, format!("{} ", self.2.as_ref()))
+        )
+    }
+}
+
+pub struct FieldV<T, U>(pub ItemPalette, pub T, pub U)
+    where T: AsRef<str> + Send + Sync, U: AsRef<str> + Send + Sync;
+
+impl<T, U> Content<TuiOut> for FieldV<T, U>
+    where T: AsRef<str> + Send + Sync, U: AsRef<str> + Send + Sync
+{
+    fn content (&self) -> impl Render<TuiOut> {
+        let ItemPalette { darkest, dark, lighter, lightest, .. } = self.0;
+        let sep1 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▐"));
+        let sep2 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▌"));
+        let name = Tui::bg(dark.rgb,  Tui::fg(lighter.rgb,
+            Tui::bold(true, format!("{}", self.1.as_ref()))));
+        let value = Tui::bg(darkest.rgb, Tui::fg(lightest.rgb,
+            format!(" {} ", self.2.as_ref())));
+        Bsp::e(Bsp::s(row!(sep1, name, sep2), value), " ")
+    }
+}