gluing

Cargo.lock

@@ -2386,6 +2386,7 @@ version = "0.2.1"
 dependencies = [
  "backtrace",
  "clap",
+ "konst",
  "palette",
  "proptest",
  "proptest-derive",

Cargo.toml

@@ -41,6 +41,7 @@ atomic_float = { version = "1.0.0" }
 backtrace    = { version = "0.3.72" }
 clap         = { version = "4.5.4", features = [ "derive" ] }
 gtk          = { version = "0.18.1" }
+konst        = { version = "0.3.16", features = [ "rust_1_83" ] }
 livi         = { version = "0.7.4" }
 midly        = { version = "0.5" }
 palette      = { version = "0.7.6", features = [ "random" ] }

bacon.toml

@@ -0,0 +1,55 @@
+# https://dystroy.org/bacon/config/
+default_job = "check"
+env.CARGO_TERM_COLOR = "always"
+[keybindings]
+c = "job:check"
+l = "job:clippy"
+[jobs]
+[jobs.check]
+command = ["cargo", "check"]
+need_stdout = false
+watch = ["crates", "deps"]
+[jobs.check-all]
+command = ["cargo", "check", "--all-targets"]
+need_stdout = false
+[jobs.clippy]
+command = ["cargo", "clippy"]
+need_stdout = false
+[jobs.clippy-all]
+command = ["cargo", "clippy", "--all-targets"]
+need_stdout = false
+[jobs.test]
+command = ["cargo", "test"]
+need_stdout = true
+[jobs.nextest]
+command = [
+    "cargo", "nextest", "run",
+    "--hide-progress-bar", "--failure-output", "final"
+]
+need_stdout = true
+analyzer = "nextest"
+[jobs.doc]
+command = ["cargo", "doc", "--no-deps"]
+need_stdout = false
+[jobs.doc-open]
+command = ["cargo", "doc", "--no-deps", "--open"]
+need_stdout = false
+on_success = "back" # so that we don't open the browser at each change
+[jobs.run]
+command = [
+    "cargo", "run",
+    # put launch parameters for your program behind a `--` separator
+]
+need_stdout = true
+allow_warnings = true
+background = true
+[jobs.run-long]
+command = [ "cargo", "run", ]
+need_stdout = true
+allow_warnings = true
+background = false
+on_change_strategy = "kill_then_restart"
+[jobs.ex]
+command = ["cargo", "run", "--example"]
+need_stdout = true
+allow_warnings = true

config/views.edn

@@ -11,7 +11,7 @@
   (mode :editor     (keys :editor))
   (mode :dialog     (keys :dialog))
   (mode :message    (keys :message))
-  (mode :device-add (keys :device-add))
+  (mode :add-device (keys :add-device))
   (mode :browser    (keys :browser))
   (mode :rename     (keys :pool-rename))
   (mode :length     (keys :pool-length))
@@ -22,7 +22,6 @@
   (keys :clock)
   (keys :arranger)
   (keys :global)
-  :view/dialog
   (bsp/w :view/meters/output
     (bsp/e :view/meters/input
       (stack/n (fixed/y 2 :view/status/h2) :view/tracks/inputs
@@ -41,7 +40,6 @@
   (keys :editor)
   (keys :sampler)
   (keys :global)
-  :view/dialog
   (bsp/w :view/meters/output
     (bsp/e :view/meters/input
       (bsp/w
@@ -61,7 +59,6 @@
   (info "A sampling soundboard.")
   (keys :sampler)
   (keys :global)
-  :view/dialog
   (bsp/s (fixed/y 1 :view/transport)
          (bsp/n (fixed/y 1 :view/status)
                 (fill/xy :view/samples/grid))))
@@ -75,6 +72,7 @@
   (keys :editor)
   (keys :clock)
   (keys :global)
-  :view/dialog
+  (bsp/s (fixed/y 1 :view/transport)
-  (bsp/s (fixed/y 1 :view/transport) (bsp/n (fixed/y 1 :view/status)
+         (bsp/n (fixed/y 1 :view/status)
-    (fill/xy (bsp/a (fill/xy (align/e :view/pool)) :view/editor)))))
+                (fill/xy (bsp/a (fill/xy (align/e :view/pool))
+                         :view/editor)))))

crates/app/Cargo.toml

@@ -12,6 +12,7 @@ tek_device = { workspace = true }
 
 backtrace = { workspace = true }
 clap      = { workspace = true, optional = true }
+konst     = { workspace = true }
 palette   = { workspace = true }
 rand      = { workspace = true }
 toml      = { workspace = true }

crates/app/app_ctrl.rs

@@ -0,0 +1,321 @@
+use crate::*;
+#[derive(Debug)]
+pub enum AppCommand {}
+handle!(TuiIn:|self: App, input|{
+    panic!("{input:?}");
+    //Ok(if let Some(binding) = self.profile.as_ref()
+        //.map(|c|c.keys.dispatch(input.event())).flatten()
+    //{
+        //let binding = binding.clone();
+        //let undo = binding.command.clone().execute(self)?;
+        //// FIXME failed commands are not persisted in undo history
+        ////self.history.push((binding.command.clone(), undo));
+        //Some(true)
+    //} else {
+        //None
+    //})
+});
+dsl_sym!(|app: App| -> isize {
+    ":_isize_stub" => -1
+});
+dsl_sym!(|app: App| -> ItemTheme {
+    ":_theme_stub" => Default::default()
+});
+dsl_sym!(|app: App| -> u16{
+    ":w/sidebar"       => app.project.w_sidebar(app.editor().is_some()),
+    ":h/sample-detail" => 6.max(app.height() as u16 * 3 / 9),
+});
+dsl_sym!(|app: App| -> usize {
+    ":scene-count"      => app.scenes().len(),
+    ":track-count"      => app.tracks().len(),
+    ":device-kind"      => app.dialog.device_kind().unwrap_or(0),
+    ":device-kind/next" => app.dialog.device_kind_next().unwrap_or(0),
+    ":device-kind/prev" => app.dialog.device_kind_prev().unwrap_or(0),
+});
+dsl_sym!(|app: App| -> bool {
+    ":focused/editor"      => app.project.editor.is_some(),
+    ":focused/dialog"      => !matches!(app.dialog, Dialog::None),
+    ":focused/message"     => matches!(app.dialog, Dialog::Message(..)),
+    ":focused/add_device"  => matches!(app.dialog, Dialog::Device(..)),
+    ":focused/browser"     => app.dialog.browser().is_some(),
+    ":focused/clip"        => !app.focused_editor() && matches!(app.selection(), Selection::TrackClip{..}),
+    ":focused/track"       => !app.focused_editor() && matches!(app.selection(), Selection::Track(..)),
+    ":focused/scene"       => !app.focused_editor() && matches!(app.selection(), Selection::Scene(..)),
+    ":focused/mix"         => !app.focused_editor() && matches!(app.selection(), Selection::Mix),
+    ":focused/pool/import" => matches!(app.pool.mode, Some(PoolMode::Import(..))),
+    ":focused/pool/export" => matches!(app.pool.mode, Some(PoolMode::Export(..))),
+    ":focused/pool/rename" => matches!(app.pool.mode, Some(PoolMode::Rename(..))),
+    ":focused/pool/length" => matches!(app.pool.mode, Some(PoolMode::Length(..))),
+});
+dsl_sym!(|app: App| -> Dialog {
+    ":dialog/none"          => Dialog::None,
+    ":dialog/options"       => Dialog::Options,
+    ":dialog/device"        => Dialog::Device(0),
+    ":dialog/device/prev"   => Dialog::Device(0),
+    ":dialog/device/next"   => Dialog::Device(0),
+    ":dialog/help"          => Dialog::Help(0),
+    ":dialog/menu"          => Dialog::Menu(0),
+    ":dialog/save"          => Dialog::Browser(BrowserTarget::SaveProject, Browser::new(None).unwrap().into()),
+    ":dialog/load"          => Dialog::Browser(BrowserTarget::LoadProject, Browser::new(None).unwrap().into()),
+    ":dialog/import/clip"   => Dialog::Browser(BrowserTarget::ImportClip(Default::default()), Browser::new(None).unwrap().into()),
+    ":dialog/export/clip"   => Dialog::Browser(BrowserTarget::ExportClip(Default::default()), Browser::new(None).unwrap().into()),
+    ":dialog/import/sample" => Dialog::Browser(BrowserTarget::ImportSample(Default::default()), Browser::new(None).unwrap().into()),
+    ":dialog/export/sample" => Dialog::Browser(BrowserTarget::ExportSample(Default::default()), Browser::new(None).unwrap().into()),
+});
+dsl_sym!(|app: App| -> Selection {
+    ":select/scene"      => app.selection().select_scene(app.tracks().len()),
+    ":select/scene/next" => app.selection().select_scene_next(app.scenes().len()),
+    ":select/scene/prev" => app.selection().select_scene_prev(),
+    ":select/track"      => app.selection().select_track(app.tracks().len()),
+    ":select/track/next" => app.selection().select_track_next(app.tracks().len()),
+    ":select/track/prev" => app.selection().select_track_prev(),
+});
+dsl_sym!(|app: App| -> Option<u7> {
+    ":editor/pitch" => Some((app.editor().as_ref().map(|e|e.get_note_pos()).unwrap() as u8).into())
+});
+dsl_sym!(|app: App| -> Option<usize> {
+    ":selected/scene" => app.selection().scene(),
+    ":selected/track" => app.selection().track(),
+});
+dsl_sym!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
+    ":selected/clip" => if let Selection::TrackClip { track, scene } = app.selection() {
+        app.scenes()[*scene].clips[*track].clone()
+    } else {
+        None
+    }
+});
+dsl_exp!(|app: App| -> AppCommand {
+    ["stop-all"] => app.project.stop_all(),
+    ["enqueue", clip?: Option<Arc<RwLock<MidiClip>>>] => todo!(),
+    ["history", delta: isize]                 => todo!(),
+    ["zoom",    zoom:  usize]                 => todo!(),
+    ["select",  selection: Selection]         => todo!(),
+    ["dialog"  / command: DialogCommand]      => todo!(),
+    ["project" / command: ArrangementCommand] => todo!(),
+    ["clock"   / command: ClockCommand]       => todo!(),
+    ["sampler" / command: SamplerCommand]     => todo!(),
+    ["pool"    / command: PoolCommand]        => todo!(),
+});
+dsl_exp!(|app: App| -> DialogCommand {});
+dsl_exp!(|app: App| -> ArrangementCommand {});
+dsl_exp!(|app: App| -> ClockCommand {});
+dsl_exp!(|app: App| -> SamplerCommand {});
+dsl_exp!(|app: App| -> PoolCommand {});
+//dsl_bind!(AppCommand: App {
+    //enqueue  = |app, clip:  Option<Arc<RwLock<MidiClip>>>| { todo!() };
+    //history  = |app, delta: isize| { todo!() };
+    //zoom     = |app, zoom:  usize| { todo!() };
+    //stop_all = |app| { app.tracks_stop_all(); Ok(None) };
+    ////dialog   = |app, command: DialogCommand|
+        ////Ok(command.delegate(&mut app.dialog, |c|Self::Dialog{command: c})?);
+    //project  = |app, command: ArrangementCommand|
+        //Ok(command.delegate(&mut app.project, |c|Self::Project{command: c})?);
+    //clock    = |app, command: ClockCommand|
+        //Ok(command.execute(app.clock_mut())?.map(|c|Self::Clock{command: c}));
+    //sampler  = |app, command: SamplerCommand|
+        //Ok(app.project.sampler_mut().map(|s|command.delegate(s, |command|Self::Sampler{command}))
+            //.transpose()?.flatten());
+    //pool     = |app, command: PoolCommand| {
+        //let undo = command.clone().delegate(&mut app.pool, |command|AppCommand::Pool{command})?;
+        //// update linked editor after pool action
+        //match command {
+            //// autoselect: automatically load selected clip in editor
+            //PoolCommand::Select { .. } |
+            //// autocolor: update color in all places simultaneously
+            //PoolCommand::Clip { command: PoolClipCommand::SetColor { .. } } => {
+                //let clip = app.pool.clip().clone();
+                //app.editor_mut().map(|editor|editor.set_clip(clip.as_ref()))
+            //},
+            //_ => None
+        //};
+        //Ok(undo)
+    //};
+    //select   = |app, selection: Selection| {
+        //*app.project.selection_mut() = selection;
+        ////todo!
+        ////if let Some(ref mut editor) = app.editor_mut() {
+            ////editor.set_clip(match selection {
+                ////Selection::TrackClip { track, scene } if let Some(Some(Some(clip))) = app
+                    ////.project
+                    ////.scenes.get(scene)
+                    ////.map(|s|s.clips.get(track))
+                ////=>
+                    ////Some(clip),
+                ////_ =>
+                    ////None
+            ////});
+        ////}
+        //Ok(None)
+        ////("select"  [t: usize, s: usize] Some(match (t.expect("no track"), s.expect("no scene")) {
+            ////(0, 0) => Self::Select(Selection::Mix),
+            ////(t, 0) => Self::Select(Selection::Track(t)),
+            ////(0, s) => Self::Select(Selection::Scene(s)),
+            ////(t, s) => Self::Select(Selection::TrackClip { track: t, scene: s }) })))
+        //// autoedit: load focused clip in editor.
+    //};
+    ////fn color (app: &mut App, theme: ItemTheme) -> Perhaps<Self> {
+        ////Ok(app.set_color(Some(theme)).map(|theme|Self::Color{theme}))
+    ////}
+    ////fn launch (app: &mut App) -> Perhaps<Self> {
+        ////app.project.launch();
+        ////Ok(None)
+    ////}
+    //toggle_editor = |app, value: bool|{ app.toggle_editor(Some(value)); Ok(None) };
+    //editor = |app, command: MidiEditCommand| Ok(if let Some(editor) = app.editor_mut() {
+        //let undo = command.clone().delegate(editor, |command|AppCommand::Editor{command})?;
+        //// update linked sampler after editor action
+        //app.project.sampler_mut().map(|sampler|match command {
+            //// autoselect: automatically select sample in sampler
+            //MidiEditCommand::SetNotePos { pos } => { sampler.set_note_pos(pos); },
+            //_ => {}
+        //});
+        //undo
+    //} else {
+        //None
+    //});
+//});
+//take!(ClockCommand       |state: App, iter|Take::take(state.clock(), iter));
+//take!(MidiEditCommand    |state: App, iter|Ok(state.editor().map(|x|Take::take(x, iter)).transpose()?.flatten()));
+//take!(PoolCommand        |state: App, iter|Take::take(&state.pool, iter));
+//take!(SamplerCommand     |state: App, iter|Ok(state.project.sampler().map(|x|Take::take(x, iter)).transpose()?.flatten()));
+//take!(ArrangementCommand |state: App, iter|Take::take(&state.project, iter));
+//take!(DialogCommand      |state: App, iter|Take::take(&state.dialog, iter));
+//has_editor!(|self: App|{
+    //editor = self.editor;
+    //editor_w = {
+        //let size      = self.size.w();
+        //let editor    = self.editor.as_ref().expect("missing editor");
+        //let time_len  = editor.time_len().get();
+        //let time_zoom = editor.time_zoom().get().max(1);
+        //(5 + (time_len / time_zoom)).min(size.saturating_sub(20)).max(16)
+    //};
+    //editor_h = 15;
+    //is_editing = self.editor.is_some();
+//});
+#[tengri_proc::command(Option<Dialog>)] impl DialogCommand {
+    fn open (dialog: &mut Option<Dialog>, new: Dialog) -> Perhaps<Self> {
+        *dialog = Some(new);
+        Ok(None)
+    }
+    fn close (dialog: &mut Option<Dialog>) -> Perhaps<Self> {
+        *dialog = None;
+        Ok(None)
+    }
+}
+
+impl App {
+    pub fn toggle_dialog (&mut self, mut dialog: Dialog) -> Dialog {
+        std::mem::swap(&mut self.dialog, &mut dialog);
+        dialog
+    }
+    pub fn toggle_editor (&mut self, value: Option<bool>) {
+        //FIXME: self.editing.store(value.unwrap_or_else(||!self.is_editing()), Relaxed);
+        let value = value.unwrap_or_else(||!self.editor().is_some());
+        if value {
+            // Create new clip in pool when entering empty cell
+            if let Selection::TrackClip { track, scene } = *self.selection()
+            && let Some(scene) = self.project.scenes.get_mut(scene)
+            && let Some(slot)  = scene.clips.get_mut(track)
+            && slot.is_none()
+            && let Some(track) = self.project.tracks.get_mut(track)
+            {
+                let (index, mut clip) = self.pool.add_new_clip();
+                // autocolor: new clip colors from scene and track color
+                let color = track.color.base.mix(scene.color.base, 0.5);
+                clip.write().unwrap().color = ItemColor::random_near(color, 0.2).into();
+                if let Some(ref mut editor) = &mut self.project.editor {
+                    editor.set_clip(Some(&clip));
+                }
+                *slot = Some(clip.clone());
+                //Some(clip)
+            } else {
+                //None
+            }
+        } else if let Selection::TrackClip { track, scene } = *self.selection()
+            && let Some(scene) = self.project.scenes.get_mut(scene)
+            && let Some(slot) = scene.clips.get_mut(track)
+            && let Some(clip) = slot.as_mut()
+        {
+            // Remove clip from arrangement when exiting empty clip editor
+            let mut swapped = None;
+            if clip.read().unwrap().count_midi_messages() == 0 {
+                std::mem::swap(&mut swapped, slot);
+            }
+            if let Some(clip) = swapped {
+                self.pool.delete_clip(&clip.read().unwrap());
+            }
+        }
+    }
+    pub fn browser (&self) -> Option<&Browser> {
+        if let Dialog::Browser(_, ref b) = self.dialog { Some(b) } else { None }
+    }
+    pub fn device_pick (&mut self, index: usize) {
+        self.dialog = Dialog::Device(index);
+    }
+    pub fn add_device (&mut self, index: usize) -> Usually<()> {
+        match index {
+            0 => {
+                let name    = self.jack.with_client(|c|c.name().to_string());
+                let midi    = self.project.track().expect("no active track").sequencer.midi_outs[0].port_name();
+                let track   = self.track().expect("no active track");
+                let port    = format!("{}/Sampler", &track.name);
+                let connect = Connect::exact(format!("{name}:{midi}"));
+                let sampler = if let Ok(sampler) = Sampler::new(
+                    &self.jack, &port, &[connect], &[&[], &[]], &[&[], &[]]
+                ) {
+                    self.dialog = Dialog::None;
+                    Device::Sampler(sampler)
+                } else {
+                    self.dialog = Dialog::Message("Failed to add device.".into());
+                    return Err("failed to add device".into())
+                };
+                let track   = self.track_mut().expect("no active track");
+                track.devices.push(sampler);
+                Ok(())
+            },
+            1 => {
+                todo!();
+                Ok(())
+            },
+            _ => unreachable!(),
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//#[derive(Clone, Debug)]
+//pub enum DialogCommand {
+    //Open { dialog: Dialog },
+    //Close
+//}
+
+//impl Command<Option<Dialog>> for DialogCommand {
+    //fn execute (self, state: &mut Option<Dialog>) -> Perhaps<Self> {
+        //match self {
+            //Self::Open { dialog } => {
+                //*state = Some(dialog);
+            //},
+            //Self::Close => {
+                //*state = None;
+            //}
+        //};
+        //Ok(None)
+    //}
+//}
+
+//dsl!(DialogCommand: |self: Dialog, iter|todo!());
+//Dsl::take(&mut self.dialog, iter));
+
+//#[tengri_proc::command(Option<Dialog>)]//Nope.
+//impl DialogCommand {
+    //fn open (dialog: &mut Option<Dialog>, new: Dialog) -> Perhaps<Self> {
+        //*dialog = Some(new);
+        //Ok(None)
+    //}
+    //fn close (dialog: &mut Option<Dialog>) -> Perhaps<Self> {
+        //*dialog = None;
+        //Ok(None)
+    //}
+//}
+//

crates/app/app_dsl.rs

@@ -0,0 +1,37 @@
+use crate::*;
+
+pub struct DslNs<'t, T: 't>(pub &'t [(&'t str, T)]);
+
+pub trait DslSymNs<'t, T: 't>: 't { const NS: DslNs<'t, fn (&'t Self)->T>; }
+#[macro_export] macro_rules! dsl_sym (
+    (|$state:ident:$State:ty| -> $type:ty {$($lit:literal => $exp:expr),* $(,)?})=>{
+        impl<'t> DslSymNs<'t, $type> for $State {
+            const NS: DslNs<'t, fn (&'t $State)->$type> =
+                DslNs(&[$(($lit, |$state: &$State|$exp)),*]); } });
+
+pub trait DslExpNs<'t, T: 't>: 't { const NS: DslNs<'t, fn (&'t Self, &str)->T>; }
+#[macro_export] macro_rules! dsl_exp (
+    (|$state:ident:$State:ty|->$type:ty { $(
+        [$key:literal $(/ $sub:ident: $Sub:ty)? $(, $arg:ident $(?)? :$argtype:ty)*] => $body:expr
+    ),* $(,)? }) => {
+        impl<'t> DslExpNs<'t, $type> for $State {
+            const NS: DslNs<'t, fn (&'t $State, &str)->$type> =
+                DslNs(&[]); } });
+
+pub type DslCb = fn (&App) -> Box<dyn Render<TuiOut>>;
+impl<'t, D: Dsl> std::ops::Index<D> for DslNs<'t, DslCb> {
+    type Output = DslCb;
+    fn index (&self, index: D) -> &Self::Output {
+        if let Ok(Some(symbol)) = index.src() {
+            for (key, value) in self.0.iter() {
+                if symbol == *key {
+                    return value
+                }
+            }
+        }
+        &(view_nil as DslCb)
+    }
+}
+fn view_nil (_: &App) -> Box<dyn Render<TuiOut>> {
+    Box::new(Fill::xy("·"))
+}

crates/app/app_jack.rs

@@ -0,0 +1,57 @@
+use crate::*;
+
+impl HasJack<'static> for App {
+    fn jack (&self) -> &Jack<'static> {
+        &self.jack
+    }
+}
+
+audio!(
+    |self: App, client, scope|{
+        let t0 = self.perf.get_t0();
+        self.clock().update_from_scope(scope).unwrap();
+        let midi_in = self.project.midi_input_collect(scope);
+        if let Some(editor) = &self.editor() {
+            let mut pitch: Option<u7> = None;
+            for port in midi_in.iter() {
+                for event in port.iter() {
+                    if let (_, Ok(LiveEvent::Midi {message: MidiMessage::NoteOn {ref key, ..}, ..}))
+                        = event
+                    {
+                        pitch = Some(key.clone());
+                    }
+                }
+            }
+            if let Some(pitch) = pitch {
+                editor.set_note_pos(pitch.as_int() as usize);
+            }
+        }
+        let result = self.project.process_tracks(client, scope);
+        self.perf.update_from_jack_scope(t0, scope);
+        result
+    };
+    |self, event|{
+        use JackEvent::*;
+        match event {
+            SampleRate(sr) => {
+                self.clock().timebase.sr.set(sr as f64);
+            },
+            PortRegistration(id, true) => {
+                //let port = self.jack().port_by_id(id);
+                //println!("\rport add: {id} {port:?}");
+                //println!("\rport add: {id}");
+            },
+            PortRegistration(id, false) => {
+                /*println!("\rport del: {id}")*/
+            },
+            PortsConnected(a, b, true) => { /*println!("\rport conn: {a} {b}")*/ },
+            PortsConnected(a, b, false) => { /*println!("\rport disc: {a} {b}")*/ },
+            ClientRegistration(id, true) => {},
+            ClientRegistration(id, false) => {},
+            ThreadInit => {},
+            XRun => {},
+            GraphReorder => {},
+            _ => { panic!("{event:?}"); }
+        }
+    }
+);

crates/app/app_view.rs

@@ -0,0 +1,290 @@
+use crate::*;
+content!(TuiOut:|self: App|VIEW[":view"](self));//if let Ok(Some(view)) = VIEW[":view"] { view(self) } else { panic!() });
+pub const VIEW: DslNs<'static, DslCb> = DslNs(&[
+    (":view", |state|VIEW[":view/menu"](state)),
+    (":view/menu", |state|{
+        let selected = state.dialog.menu_selected();
+        let outputs  = VIEW[":view/ports/outs"](state);
+        let inputs   = VIEW[":view/ports/ins"](state);
+        Box::new(Tui::bg(Rgb(0,0,0), Bsp::s(outputs, Bsp::s(
+            Fill::x(Fixed::y(3, Tui::bg(Rgb(33,33,33), Tui::bold(true, "tek 0.3.0-rc0")))),
+            Bsp::n(inputs, Bsp::n(
+                Fill::x(Fixed::y(3, Tui::bg(Rgb(33,33,33), Bsp::e(Tui::fg(Rgb(255,192,48), "[Enter]"), " new session")))),
+                Fill::y(Align::n(Fill::x(VIEW[":view/profiles"](state)))))))))) }),
+    (":view/ports/outs", |state|Box::new(Fill::x(Fixed::y(3,
+        Bsp::a(Fill::x(Align::w("  L AUDIO OUTS")), Bsp::a("MIDI OUT", Fill::x(Align::e("AUDIO OUTS R  ")))))))),
+    (":view/ports/ins", |state|Box::new(Fill::x(Fixed::y(3,
+        Bsp::a(Fill::x(Align::w("  L AUDIO INS")),  Bsp::a("MIDI INS", Fill::x(Align::e("AUDIO INS R  ")))))))),
+    (":view/profiles", |state: &App|Box::new({
+        let views = state.config.views.clone();
+        Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
+            for (index, (id, profile)) in views.read().unwrap().iter().enumerate() {
+                let bg   = if index == 0 { Rgb(64,64,64) } else { Rgb(32,32,32) };
+                let name = profile.name.as_ref().map(|x|unquote(unquote(x.as_ref())));
+                let info = profile.info.as_ref().map(|x|unquote(unquote(x.as_ref())));
+                add(&Fixed::y(3, Tui::bg(bg, Bsp::s(
+                    Fill::x(Bsp::a(
+                        Fill::x(Align::w(Tui::fg(Rgb(224,192,128), name))),
+                        Fill::x(Align::e(Tui::fg(Rgb(224,128,32), &id))))),
+                    Fill::x(Align::w(info)))))); } })})),
+    (":view/browse", |state: &App|{
+        let browser = state.dialog.browser().cloned().unwrap();
+        Box::new(Bsp::s(
+            Padding::xy(3, 1, VIEW[":view/browse-title"](state)),
+            Outer(true, Style::default().fg(Tui::g(96)))
+                .enclose(Fill::xy(browser)))) }),
+    (":view/browse-title", |state: &App|{
+        let target  = state.dialog.browser_target().unwrap();
+        Box::new(Fill::x(Align::w(FieldV(Default::default(), match target {
+            BrowserTarget::SaveProject     => "Save project:",
+            BrowserTarget::LoadProject     => "Load project:",
+            BrowserTarget::ImportSample(_) => "Import sample:",
+            BrowserTarget::ExportSample(_) => "Export sample:",
+            BrowserTarget::ImportClip(_)   => "Import clip:",
+            BrowserTarget::ExportClip(_)   => "Export clip:",
+        }, Shrink::x(3, Fixed::y(1, Tui::fg(Tui::g(96), RepeatH("🭻"))))))))}),
+    (":view/device",  |state: &App|{
+        let selected = state.dialog.device_kind().unwrap();
+        Box::new(Bsp::s(Tui::bold(true, "Add device"), Map::south(1,
+            move||device_kinds().iter(),
+            move|label: &&'static str, i|{
+                let bg = if i == selected { Rgb(64,128,32) } else { Rgb(0,0,0) };
+                let lb = if i == selected { "[ " } else { "  " };
+                let rb = if i == selected { " ]" } else { "  " };
+                Fill::x(Tui::bg(bg, Bsp::e(lb, Bsp::w(rb, "FIXME device name")))) }))) }),
+    //(":view/options", view_options),
+]);
+fn wrap_dialog (dialog: impl Content<TuiOut>) -> impl Content<TuiOut> {
+    Fixed::xy(70, 23, Tui::fg_bg(Rgb(255,255,255), Rgb(16,16,16), Bsp::b(
+        Repeat(" "), Outer(true, Style::default().fg(Tui::g(96))).enclose(dialog))))
+}
+impl ScenesView for App {
+    fn h_scenes (&self) -> u16 {
+        (self.height() as u16).saturating_sub(20)
+    }
+    fn w_side (&self) -> u16 {
+        20
+    }
+    fn w_mid (&self) -> u16 {
+        (self.width() as u16).saturating_sub(self.w_side())
+    }
+}
+
+                //Bsp::s("",
+                    //Map::south(1,
+                        //move||state.config.binds.layers.iter()
+                            //.filter_map(|a|(a.0)(state).then_some(a.1))
+                            //.flat_map(|a|a)
+                            //.filter_map(|x|if let Value::Exp(_, iter)=x.value{ Some(iter) } else { None })
+                            //.skip(offset)
+                            //.take(20),
+                        //|mut b,i|Fixed::x(60, Align::w(Bsp::e("(", Bsp::e(
+                            //b.next().map(|t|Fixed::x(16, Align::w(Tui::fg(Rgb(64,224,0), format!("{}", t.value))))),
+                            //Bsp::e(" ", Align::w(format!("{}", b.0.0.trim()))))))))))),
+
+            //Dialog::Browser(BrowserTarget::Load, browser) => {
+                //"bobcat".boxed()
+                    ////Bsp::s(
+                        ////Fill::x(Align::w(Margin::xy(1, 1, Bsp::e(
+                            ////Tui::bold(true, " Load project: "),
+                            ////Shrink::x(3, Fixed::y(1, RepeatH("🭻"))))))),
+                        ////Outer(true, Style::default().fg(Tui::g(96)))
+                            ////.enclose(Fill::xy(browser)))
+            //},
+            //Dialog::Browser(BrowserTarget::Export, browser) => {
+                //"bobcat".boxed()
+                    ////Bsp::s(
+                        ////Fill::x(Align::w(Margin::xy(1, 1, Bsp::e(
+                            ////Tui::bold(true, " Export: "),
+                            ////Shrink::x(3, Fixed::y(1, RepeatH("🭻"))))))),
+                        ////Outer(true, Style::default().fg(Tui::g(96)))
+                            ////.enclose(Fill::xy(browser)))
+            //},
+            //Dialog::Browser(BrowserTarget::Import, browser) => {
+                //"bobcat".boxed()
+                    ////Bsp::s(
+                        ////Fill::x(Align::w(Margin::xy(1, 1, Bsp::e(
+                            ////Tui::bold(true, " Import: "),
+                            ////Shrink::x(3, Fixed::y(1, RepeatH("🭻"))))))),
+                        ////Outer(true, Style::default().fg(Tui::g(96)))
+                            ////.enclose(Fill::xy(browser)))
+            //},
+//
+    //pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|
+            //s.view_meters_input())
+    //}
+    //pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|
+            //s.view_meters_output())
+    //}
+    //pub fn view_history (&self) -> impl Content<TuiOut> {
+        //Fixed::y(1, Fill::x(Align::w(FieldH(self.color,
+            //format!("History ({})", self.history.len()),
+                //self.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0))))))))
+    //}
+    //pub fn view_status_h2 (&self) -> impl Content<TuiOut> {
+        //self.update_clock();
+        //let theme     = self.color;
+        //let clock     = self.clock();
+        //let playing   = clock.is_rolling();
+        //let cache     = clock.view_cache.clone();
+        ////let selection = self.selection().describe(self.tracks(), self.scenes());
+        //let hist_len  = self.history.len();
+        //let hist_last = self.history.last();
+        //Fixed::y(2, Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
+            //add(&Fixed::x(5, Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) },
+                //Either::new(false, // TODO
+                    //Thunk::new(move||Fixed::x(9, Either::new(playing,
+                        //Tui::fg(Rgb(0, 255, 0),   " PLAYING "),
+                        //Tui::fg(Rgb(255, 128, 0), " STOPPED ")))
+                    //),
+                    //Thunk::new(move||Fixed::x(5, Either::new(playing,
+                        //Tui::fg(Rgb(0, 255, 0),   Bsp::s(" 🭍🭑🬽 ", " 🭞🭜🭘 ",)),
+                        //Tui::fg(Rgb(255, 128, 0), Bsp::s(" ▗▄▖ ", " ▝▀▘ ",))))
+                    //)
+                //)
+            //)));
+            //add(&" ");
+            //{
+                //let cache = cache.read().unwrap();
+                //add(&Fixed::x(15, Align::w(Bsp::s(
+                    //FieldH(theme, "Beat", cache.beat.view.clone()),
+                    //FieldH(theme, "Time", cache.time.view.clone()),
+                //))));
+                //add(&Fixed::x(13, Align::w(Bsp::s(
+                    //Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))),
+                    //Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))),
+                //))));
+                //add(&Fixed::x(12, Align::w(Bsp::s(
+                    //Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))),
+                    //Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))),
+                //))));
+                ////add(&Bsp::s(
+                    //////Fill::x(Align::w(FieldH(theme, "Selected", Align::w(selection)))),
+                    ////Fill::x(Align::w(FieldH(theme, format!("History ({})", hist_len),
+                        ////hist_last.map(|last|Fill::x(Align::w(format!("{:?}", last.0))))))),
+                    ////""
+                ////));
+                //////if let Some(last) = self.history.last() {
+                    //////add(&FieldV(theme, format!("History ({})", self.history.len()),
+                        //////Fill::x(Align::w(format!("{:?}", last.0)))));
+                //////}
+            //}
+        //}))
+    //}
+    //pub fn view_status_v (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.update_clock();
+        //let cache   = self.project.clock.view_cache.read().unwrap();
+        //let theme   = self.color;
+        //let playing = self.clock().is_rolling();
+        //Tui::bg(theme.darker.rgb, Fixed::xy(20, 5, Outer(true, Style::default().fg(Tui::g(96))).enclose(
+            //col!(
+                //Fill::x(Align::w(Bsp::e(
+                    //Align::w(Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) },
+                        //Either::new(false, // TODO
+                            //Thunk::new(move||Fixed::x(9, Either::new(playing,
+                                //Tui::fg(Rgb(0, 255, 0),   " PLAYING "),
+                                //Tui::fg(Rgb(255, 128, 0), " STOPPED ")))
+                            //),
+                            //Thunk::new(move||Fixed::x(5, Either::new(playing,
+                                //Tui::fg(Rgb(0, 255, 0),   Bsp::s(" 🭍🭑🬽 ", " 🭞🭜🭘 ",)),
+                                //Tui::fg(Rgb(255, 128, 0), Bsp::s(" ▗▄▖ ", " ▝▀▘ ",))))
+                            //)
+                        //)
+                    //)),
+                    //Bsp::s(
+                        //FieldH(theme, "Beat", cache.beat.view.clone()),
+                        //FieldH(theme, "Time", cache.time.view.clone()),
+                    //),
+                //))),
+                //Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))),
+                //Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))),
+                //Fill::x(Align::w(FieldH(theme, "Buf", Bsp::e(cache.buf.view.clone(), Bsp::e(" = ", cache.lat.view.clone()))))),
+            //))))
+    //}
+    //pub fn view_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.update_clock();
+        //let cache = self.project.clock.view_cache.read().unwrap();
+        //view_status(Some(self.project.selection.describe(self.tracks(), self.scenes())),
+            //cache.sr.view.clone(), cache.buf.view.clone(), cache.lat.view.clone())
+    //}
+    //pub fn view_transport (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.update_clock();
+        //let cache = self.project.clock.view_cache.read().unwrap();
+        //view_transport(self.project.clock.is_rolling(),
+            //cache.bpm.view.clone(), cache.beat.view.clone(), cache.time.view.clone())
+    //}
+    //pub fn view_editor (&self) -> impl Content<TuiOut> + use<'_> {
+        //let bg = self.editor()
+            //.and_then(|editor|editor.clip().clone())
+            //.map(|clip|clip.read().unwrap().color.darker)
+            //.unwrap_or(self.color.darker);
+        //Fill::xy(Tui::bg(bg.rgb, self.editor()))
+    //}
+    //pub fn view_editor_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.editor().map(|e|Fixed::x(20, Outer(true, Style::default().fg(Tui::g(96))).enclose(
+            //Fill::y(Align::n(Bsp::s(e.clip_status(), e.edit_status()))))))
+    //}
+    //pub fn view_midi_ins_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.view_midi_ins_status(self.color)
+    //}
+    //pub fn view_midi_outs_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.view_midi_outs_status(self.color)
+    //}
+    //pub fn view_audio_ins_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.view_audio_ins_status(self.color)
+    //}
+    //pub fn view_audio_outs_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.view_audio_outs_status(self.color)
+    //}
+    //pub fn view_scenes (&self) -> impl Content<TuiOut> + use<'_> {
+        //Bsp::e(
+            //Fixed::x(20, Align::nw(self.project.view_scenes_names())),
+            //self.project.view_scenes_clips(),
+        //)
+    //}
+    //pub fn view_scenes_names (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.view_scenes_names()
+    //}
+    //pub fn view_scenes_clips (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.view_scenes_clips()
+    //}
+    //pub fn view_tracks_inputs <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
+        //Fixed::y(1 + self.project.midi_ins.len() as u16,
+            //self.project.view_inputs(self.color))
+    //}
+    //pub fn view_tracks_outputs <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
+        //self.project.view_outputs(self.color)
+    //}
+    //pub fn view_tracks_devices <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
+        //Fixed::y(4, self.project.view_track_devices(self.color))
+    //}
+    //pub fn view_tracks_names <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
+        //Fixed::y(2, self.project.view_track_names(self.color))
+    //}
+    //pub fn view_pool (&self) -> impl Content<TuiOut> + use<'_> {
+        //Fixed::x(20, Bsp::s(
+            //Fill::x(Align::w(FieldH(self.color, "Clip pool:", ""))),
+            //Fill::y(Align::n(Tui::bg(Rgb(0, 0, 0), Outer(true, Style::default().fg(Tui::g(96)))
+                //.enclose(PoolView(&self.pool)))))))
+    //}
+    //pub fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|s.view_list(true, self.editor().unwrap()))
+    //}
+    //pub fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|s.view_grid())
+    //}
+    //pub fn view_sample_viewer (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|s.view_sample(self.editor().unwrap().get_note_pos()))
+    //}
+    //pub fn view_sample_info (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|s.view_sample_info(self.editor().unwrap().get_note_pos()))
+    //}
+    //pub fn view_sample_status (&self) -> impl Content<TuiOut> + use<'_> {
+        //self.project.sampler().map(|s|Outer(true, Style::default().fg(Tui::g(96))).enclose(
+            //Fill::y(Align::n(s.view_sample_status(self.editor().unwrap().get_note_pos())))))
+    //}
+            ////let options = ||["Projects", "Settings", "Help", "Quit"].iter();
+            ////let option  = |a,i|Tui::fg(Rgb(255,255,255), format!("{}", a));
+            ////Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option)))

crates/cli/tek.rs

@@ -78,7 +78,7 @@ impl Cli {
                 jack:    jack.clone(),
                 config:  Config::init()?,
                 color:   ItemTheme::random(),
-                dialog:  Some(Dialog::Menu(0)),
+                dialog:  Dialog::Menu(0),
                 project: Arrangement {
                     name:  Default::default(),
                     color: ItemTheme::random(),

deps/tengri

@@ -1 +1 @@
-Subproject commit b52c1f582880d08e663411e9238d3fdacfda9473
+Subproject commit 24ac52d8079140b2b9f363d1568597bb5600a166