lib: Introduce typed inline and fullscreen terminal

This commit is contained in:
Erik Kundt
2024-09-26 14:16:13 +02:00
parent a147d2359d
commit 066e7502a4
3 changed files with 81 additions and 36 deletions
+6 -9
View File
@@ -21,6 +21,7 @@ use crate::event::Event;
use crate::store::Update;
use crate::task::Interrupted;
use crate::terminal;
use crate::terminal::Terminal;
use crate::ui::theme::Theme;
use crate::ui::{Column, ToRow};
@@ -53,20 +54,19 @@ impl Frontend {
{
let mut ticker = tokio::time::interval(RENDERING_TICK_RATE);
let mut terminal = terminal::setup(viewport)?;
let mut terminal = Terminal::try_from(viewport)?;
let mut events_rx = terminal::events();
let mut state = state_rx.recv().await.unwrap();
let mut ctx = Context::default().with_sender(state_tx);
let mut events_rx = terminal::events();
let result: anyhow::Result<Interrupted<P>> = loop {
tokio::select! {
// Tick to terminate the select every N milliseconds
_ = ticker.tick() => (),
// Handle input events
Some(event) = events_rx.recv() => {
log::info!("Received event: {:?}", event);
match event {
Event::Key(key) => ctx.store_input(key),
Event::Resize => (),
@@ -79,9 +79,7 @@ impl Frontend {
// Catch and handle interrupt signal to gracefully shutdown
Ok(interrupted) = interrupt_rx.recv() => {
log::info!("Received interrupt: {:?}", interrupted);
let size = terminal.get_frame().size();
let _ = terminal.set_cursor(size.x, size.y);
terminal.restore()?;
break Ok(interrupted);
}
@@ -96,8 +94,7 @@ impl Frontend {
ctx.clear_inputs();
};
terminal::restore(&mut terminal)?;
terminal.restore()?;
result
}
+5 -5
View File
@@ -11,6 +11,7 @@ use crate::event::Event;
use crate::store::Update;
use crate::task::Interrupted;
use crate::terminal;
use crate::terminal::Terminal;
use crate::ui::rm::widget::RenderProps;
use crate::ui::rm::widget::Widget;
@@ -53,7 +54,7 @@ impl Frontend {
{
let mut ticker = tokio::time::interval(RENDERING_TICK_RATE);
let mut terminal = terminal::setup(viewport)?;
let mut terminal = Terminal::try_from(viewport)?;
let mut events_rx = terminal::events();
let mut root = {
@@ -67,6 +68,7 @@ impl Frontend {
tokio::select! {
// Tick to terminate the select every N milliseconds
_ = ticker.tick() => (),
// Handle input events
Some(event) = events_rx.recv() => match event {
Event::Key(key) => root.handle_event(key),
Event::Resize => (),
@@ -77,16 +79,14 @@ impl Frontend {
},
// Catch and handle interrupt signal to gracefully shutdown
Ok(interrupted) = interrupt_rx.recv() => {
let size = terminal.get_frame().size();
let _ = terminal.set_cursor(size.x, size.y);
terminal.restore()?;
break Ok(interrupted);
}
}
terminal.draw(|frame| root.render(RenderProps::from(frame.size()), frame))?;
};
terminal::restore(&mut terminal)?;
terminal.restore()?;
result
}