wip

Author: prokopyl

examples/render_femtovg/src/main.rs

@@ -104,7 +104,7 @@ impl WindowHandler for FemtovgExample {
             ) => {
                 self.current_mouse_position.set(position);
                 if position.y > 400. && !self.window_context.has_focus() {
-                    self.window_context.focus()
+                    let _ = self.window_context.focus();
                 }
                 self.damaged.set(true);
             }

src/context.rs

@@ -1,3 +1,4 @@
+use super::*;
 use crate::{platform, MouseCursor, WindowSize};
 use dpi::Size;
 use raw_window_handle::{
@@ -18,8 +19,9 @@ impl WindowContext {
     }
 
     /// Sets the [`MouseCursor`] icon to be displayed when the mouse cursor hovers this window.
-    pub fn set_mouse_cursor(&self, mouse_cursor: MouseCursor) {
-        self.inner.set_mouse_cursor(mouse_cursor);
+    pub fn set_mouse_cursor(&self, mouse_cursor: MouseCursor) -> Result<()> {
+        self.inner.set_mouse_cursor(mouse_cursor)?;
+        Ok(())
     }
 
     /// Requests the window to be closed.
@@ -38,16 +40,18 @@ impl WindowContext {
     }
 
     /// Focuses this window.
-    pub fn focus(&self) {
-        self.inner.focus();
+    pub fn focus(&self) -> Result<()> {
+        self.inner.focus()?;
+        Ok(())
     }
 
     /// Resizes this window to the given `size`.
     ///
     /// The given `size` can either be in [physical](dpi::PhysicalSize) or
     /// [logical](dpi::LogicalSize) pixels.
-    pub fn resize(&self, size: impl Into<Size>) {
-        self.inner.resize(size.into());
+    pub fn resize(&self, size: impl Into<Size>) -> Result<()> {
+        self.inner.resize(size.into())?;
+        Ok(())
     }
 
     /// Returns the current scale factor of this window.
@@ -78,13 +82,13 @@ impl WindowContext {
 }
 
 impl HasWindowHandle for WindowContext {
-    fn window_handle(&self) -> Result<WindowHandle<'_>, HandleError> {
+    fn window_handle(&self) -> core::result::Result<WindowHandle<'_>, HandleError> {
         self.inner.window_handle().ok_or(HandleError::Unavailable)
     }
 }
 
 impl HasDisplayHandle for WindowContext {
-    fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
+    fn display_handle(&self) -> core::result::Result<DisplayHandle<'_>, HandleError> {
         Ok(self.inner.display_handle())
     }
 }
@@ -124,13 +128,13 @@ const _: () = {
 };
 
 impl HasWindowHandle for PlatformHandle {
-    fn window_handle(&self) -> Result<WindowHandle<'_>, HandleError> {
+    fn window_handle(&self) -> core::result::Result<WindowHandle<'_>, HandleError> {
         self.inner.window_handle().ok_or(HandleError::Unavailable)
     }
 }
 
 impl HasDisplayHandle for PlatformHandle {
-    fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
+    fn display_handle(&self) -> core::result::Result<DisplayHandle<'_>, HandleError> {
         Ok(self.inner.display_handle())
     }
 }

src/lib.rs

@@ -24,6 +24,6 @@ pub use mouse_cursor::MouseCursor;
 pub use window::*;
 pub use window_open_options::*;
 
-pub(crate) use tracing::*;
+pub(crate) use tracing::warn;
 
 pub(crate) mod wrappers;

src/platform/macos/gl.rs

@@ -2,7 +2,7 @@
 
 use crate::gl::{GlConfig, Profile};
 use crate::platform::*;
-use crate::tracing::*;
+use crate::warn;
 use objc2::rc::Retained;
 use objc2::AllocAnyThread;
 use objc2::{MainThreadMarker, MainThreadOnly};

src/platform/win/gl.rs

@@ -5,7 +5,7 @@ use windows_core::{s, PCSTR};
 use windows_sys::Win32::Graphics::OpenGL::wglGetProcAddress;
 
 use crate::gl::*;
-use crate::tracing::warn;
+use crate::warn;
 use crate::wrappers::win32::window::{
     with_dummy_window, HWnd, OwnDeviceContext, PixelFormat, PixelFormatAttribs, WglContext,
     WglExtra,

src/platform/x11/drag_n_drop.rs

@@ -2,7 +2,7 @@ use super::xcb_connection::{Atoms, GetPropertyError};
 use super::*;
 use crate::handler::WindowHandler;
 use crate::platform::x11::error::ReplyExt;
-use crate::tracing::warn;
+use crate::warn;
 use crate::{DropData, Event, MouseEvent};
 use core::result::Result;
 use dpi::PhysicalPosition;

src/platform/x11/error.rs

@@ -1,6 +1,6 @@
 use crate::platform::x11::drag_n_drop::ParseError;
 use crate::platform::x11::xcb_connection::GetPropertyError;
-use crate::tracing::warn;
+use crate::warn;
 use crate::wrappers::xlib::{DisplayOpenFailedError, InitThreadsFailedError};
 use crate::HandlerError;
 use std::sync::mpsc::RecvError;

src/platform/x11/event_loop.rs

@@ -2,6 +2,7 @@ use super::drag_n_drop::DragNDropState;
 use super::keyboard::{convert_key_press_event, convert_key_release_event, key_mods};
 use super::*;
 
+use crate::warn;
 use crate::wrappers::connection_poller::{ConnectionPoller, PollStatus};
 use crate::wrappers::xkbcommon::XkbcommonState;
 use crate::{Event, MouseButton, MouseEvent, ScrollDelta, WindowEvent, WindowHandler, WindowSize};
@@ -59,11 +60,16 @@ impl EventLoop {
         }
 
         if let Some(size) = self.new_physical_size.take() {
-            self.window.window_size.set(size);
+            let previous = self.window.window_size.replace(size);
 
             let scale_factor = self.window.scaling_factor.get();
-
-            self.handler.resized(WindowSize::from_physical(size.cast(), scale_factor));
+            if let Err(e) =
+                self.handler.resized(WindowSize::from_physical(size.cast(), scale_factor))
+            {
+                warn!("Window Handler failed to resize: {}", e);
+                self.window.window_size.set(previous);
+                self.window.xcb_window.resize(previous.cast())?.check_warn();
+            }
         }
 
         Ok(())

src/platform/x11/window_shared.rs

@@ -6,9 +6,7 @@ use raw_window_handle::{DisplayHandle, XlibWindowHandle};
 use std::cell::Cell;
 use std::rc::Rc;
 use std::sync::Arc;
-use x11rb::protocol::xproto::{
-    ChangeWindowAttributesAux, ConfigureWindowAux, ConnectionExt, InputFocus, Visualid,
-};
+use x11rb::protocol::xproto::{ChangeWindowAttributesAux, ConnectionExt, InputFocus, Visualid};
 use x11rb::CURRENT_TIME;
 
 pub(crate) struct WindowInner {
@@ -90,16 +88,7 @@ impl WindowInner {
 
     pub fn resize(&self, size: Size) -> Result<()> {
         let new_physical_size = size.to_physical::<u32>(self.scaling_factor.get());
-
-        self.connection
-            .conn
-            .configure_window(
-                self.xcb_window.id().get(),
-                &ConfigureWindowAux::new()
-                    .width(new_physical_size.width)
-                    .height(new_physical_size.height),
-            )?
-            .check()?;
+        self.xcb_window.resize(new_physical_size)?;
 
         // This will trigger a `ConfigureNotify` event which will in turn change `self.window_info`
         // and notify the window handler about it

src/platform/x11/xcb_window.rs

@@ -5,9 +5,10 @@ use std::num::{NonZero, NonZeroU32};
 use std::rc::Rc;
 use x11rb::connection::Connection;
 use x11rb::cookie::VoidCookie;
-use x11rb::errors::ReplyOrIdError;
+use x11rb::errors::{ConnectionError, ReplyOrIdError};
 use x11rb::protocol::xproto::{
-    AtomEnum, ConnectionExt as _, CreateWindowAux, EventMask, PropMode, WindowClass,
+    AtomEnum, ConfigureWindowAux, ConnectionExt as _, CreateWindowAux, EventMask, PropMode,
+    WindowClass,
 };
 use x11rb::wrapper::ConnectionExt as _;
 use x11rb::xcb_ffi::XCBConnection;
@@ -63,6 +64,15 @@ impl XcbWindow {
         Ok(self.connection.conn.map_window(self.window_id.get())?)
     }
 
+    pub fn resize(
+        &self, size: PhysicalSize<u32>,
+    ) -> Result<VoidCookie<'_, XCBConnection>, ConnectionError> {
+        Ok(self.connection.conn.configure_window(
+            self.id().get(),
+            &ConfigureWindowAux::new().width(size.width).height(size.height),
+        )?)
+    }
+
     pub fn set_title(&self, title: &str) -> Result<VoidCookie<'_, XCBConnection>, ReplyOrIdError> {
         Ok(self.connection.conn.change_property8(
             PropMode::REPLACE,