diff --git a/Cargo.toml b/Cargo.toml index c134e01..7b95366 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["clipboard", "window", "ui", "gui", "raw-window-handle"] categories = ["gui"] [dependencies] -raw-window-handle = "0.3" +raw-window-handle = "0.5" thiserror = "1.0" [target.'cfg(windows)'.dependencies] @@ -27,7 +27,7 @@ clipboard_wayland = { version = "0.2", path = "./wayland" } [dev-dependencies] rand = "0.8" -winit = "0.23" +winit = "0.27" [workspace] members = [ diff --git a/src/lib.rs b/src/lib.rs index 6a940a2..8f05018 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -44,7 +44,7 @@ mod platform; #[path = "platform/dummy.rs"] mod platform; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::HasRawDisplayHandle; use std::error::Error; pub struct Clipboard { @@ -52,7 +52,7 @@ pub struct Clipboard { } impl Clipboard { - pub fn connect( + pub fn connect( window: &W, ) -> Result> { let raw = platform::connect(window)?; diff --git a/src/platform/android.rs b/src/platform/android.rs index e0e44ed..b808911 100644 --- a/src/platform/android.rs +++ b/src/platform/android.rs @@ -1,9 +1,9 @@ use crate::ClipboardProvider; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::HasRawDisplayHandle; use std::error::Error; -pub fn connect( +pub fn connect( _window: &W, ) -> Result, Box> { Ok(Box::new(Clipboard::new()?)) diff --git a/src/platform/dummy.rs b/src/platform/dummy.rs index 410adc3..edb02dc 100644 --- a/src/platform/dummy.rs +++ b/src/platform/dummy.rs @@ -1,10 +1,10 @@ use crate::ClipboardProvider; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::HasRawDisplayHandle; struct Dummy; -pub fn connect( +pub fn connect( _window: &W, ) -> Result, Box> { Ok(Box::new(Dummy)) diff --git a/src/platform/ios.rs b/src/platform/ios.rs index 0c36f54..b64d8ed 100644 --- a/src/platform/ios.rs +++ b/src/platform/ios.rs @@ -1,9 +1,9 @@ use crate::ClipboardProvider; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::HasRawDisplayHandle; use std::error::Error; -pub fn connect( +pub fn connect( _window: &W, ) -> Result, Box> { Ok(Box::new(Clipboard::new()?)) diff --git a/src/platform/linux.rs b/src/platform/linux.rs index 8d93964..16aa8c4 100644 --- a/src/platform/linux.rs +++ b/src/platform/linux.rs @@ -1,16 +1,16 @@ use crate::ClipboardProvider; -use raw_window_handle::{HasRawWindowHandle, RawWindowHandle}; +use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle}; use std::error::Error; pub use clipboard_wayland as wayland; pub use clipboard_x11 as x11; -pub fn connect( +pub fn connect( window: &W, ) -> Result, Box> { - let clipboard = match window.raw_window_handle() { - RawWindowHandle::Wayland(handle) => { + let clipboard = match window.raw_display_handle() { + RawDisplayHandle::Wayland(handle) => { assert!(!handle.display.is_null()); Box::new(unsafe { diff --git a/src/platform/macos.rs b/src/platform/macos.rs index 47ba0a2..4ebecc1 100644 --- a/src/platform/macos.rs +++ b/src/platform/macos.rs @@ -1,9 +1,9 @@ use crate::ClipboardProvider; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::HasRawDisplayHandle; use std::error::Error; -pub fn connect( +pub fn connect( _window: &W, ) -> Result, Box> { Ok(Box::new(clipboard_macos::Clipboard::new()?)) diff --git a/src/platform/windows.rs b/src/platform/windows.rs index 4c498a4..85a9136 100644 --- a/src/platform/windows.rs +++ b/src/platform/windows.rs @@ -1,11 +1,11 @@ use crate::ClipboardProvider; use clipboard_win::{get_clipboard_string, set_clipboard_string}; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::HasRawDisplayHandle; use std::error::Error; -pub fn connect( +pub fn connect( _window: &W, ) -> Result, Box> { Ok(Box::new(Clipboard))