Port to use raw-window-handle v0.6

CHANGELOG.md

@@ -15,6 +15,7 @@ And please only add new entries to the top of this list, right below the `# Unre
 - On macOS, add tabbing APIs on `WindowExtMacOS` and `EventLoopWindowTargetExtMacOS`.
 - **Breaking:** Rename `Window::set_inner_size` to `Window::request_inner_size` and indicate if the size was applied immediately.
 - On X11, fix false positive flagging of key repeats when pressing different keys with no release between presses.
+- Port types to use `raw-window-handle` v0.6. `raw-window-handle` v0.5 is still supported.
 - Implement `PartialOrd` and `Ord` for `KeyCode` and `NativeKeyCode`.
 - On Web, implement `WindowEvent::Occluded`.
 - On Web, fix touch location to be as accurate as mouse position.

Cargo.toml

@@ -55,7 +55,8 @@ cursor-icon = "1.0.0"
 log = "0.4"
 mint = { version = "0.5.6", optional = true }
 once_cell = "1.12"
-raw_window_handle = { package = "raw-window-handle", version = "0.5", features = ["std"] }
+raw_window_handle = { package = "raw-window-handle", version = "0.6", features = ["std"] }
+raw_window_handle_05 = { package = "raw-window-handle", version = "0.5" }
 serde = { version = "1", optional = true, features = ["serde_derive"] }
 smol_str = "0.2.0"
 
@@ -206,3 +207,7 @@ web-sys = { version = "0.3.22", features = ['CanvasRenderingContext2d'] }
 members = [
     "run-wasm",
 ]
+
+[patch.crates-io]
+softbuffer = { git = "https://github.com/rust-windowing/softbuffer.git", branch = "notgull/rwh-v0.6" }
+raw_window_handle = { package = "raw-window-handle", git = "https://github.com/rust-windowing/raw-window-handle.git", branch = "notgull/next" }

deny.toml

@@ -40,6 +40,7 @@ skip = [
     { name = "num_enum"},       # See above ^, waiting for release
     { name = "num_enum_derive"},# See above ^, waiting for release
     { name = "miniz_oxide"},    # https://github.com/rust-lang/flate2-rs/issues/340
+    { name = "raw-window-handle" }, # https://github.com/rust-windowing/raw-window-handle/issues/125, slow transition
     { name = "redox_syscall" }, # https://gitlab.redox-os.org/redox-os/orbclient/-/issues/46
 ]
 skip-tree = []

examples/child_window.rs

@@ -5,6 +5,7 @@ mod fill;
 #[cfg(any(x11_platform, macos_platform, windows_platform))]
 fn main() -> Result<(), impl std::error::Error> {
     use std::collections::HashMap;
+    use std::rc::Rc;
 
     use raw_window_handle::HasRawWindowHandle;
     use winit::{
@@ -17,17 +18,17 @@ fn main() -> Result<(), impl std::error::Error> {
     fn spawn_child_window(
         parent: &Window,
         event_loop: &EventLoopWindowTarget<()>,
-        windows: &mut HashMap<WindowId, Window>,
+        windows: &mut HashMap<WindowId, Rc<Window>>,
     ) {
-        let parent = parent.raw_window_handle();
+        let parent = parent.raw_window_handle().unwrap();
         let mut builder = WindowBuilder::new()
             .with_title("child window")
             .with_inner_size(LogicalSize::new(200.0f32, 200.0f32))
             .with_position(Position::Logical(LogicalPosition::new(0.0, 0.0)))
             .with_visible(true);
         // `with_parent_window` is unsafe. Parent window must be a valid window.
         builder = unsafe { builder.with_parent_window(Some(parent)) };
-        let child_window = builder.build(event_loop).unwrap();
+        let child_window = Rc::new(builder.build(event_loop).unwrap());
 
         let id = child_window.id();
         windows.insert(id, child_window);
@@ -37,12 +38,14 @@ fn main() -> Result<(), impl std::error::Error> {
     let mut windows = HashMap::new();
 
     let event_loop: EventLoop<()> = EventLoop::new();
-    let parent_window = WindowBuilder::new()
-        .with_title("parent window")
-        .with_position(Position::Logical(LogicalPosition::new(0.0, 0.0)))
-        .with_inner_size(LogicalSize::new(640.0f32, 480.0f32))
-        .build(&event_loop)
-        .unwrap();
+    let parent_window = Rc::new(
+        WindowBuilder::new()
+            .with_title("parent window")
+            .with_position(Position::Logical(LogicalPosition::new(0.0, 0.0)))
+            .with_inner_size(LogicalSize::new(640.0f32, 480.0f32))
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     println!("parent window: {parent_window:?})");
 

examples/control_flow.rs

@@ -1,5 +1,6 @@
 #![allow(clippy::single_match)]
 
+use std::rc::Rc;
 use std::thread;
 #[cfg(not(wasm_platform))]
 use std::time;
@@ -37,10 +38,14 @@ fn main() -> Result<(), impl std::error::Error> {
     println!("Press 'Esc' to close the window.");
 
     let event_loop = EventLoop::new();
-    let window = WindowBuilder::new()
-        .with_title("Press 1, 2, 3 to change control flow mode. Press R to toggle redraw requests.")
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_title(
+                "Press 1, 2, 3 to change control flow mode. Press R to toggle redraw requests.",
+            )
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     let mut mode = Mode::Wait;
     let mut request_redraw = false;

examples/cursor.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::{
     event::{ElementState, Event, KeyEvent, WindowEvent},
     event_loop::EventLoop,
@@ -14,7 +15,7 @@ fn main() -> Result<(), impl std::error::Error> {
     SimpleLogger::new().init().unwrap();
     let event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
+    let window = Rc::new(WindowBuilder::new().build(&event_loop).unwrap());
     window.set_title("A fantastic window!");
 
     let mut cursor_idx = 0;

examples/cursor_grab.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::{
     event::{DeviceEvent, ElementState, Event, KeyEvent, WindowEvent},
     event_loop::EventLoop,
@@ -15,10 +16,12 @@ fn main() -> Result<(), impl std::error::Error> {
     SimpleLogger::new().init().unwrap();
     let event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new()
-        .with_title("Super Cursor Grab'n'Hide Simulator 9000")
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_title("Super Cursor Grab'n'Hide Simulator 9000")
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     let mut modifiers = ModifiersState::default();
 

examples/custom_events.rs

@@ -3,6 +3,7 @@
 #[cfg(not(wasm_platform))]
 fn main() -> Result<(), impl std::error::Error> {
     use simple_logger::SimpleLogger;
+    use std::rc::Rc;
     use winit::{
         event::{Event, WindowEvent},
         event_loop::EventLoopBuilder,
@@ -20,10 +21,12 @@ fn main() -> Result<(), impl std::error::Error> {
     SimpleLogger::new().init().unwrap();
     let event_loop = EventLoopBuilder::<CustomEvent>::with_user_event().build();
 
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_title("A fantastic window!")
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     // `EventLoopProxy` allows you to dispatch custom events to the main Winit event
     // loop from any thread.

examples/drag_window.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::{
     event::{ElementState, Event, KeyEvent, MouseButton, StartCause, WindowEvent},
     event_loop::EventLoop,
@@ -15,8 +16,8 @@ fn main() -> Result<(), impl std::error::Error> {
     SimpleLogger::new().init().unwrap();
     let event_loop = EventLoop::new();
 
-    let window_1 = WindowBuilder::new().build(&event_loop).unwrap();
-    let window_2 = WindowBuilder::new().build(&event_loop).unwrap();
+    let window_1 = Rc::new(WindowBuilder::new().build(&event_loop).unwrap());
+    let window_2 = Rc::new(WindowBuilder::new().build(&event_loop).unwrap());
 
     let mut switched = false;
     let mut entered_id = window_2.id();

examples/fullscreen.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::dpi::PhysicalSize;
 use winit::event::{ElementState, Event, KeyEvent, WindowEvent};
 use winit::event_loop::EventLoop;
@@ -22,10 +23,12 @@ fn main() -> Result<(), impl std::error::Error> {
     let mut with_min_size = false;
     let mut with_max_size = false;
 
-    let window = WindowBuilder::new()
-        .with_title("Hello world!")
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_title("Hello world!")
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     let mut monitor_index = 0;
     let mut monitor = event_loop

examples/handling_close.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::{
     event::{ElementState, Event, KeyEvent, WindowEvent},
     event_loop::EventLoop,
@@ -15,10 +16,12 @@ fn main() -> Result<(), impl std::error::Error> {
     SimpleLogger::new().init().unwrap();
     let event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new()
-        .with_title("Your faithful window")
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_title("Your faithful window")
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     let mut close_requested = false;
 

examples/ime.rs

@@ -2,6 +2,7 @@
 
 use log::LevelFilter;
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::{
     dpi::{PhysicalPosition, PhysicalSize},
     event::{ElementState, Event, Ime, WindowEvent},
@@ -26,10 +27,12 @@ fn main() -> Result<(), impl std::error::Error> {
 
     let event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new()
-        .with_inner_size(winit::dpi::LogicalSize::new(256f64, 128f64))
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_inner_size(winit::dpi::LogicalSize::new(256f64, 128f64))
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     let mut ime_purpose = ImePurpose::Normal;
     let mut ime_allowed = true;

examples/key_binding.rs

@@ -18,16 +18,20 @@ fn main() {
 
 #[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
 fn main() -> Result<(), impl std::error::Error> {
+    use std::rc::Rc;
+
     #[path = "util/fill.rs"]
     mod fill;
 
     simple_logger::SimpleLogger::new().init().unwrap();
     let event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new()
-        .with_inner_size(LogicalSize::new(400.0, 200.0))
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_inner_size(LogicalSize::new(400.0, 200.0))
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     let mut modifiers = ModifiersState::default();
 

examples/mouse_wheel.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use simple_logger::SimpleLogger;
+use std::rc::Rc;
 use winit::{
     event::{Event, WindowEvent},
     event_loop::EventLoop,
@@ -14,10 +15,12 @@ fn main() -> Result<(), impl std::error::Error> {
     SimpleLogger::new().init().unwrap();
     let event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new()
-        .with_title("Mouse Wheel events")
-        .build(&event_loop)
-        .unwrap();
+    let window = Rc::new(
+        WindowBuilder::new()
+            .with_title("Mouse Wheel events")
+            .build(&event_loop)
+            .unwrap(),
+    );
 
     println!(
         r"

examples/multithreaded.rs

@@ -2,7 +2,12 @@
 
 #[cfg(not(wasm_platform))]
 fn main() -> Result<(), impl std::error::Error> {
-    use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
+    use std::{
+        collections::HashMap,
+        sync::{mpsc, Arc},
+        thread,
+        time::Duration,
+    };
 
     use simple_logger::SimpleLogger;
     use winit::{
@@ -20,10 +25,12 @@ fn main() -> Result<(), impl std::error::Error> {
     let event_loop = EventLoop::new();
     let mut window_senders = HashMap::with_capacity(WINDOW_COUNT);
     for _ in 0..WINDOW_COUNT {
-        let window = WindowBuilder::new()
-            .with_inner_size(WINDOW_SIZE)
-            .build(&event_loop)
-            .unwrap();
+        let window = Arc::new(
+            WindowBuilder::new()
+                .with_inner_size(WINDOW_SIZE)
+                .build(&event_loop)
+                .unwrap(),
+        );
 
         let mut video_modes: Vec<_> = window.current_monitor().unwrap().video_modes().collect();
         let mut video_mode_id = 0usize;

examples/multiwindow.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::single_match)]
 
 use std::collections::HashMap;
+use std::rc::Rc;
 
 use simple_logger::SimpleLogger;
 use winit::{
@@ -19,7 +20,7 @@ fn main() -> Result<(), impl std::error::Error> {
 
     let mut windows = HashMap::new();
     for _ in 0..3 {
-        let window = Window::new(&event_loop).unwrap();
+        let window = Rc::new(Window::new(&event_loop).unwrap());
         println!("Opened a new window: {:?}", window.id());
         windows.insert(window.id(), window);
     }
@@ -52,7 +53,7 @@ fn main() -> Result<(), impl std::error::Error> {
                         is_synthetic: false,
                         ..
                     } if matches!(c.as_ref(), "n" | "N") => {
-                        let window = Window::new(event_loop).unwrap();
+                        let window = Rc::new(Window::new(event_loop).unwrap());
                         println!("Opened a new window: {:?}", window.id());
                         windows.insert(window.id(), window);
                     }