Chatgippity

Author: suchmememanyskill

src/hardware/framebuffer_platform.rs

@@ -1,7 +1,7 @@
 // Based on https://github.com/nilclass/slint-framebuffer-example
 
-use std::{cell::{Cell, RefCell}, rc::Rc, sync::Mutex, time::{Duration, Instant}};
-use evdev::{Device, EventSummary};
+use std::{cell::RefCell, rc::Rc, sync::{Arc, Mutex}, time::{Duration, Instant}, collections::VecDeque};
+use evdev::Device;
 use linuxfb::{double::Buffer, Framebuffer};
 use slint::{platform::{software_renderer::{MinimalSoftwareWindow, PremultipliedRgbaColor, RepaintBufferType, Rgb565Pixel, TargetPixel}, Platform, WindowEvent}, PhysicalSize, Rgb8Pixel};
 
@@ -20,6 +20,8 @@ pub struct FramebufferPlatform {
     stride: usize,
     bytes_per_pixel: usize,
     touch_device: Option<Box<dyn TouchPlatform>>,
+    event_queue: Arc<Mutex<VecDeque<Box<dyn FnOnce() + Send>>>>,
+    quit_requested: Arc<Mutex<bool>>,
 }
 
 impl FramebufferPlatform {
@@ -56,6 +58,8 @@ impl FramebufferPlatform {
             stride: size.0 as usize,
             bytes_per_pixel: bytes_per_pixel as usize,
             touch_device: mutex_touch_device,
+            event_queue: Arc::new(Mutex::new(VecDeque::new())),
+            quit_requested: Arc::new(Mutex::new(false)),
         }
     }
 }
@@ -87,14 +91,69 @@ impl TargetPixel for PremultipliedAbgrColor {
     }
 }
 
+struct FramebufferEventLoopProxy {
+    event_queue: Arc<Mutex<VecDeque<Box<dyn FnOnce() + Send>>>>,
+    quit_requested: Arc<Mutex<bool>>,
+}
+
+impl FramebufferEventLoopProxy {
+    fn new(event_queue: Arc<Mutex<VecDeque<Box<dyn FnOnce() + Send>>>>, quit_requested: Arc<Mutex<bool>>) -> Self {
+        Self { event_queue, quit_requested }
+    }
+}
+
+impl slint::platform::EventLoopProxy for FramebufferEventLoopProxy {
+    fn quit_event_loop(&self) -> Result<(), slint::EventLoopError> {
+        if let Ok(mut quit_flag) = self.quit_requested.lock() {
+            *quit_flag = true;
+            Ok(())
+        } else {
+            Err(slint::EventLoopError::EventLoopTerminated)
+        }
+    }
+
+    fn invoke_from_event_loop(
+        &self,
+        event: Box<dyn FnOnce() + Send>,
+    ) -> Result<(), slint::EventLoopError> {
+        if let Ok(mut queue) = self.event_queue.lock() {
+            queue.push_back(event);
+            Ok(())
+        } else {
+            Err(slint::EventLoopError::EventLoopTerminated)
+        }
+    }
+}
+
 impl Platform for FramebufferPlatform {
     fn create_window_adapter(&self) -> Result<Rc<dyn slint::platform::WindowAdapter>, slint::PlatformError> {
         Ok(self.window.clone())
     }
 
+    fn new_event_loop_proxy(&self) -> Option<Box<dyn slint::platform::EventLoopProxy>> {
+        Some(Box::new(FramebufferEventLoopProxy::new(
+            self.event_queue.clone(),
+            self.quit_requested.clone()
+        )))
+    }
+
     fn run_event_loop(&self) -> Result<(), slint::PlatformError> {
         let mut fb = self.fb.borrow_mut();
         loop {
+            // Check for quit request
+            if let Ok(quit_flag) = self.quit_requested.lock() {
+                if *quit_flag {
+                    break;
+                }
+            }
+
+            // Process queued events from other threads
+            if let Ok(mut queue) = self.event_queue.lock() {
+                while let Some(event) = queue.pop_front() {
+                    event();
+                }
+            }
+
             slint::platform::update_timers_and_animations();
 
             if let Some(touch_device) = &self.touch_device
@@ -134,5 +193,6 @@ impl Platform for FramebufferPlatform {
                 std::thread::sleep(slint::platform::duration_until_next_timer_update().unwrap_or(Duration::from_millis(100)));
             }
         }
+        Ok(())
     }
 }

src/main.rs

@@ -43,7 +43,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let ui_weak_3 = ui.as_weak();
 
     tokio::spawn(async move {
-        tokio::time::sleep(Duration::from_secs(1)).await;
         moonraker_connection.connection_loop().await;
     });