wip

Author: prokopyl

src/platform/x11/error.rs

@@ -2,6 +2,7 @@ use crate::platform::x11::drag_n_drop::ParseError;
 use crate::platform::x11::xcb_connection::GetPropertyError;
 use crate::tracing::warn;
 use crate::wrappers::xlib::{DisplayOpenFailedError, InitThreadsFailedError};
+use crate::HandlerError;
 use x11_dl::error::OpenError;
 use x11rb::connection::RequestConnection;
 use x11rb::cookie::{Cookie, VoidCookie};
@@ -20,6 +21,7 @@ pub enum Error {
     GetProperty(GetPropertyError),
     Connect(ConnectError),
     DisplayOpenFailed(DisplayOpenFailedError),
+    Handler(HandlerError),
     #[cfg(feature = "opengl")]
     XLib(crate::wrappers::xlib::XLibError),
     #[cfg(feature = "opengl")]
@@ -74,6 +76,12 @@ impl From<X11Error> for Error {
     }
 }
 
+impl From<HandlerError> for Error {
+    fn from(value: HandlerError) -> Self {
+        Self::Handler(value)
+    }
+}
+
 #[cfg(feature = "opengl")]
 impl From<crate::wrappers::xlib::XLibError> for Error {
     fn from(value: crate::wrappers::xlib::XLibError) -> Self {

src/platform/x11/gl.rs

@@ -20,18 +20,6 @@ pub enum CreationFailedError {
     OpenError(OpenError),
 }
 
-impl From<XLibError> for GlError {
-    fn from(e: XLibError) -> Self {
-        GlError::CreationFailed(CreationFailedError::X11Error(e))
-    }
-}
-
-impl From<OpenError> for GlError {
-    fn from(e: OpenError) -> Self {
-        GlError::CreationFailed(CreationFailedError::OpenError(e))
-    }
-}
-
 pub type GlContext = Rc<GlContextInner>;
 
 pub struct GlContextInner {

src/platform/x11/window.rs

@@ -164,7 +164,7 @@ impl Window {
             gl_context,
         ));
 
-        let handler = build.build(WindowContext::new(Rc::clone(&inner)));
+        let handler = build.build(WindowContext::new(Rc::clone(&inner)))?;
 
         let _ = tx.send(Ok(window_id));