Fix frame hanging

itome · Jun 5, 2024 · b448eee · b448eee
1 parent 3223cd5
commit b448eee
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 41 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -102,7 +102,7 @@ impl App {
 
         Ok(Self {
             tick_rate: 4.0,
-            frame_rate: 24.0,
+            frame_rate: 60.0,
             project_root: project_root.clone(),
             use_fvm,
             components: HashMap::from([

diff --git a/src/tui.rs b/src/tui.rs
@@ -16,7 +16,7 @@ use futures::{FutureExt, StreamExt};
 use ratatui::backend::CrosstermBackend as Backend;
 use serde::{Deserialize, Serialize};
 use tokio::{
-    sync::mpsc::{self, UnboundedReceiver, UnboundedSender},
+    sync::mpsc::{self, Receiver, Sender, UnboundedReceiver, UnboundedSender},
     task::JoinHandle,
 };
 use tokio_util::sync::CancellationToken;
@@ -105,6 +105,7 @@ impl Tui {
         self.cancellation_token = CancellationToken::new();
         let _cancellation_token = self.cancellation_token.clone();
         let _event_tx = self.event_tx.clone();
+        let (render_tx, mut render_rx) = mpsc::channel(1);
         self.task = tokio::spawn(async move {
             let mut reader = crossterm::event::EventStream::new();
             let mut tick_interval = tokio::time::interval(tick_delay);
@@ -115,47 +116,53 @@ impl Tui {
                 let render_delay = render_interval.tick();
                 let crossterm_event = reader.next().fuse();
                 tokio::select! {
-                  _ = _cancellation_token.cancelled() => {
-                    break;
-                  }
-                  maybe_event = crossterm_event => {
-                    match maybe_event {
-                      Some(Ok(evt)) => {
-                        match evt {
-                          CrosstermEvent::Key(key) => {
-                            if key.kind == KeyEventKind::Press {
-                              _event_tx.send(Event::Key(key)).unwrap();
+                    _ = _cancellation_token.cancelled() => {
+                        break;
+                    }
+                    maybe_event = crossterm_event => {
+                        match maybe_event {
+                            Some(Ok(evt)) => {
+                                match evt {
+                                    CrosstermEvent::Key(key) => {
+                                        if key.kind == KeyEventKind::Press {
+                                            _event_tx.send(Event::Key(key)).unwrap();
+                                        }
+                                    },
+                                    CrosstermEvent::Mouse(mouse) => {
+                                        _event_tx.send(Event::Mouse(mouse)).unwrap();
+                                    },
+                                    CrosstermEvent::Resize(x, y) => {
+                                        _event_tx.send(Event::Resize(x, y)).unwrap();
+                                    },
+                                    CrosstermEvent::FocusLost => {
+                                        _event_tx.send(Event::FocusLost).unwrap();
+                                    },
+                                    CrosstermEvent::FocusGained => {
+                                        _event_tx.send(Event::FocusGained).unwrap();
+                                    },
+                                    CrosstermEvent::Paste(s) => {
+                                        _event_tx.send(Event::Paste(s)).unwrap();
+                                    },
+                                }
+                            }
+                            Some(Err(_)) => {
+                                _event_tx.send(Event::Error).unwrap();
                             }
-                          },
-                          CrosstermEvent::Mouse(mouse) => {
-                            _event_tx.send(Event::Mouse(mouse)).unwrap();
-                          },
-                          CrosstermEvent::Resize(x, y) => {
-                            _event_tx.send(Event::Resize(x, y)).unwrap();
-                          },
-                          CrosstermEvent::FocusLost => {
-                            _event_tx.send(Event::FocusLost).unwrap();
-                          },
-                          CrosstermEvent::FocusGained => {
-                            _event_tx.send(Event::FocusGained).unwrap();
-                          },
-                          CrosstermEvent::Paste(s) => {
-                            _event_tx.send(Event::Paste(s)).unwrap();
-                          },
+                            None => {},
                         }
-                      }
-                      Some(Err(_)) => {
-                        _event_tx.send(Event::Error).unwrap();
-                      }
-                      None => {},
-                    }
-                  },
-                  _ = tick_delay => {
-                      _event_tx.send(Event::Tick).unwrap();
-                  },
-                  _ = render_delay => {
-                      _event_tx.send(Event::Render).unwrap();
-                  },
+                    },
+                    _ = tick_delay => {
+                        _event_tx.send(Event::Tick).unwrap();
+                    },
+                    // Render event is sent via bounded channel to avoid blocking the event loop
+                    _ = render_delay => {
+                        if let Err(e) = render_tx.try_send(Event::Render) {
+                            log::error!("Failed to send render event: {}", e);
+                        }
+                    },
+                    _ = render_rx.recv() => {
+                        _event_tx.send(Event::Render).unwrap();
+                    },
                 }
             }
         });