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

deps: Update for wayland-rs beta.8

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-07-18 18:04:02 +02:00
parent ed0104be01
commit 994114661b
7 changed files with 57 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Cargo.lock generated
View file

@ -352,7 +352,7 @@ dependencies = [
"smithay-egui", "smithay-egui",
"thiserror", "thiserror",
"wayland-backend", "wayland-backend",
"wayland-scanner 0.30.0-beta.7", "wayland-scanner 0.30.0-beta.8",
"xcursor", "xcursor",
"xdg", "xdg",
"xkbcommon", "xkbcommon",
@ -361,13 +361,13 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-protocols" name = "cosmic-protocols"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#1962ffdca3d9c914929eea358ebeab61ff2217a8" source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#55f15e8b05fc983ab36b65b4c027b59f5876a181"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"wayland-backend", "wayland-backend",
"wayland-client 0.30.0-beta.7", "wayland-client 0.30.0-beta.8",
"wayland-protocols 0.30.0-beta.7", "wayland-protocols 0.30.0-beta.8",
"wayland-scanner 0.30.0-beta.7", "wayland-scanner 0.30.0-beta.8",
"wayland-server", "wayland-server",
] ]
@ -1517,7 +1517,7 @@ checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/pop-os/smithay?branch=main#2a2c55b8cede75d988599e2320c53510dd9fabf6" source = "git+https://github.com/pop-os/smithay?branch=main#2125a22dd29b59d0a52415cb8db8a76b76bd6c89"
dependencies = [ dependencies = [
"appendlist", "appendlist",
"bitflags", "bitflags",
@ -1546,10 +1546,10 @@ dependencies = [
"udev", "udev",
"wayland-backend", "wayland-backend",
"wayland-egl", "wayland-egl",
"wayland-protocols 0.30.0-beta.7", "wayland-protocols 0.30.0-beta.8",
"wayland-protocols-wlr", "wayland-protocols-wlr",
"wayland-server", "wayland-server",
"wayland-sys 0.30.0-beta.7", "wayland-sys 0.30.0-beta.8",
"winit", "winit",
"x11rb", "x11rb",
"xkbcommon", "xkbcommon",
@ -1816,17 +1816,16 @@ checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
[[package]] [[package]]
name = "wayland-backend" name = "wayland-backend"
version = "0.1.0-beta.7" version = "0.1.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a861eb7cd51f67de60f228a570f142396d94759babcb427f861071ffb0757c9e" checksum = "0ee8e77c63b0cdc68bfc7b407b862b0fe2718949ce060b32d4f94ef1ea9607a4"
dependencies = [ dependencies = [
"cc", "cc",
"downcast-rs", "downcast-rs",
"log",
"nix 0.24.2", "nix 0.24.2",
"scoped-tls", "scoped-tls",
"smallvec", "smallvec",
"wayland-sys 0.30.0-beta.7", "wayland-sys 0.30.0-beta.8",
] ]
[[package]] [[package]]
@ -1847,18 +1846,17 @@ dependencies = [
[[package]] [[package]]
name = "wayland-client" name = "wayland-client"
version = "0.30.0-beta.7" version = "0.30.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dca5290499da69c21fcf64b4021886963511b888af056dbfb6bebfb7e1587e6" checksum = "0f9e0d862c23f07b2c4b49de66b0680948af5dd1d2def17f1ddc16520352bf14"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"log",
"nix 0.24.2", "nix 0.24.2",
"thiserror", "thiserror",
"wayland-backend", "wayland-backend",
"wayland-scanner 0.30.0-beta.7", "wayland-scanner 0.30.0-beta.8",
] ]
[[package]] [[package]]
@ -1886,13 +1884,13 @@ dependencies = [
[[package]] [[package]]
name = "wayland-egl" name = "wayland-egl"
version = "0.30.0-beta.7" version = "0.30.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c7512147494471c8ea9a0e7fe6375a72f94229520705ebf4e4ef92e53e855df" checksum = "c0c476ffaaea6f046c976d2ffd48c0bda72fba50a701d82f28651be9fab8e99a"
dependencies = [ dependencies = [
"thiserror", "thiserror",
"wayland-backend", "wayland-backend",
"wayland-sys 0.30.0-beta.7", "wayland-sys 0.30.0-beta.8",
] ]
[[package]] [[package]]
@ -1909,27 +1907,27 @@ dependencies = [
[[package]] [[package]]
name = "wayland-protocols" name = "wayland-protocols"
version = "0.30.0-beta.7" version = "0.30.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d64adbf2e145b9da69ff0e9bb72fc513182978c826fc6f704c05f0f80b663a6d" checksum = "e47c45a60d531d5a513601f47f51a4743901836778ddae208ae9124606be1719"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"wayland-backend", "wayland-backend",
"wayland-client 0.30.0-beta.7", "wayland-client 0.30.0-beta.8",
"wayland-scanner 0.30.0-beta.7", "wayland-scanner 0.30.0-beta.8",
"wayland-server", "wayland-server",
] ]
[[package]] [[package]]
name = "wayland-protocols-wlr" name = "wayland-protocols-wlr"
version = "0.1.0-beta.7" version = "0.1.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b547ed68f5ffa180f7941baa0593a183fcc40cd91276ab8fb95839d332aa5940" checksum = "d0b477d16e0c1d7512f11799403c8dbb1964e756667208569ec0ea2bd1abbccb"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"wayland-backend", "wayland-backend",
"wayland-protocols 0.30.0-beta.7", "wayland-protocols 0.30.0-beta.8",
"wayland-scanner 0.30.0-beta.7", "wayland-scanner 0.30.0-beta.8",
"wayland-server", "wayland-server",
] ]
@ -1946,9 +1944,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-scanner" name = "wayland-scanner"
version = "0.30.0-beta.7" version = "0.30.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3baff545c2f5a0c32d796595d0b3c8fafccf29e72e557ff1969fe552ff093d6" checksum = "87933ccc3df4f6335cf240aca0647aa34319fdd693dda503f645ca4df4e10386"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1958,17 +1956,16 @@ dependencies = [
[[package]] [[package]]
name = "wayland-server" name = "wayland-server"
version = "0.30.0-beta.7" version = "0.30.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ae3737832840be32a0e715b665c36fc7df308724e82282580a1d592b7ca2a1" checksum = "b41683fd43b57d7ab2a2d5cc60acecea2cd8feca8514857088fba1721a568819"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"downcast-rs", "downcast-rs",
"log",
"nix 0.24.2", "nix 0.24.2",
"thiserror", "thiserror",
"wayland-backend", "wayland-backend",
"wayland-scanner 0.30.0-beta.7", "wayland-scanner 0.30.0-beta.8",
] ]
[[package]] [[package]]
@ -1984,9 +1981,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-sys" name = "wayland-sys"
version = "0.30.0-beta.7" version = "0.30.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f62b62672d36b6cf2f7d936f95c9f5894c0609190fa789c2ce46b73912baf239" checksum = "beca223ed017df1b356ff181d4d6e7f2b135418c4888df5bb02df7a563f02ab0"
dependencies = [ dependencies = [
"dlib", "dlib",
"libc", "libc",

4
Cargo.toml
View file

@ -29,8 +29,8 @@ xdg = "^2.1"
ron = "0.7" ron = "0.7"
atomic_float = "0.1" atomic_float = "0.1"
libsystemd = "0.5" libsystemd = "0.5"
wayland-backend = "=0.1.0-beta.7" wayland-backend = "=0.1.0-beta.8"
wayland-scanner = "=0.30.0-beta.7" wayland-scanner = "=0.30.0-beta.8"
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main" }
[dependencies.smithay] [dependencies.smithay]

2
src/backend/kms/mod.rs
View file

@ -552,7 +552,7 @@ impl State {
self.common self.common
.dmabuf_state .dmabuf_state
.destroy_global::<State>(dh, socket.dmabuf_global); .destroy_global::<State>(dh, socket.dmabuf_global);
dh.remove_global(socket.drm_global); dh.remove_global::<State>(socket.drm_global);
} }
} }
self.common self.common

8
src/wayland/protocols/drm.rs
View file

@ -26,8 +26,8 @@ use smithay::{
Format, Fourcc, Modifier, Format, Fourcc, Modifier,
}, },
reexports::wayland_server::{ reexports::wayland_server::{
backend::GlobalId, protocol::wl_buffer::WlBuffer, Client, DataInit, DelegateDispatch, backend::GlobalId, protocol::wl_buffer::WlBuffer, Client, DataInit,
DelegateGlobalDispatch, Dispatch, DisplayHandle, GlobalDispatch, New, Resource, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
}, },
wayland::{ wayland::{
buffer::BufferHandler, buffer::BufferHandler,
@ -53,7 +53,7 @@ pub struct DrmInstanceData {
dmabuf_global: DmabufGlobal, dmabuf_global: DmabufGlobal,
} }
impl<D> DelegateGlobalDispatch<wl_drm::WlDrm, DrmGlobalData, D> for WlDrmState impl<D> GlobalDispatch<wl_drm::WlDrm, DrmGlobalData, D> for WlDrmState
where where
D: GlobalDispatch<wl_drm::WlDrm, DrmGlobalData> D: GlobalDispatch<wl_drm::WlDrm, DrmGlobalData>
+ Dispatch<wl_drm::WlDrm, DrmInstanceData> + Dispatch<wl_drm::WlDrm, DrmInstanceData>
@ -91,7 +91,7 @@ where
} }
} }
impl<D> DelegateDispatch<wl_drm::WlDrm, DrmInstanceData, D> for WlDrmState impl<D> Dispatch<wl_drm::WlDrm, DrmInstanceData, D> for WlDrmState
where where
D: GlobalDispatch<wl_drm::WlDrm, DrmGlobalData> D: GlobalDispatch<wl_drm::WlDrm, DrmGlobalData>
+ Dispatch<wl_drm::WlDrm, DrmInstanceData> + Dispatch<wl_drm::WlDrm, DrmInstanceData>

18
src/wayland/protocols/output_configuration.rs
View file

@ -12,7 +12,7 @@ use smithay::{
wayland_server::{ wayland_server::{
backend::{ClientId, GlobalId, ObjectId}, backend::{ClientId, GlobalId, ObjectId},
protocol::wl_output::WlOutput, protocol::wl_output::WlOutput,
Client, DataInit, DelegateDispatch, DelegateGlobalDispatch, Dispatch, DisplayHandle, Client, DataInit, Dispatch, DisplayHandle,
GlobalDispatch, New, Resource, GlobalDispatch, New, Resource,
}, },
}, },
@ -133,7 +133,7 @@ struct OutputStateInner {
} }
type OutputState = Mutex<OutputStateInner>; type OutputState = Mutex<OutputStateInner>;
impl<D> DelegateGlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData, D> impl<D> GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData, D>
for OutputConfigurationState<D> for OutputConfigurationState<D>
where where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData> D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
@ -176,7 +176,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZwlrOutputManagerV1, OutputMngrInstanceData, D> impl<D> Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData, D>
for OutputConfigurationState<D> for OutputConfigurationState<D>
where where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData> D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
@ -221,7 +221,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZwlrOutputHeadV1, Output, D> for OutputConfigurationState<D> impl<D> Dispatch<ZwlrOutputHeadV1, Output, D> for OutputConfigurationState<D>
where where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData> D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData> + Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
@ -253,7 +253,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZwlrOutputModeV1, Mode, D> for OutputConfigurationState<D> impl<D> Dispatch<ZwlrOutputModeV1, Mode, D> for OutputConfigurationState<D>
where where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData> D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData> + Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
@ -279,7 +279,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZwlrOutputConfigurationV1, PendingConfiguration, D> impl<D> Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration, D>
for OutputConfigurationState<D> for OutputConfigurationState<D>
where where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData> D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
@ -401,7 +401,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZwlrOutputConfigurationHeadV1, PendingOutputConfiguration, D> impl<D> Dispatch<ZwlrOutputConfigurationHeadV1, PendingOutputConfiguration, D>
for OutputConfigurationState<D> for OutputConfigurationState<D>
where where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData> D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
@ -562,7 +562,7 @@ where
// if it gets re-added it should start with being enabled and no global // if it gets re-added it should start with being enabled and no global
inner.enabled = true; inner.enabled = true;
if let Some(global) = inner.global.take() { if let Some(global) = inner.global.take() {
self.dh.remove_global(global); self.dh.remove_global::<D>(global);
} }
} }
} }
@ -611,7 +611,7 @@ where
inner.global = Some(output.create_global::<D>(&self.dh)); inner.global = Some(output.create_global::<D>(&self.dh));
} }
if !inner.enabled && inner.global.is_some() { if !inner.enabled && inner.global.is_some() {
self.dh.remove_global(inner.global.take().unwrap()); self.dh.remove_global::<D>(inner.global.take().unwrap());
} }
} }
for manager in self.instances.iter_mut() { for manager in self.instances.iter_mut() {

8
src/wayland/protocols/toplevel_info.rs
View file

@ -8,7 +8,7 @@ use smithay::{
wayland_protocols::xdg::shell::server::xdg_toplevel, wayland_protocols::xdg::shell::server::xdg_toplevel,
wayland_server::{ wayland_server::{
backend::{ClientId, GlobalId, ObjectId}, backend::{ClientId, GlobalId, ObjectId},
Client, DataInit, DelegateDispatch, DelegateGlobalDispatch, Dispatch, DisplayHandle, Client, DataInit, Dispatch, DisplayHandle,
GlobalDispatch, New, Resource, GlobalDispatch, New, Resource,
}, },
}, },
@ -61,7 +61,7 @@ pub struct ToplevelHandleStateInner {
} }
pub type ToplevelHandleState = Mutex<ToplevelHandleStateInner>; pub type ToplevelHandleState = Mutex<ToplevelHandleStateInner>;
impl<D> DelegateGlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData, D> impl<D> GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData, D>
for ToplevelInfoState<D> for ToplevelInfoState<D>
where where
D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData> D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData>
@ -89,7 +89,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZcosmicToplevelInfoV1, (), D> for ToplevelInfoState<D> impl<D> Dispatch<ZcosmicToplevelInfoV1, (), D> for ToplevelInfoState<D>
where where
D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData> D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData>
+ Dispatch<ZcosmicToplevelInfoV1, ()> + Dispatch<ZcosmicToplevelInfoV1, ()>
@ -125,7 +125,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZcosmicToplevelHandleV1, ToplevelHandleState, D> for ToplevelInfoState<D> impl<D> Dispatch<ZcosmicToplevelHandleV1, ToplevelHandleState, D> for ToplevelInfoState<D>
where where
D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData> D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData>
+ Dispatch<ZcosmicToplevelInfoV1, ()> + Dispatch<ZcosmicToplevelInfoV1, ()>

10
src/wayland/protocols/workspace.rs
View file

@ -8,7 +8,7 @@ use std::{
use smithay::{ use smithay::{
reexports::wayland_server::{ reexports::wayland_server::{
backend::{ClientData, ClientId, GlobalId, ObjectId}, backend::{ClientData, ClientId, GlobalId, ObjectId},
Client, DataInit, DelegateDispatch, DelegateGlobalDispatch, Dispatch, DisplayHandle, Client, DataInit, Dispatch, DisplayHandle,
GlobalDispatch, New, Resource, GlobalDispatch, New, Resource,
}, },
wayland::output::Output, wayland::output::Output,
@ -142,7 +142,7 @@ pub trait WorkspaceClientHandler {
fn workspace_state(&self) -> &WorkspaceClientState; fn workspace_state(&self) -> &WorkspaceClientState;
} }
impl<D> DelegateGlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData, D> impl<D> GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData, D>
for WorkspaceState<D> for WorkspaceState<D>
where where
D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData> D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData>
@ -175,7 +175,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZcosmicWorkspaceManagerV1, (), D> for WorkspaceState<D> impl<D> Dispatch<ZcosmicWorkspaceManagerV1, (), D> for WorkspaceState<D>
where where
D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData> D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData>
+ Dispatch<ZcosmicWorkspaceManagerV1, ()> + Dispatch<ZcosmicWorkspaceManagerV1, ()>
@ -223,7 +223,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZcosmicWorkspaceGroupHandleV1, WorkspaceGroupData, D> for WorkspaceState<D> impl<D> Dispatch<ZcosmicWorkspaceGroupHandleV1, WorkspaceGroupData, D> for WorkspaceState<D>
where where
D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData> D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData>
+ Dispatch<ZcosmicWorkspaceManagerV1, ()> + Dispatch<ZcosmicWorkspaceManagerV1, ()>
@ -279,7 +279,7 @@ where
} }
} }
impl<D> DelegateDispatch<ZcosmicWorkspaceHandleV1, WorkspaceData, D> for WorkspaceState<D> impl<D> Dispatch<ZcosmicWorkspaceHandleV1, WorkspaceData, D> for WorkspaceState<D>
where where
D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData> D: GlobalDispatch<ZcosmicWorkspaceManagerV1, WorkspaceGlobalData>
+ Dispatch<ZcosmicWorkspaceManagerV1, ()> + Dispatch<ZcosmicWorkspaceManagerV1, ()>