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

remove VerticalArrangerGrid/Cursor

Browse source
This commit is contained in:
🪞👃🪞 2024-10-18 15:55:45 +03:00
parent a4269337bc
commit 0b71a57ead
4 changed files with 196 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

106
crates/tek_sequencer/src/arranger_cmd.rs
View file

@ -2,51 +2,51 @@ use crate::*;
/// Handle top-level events in standalone arranger.
impl Handle<Tui> for Arranger<Tui> {
fn handle (&mut self, from: &TuiInput) -> Perhaps<bool> {
if !match self.focused() {
ArrangerFocus::Transport => self.transport.handle(from)?,
ArrangerFocus::PhrasePool => self.phrases.handle(from)?,
ArrangerFocus::PhraseEditor => self.editor.handle(from)?,
ArrangerFocus::Arrangement => {
let mut handle_phrase = ||{
let result = self.phrases.handle(from);
self.arrangement.phrase_put();
result
};
match from.event() {
key!(KeyCode::Char('a')) => handle_phrase()?,
key!(KeyCode::Char('c')) => handle_phrase()?,
key!(KeyCode::Char('i')) => handle_phrase()?,
key!(KeyCode::Char('d')) => handle_phrase()?,
_ => self.arrangement.handle(from)?
}
},
}.unwrap_or(false) {
if !self.handle_focused(from)?.unwrap_or(false) {
match from.event() {
// Tab navigation
key!(KeyCode::Tab) => { self.focus_next(); },
key!(Shift-KeyCode::Tab) => { self.focus_prev(); },
key!(KeyCode::BackTab) => { self.focus_prev(); },
key!(Shift-KeyCode::BackTab) => { self.focus_prev(); },
// Directional navigation
key!(KeyCode::Up) => { self.focus_up(); },
key!(KeyCode::Down) => { self.focus_down(); },
key!(KeyCode::Left) => { self.focus_left(); },
key!(KeyCode::Right) => { self.focus_right(); },
key!(KeyCode::Char('e')) => {
self.editor.phrase = self.arrangement.phrase().clone();
self.focus(ArrangerFocus::PhraseEditor);
}
// Global play/pause binding
key!(KeyCode::Char(' ')) => match self.transport {
Some(ref mut transport) => { transport.write().unwrap().toggle_play()?; },
None => { return Ok(None) }
},
_ => {}
key!(KeyCode::Char('e')) => { self.edit_phrase(); },
key!(KeyCode::Char(' ')) => { self.toggle_play(); },
_ => return Ok(None)
}
};
Ok(Some(true))
}
}
impl Arranger<Tui> {
/// Helper for event passthru to focused component
fn handle_focused (&mut self, from: &TuiInput) -> Perhaps<bool> {
match self.focused() {
ArrangerFocus::Transport => self.transport.handle(from),
ArrangerFocus::PhrasePool => self.phrases.handle(from),
ArrangerFocus::PhraseEditor => self.editor.handle(from),
ArrangerFocus::Arrangement => self.handle_arrangement(from),
}
}
/// Helper for phrase event passthru when arrangement is focused
fn handle_arrangement (&mut self, from: &TuiInput) -> Perhaps<bool> {
let mut handle_phrase = ||{
let result = self.phrases.handle(from);
self.arrangement.phrase_put();
result
};
match from.event() {
key!(KeyCode::Char('a')) => handle_phrase(),
key!(KeyCode::Char('c')) => handle_phrase(),
key!(KeyCode::Char('i')) => handle_phrase(),
key!(KeyCode::Char('d')) => handle_phrase(),
_ => self.arrangement.handle(from)
}
}
}
/// Handle events for arrangement.
impl Handle<Tui> for Arrangement<Tui> {
fn handle (&mut self, from: &TuiInput) -> Perhaps<bool> {
match from.event() {
@ -55,46 +55,18 @@ impl Handle<Tui> for Arrangement<Tui> {
key!(KeyCode::Enter) => { self.activate(); },
key!(KeyCode::Char('.')) => { self.increment(); },
key!(KeyCode::Char(',')) => { self.decrement(); },
//key!(KeyCode::Char('<')) => { self.move_back(); },
//key!(KeyCode::Char('>')) => { self.move_forward(); },
// Put selected phrase at position
key!(KeyCode::Char('<')) => { self.move_back(); },
key!(KeyCode::Char('>')) => { self.move_forward(); },
key!(KeyCode::Char('s')) => { self.phrase_put(); },
// Select phrase at current position
key!(KeyCode::Char('g')) => { self.phrase_get(); },
key!(Ctrl-KeyCode::Char('a')) => { self.scene_add(None, None)?; },
key!(Ctrl-KeyCode::Char('t')) => { self.track_add(None, None)?; },
key!(KeyCode::Char('n')) => { todo!("rename selected"); },
key!(KeyCode::Char('l')) => if let Some(phrase) = self.phrase() {
phrase.write().unwrap().toggle_loop()
},
key!(KeyCode::Up) => {
match self.mode {
ArrangementViewMode::Horizontal => self.track_prev(),
_ => self.scene_prev(),
};
self.show_phrase();
},
key!(KeyCode::Down) => {
match self.mode {
ArrangementViewMode::Horizontal => self.track_next(),
_ => self.scene_next(),
};
self.show_phrase();
},
key!(KeyCode::Left) => {
match self.mode {
ArrangementViewMode::Horizontal => self.scene_prev(),
_ => self.track_prev(),
};
self.show_phrase();
},
key!(KeyCode::Right) => {
match self.mode {
ArrangementViewMode::Horizontal => self.scene_next(),
_ => self.track_next(),
};
self.show_phrase();
},
key!(KeyCode::Char('n')) => { self.rename_selected(); },
key!(KeyCode::Char('l')) => { self.toggle_loop() },
key!(KeyCode::Up) => { self.go_up() },
key!(KeyCode::Down) => { self.go_down() },
key!(KeyCode::Left) => { self.go_left() },
key!(KeyCode::Right) => { self.go_right() },
_ => return Ok(None)
}
Ok(Some(true))