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

Use HasDisplayHandle instead of deprecated HasRawDisplayHandle

Browse source 
Currently `connect` is unsafe because it doesn't take ownership of the
display or have a lifetime bound.
This commit is contained in:
Ian Douglas Scott 2024-01-16 21:28:25 -08:00
parent bf49c91331
commit 869737dadc
11 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/platform/linux.rs
View file

@ -1,18 +1,18 @@
use crate::ClipboardProvider;
use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle};
use raw_window_handle::{HasDisplayHandle, RawDisplayHandle};
use std::error::Error;
pub use clipboard_wayland as wayland;
pub use clipboard_x11 as x11;
pub fn connect<W: HasRawDisplayHandle>(
pub unsafe fn connect<W: HasDisplayHandle>(
window: &W,
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
let clipboard = match window.raw_display_handle() {
Ok(RawDisplayHandle::Wayland(handle)) => Box::new(unsafe {
wayland::Clipboard::connect(handle.display.as_ptr())
}) as _,
let clipboard = match window.display_handle()?.as_raw() {
RawDisplayHandle::Wayland(handle) => {
Box::new(wayland::Clipboard::connect(handle.display.as_ptr())) as _
}
_ => Box::new(x11::Clipboard::connect()?) as _,
};