mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 12:16:42 +01:00
use main loop with input everywhere
This commit is contained in:
parent
d6bf840a1f
commit
7dd5f7f488
16 changed files with 301 additions and 168 deletions
294
src/main.rs
294
src/main.rs
|
|
@ -20,131 +20,199 @@ use crate::prelude::*;
|
|||
fn main () -> Result<(), Box<dyn Error>> {
|
||||
let cli = cli::Cli::parse();
|
||||
if let Some(command) = cli.command {
|
||||
match command {
|
||||
cli::Command::Transport => main_loop(
|
||||
&mut transport::Transport::new()?,
|
||||
transport::render
|
||||
),
|
||||
cli::Command::Mixer => main_loop(
|
||||
&mut mixer::Mixer::new()?,
|
||||
mixer::render
|
||||
),
|
||||
cli::Command::Looper => main_loop(
|
||||
&mut looper::Looper::new()?,
|
||||
looper::render
|
||||
),
|
||||
cli::Command::Sampler => main_loop(
|
||||
&mut sampler::Sampler::new()?,
|
||||
sampler::render
|
||||
),
|
||||
cli::Command::Sequencer => main_loop(
|
||||
&mut sequencer::Sequencer::new()?,
|
||||
sequencer::render
|
||||
),
|
||||
}
|
||||
run_one(&command)
|
||||
} else {
|
||||
main_loop(&mut (
|
||||
transport::Transport::new()?,
|
||||
mixer::Mixer::new()?,
|
||||
looper::Looper::new()?,
|
||||
sampler::Sampler::new()?,
|
||||
sequencer::Sequencer::new()?,
|
||||
), |(transport, mixer, looper, sampler, sequencer), stdout, offset| {
|
||||
transport::render(transport, stdout, (1, 1))?;
|
||||
render::render_box(stdout, 28, 0, 60, 6, false)?;
|
||||
mixer::render(mixer, stdout, (1, 10))?;
|
||||
render::render_box(stdout, 18, 9, 62, 9, false)?;
|
||||
looper::render(looper, stdout, (1, 20))?;
|
||||
render::render_box(stdout, 17, 19, 50, 6, false)?;
|
||||
run_all()
|
||||
}
|
||||
}
|
||||
|
||||
fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
||||
match command {
|
||||
cli::Command::Transport => main_loop(
|
||||
&mut transport::Transport::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &transport::ACTIONS)?;
|
||||
offset.0 = offset.0 + w + 2;
|
||||
transport::render(state, stdout, offset)
|
||||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Mixer => main_loop(
|
||||
&mut mixer::Mixer::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &mixer::ACTIONS)?;
|
||||
offset.0 = offset.0 + w + 2;
|
||||
mixer::render(state, stdout, offset)
|
||||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Looper => main_loop(
|
||||
&mut looper::Looper::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &looper::ACTIONS)?;
|
||||
offset.0 = offset.0 + w + 2;
|
||||
looper::render(state, stdout, offset)
|
||||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Sampler => main_loop(
|
||||
&mut sampler::Sampler::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &sampler::ACTIONS)?;
|
||||
offset.0 = offset.0 + w + 2;
|
||||
sampler::render(state, stdout, offset)
|
||||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Sequencer => main_loop(
|
||||
&mut sequencer::Sequencer::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &sequencer::ACTIONS)?;
|
||||
offset.0 = offset.0 + w + 2;
|
||||
sequencer::render(state, stdout, offset)
|
||||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
fn run_all () -> Result<(), Box<dyn Error>> {
|
||||
let mut actions = vec![];
|
||||
actions.extend_from_slice(&transport::ACTIONS);
|
||||
actions.extend_from_slice(&mixer::ACTIONS);
|
||||
actions.extend_from_slice(&looper::ACTIONS);
|
||||
main_loop(
|
||||
&mut App {
|
||||
exited: false,
|
||||
mode: Mode::Transport,
|
||||
transport: transport::Transport::new()?,
|
||||
mixer: mixer::Mixer::new()?,
|
||||
looper: looper::Looper::new()?,
|
||||
sampler: sampler::Sampler::new()?,
|
||||
sequencer: sequencer::Sequencer::new()?,
|
||||
},
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, (offset.0, offset.1 + 1), &actions)?;
|
||||
offset.0 = offset.0 + w + 1;
|
||||
|
||||
transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?;
|
||||
render::render_box(stdout, offset.0, 0, 64, 4,
|
||||
state.mode == Mode::Transport)?;
|
||||
|
||||
mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 6))?;
|
||||
render::render_box(stdout, offset.0, 5, 64, 9,
|
||||
state.mode == Mode::Mixer)?;
|
||||
|
||||
looper::render(&mut state.looper, stdout, (offset.0 + 1, 16))?;
|
||||
render::render_box(stdout, offset.0, 15, 64, 6,
|
||||
state.mode == Mode::Looper)?;
|
||||
|
||||
//sampler::render(sampler, stdout, (1, 46))?;
|
||||
//sequencer::render(sequencer, stdout, (1, 66))?;
|
||||
Ok(())
|
||||
})
|
||||
},
|
||||
|state, event| {
|
||||
if let Event::Key(key) = event {
|
||||
match key.code {
|
||||
KeyCode::Char('c') => {
|
||||
if key.modifiers == KeyModifiers::CONTROL {
|
||||
state.exit();
|
||||
}
|
||||
},
|
||||
KeyCode::Tab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Mixer,
|
||||
Mode::Mixer => state.mode = Mode::Looper,
|
||||
Mode::Looper => state.mode = Mode::Transport,
|
||||
_ => {}
|
||||
},
|
||||
KeyCode::BackTab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Looper,
|
||||
Mode::Looper => state.mode = Mode::Mixer,
|
||||
Mode::Mixer => state.mode = Mode::Transport,
|
||||
_ => {}
|
||||
},
|
||||
_ => match state.mode {
|
||||
Mode::Transport => transport::handle(
|
||||
&mut state.transport, event
|
||||
)?,
|
||||
Mode::Mixer => mixer::handle(
|
||||
&mut state.mixer, event
|
||||
)?,
|
||||
Mode::Looper => looper::handle(
|
||||
&mut state.looper, event
|
||||
)?,
|
||||
_ => {},
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
struct App {
|
||||
exited: bool,
|
||||
mode: Mode,
|
||||
transport: crate::transport::Transport,
|
||||
mixer: crate::mixer::Mixer,
|
||||
looper: crate::looper::Looper,
|
||||
sampler: crate::sampler::Sampler,
|
||||
sequencer: crate::sequencer::Sequencer,
|
||||
}
|
||||
|
||||
#[derive(PartialEq)]
|
||||
enum Mode {
|
||||
Transport,
|
||||
Mixer,
|
||||
Looper,
|
||||
Sampler,
|
||||
Sequencer
|
||||
}
|
||||
|
||||
impl Exitable for App {
|
||||
fn exit (&mut self) {
|
||||
self.exited = true
|
||||
}
|
||||
fn exited (&self) -> bool {
|
||||
self.exited
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main_loop <T> (
|
||||
pub fn main_loop <T: Exitable> (
|
||||
state: &mut T,
|
||||
mut render: impl FnMut(&mut T, &mut Stdout, (u16, u16)) -> Result<(), Box<dyn Error>>
|
||||
mut render: impl FnMut(&mut T, &mut Stdout, (u16, u16)) -> Result<(), Box<dyn Error>>,
|
||||
mut handle: impl FnMut(&mut T, &Event) -> Result<(), Box<dyn Error>>,
|
||||
) -> Result<(), Box<dyn Error>> {
|
||||
let mut stdout = stdout();
|
||||
let sleep = std::time::Duration::from_millis(16);
|
||||
let mut stdout = std::io::stdout();
|
||||
crossterm::terminal::enable_raw_mode()?;
|
||||
let (tx, input) = channel::<crossterm::event::Event>();
|
||||
let exited = Arc::new(AtomicBool::new(false));
|
||||
let exit_input_thread = exited.clone();
|
||||
spawn(move || {
|
||||
loop {
|
||||
// Exit if flag is set
|
||||
if exit_input_thread.fetch_and(true, Ordering::Relaxed) {
|
||||
break
|
||||
}
|
||||
// Listen for events and send them to the main thread
|
||||
if crossterm::event::poll(Duration::from_millis(100)).is_ok() {
|
||||
if tx.send(crossterm::event::read().unwrap()).is_err() {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
stdout.queue(Clear(ClearType::All))?.queue(Hide)?.flush()?;
|
||||
loop {
|
||||
stdout.queue(Clear(ClearType::All))?.queue(Hide)?;
|
||||
render(state, &mut stdout, (0, 0))?;
|
||||
stdout.flush()?;
|
||||
std::thread::sleep(sleep);
|
||||
handle(state, &input.recv()?)?;
|
||||
if state.exited() {
|
||||
crossterm::terminal::disable_raw_mode()?;
|
||||
stdout.queue(Clear(ClearType::All))?.queue(Show)?.flush()?;
|
||||
break
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
//pub fn run_tui () -> Result<(), Box<dyn Error>> {
|
||||
//let mut stdout = stdout();
|
||||
//let mut app = Mixer::new()?;
|
||||
//let sleep = std::time::Duration::from_millis(16);
|
||||
//crossterm::terminal::enable_raw_mode()?;
|
||||
//let (tx, input) = channel::<crossterm::event::Event>();
|
||||
//let exited = Arc::new(AtomicBool::new(false));
|
||||
//let exit_input_thread = exited.clone();
|
||||
//spawn(move || {
|
||||
//loop {
|
||||
//// Exit if flag is set
|
||||
//if exit_input_thread.fetch_and(true, Ordering::Relaxed) {
|
||||
//break
|
||||
//}
|
||||
//// Listen for events and send them to the main thread
|
||||
//if crossterm::event::poll(Duration::from_millis(100)).is_ok() {
|
||||
//if tx.send(crossterm::event::read().unwrap()).is_err() {
|
||||
//break
|
||||
//}
|
||||
//}
|
||||
//}
|
||||
//});
|
||||
//loop {
|
||||
//render(&mut app, &mut stdout, (0, 0))?;
|
||||
//handle(&mut app, input.recv()?)?;
|
||||
//if app.exit {
|
||||
//app.stdout.queue(cursor::Show)?.flush()?;
|
||||
//crossterm::terminal::disable_raw_mode()?;
|
||||
//break
|
||||
//}
|
||||
//}
|
||||
//Ok(())
|
||||
//}
|
||||
|
||||
//pub fn run_tui () -> Result<(), Box<dyn Error>> {
|
||||
//let mut app = Self::new()?;
|
||||
//let mut stdout = std::io::stdout();
|
||||
//let sleep = std::time::Duration::from_millis(16);
|
||||
//crossterm::terminal::enable_raw_mode()?;
|
||||
//let (tx, input) = channel::<crossterm::event::Event>();
|
||||
//let exited = Arc::new(AtomicBool::new(false));
|
||||
//// Spawn the input thread
|
||||
//let exit_input_thread = exited.clone();
|
||||
//spawn(move || {
|
||||
//loop {
|
||||
//// Exit if flag is set
|
||||
//if exit_input_thread.fetch_and(true, Ordering::Relaxed) {
|
||||
//break
|
||||
//}
|
||||
//// Listen for events and send them to the main thread
|
||||
//if crossterm::event::poll(Duration::from_millis(100)).is_ok() {
|
||||
//if tx.send(crossterm::event::read().unwrap()).is_err() {
|
||||
//break
|
||||
//}
|
||||
//}
|
||||
//}
|
||||
//});
|
||||
//loop {
|
||||
//use crossterm::{*, terminal::{Clear, ClearType}, cursor::Hide};
|
||||
//stdout.queue(Clear(ClearType::All))?.queue(Hide)?;
|
||||
//render(&mut app, &mut stdout, (0, 0))?;
|
||||
//stdout.flush()?;
|
||||
//handle(&mut app, input.recv()?)?;
|
||||
//if app.exit {
|
||||
//stdout.queue(cursor::Hide)?.flush()?;
|
||||
//crossterm::terminal::disable_raw_mode()?;
|
||||
//break
|
||||
//}
|
||||
//}
|
||||
//Ok(())
|
||||
//}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue