Update raw-win-handle to 0.6

druid-shell/Cargo.toml

@@ -76,7 +76,7 @@ anyhow = "1.0.69"
 keyboard-types = { version = "0.6.2", default-features = false }
 
 # Optional dependencies
-raw-window-handle = { version = "0.5.0", optional = true, default-features = false }
+raw-window-handle = { version = "0.6.0", optional = true, default-features = false }
 
 [target.'cfg(target_os="windows")'.dependencies]
 scopeguard = "1.1.0"

druid-shell/src/backend/gtk/window.rs

@@ -24,7 +24,7 @@ use std::slice;
 use std::sync::{Arc, Mutex, Weak};
 use std::time::Instant;
 
-use cairo::glib::{Propagation, ControlFlow};
+use cairo::glib::{ControlFlow, Propagation};
 use gtk::gdk_pixbuf::Colorspace::Rgb;
 use gtk::gdk_pixbuf::Pixbuf;
 use gtk::glib::translate::FromGlib;
@@ -44,7 +44,7 @@ use instant::Duration;
 use tracing::{error, warn};
 
 #[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, XcbWindowHandle};
+use raw_window_handle::{HandleError, HasWindowHandle};
 
 use crate::kurbo::{Insets, Point, Rect, Size, Vec2};
 use crate::piet::{Piet, PietText, RenderContext};
@@ -122,11 +122,10 @@ impl PartialEq for WindowHandle {
 impl Eq for WindowHandle {}
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
-        error!("HasRawWindowHandle trait not implemented for gtk.");
-        // GTK is not a platform, and there's no empty generic handle. Pick XCB randomly as fallback.
-        RawWindowHandle::Xcb(XcbWindowHandle::empty())
+impl HasWindowHandle for WindowHandle {
+    fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, HandleError> {
+        tracing::error!("HasRawWindowHandle trait not implemented for gtk.");
+        Err(HandleError::NotSupported)
     }
 }
 

druid-shell/src/backend/mac/window.rs

@@ -40,7 +40,7 @@ use once_cell::sync::Lazy;
 use tracing::{debug, error, info};
 
 #[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{AppKitWindowHandle, HasRawWindowHandle, RawWindowHandle};
+use raw_window_handle::{AppKitWindowHandle, HandleError, HasWindowHandle, RawWindowHandle};
 
 use crate::kurbo::{Insets, Point, Rect, Size, Vec2};
 use crate::piet::{Piet, PietText, RenderContext};
@@ -1464,12 +1464,14 @@ impl WindowHandle {
 }
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
+impl HasWindowHandle for WindowHandle {
+    fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, HandleError> {
         let nsv = self.nsview.load();
-        let mut handle = AppKitWindowHandle::empty();
-        handle.ns_view = *nsv as *mut _;
-        RawWindowHandle::AppKit(handle)
+        let handle = AppKitWindowHandle::new(std::ptr::NonNull::from(&nsv).cast());
+
+        let handle =
+            unsafe { raw_window_handle::WindowHandle::borrow_raw(RawWindowHandle::AppKit(handle)) };
+        Ok(handle)
     }
 }
 

druid-shell/src/backend/wayland/window.rs

@@ -20,7 +20,7 @@ use wayland_protocols::xdg_shell::client::xdg_positioner;
 use wayland_protocols::xdg_shell::client::xdg_surface;
 
 #[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, WaylandWindowHandle};
+use raw_window_handle::{HandleError, HasWindowHandle};
 
 use super::application::{self, Timer};
 use super::{error::Error, menu::Menu, outputs, surfaces};
@@ -327,10 +327,10 @@ impl std::default::Default for WindowHandle {
 }
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
-        tracing::error!("HasRawWindowHandle trait not implemented for wasm.");
-        RawWindowHandle::Wayland(WaylandWindowHandle::empty())
+impl HasWindowHandle for WindowHandle {
+    fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, HandleError> {
+        tracing::error!("HasRawWindowHandle trait not implemented for wayland.");
+        Err(HandleError::NotSupported)
     }
 }
 

druid-shell/src/backend/web/window.rs

@@ -25,7 +25,7 @@ use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 
 #[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, WebWindowHandle};
+use raw_window_handle::{HandleError, HasWindowHandle};
 
 use crate::kurbo::{Insets, Point, Rect, Size, Vec2};
 
@@ -91,10 +91,10 @@ impl PartialEq for WindowHandle {
 impl Eq for WindowHandle {}
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
-        error!("HasRawWindowHandle trait not implemented for wasm.");
-        RawWindowHandle::Web(WebWindowHandle::empty())
+impl HasWindowHandle for WindowHandle {
+    fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, HandleError> {
+        tracing::error!("HasRawWindowHandle trait not implemented for wasm.");
+        Err(HandleError::NotSupported)
     }
 }
 

druid-shell/src/backend/windows/window.rs

@@ -47,9 +47,6 @@ use winapi::um::winuser::*;
 use winapi::Interface;
 use wio::com::ComPtr;
 
-#[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, Win32WindowHandle};
-
 use piet_common::d2d::{D2DFactory, DeviceContext};
 use piet_common::dwrite::DwriteFactory;
 
@@ -187,20 +184,28 @@ impl PartialEq for WindowHandle {
 impl Eq for WindowHandle {}
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
-        if let Some(hwnd) = self.get_hwnd() {
-            let mut handle = Win32WindowHandle::empty();
-            handle.hwnd = hwnd as *mut core::ffi::c_void;
-            handle.hinstance = unsafe {
-                winapi::um::libloaderapi::GetModuleHandleW(0 as winapi::um::winnt::LPCWSTR)
-                    as *mut core::ffi::c_void
-            };
-            RawWindowHandle::Win32(handle)
-        } else {
-            error!("Cannot retrieved HWND for window.");
-            RawWindowHandle::Win32(Win32WindowHandle::empty())
-        }
+impl raw_window_handle::HasWindowHandle for WindowHandle {
+    fn window_handle(
+        &self,
+    ) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
+        let hwnd = self
+            .get_hwnd()
+            .ok_or(raw_window_handle::HandleError::Unavailable)?;
+        let mut handle = raw_window_handle::Win32WindowHandle::new(unsafe {
+            std::num::NonZeroIsize::new_unchecked(hwnd as isize)
+        });
+        handle.hinstance = unsafe {
+            std::num::NonZeroIsize::new(winapi::um::libloaderapi::GetModuleHandleW(
+                0 as winapi::um::winnt::LPCWSTR,
+            ) as isize)
+        };
+        let handle = unsafe {
+            raw_window_handle::WindowHandle::borrow_raw(raw_window_handle::RawWindowHandle::Win32(
+                handle,
+            ))
+        };
+
+        Ok(handle)
     }
 }
 

druid-shell/src/backend/x11/window.rs

@@ -42,7 +42,7 @@ use x11rb::wrapper::ConnectionExt as _;
 use x11rb::xcb_ffi::XCBConnection;
 
 #[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle, XcbWindowHandle};
+use raw_window_handle::{HandleError, HasWindowHandle, RawWindowHandle, XcbWindowHandle};
 
 use crate::backend::shared::Timer;
 use crate::common_util::IdleCallback;
@@ -1903,12 +1903,14 @@ impl WindowHandle {
 }
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
-        let mut handle = XcbWindowHandle::empty();
-        handle.window = self.id;
-        handle.visual_id = self.visual_id;
-        RawWindowHandle::Xcb(handle)
+impl HasWindowHandle for WindowHandle {
+    fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, HandleError> {
+        let mut handle = XcbWindowHandle::new(std::num::NonZeroU32::new(self.id).unwrap());
+        handle.visual_id = std::num::NonZeroU32::new(self.visual_id);
+
+        let handle =
+            unsafe { raw_window_handle::WindowHandle::borrow_raw(RawWindowHandle::Xcb(handle)) };
+        Ok(handle)
     }
 }
 

druid-shell/src/window.rs

@@ -31,7 +31,7 @@ use crate::scale::Scale;
 use crate::text::{Event, InputHandler};
 use piet_common::PietText;
 #[cfg(feature = "raw-win-handle")]
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
+use raw_window_handle::{HandleError, HasWindowHandle};
 
 /// A token that uniquely identifies a running timer.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Hash)]
@@ -449,9 +449,9 @@ impl WindowHandle {
 }
 
 #[cfg(feature = "raw-win-handle")]
-unsafe impl HasRawWindowHandle for WindowHandle {
-    fn raw_window_handle(&self) -> RawWindowHandle {
-        self.0.raw_window_handle()
+impl HasWindowHandle for WindowHandle {
+    fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, HandleError> {
+        self.0.window_handle()
     }
 }
 

druid/src/lib.rs

@@ -217,7 +217,7 @@ pub use shell::{
 };
 
 #[cfg(feature = "raw-win-handle")]
-pub use crate::shell::raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
+pub use crate::shell::raw_window_handle::{self, HandleError, HasWindowHandle, RawWindowHandle};
 
 pub use crate::core::{WidgetPod, WidgetState};
 pub use app::{AppLauncher, WindowConfig, WindowDesc, WindowSizePolicy};

druid/src/widget/image.rs

@@ -318,11 +318,8 @@ mod tests {
                 // the padding color and the middle rows will not have any padding.
 
                 // Check that the middle row 400 pix wide is 200 black then 200 white.
-                let expecting: Vec<u8> = [
-                    [0, 0, 0, 255].repeat(200),
-                    [255, 255, 255, 255].repeat(200),
-                ]
-                .concat();
+                let expecting: Vec<u8> =
+                    [[0, 0, 0, 255].repeat(200), [255, 255, 255, 255].repeat(200)].concat();
                 assert_eq!(raw_pixels[400 * 300 * 4..400 * 301 * 4], expecting[..]);
 
                 // Check that all of the last 100 rows are all the background color.