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

wip: unified focus system

Browse source
This commit is contained in:
🪞👃🪞 2024-08-24 00:27:24 +03:00
parent 8b59658015
commit 3a7aa9e9a3
10 changed files with 194 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

135
crates/tek_sequencer/src/arranger_main.rs
View file

@ -8,11 +8,22 @@ pub fn main () -> Usually<()> {
}
struct ArrangerStandalone {
arranger: Arranger,
transport: Option<Arc<RwLock<TransportToolbar>>>,
show_sequencer: Option<tek_core::Direction>,
/// Contains all the sequencers.
arranger: Arc<Arranger>,
/// Controls the JACK transport.
transport: Option<Arc<RwLock<TransportToolbar>>>,
/// This allows the sequencer view to be moved or hidden.
show_sequencer: Option<tek_core::Direction>,
/// Proxies input events to the currently active sequencer.
sequencer_proxy: SequencerProxy,
///
focus_order: Vec<FocusItem>,
}
struct SequencerProxy;
impl Focus for SequencerProxy {}
#[derive(Debug, Parser)]
#[command(version, about, long_about = None)]
pub struct ArrangerCli {
@ -28,17 +39,24 @@ pub struct ArrangerCli {
#[arg(short, long, default_value_t = 8)] scenes: usize,
}
impl ArrangerStandalone {
impl<'a> ArrangerStandalone<'a> {
pub fn from_args () -> Usually<Self> {
let args = ArrangerCli::parse();
let mut app = ArrangerStandalone {
arranger: Arranger::new(""),
transport: match args.transport {
Some(true) => Some(Arc::new(RwLock::new(TransportToolbar::new(None)))),
_ => None
},
show_sequencer: Some(tek_core::Direction::Down),
let arranger = Arranger::new("");
let transport = match args.transport {
Some(true) => Some(Arc::new(RwLock::new(TransportToolbar::new(None)))),
_ => None
};
let sequencer_proxy = SequencerProxy;
let mut app = ArrangerStandalone {
transport,
show_sequencer: Some(tek_core::Direction::Down),
arranger,
sequencer_proxy,
focus_order: vec![],
};
app.focus_order.push(FocusItem::Mono(&app.arranger));
app.focus_order.push(FocusItem::Poly(&app.sequencer_proxy));
if let Some(name) = args.name {
*app.arranger.name.write().unwrap() = name.clone();
}
@ -60,52 +78,57 @@ impl ArrangerStandalone {
}
}
render!(ArrangerStandalone |self, buf, area| {
let mut layout = Split::down();
if let Some(transport) = &self.transport {
layout = layout.add_ref(transport);
}
let sequencer = self.arranger.sequencer();
if let Some(direction) = self.show_sequencer {
layout = layout.add(Split::new(direction)
.add_ref(&self.arranger)
.add(sequencer))
} else {
layout = layout.add_ref(&self.arranger)
}
let result = layout.render(buf, area)?;
if let Some(ref modal) = self.arranger.modal {
fill_bg(buf, area, Nord::bg_lo(false, false));
fill_fg(buf, area, Nord::bg_hi(false, false));
modal.render(buf, area)?;
}
Ok(result)
});
handle!(ArrangerStandalone |self, e| {
if let Some(modal) = self.arranger.modal.as_mut() {
let result = modal.handle(e)?;
if modal.exited() {
self.arranger.modal = None;
impl Render for ArrangerStandalone {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let mut layout = Split::down();
if let Some(transport) = &self.transport {
layout = layout.add_ref(transport);
}
let sequencer = self.arranger.sequencer();
if let Some(direction) = self.show_sequencer {
layout = layout.add(Split::new(direction)
.add_ref(&self.arranger)
.add(sequencer))
} else {
layout = layout.add_ref(&self.arranger)
}
let result = layout.render(buf, area)?;
if let Some(ref modal) = self.arranger.modal {
fill_bg(buf, area, Nord::bg_lo(false, false));
fill_fg(buf, area, Nord::bg_hi(false, false));
modal.render(buf, area)?;
}
Ok(result)
} else {
match e {
AppEvent::Input(Event::Key(k)) => {
if k.code == KeyCode::Tab {
self.arranger.focus_sequencer = !self.arranger.focus_sequencer;
Ok(true)
} else if self.arranger.focus_sequencer {
if let Some(sequencer) = self.arranger.sequencer_mut() {
handle_keymap(sequencer, e, KEYMAP_SEQUENCER)
} else {
Ok(false)
}
} else {
handle_keymap(&mut self.arranger, e, KEYMAP_ARRANGER)
}
},
_ => Ok(false),
}
}
impl Handle for ArrangerStandalone {
fn handle (&mut self, e: &AppEvent) -> Usually<bool> {
if let Some(modal) = self.arranger.modal.as_mut() {
let result = modal.handle(e)?;
if modal.exited() {
self.arranger.modal = None;
}
Ok(result)
} else {
match e {
AppEvent::Input(Event::Key(k)) => {
Ok(false)
//if k.code == KeyCode::Tab {
//self.arranger.focus_sequencer = !self.arranger.focus_sequencer;
//Ok(true)
//} else if self.arranger.focus_sequencer {
//if let Some(sequencer) = self.arranger.sequencer_mut() {
//handle_keymap(sequencer, e, KEYMAP_SEQUENCER)
//} else {
//Ok(false)
//}
//} else {
//handle_keymap(&mut self.arranger, e, KEYMAP_ARRANGER)
//}
},
_ => Ok(false),
}
}
}
});
}