wip

Author: prokopyl

examples/open_parented/src/main.rs

@@ -130,7 +130,7 @@ impl WindowHandler for ChildWindowHandler {
 fn main() -> Result<(), baseview::Error> {
     let window_open_options = WindowOpenOptions::new().with_size(LogicalSize::new(512.0, 512.0));
 
-    baseview::create_window(window_open_options, ParentWindowHandler::new)?.run_until_closed();
+    baseview::create_window(window_open_options, ParentWindowHandler::new)?.run_until_closed()?;
 
     Ok(())
 }

examples/open_window/src/main.rs

@@ -167,7 +167,7 @@ fn main() -> Result<(), baseview::Error> {
             damaged: true.into(),
         })
     })?
-    .run_until_closed();
+    .run_until_closed()?;
 
     Ok(())
 }

examples/render_femtovg/src/main.rs

@@ -123,7 +123,7 @@ fn main() -> Result<(), baseview::Error> {
         .with_size(LogicalSize::new(512, 512))
         .with_gl_config(GlConfig { alpha_bits: 8, ..GlConfig::default() });
 
-    baseview::create_window(window_open_options, FemtovgExample::new)?.run_until_closed();
+    baseview::create_window(window_open_options, FemtovgExample::new)?.run_until_closed()?;
     Ok(())
 }
 

examples/render_wgpu/src/main.rs

@@ -214,7 +214,7 @@ fn main() -> Result<(), baseview::Error> {
         .with_size(LogicalSize::new(512, 512));
 
     baseview::create_window(window_open_options, |c| pollster::block_on(WgpuExample::new(c)))?
-        .run_until_closed();
+        .run_until_closed()?;
 
     Ok(())
 }

src/platform/x11/error.rs

@@ -13,7 +13,7 @@ use x11rb::x11_utils::{TryParse, X11Error};
 #[derive(Debug)]
 pub enum Error {
     CreationFailed(String),
-    RunError(String),
+    Run(String),
     Io(std::io::Error),
     DylibOpen(OpenError),
     InitThreadsFailed(InitThreadsFailedError),

src/platform/x11/event_loop.rs

@@ -3,7 +3,6 @@ use super::keyboard::{convert_key_press_event, convert_key_release_event, key_mo
 use super::*;
 use std::result::Result;
 
-use crate::platform::x11::window_thread::WindowThreadShared;
 use crate::warn;
 use crate::wrappers::xkbcommon::XkbcommonState;
 use crate::{Event, MouseButton, MouseEvent, ScrollDelta, WindowEvent, WindowHandler, WindowSize};
@@ -29,14 +28,13 @@ pub(crate) struct EventLoop {
     xkb_state: Option<XkbcommonState>,
 
     run_error: Option<Error>,
-    pub(crate) shared: Arc<WindowThreadShared>,
 }
 
 const FRAME_INTERVAL: Duration = Duration::from_millis(15);
 
 impl EventLoop {
     pub fn new(
-        window: Rc<WindowInner>, handler: Box<dyn WindowHandler>, shared: Arc<WindowThreadShared>,
+        window: Rc<WindowInner>, handler: Box<dyn WindowHandler>,
         inner: &mut calloop::EventLoop<'static, Self>,
     ) -> Result<Self, Error> {
         let loop_handle = inner.handle();
@@ -59,15 +57,10 @@ impl EventLoop {
             drag_n_drop: DragNDropState::NoCurrentSession,
             xkb_state: XkbcommonState::new(&window.connection),
             run_error: None,
-            shared,
             window,
         })
     }
 
-    pub fn window_id(&self) -> NonZeroU32 {
-        self.window.xcb_window.id()
-    }
-
     #[inline]
     fn drain_xcb_events(&mut self) -> Result<(), ConnectionError> {
         // the X server has a tendency to send spurious/extraneous configure notify events when a

src/platform/x11/window_shared.rs

@@ -47,7 +47,7 @@ impl WindowInner {
             WindowVisualConfig::find_best_visual_config_for_gl(&xcb_connection, options.gl_config)?;
 
         #[cfg(not(feature = "opengl"))]
-        let visual_info = WindowVisualConfig::find_best_visual_config(&connection)?;
+        let visual_info = WindowVisualConfig::find_best_visual_config(&xcb_connection)?;
 
         let connection = Rc::new(xcb_connection);
 

src/platform/x11/window_thread.rs

@@ -5,7 +5,6 @@ use crate::platform::x11::window_shared::WindowInner;
 use crate::{WindowContext, WindowOpenOptions};
 use calloop::LoopSignal;
 use std::cell::Cell;
-use std::num::NonZeroU32;
 use std::panic::resume_unwind;
 use std::rc::Rc;
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -63,7 +62,7 @@ impl WindowThreadHandle {
         }
 
         if let Some(e) = self.shared.final_error.lock().unwrap().take() {
-            return Err(Error::RunError(e));
+            return Err(Error::Run(e));
         }
 
         Ok(())
@@ -79,7 +78,9 @@ impl Drop for WindowThreadHandle {
         self.loop_signal.stop();
         self.loop_signal.wakeup();
 
-        self.run_until_closed();
+        if let Err(e) = self.run_until_closed() {
+            crate::warn!("Error while closing window: {}", e)
+        }
     }
 }
 
@@ -101,7 +102,7 @@ impl WindowThread {
         let mut ev_loop = calloop::EventLoop::try_new()?;
         let inner = WindowInner::create(options, &ev_loop)?;
         let handler = handler.build(WindowContext::new(Rc::clone(&inner)))?;
-        let event_loop = EventLoop::new(inner, handler, shared.clone(), &mut ev_loop)?;
+        let event_loop = EventLoop::new(inner, handler, &mut ev_loop)?;
 
         Ok(Self { event_loop, ev_loop, shared })
     }