unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-06 11:46:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

slightly closer to scripted

Browse source
This commit is contained in:
🪞👃🪞 2025-08-10 21:05:14 +03:00
parent 50728729b7
commit fcfb7a0915
5 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/app/app_ctrl.rs
View file

@ -1,6 +1,4 @@
use crate::*;
#[derive(Debug)]
pub enum AppCommand {}
handle!(TuiIn:|self: App, input|{
panic!("wat: {:?}", self.mode);
for keys in self.mode.keys.iter() {
@ -91,6 +89,9 @@ dsl_sym!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
None
}
});
#[derive(Debug)]
pub enum AppCommand {
}
dsl_exp!(|app: App| -> AppCommand {
["stop-all"] => app.project.stop_all(),
["enqueue", clip?: Option<Arc<RwLock<MidiClip>>>] => todo!(),

16
crates/app/app_dsl.rs
View file

@ -5,10 +5,10 @@ pub struct DslNs<'t, T: 't>(pub &'t [(&'t str, T)]);
/// Namespace where keys are symbols.
pub trait DslSymNs<'t, T: 't>: 't {
const NS: DslNs<'t, fn (&'t Self)->T>;
const SYMS: DslNs<'t, fn (&'t Self)->T>;
fn from_sym <D: Dsl> (&'t self, dsl: D) -> Usually<T> {
if let Some(dsl) = dsl.sym()? {
for (sym, get) in Self::NS.0 {
for (sym, get) in Self::SYMS.0 {
if dsl == *sym {
return Ok(get(self))
}
@ -21,19 +21,22 @@ pub trait DslSymNs<'t, T: 't>: '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> =
const SYMS: 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>; }
pub trait DslExpNs<'t, T: 't>: 't {
const EXPS: 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> =
const EXPS: 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 {
@ -47,6 +50,7 @@ impl<'t, D: Dsl> std::ops::Index<D> for DslNs<'t, DslCb> {
&(view_nil as DslCb)
}
}
fn view_nil (_: &App) -> Box<dyn Render<TuiOut>> {
pub fn view_nil (_: &App) -> Box<dyn Render<TuiOut>> {
Box::new(Fill::xy("·"))
}

72
crates/app/app_view.rs
View file

@ -1,22 +1,37 @@
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);
content!(TuiOut:|self: App|Stack::above(|add|{
for dsl in self.mode.view.iter() { add(&self.view(dsl.as_ref())); }
}));
impl App {
fn view <D: Dsl> (&self, index: D) -> Box<dyn Render<TuiOut>> {
if let Ok(Some(symbol)) = index.src() {
for (key, value) in Self::SYMS.0.iter() {
if symbol == *key {
return value(self)
}
}
}
view_nil(self)
}
}
dsl_sym!(|app: App| -> Box<dyn Render<TuiOut>> {
":view" => app.view(":view/menu"),
":view/menu" => {
let selected = app.dialog.menu_selected();
let outputs = app.view(":view/ports/outs");
let inputs = app.view(":view/ports/ins");
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 modes = state.config.modes.clone();
Fill::y(Align::n(Fill::x(app.view(":view/profiles"))))))))))
},
":view/ports/outs" => 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" => Box::new(Fill::x(Fixed::y(3,
Bsp::a(Fill::x(Align::w(" L AUDIO ISYMS")), Bsp::a("MIDI ISYMS", Fill::x(Align::e("AUDIO ISYMS R "))))))),
":view/profiles" => Box::new({
let modes = app.config.modes.clone();
Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, (id, profile)) in modes.read().unwrap().iter().enumerate() {
let bg = if index == 0 { Rgb(64,64,64) } else { Rgb(32,32,32) };
@ -26,15 +41,14 @@ pub const VIEW: DslNs<'static, DslCb> = DslNs(&[
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)),
Fill::x(Align::w(info)))))); } })}),
":view/browse" => {
let browser = app.dialog.browser().cloned().unwrap();
Box::new(Bsp::s(Padding::xy(3, 1, app.view(":view/browse-title")),
Outer(true, Style::default().fg(Tui::g(96)))
.enclose(Fill::xy(browser)))) }),
(":view/browse-title", |state: &App|{
let target = state.dialog.browser_target().unwrap();
.enclose(Fill::xy(browser)))) },
":view/browse/title" => {
let target = app.dialog.browser_target().unwrap();
Box::new(Fill::x(Align::w(FieldV(Default::default(), match target {
BrowserTarget::SaveProject => "Save project:",
BrowserTarget::LoadProject => "Load project:",
@ -42,18 +56,18 @@ pub const VIEW: DslNs<'static, DslCb> = DslNs(&[
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();
}, Shrink::x(3, Fixed::y(1, Tui::fg(Tui::g(96), RepeatH("🭻"))))))))},
":view/device" => {
let selected = app.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")))) }))) }),
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))))
@ -72,8 +86,8 @@ impl ScenesView for App {
//Bsp::s("",
//Map::south(1,
//move||state.config.binds.layers.iter()
//.filter_map(|a|(a.0)(state).then_some(a.1))
//move||app.config.binds.layers.iter()
//.filter_map(|a|(a.0)(app).then_some(a.1))
//.flat_map(|a|a)
//.filter_map(|x|if let Value::Exp(_, iter)=x.value{ Some(iter) } else { None })
//.skip(offset)

1
crates/cli/tek.rs
View file

@ -79,6 +79,7 @@ impl Cli {
config,
color: ItemTheme::random(),
dialog: Dialog::Menu(0),
mode: Mode { view: vec![":view/menu".into()], ..Default::default() },
project: Arrangement {
name: Default::default(),
color: ItemTheme::random(),

2
deps/tengri vendored

@ -1 +1 @@
Subproject commit 7fd6c91643cbcfece56ebc14500c6a1ab775fc9e
Subproject commit 35a5784d23fdcfd15daa28728f18c4924fc945c4