From 5bd36b139d8ba07bce7edb8828beec3f114b3271 Mon Sep 17 00:00:00 2001 From: Mroik Date: Mon, 27 Jan 2025 17:43:32 +0100 Subject: Implement app loop --- src/app.rs | 80 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 35 deletions(-) (limited to 'src/app.rs') diff --git a/src/app.rs b/src/app.rs index f0ffff0..7ba3da8 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,21 +1,26 @@ use std::{ error::Error, io::{stdout, Stdout}, - time::Duration, }; -use crossterm::event::{poll, read, KeyCode, KeyModifiers}; +use crossterm::{ + terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, + ExecutableCommand, +}; use rand::Rng; -use tokio::sync::mpsc::{channel, Receiver, Sender}; +use tokio::{ + spawn, + sync::mpsc::{channel, Receiver, Sender}, +}; -use crate::event::Event; +use crate::event::{handle_input, Event}; -const TICK_RATE: u64 = 1000 / 20; +pub const TICK_RATE: u64 = 1000 / 20; pub struct App { stdout: Stdout, quote: Vec, - event_tx: Sender, + pub event_tx: Sender, event_rx: Receiver, running: bool, } @@ -34,39 +39,44 @@ impl App { } } - pub async fn run(&mut self) { - todo!() - } + pub async fn run(&mut self) -> Result<(), Box> { + self.stdout.execute(EnterAlternateScreen)?; + enable_raw_mode()?; + + let (ks_tx, ks_rx): (Sender<()>, Receiver<()>) = channel(1); + let ev = self.event_tx.clone(); + spawn(async { + start_input_handler(ev, ks_rx).await; + }); - // TODO - // - [ ] Pause on focus lost - // - [ ] Invalidate on paste - async fn handle_input(&mut self) -> Result<(), Box> { + self.running = true; while self.running { - if poll(Duration::from_millis(TICK_RATE))? { - match read()? { - //crossterm::event::Event::FocusGained => todo!(), - //crossterm::event::Event::FocusLost => todo!(), - //crossterm::event::Event::Paste(_) => todo!(), - crossterm::event::Event::Key(key_event) => { - if key_event.code == KeyCode::Char('c') - && key_event.modifiers == KeyModifiers::CONTROL - { - self.event_tx.send(Event::Terminate).await?; - continue; - } - if key_event.code == KeyCode::Backspace { - self.event_tx.send(Event::Backspace).await?; - continue; - } - if let KeyCode::Char(c) = key_event.code { - self.event_tx.send(Event::KeyPress(c)).await?; - } - } - _ => (), - } + self.process().await?; + } + let _ = ks_tx.send(()); + + disable_raw_mode()?; + self.stdout.execute(LeaveAlternateScreen)?; + return Ok(()); + } + + async fn process(&mut self) -> Result<(), Box> { + match self.event_rx.recv().await.unwrap() { + Event::Terminate => { + self.running = false; } + Event::KeyPress(_) => todo!(), + Event::Backspace => todo!(), } return Ok(()); } } + +async fn start_input_handler(ev: Sender, mut kill_switch: Receiver<()>) { + loop { + tokio::select! { + _ = handle_input(&ev) => (), + _ = kill_switch.recv() => return, + } + } +} -- cgit v1.3