Port to crossterm

1 files changed, 44 insertions, 19 deletions

diff --git a/src/main.rs b/src/main.rs
index a7b3e59..e04f92c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,31 +1,56 @@
 pub mod display;
 pub mod game;
 
+use crossterm::{cursor, event, execute, queue, terminal};
 use game::{Board, Dir::*, Pos};
+use std::io::Write;
 
 fn main() {
     let mut rng = rand::thread_rng();
-    let getch = getch::Getch::new();
-    let board = Board::new(Pos::new(4, 4));
 
+    let mut stdout = std::io::stdout();
+    queue!(stdout, terminal::EnterAlternateScreen, cursor::Hide).unwrap();
+
+    terminal::enable_raw_mode().unwrap();
+
+    let board = Board::new(Pos::new(4, 4));
     board.spawn(&mut rng);
-    clearscreen::clear().unwrap();
-    print!("{board}");
-
-    while let Ok(ch) = getch.getch() {
-        if !board.step(match ch {
-            b'w' => Up,
-            b'a' => Left,
-            b's' => Down,
-            b'd' => Right,
-            b'q' => break,
-            _ => continue,
-        }) {
-            continue;
-        }
+    board.spawn(&mut rng);
+
+    loop {
+        queue!(
+            stdout,
+            terminal::Clear(terminal::ClearType::All),
+            cursor::MoveTo(0, 0)
+        )
+        .unwrap();
+        display::display_board(&mut stdout, &board).unwrap();
+        stdout.flush().unwrap();
 
-        board.spawn(&mut rng);
-        clearscreen::clear().unwrap();
-        print!("{board}");
+        if let Ok(evt) = event::read() {
+            match evt {
+                event::Event::Key(event::KeyEvent { code, .. }) => match code {
+                    event::KeyCode::Char(ch) => {
+                        if board.step(match ch.to_ascii_lowercase() {
+                            'w' => Up,
+                            'a' => Left,
+                            's' => Down,
+                            'd' => Right,
+                            'q' => break,
+                            _ => continue,
+                        }) {
+                            board.spawn(&mut rng);
+                        }
+                    }
+                    _ => {}
+                },
+                _ => {}
+            }
+        } else {
+            break;
+        }
     }
+
+    terminal::disable_raw_mode().unwrap();
+    execute!(stdout, cursor::Show, terminal::LeaveAlternateScreen).unwrap();
 }