|
1 |
| -#[allow(dead_code)] |
2 |
| -mod util; |
3 |
| - |
4 |
| -use crate::util::event::{Event, Events}; |
5 |
| -use std::{error::Error, io}; |
6 |
| -use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; |
| 1 | +use crossterm::{ |
| 2 | + event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode}, |
| 3 | + execute, |
| 4 | + terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, |
| 5 | +}; |
| 6 | +use std::{ |
| 7 | + error::Error, |
| 8 | + io, |
| 9 | + time::{Duration, Instant}, |
| 10 | +}; |
7 | 11 | use tui::{
|
8 |
| - backend::TermionBackend, |
| 12 | + backend::{Backend, CrosstermBackend}, |
9 | 13 | layout::{Constraint, Direction, Layout},
|
10 | 14 | style::{Color, Modifier, Style},
|
11 | 15 | widgets::{BarChart, Block, Borders},
|
12 |
| - Terminal, |
| 16 | + Frame, Terminal, |
13 | 17 | };
|
14 | 18 |
|
15 | 19 | struct App<'a> {
|
@@ -48,85 +52,111 @@ impl<'a> App<'a> {
|
48 | 52 | }
|
49 | 53 | }
|
50 | 54 |
|
51 |
| - fn update(&mut self) { |
| 55 | + fn on_tick(&mut self) { |
52 | 56 | let value = self.data.pop().unwrap();
|
53 | 57 | self.data.insert(0, value);
|
54 | 58 | }
|
55 | 59 | }
|
56 | 60 |
|
57 | 61 | fn main() -> Result<(), Box<dyn Error>> {
|
58 |
| - // Terminal initialization |
59 |
| - let stdout = io::stdout().into_raw_mode()?; |
60 |
| - let stdout = MouseTerminal::from(stdout); |
61 |
| - let stdout = AlternateScreen::from(stdout); |
62 |
| - let backend = TermionBackend::new(stdout); |
| 62 | + // setup terminal |
| 63 | + enable_raw_mode()?; |
| 64 | + let mut stdout = io::stdout(); |
| 65 | + execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?; |
| 66 | + let backend = CrosstermBackend::new(stdout); |
63 | 67 | let mut terminal = Terminal::new(backend)?;
|
64 | 68 |
|
65 |
| - // Setup event handlers |
66 |
| - let events = Events::new(); |
67 |
| - |
68 |
| - // App |
69 |
| - let mut app = App::new(); |
| 69 | + // create app and run it |
| 70 | + let tick_rate = Duration::from_millis(250); |
| 71 | + let app = App::new(); |
| 72 | + let res = run_app(&mut terminal, app, tick_rate); |
70 | 73 |
|
71 |
| - loop { |
72 |
| - terminal.draw(|f| { |
73 |
| - let chunks = Layout::default() |
74 |
| - .direction(Direction::Vertical) |
75 |
| - .margin(2) |
76 |
| - .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) |
77 |
| - .split(f.size()); |
78 |
| - let barchart = BarChart::default() |
79 |
| - .block(Block::default().title("Data1").borders(Borders::ALL)) |
80 |
| - .data(&app.data) |
81 |
| - .bar_width(9) |
82 |
| - .bar_style(Style::default().fg(Color::Yellow)) |
83 |
| - .value_style(Style::default().fg(Color::Black).bg(Color::Yellow)); |
84 |
| - f.render_widget(barchart, chunks[0]); |
| 74 | + // restore terminal |
| 75 | + disable_raw_mode()?; |
| 76 | + execute!( |
| 77 | + terminal.backend_mut(), |
| 78 | + LeaveAlternateScreen, |
| 79 | + DisableMouseCapture |
| 80 | + )?; |
| 81 | + terminal.show_cursor()?; |
85 | 82 |
|
86 |
| - let chunks = Layout::default() |
87 |
| - .direction(Direction::Horizontal) |
88 |
| - .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) |
89 |
| - .split(chunks[1]); |
| 83 | + if let Err(err) = res { |
| 84 | + println!("{:?}", err) |
| 85 | + } |
90 | 86 |
|
91 |
| - let barchart = BarChart::default() |
92 |
| - .block(Block::default().title("Data2").borders(Borders::ALL)) |
93 |
| - .data(&app.data) |
94 |
| - .bar_width(5) |
95 |
| - .bar_gap(3) |
96 |
| - .bar_style(Style::default().fg(Color::Green)) |
97 |
| - .value_style( |
98 |
| - Style::default() |
99 |
| - .bg(Color::Green) |
100 |
| - .add_modifier(Modifier::BOLD), |
101 |
| - ); |
102 |
| - f.render_widget(barchart, chunks[0]); |
| 87 | + Ok(()) |
| 88 | +} |
103 | 89 |
|
104 |
| - let barchart = BarChart::default() |
105 |
| - .block(Block::default().title("Data3").borders(Borders::ALL)) |
106 |
| - .data(&app.data) |
107 |
| - .bar_style(Style::default().fg(Color::Red)) |
108 |
| - .bar_width(7) |
109 |
| - .bar_gap(0) |
110 |
| - .value_style(Style::default().bg(Color::Red)) |
111 |
| - .label_style( |
112 |
| - Style::default() |
113 |
| - .fg(Color::Cyan) |
114 |
| - .add_modifier(Modifier::ITALIC), |
115 |
| - ); |
116 |
| - f.render_widget(barchart, chunks[1]); |
117 |
| - })?; |
| 90 | +fn run_app<B: Backend>( |
| 91 | + terminal: &mut Terminal<B>, |
| 92 | + mut app: App, |
| 93 | + tick_rate: Duration, |
| 94 | +) -> io::Result<()> { |
| 95 | + let mut last_tick = Instant::now(); |
| 96 | + loop { |
| 97 | + terminal.draw(|f| ui(f, &mut app))?; |
118 | 98 |
|
119 |
| - match events.next()? { |
120 |
| - Event::Input(input) => { |
121 |
| - if input == Key::Char('q') { |
122 |
| - break; |
| 99 | + let timeout = tick_rate |
| 100 | + .checked_sub(last_tick.elapsed()) |
| 101 | + .unwrap_or_else(|| Duration::from_secs(0)); |
| 102 | + if crossterm::event::poll(timeout)? { |
| 103 | + if let Event::Key(key) = event::read()? { |
| 104 | + match key.code { |
| 105 | + KeyCode::Char('q') => return Ok(()), |
| 106 | + _ => {} |
123 | 107 | }
|
124 | 108 | }
|
125 |
| - Event::Tick => { |
126 |
| - app.update(); |
127 |
| - } |
| 109 | + } |
| 110 | + if last_tick.elapsed() >= tick_rate { |
| 111 | + app.on_tick(); |
| 112 | + last_tick = Instant::now(); |
128 | 113 | }
|
129 | 114 | }
|
| 115 | +} |
130 | 116 |
|
131 |
| - Ok(()) |
| 117 | +fn ui<B: Backend>(f: &mut Frame<B>, app: &App) { |
| 118 | + let chunks = Layout::default() |
| 119 | + .direction(Direction::Vertical) |
| 120 | + .margin(2) |
| 121 | + .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) |
| 122 | + .split(f.size()); |
| 123 | + let barchart = BarChart::default() |
| 124 | + .block(Block::default().title("Data1").borders(Borders::ALL)) |
| 125 | + .data(&app.data) |
| 126 | + .bar_width(9) |
| 127 | + .bar_style(Style::default().fg(Color::Yellow)) |
| 128 | + .value_style(Style::default().fg(Color::Black).bg(Color::Yellow)); |
| 129 | + f.render_widget(barchart, chunks[0]); |
| 130 | + |
| 131 | + let chunks = Layout::default() |
| 132 | + .direction(Direction::Horizontal) |
| 133 | + .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) |
| 134 | + .split(chunks[1]); |
| 135 | + |
| 136 | + let barchart = BarChart::default() |
| 137 | + .block(Block::default().title("Data2").borders(Borders::ALL)) |
| 138 | + .data(&app.data) |
| 139 | + .bar_width(5) |
| 140 | + .bar_gap(3) |
| 141 | + .bar_style(Style::default().fg(Color::Green)) |
| 142 | + .value_style( |
| 143 | + Style::default() |
| 144 | + .bg(Color::Green) |
| 145 | + .add_modifier(Modifier::BOLD), |
| 146 | + ); |
| 147 | + f.render_widget(barchart, chunks[0]); |
| 148 | + |
| 149 | + let barchart = BarChart::default() |
| 150 | + .block(Block::default().title("Data3").borders(Borders::ALL)) |
| 151 | + .data(&app.data) |
| 152 | + .bar_style(Style::default().fg(Color::Red)) |
| 153 | + .bar_width(7) |
| 154 | + .bar_gap(0) |
| 155 | + .value_style(Style::default().bg(Color::Red)) |
| 156 | + .label_style( |
| 157 | + Style::default() |
| 158 | + .fg(Color::Cyan) |
| 159 | + .add_modifier(Modifier::ITALIC), |
| 160 | + ); |
| 161 | + f.render_widget(barchart, chunks[1]); |
132 | 162 | }
|
0 commit comments