leyoda/smithay-clipboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump 'smithay-client-toolkit' to v0.15

Browse source 
This also bumps 'wayland-rs' to 'v0.29'.
This commit is contained in:
Kirill Chibisov 2021-08-14 00:59:18 +03:00 • committed by Victor Berger
parent 2833d93b48
commit f807e133c0
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
- Update SCTK to 0.15, updating wayland-rs to `0.29`
## 0.6.4 -- 2021-06-25 ## 0.6.4 -- 2021-06-25
- Update SCTK to 0.14, significantly reducing the depdendency tree - Update SCTK to 0.14, significantly reducing the depdendency tree

6
Cargo.toml
View file

@ -10,11 +10,11 @@ license = "MIT"
keywords = ["clipboard", "wayland"] keywords = ["clipboard", "wayland"]
[dependencies] [dependencies]
sctk = { package = "smithay-client-toolkit", version = "0.14", default-features = false } sctk = { package = "smithay-client-toolkit", version = "0.15", default-features = false }
wayland-client = { version = "0.28", features = ["use_system_lib"] } wayland-client = { version = "0.29", features = ["use_system_lib"] }
[dev-dependencies] [dev-dependencies]
sctk = { package = "smithay-client-toolkit", version = "0.14", default-features = false, features = ["calloop"] } sctk = { package = "smithay-client-toolkit", version = "0.15", default-features = false, features = ["calloop"] }
[features] [features]
default = ["dlopen"] default = ["dlopen"]

8
src/env.rs
View file

@ -1,4 +1,3 @@
use sctk::MissingGlobal;
use sctk::data_device::{DataDevice, DataDeviceHandler, DataDeviceHandling, DndEvent}; use sctk::data_device::{DataDevice, DataDeviceHandler, DataDeviceHandling, DndEvent};
use sctk::primary_selection::{ use sctk::primary_selection::{
PrimarySelectionDevice, PrimarySelectionDeviceManager, PrimarySelectionHandler, PrimarySelectionDevice, PrimarySelectionDeviceManager, PrimarySelectionHandler,
@ -7,6 +6,7 @@ use sctk::primary_selection::{
use sctk::reexports::client::protocol::wl_seat::WlSeat; use sctk::reexports::client::protocol::wl_seat::WlSeat;
use sctk::reexports::client::{Attached, DispatchData}; use sctk::reexports::client::{Attached, DispatchData};
use sctk::seat::{SeatData, SeatHandler, SeatHandling, SeatListener}; use sctk::seat::{SeatData, SeatHandler, SeatHandling, SeatListener};
use sctk::MissingGlobal;
/// Environemt setup for smithay-clipboard. /// Environemt setup for smithay-clipboard.
pub struct SmithayClipboard { pub struct SmithayClipboard {
@ -57,7 +57,11 @@ impl DataDeviceHandling for SmithayClipboard {
self.data_device_manager.set_callback(callback) self.data_device_manager.set_callback(callback)
} }
fn with_device<F: FnOnce(&DataDevice)>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal> { fn with_device<F: FnOnce(&DataDevice)>(
&self,
seat: &WlSeat,
f: F,
) -> Result<(), MissingGlobal> {
self.data_device_manager.with_device(seat, f) self.data_device_manager.with_device(seat, f)
} }
} }

2
src/lib.rs
View file

@ -3,7 +3,7 @@
//! Provides access to the Wayland clipboard for gui applications. The user should have surface //! Provides access to the Wayland clipboard for gui applications. The user should have surface
//! around. //! around.
#![deny(clippy::all, clippy::if_not_else, clippy::enum_glob_use, clippy::wrong_pub_self_convention)] #![deny(clippy::all, clippy::if_not_else, clippy::enum_glob_use)]
use std::ffi::c_void; use std::ffi::c_void;
use std::io::Result; use std::io::Result;
use std::sync::mpsc::{self, Receiver, Sender}; use std::sync::mpsc::{self, Receiver, Sender};