leyoda/window_clipboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20 from TobTobXX/update-raw-window-handle

Browse source 
Update raw-window-handle to v0.5
This commit is contained in:
Héctor Ramón 2023-04-11 06:18:16 +02:00 • committed by GitHub
commit 02979730ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -12,7 +12,7 @@ keywords = ["clipboard", "window", "ui", "gui", "raw-window-handle"]
categories = ["gui"] categories = ["gui"]
[dependencies] [dependencies]
raw-window-handle = "0.3" raw-window-handle = "0.5"
thiserror = "1.0" thiserror = "1.0"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
@ -27,7 +27,7 @@ clipboard_wayland = { version = "0.2", path = "./wayland" }
[dev-dependencies] [dev-dependencies]
rand = "0.8" rand = "0.8"
winit = "0.23" winit = "0.27"
[workspace] [workspace]
members = [ members = [

4
src/lib.rs
View file

@ -46,7 +46,7 @@ mod platform;
#[path = "platform/dummy.rs"] #[path = "platform/dummy.rs"]
mod platform; mod platform;
use raw_window_handle::HasRawWindowHandle; use raw_window_handle::HasRawDisplayHandle;
use std::error::Error; use std::error::Error;
pub struct Clipboard { pub struct Clipboard {
@ -54,7 +54,7 @@ pub struct Clipboard {
} }
impl Clipboard { impl Clipboard {
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
window: &W, window: &W,
) -> Result<Self, Box<dyn Error>> { ) -> Result<Self, Box<dyn Error>> {
let raw = platform::connect(window)?; let raw = platform::connect(window)?;

4
src/platform/android.rs
View file

@ -1,9 +1,9 @@
use crate::ClipboardProvider; use crate::ClipboardProvider;
use raw_window_handle::HasRawWindowHandle; use raw_window_handle::HasRawDisplayHandle;
use std::error::Error; use std::error::Error;
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
_window: &W, _window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> { ) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
Ok(Box::new(Clipboard::new()?)) Ok(Box::new(Clipboard::new()?))

4
src/platform/dummy.rs
View file

@ -1,10 +1,10 @@
use crate::ClipboardProvider; use crate::ClipboardProvider;
use raw_window_handle::HasRawWindowHandle; use raw_window_handle::HasRawDisplayHandle;
struct Dummy; struct Dummy;
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
_window: &W, _window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn std::error::Error>> { ) -> Result<Box<dyn ClipboardProvider>, Box<dyn std::error::Error>> {
Ok(Box::new(Dummy)) Ok(Box::new(Dummy))

4
src/platform/ios.rs
View file

@ -1,9 +1,9 @@
use crate::ClipboardProvider; use crate::ClipboardProvider;
use raw_window_handle::HasRawWindowHandle; use raw_window_handle::HasRawDisplayHandle;
use std::error::Error; use std::error::Error;
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
_window: &W, _window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> { ) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
Ok(Box::new(Clipboard::new()?)) Ok(Box::new(Clipboard::new()?))

8
src/platform/linux.rs
View file

@ -1,16 +1,16 @@
use crate::ClipboardProvider; use crate::ClipboardProvider;
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle}; use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle};
use std::error::Error; use std::error::Error;
pub use clipboard_wayland as wayland; pub use clipboard_wayland as wayland;
pub use clipboard_x11 as x11; pub use clipboard_x11 as x11;
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
window: &W, window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> { ) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
let clipboard = match window.raw_window_handle() { let clipboard = match window.raw_display_handle() {
RawWindowHandle::Wayland(handle) => { RawDisplayHandle::Wayland(handle) => {
assert!(!handle.display.is_null()); assert!(!handle.display.is_null());
Box::new(unsafe { Box::new(unsafe {

4
src/platform/macos.rs
View file

@ -1,9 +1,9 @@
use crate::ClipboardProvider; use crate::ClipboardProvider;
use raw_window_handle::HasRawWindowHandle; use raw_window_handle::HasRawDisplayHandle;
use std::error::Error; use std::error::Error;
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
_window: &W, _window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> { ) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
Ok(Box::new(clipboard_macos::Clipboard::new()?)) Ok(Box::new(clipboard_macos::Clipboard::new()?))

4
src/platform/windows.rs
View file

@ -1,11 +1,11 @@
use crate::ClipboardProvider; use crate::ClipboardProvider;
use clipboard_win::{get_clipboard_string, set_clipboard_string}; use clipboard_win::{get_clipboard_string, set_clipboard_string};
use raw_window_handle::HasRawWindowHandle; use raw_window_handle::HasRawDisplayHandle;
use std::error::Error; use std::error::Error;
pub fn connect<W: HasRawWindowHandle>( pub fn connect<W: HasRawDisplayHandle>(
_window: &W, _window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> { ) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
Ok(Box::new(Clipboard)) Ok(Box::new(Clipboard))