From d182d5b3880a8b2c0584f26a5cc54379ca1ed9a9 Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Mon, 4 Jul 2022 15:24:50 +0200 Subject: [PATCH] deps: Update to wayland-rs.0.30 --- Cargo.lock | 142 ++++++---- Cargo.toml | 15 +- build.rs | 17 +- resources/ext-workspace-unstable-v1.xml | 306 ---------------------- resources/{ => protocols}/wayland-drm.xml | 0 rust-toolchain.toml | 2 +- 6 files changed, 105 insertions(+), 377 deletions(-) delete mode 100644 resources/ext-workspace-unstable-v1.xml rename resources/{ => protocols}/wayland-drm.xml (100%) diff --git a/Cargo.lock b/Cargo.lock index b508feee..668e8018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,10 +322,12 @@ dependencies = [ "anyhow", "atomic_float", "bitflags", + "cosmic-protocols", "edid-rs", "egui 0.16.1", "id_tree", "indexmap", + "lazy_static", "libsystemd", "ron", "serde", @@ -338,12 +340,26 @@ dependencies = [ "smithay", "smithay-egui", "thiserror", - "wayland-scanner 0.29.4", + "wayland-backend", + "wayland-scanner 0.30.0-beta.7", "xcursor", "xdg", "xkbcommon", ] +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#1962ffdca3d9c914929eea358ebeab61ff2217a8" +dependencies = [ + "bitflags", + "wayland-backend", + "wayland-client 0.30.0-beta.7", + "wayland-protocols 0.30.0-beta.7", + "wayland-scanner 0.30.0-beta.7", + "wayland-server", +] + [[package]] name = "cpufeatures" version = "0.2.2" @@ -365,9 +381,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -375,9 +391,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0" dependencies = [ "generic-array", "typenum", @@ -652,6 +668,21 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + [[package]] name = "gbm" version = "0.8.0" @@ -763,9 +794,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", @@ -1144,9 +1175,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "ac8b1a9b2518dc799a2271eff1688707eb315f0d4697aa6b0871369ca4c4da55" [[package]] name = "owned_ttf_parser" @@ -1368,18 +1399,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" dependencies = [ "proc-macro2", "quote", @@ -1388,9 +1419,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa", "ryu", @@ -1472,14 +1503,14 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git?rev=c30fc14a#c30fc14a4c638ee56f8dce2d43ab5f82df9ef414" +source = "git+https://github.com/Smithay/smithay.git?rev=11d48a76#11d48a76082a1efddb7dbfeef2aa1d7c13f8f67d" dependencies = [ "appendlist", "bitflags", @@ -1508,10 +1539,10 @@ dependencies = [ "udev", "wayland-backend", "wayland-egl", - "wayland-protocols 0.30.0-beta.4", + "wayland-protocols 0.30.0-beta.7", "wayland-protocols-wlr", "wayland-server", - "wayland-sys 0.30.0-beta.4", + "wayland-sys 0.30.0-beta.7", "winit", "x11rb", "xkbcommon", @@ -1531,7 +1562,7 @@ dependencies = [ "memmap2", "nix 0.22.3", "pkg-config", - "wayland-client", + "wayland-client 0.29.4", "wayland-cursor", "wayland-protocols 0.29.4", ] @@ -1539,7 +1570,7 @@ dependencies = [ [[package]] name = "smithay-egui" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay-egui.git?rev=ce9750d4#ce9750d4ca42da7116cec2cb75999e9aa9604164" +source = "git+https://github.com/Smithay/smithay-egui.git?rev=1969c96d#1969c96d21743134bb11eadde4866245ae7c0478" dependencies = [ "cgmath", "egui 0.18.1", @@ -1641,9 +1672,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82501a4c1c0330d640a6e176a3d6a204f5ec5237aca029029d21864a902e27b0" +checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" dependencies = [ "itoa", "libc", @@ -1778,9 +1809,9 @@ checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" [[package]] name = "wayland-backend" -version = "0.1.0-beta.4" +version = "0.1.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53af59d7350735c2a8157f2ddf8d1f75931f867b6f483734ef8f3f86ddf0fd3" +checksum = "a861eb7cd51f67de60f228a570f142396d94759babcb427f861071ffb0757c9e" dependencies = [ "cc", "downcast-rs", @@ -1788,7 +1819,7 @@ dependencies = [ "nix 0.24.1", "scoped-tls", "smallvec", - "wayland-sys 0.30.0-beta.4", + "wayland-sys 0.30.0-beta.7", ] [[package]] @@ -1807,6 +1838,22 @@ dependencies = [ "wayland-sys 0.29.4", ] +[[package]] +name = "wayland-client" +version = "0.30.0-beta.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dca5290499da69c21fcf64b4021886963511b888af056dbfb6bebfb7e1587e6" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "log", + "nix 0.24.1", + "thiserror", + "wayland-backend", + "wayland-scanner 0.30.0-beta.7", +] + [[package]] name = "wayland-commons" version = "0.29.4" @@ -1826,19 +1873,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd" dependencies = [ "nix 0.22.3", - "wayland-client", + "wayland-client 0.29.4", "xcursor", ] [[package]] name = "wayland-egl" -version = "0.30.0-beta.4" +version = "0.30.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8cb6d2f0a67e4f0522a7be07428cad7ab68bbbc044158923adb89531d4dbefb" +checksum = "2c7512147494471c8ea9a0e7fe6375a72f94229520705ebf4e4ef92e53e855df" dependencies = [ "thiserror", "wayland-backend", - "wayland-sys 0.30.0-beta.4", + "wayland-sys 0.30.0-beta.7", ] [[package]] @@ -1848,33 +1895,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" dependencies = [ "bitflags", - "wayland-client", + "wayland-client 0.29.4", "wayland-commons", "wayland-scanner 0.29.4", ] [[package]] name = "wayland-protocols" -version = "0.30.0-beta.4" +version = "0.30.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7737639739314da0e813e142f2e9a934403aa35306fead10328425bc2343da" +checksum = "d64adbf2e145b9da69ff0e9bb72fc513182978c826fc6f704c05f0f80b663a6d" dependencies = [ "bitflags", "wayland-backend", - "wayland-scanner 0.30.0-beta.4", + "wayland-client 0.30.0-beta.7", + "wayland-scanner 0.30.0-beta.7", "wayland-server", ] [[package]] name = "wayland-protocols-wlr" -version = "0.1.0-beta.4" +version = "0.1.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cda1cb8d290dddd2b628529e2eb9a9db4241577d66c982692b43febffa4ec3b" +checksum = "b547ed68f5ffa180f7941baa0593a183fcc40cd91276ab8fb95839d332aa5940" dependencies = [ "bitflags", "wayland-backend", - "wayland-protocols 0.30.0-beta.4", - "wayland-scanner 0.30.0-beta.4", + "wayland-protocols 0.30.0-beta.7", + "wayland-scanner 0.30.0-beta.7", "wayland-server", ] @@ -1891,9 +1939,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.30.0-beta.4" +version = "0.30.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "204323991a87e1c1f1a59cb613075775e944af497aa5515edd040de99e01723f" +checksum = "e3baff545c2f5a0c32d796595d0b3c8fafccf29e72e557ff1969fe552ff093d6" dependencies = [ "proc-macro2", "quote", @@ -1903,9 +1951,9 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.30.0-beta.4" +version = "0.30.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b71dda88deb7029ba486e4bdbe5b7e8ac1ca468aa584f418c5e0301ccc48268" +checksum = "a1ae3737832840be32a0e715b665c36fc7df308724e82282580a1d592b7ca2a1" dependencies = [ "bitflags", "downcast-rs", @@ -1913,7 +1961,7 @@ dependencies = [ "nix 0.24.1", "thiserror", "wayland-backend", - "wayland-scanner 0.30.0-beta.4", + "wayland-scanner 0.30.0-beta.7", ] [[package]] @@ -1929,9 +1977,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.30.0-beta.4" +version = "0.30.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27ea40a9942d6f38baa7f67afbcaa003c7d7769702d810b50fadbe0fdcaed2f" +checksum = "f62b62672d36b6cf2f7d936f95c9f5894c0609190fa789c2ce46b73912baf239" dependencies = [ "dlib", "libc", @@ -2050,7 +2098,7 @@ dependencies = [ "raw-window-handle", "smithay-client-toolkit", "wasm-bindgen", - "wayland-client", + "wayland-client 0.29.4", "wayland-protocols 0.29.4", "web-sys", "winapi", diff --git a/Cargo.toml b/Cargo.toml index a1cafab0..f9a5eb9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Victoria Brekenfeld"] [dependencies] anyhow = { version = "1.0.51", features = ["backtrace"] } bitflags = "1.3.2" -slog = "2.7" +slog = { version = "2.7", features = ["max_level_trace"] } slog-term = "2.8" slog-async = "2.7" slog-scope = "4.4" @@ -17,6 +17,7 @@ serde = { version = "1", features = ["derive"] } serde_json = { version = "1", optional = true } egui = { version = "0.16", optional = true } edid-rs = { version = "0.1" } +lazy_static = "1.4.0" thiserror = "1.0.26" xcursor = "0.3.3" id_tree = "1.8.0" @@ -26,22 +27,22 @@ xdg = "^2.1" ron = "0.7" atomic_float = "0.1" libsystemd = "0.5" +wayland-backend = "0.1.0-beta.7" +wayland-scanner = "0.30.0-beta.7" +cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main" } [dependencies.smithay] version = "0.3" git = "https://github.com/Smithay/smithay.git" -rev = "c30fc14a" +rev = "11d48a76" default-features = false features = ["backend_drm", "backend_gbm", "backend_egl", "backend_libinput", "backend_session_libseat", "backend_udev", "backend_winit", "backend_x11", "desktop", "use_system_lib", "renderer_gl", "renderer_multi", "wayland_frontend", "slog-stdlog"] [dependencies.smithay-egui] git = "https://github.com/Smithay/smithay-egui.git" -rev = "ce9750d4" +rev = "1969c96d" optional = true -[build-dependencies] -wayland-scanner = "0.29" - [features] default = [] debug = ["egui", "smithay-egui", "serde_json"] @@ -58,4 +59,4 @@ debug = true lto = "fat" #[patch."https://github.com/Smithay/smithay.git"] -#smithay = { git = "https://github.com/pop-os/smithay", branch = "main" } \ No newline at end of file +#smithay = { git = "https://github.com/pop-os/smithay", branch = "main" } diff --git a/build.rs b/build.rs index b8fcd830..9a5d56f7 100644 --- a/build.rs +++ b/build.rs @@ -1,8 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-only -extern crate wayland_scanner; - -use std::{env, path::PathBuf, process::Command}; -use wayland_scanner::{generate_code, Side}; +use std::process::Command; fn main() { if let Some(output) = Command::new("git") @@ -13,16 +10,4 @@ fn main() { let git_hash = String::from_utf8(output.stdout).unwrap(); println!("cargo:rustc-env=GIT_HASH={}", git_hash); } - - let dest = PathBuf::from(&env::var("OUT_DIR").unwrap()); - // Location of the xml file, relative to the `Cargo.toml` - let drm_protocol_file = "resources/wayland-drm.xml"; - let ext_workspace_protocol_file = "resources/ext-workspace-unstable-v1.xml"; - // Target directory for the generate files - generate_code(drm_protocol_file, &dest.join("wl_drm.rs"), Side::Server); - generate_code( - ext_workspace_protocol_file, - &dest.join("ext_workspace.rs"), - Side::Server, - ); } diff --git a/resources/ext-workspace-unstable-v1.xml b/resources/ext-workspace-unstable-v1.xml deleted file mode 100644 index 24410b62..00000000 --- a/resources/ext-workspace-unstable-v1.xml +++ /dev/null @@ -1,306 +0,0 @@ - - - - Copyright © 2019 Christopher Billington - Copyright © 2020 Ilia Bozhinov - - Permission to use, copy, modify, distribute, and sell this - software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in - all copies and that both that copyright notice and this permission - notice appear in supporting documentation, and that the name of - the copyright holders not be used in advertising or publicity - pertaining to distribution of the software without specific, - written prior permission. The copyright holders make no - representations about the suitability of this software for any - purpose. It is provided "as is" without express or implied - warranty. - - THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF - THIS SOFTWARE. - - - - - Workspaces, also called virtual desktops, are groups of surfaces. A - compositor with a concept of workspaces may only show some such groups of - surfaces (those of 'active' workspaces) at a time. 'Activating' a - workspace is a request for the compositor to display that workspace's - surfaces as normal, whereas the compositor may hide or otherwise - de-emphasise surfaces that are associated only with 'inactive' workspaces. - Workspaces are grouped by which sets of outputs they correspond to, and - may contain surfaces only from those outputs. In this way, it is possible - for each output to have its own set of workspaces, or for all outputs (or - any other arbitrary grouping) to share workspaces. Compositors may - optionally conceptually arrange each group of workspaces in an - N-dimensional grid. - - The purpose of this protocol is to enable the creation of taskbars and - docks by providing them with a list of workspaces and their properties, - and allowing them to activate and deactivate workspaces. - - After a client binds the zext_workspace_manager_v1, each workspace will be - sent via the workspace event. - - - - - This event is emitted whenever a new workspace group has been created. - - All initial details of the workspace group (workspaces, outputs) will be - sent immediately after this event via the corresponding events in - zext_workspace_group_handle_v1. - - - - - - - The client must send this request after it has finished sending other - requests. The compositor must process a series of requests preceding a - commit request atomically. - - This allows changes to the workspace properties to be seen as atomic, - even if they happen via multiple events, and even if they involve - multiple zext_workspace_handle_v1 objects, for example, deactivating one - workspace and activating another. - - - - - - This event is sent after all changes in all workspace groups have been - sent. - - This allows changes to one or more zext_workspace_group_handle_v1 - properties to be seen as atomic, even if they happen via multiple - events. In particular, an output moving from one workspace group to - another sends an output_enter event and an output_leave event to the two - zext_workspace_group_handle_v1 objects in question. The compositor sends - the done event only after updating the output information in both - workspace groups. - - - - - - This event indicates that the compositor is done sending events to the - zext_workspace_manager_v1. The server will destroy the object - immediately after sending this request, so it will become invalid and - the client should free any resources associated with it. - - - - - - Indicates the client no longer wishes to receive events for new - workspace groups. However the compositor may emit further workspace - events, until the finished event is emitted. - - The client must not send any more requests after this one. - - - - - - - A zext_workspace_group_handle_v1 object represents a a workspace group - that is assigned a set of outputs and contains a number of workspaces. - - The set of outputs assigned to the workspace group is conveyed to the client via - output_enter and output_leave events, and its workspaces are conveyed with - workspace events. - - For example, a compositor which has a set of workspaces for each output may - advertise a workspace group (and its workspaces) per output, whereas a compositor - where a workspace spans all outputs may advertise a single workspace group for all - outputs. - - - - - This event is emitted whenever an output is assigned to the workspace - group. - - - - - - - This event is emitted whenever an output is removed from the workspace - group. - - - - - - - This event is emitted whenever a new workspace has been created. - - All initial details of the workspace (name, coordinates, state) will - be sent immediately after this event via the corresponding events in - zext_workspace_handle_v1. - - - - - - - This event means the zext_workspace_group_handle_v1 has been destroyed. - It is guaranteed there won't be any more events for this - zext_workspace_group_handle_v1. The zext_workspace_group_handle_v1 becomes - inert so any requests will be ignored except the destroy request. - - The compositor must remove all workspaces belonging to a workspace group - before removing the workspace group. - - - - - - Request that the compositor create a new workspace with the given name. - - There is no guarantee that the compositor will create a new workspace, - or that the created workspace will have the provided name. - - - - - - - Destroys the zext_workspace_handle_v1 object. - - This request should be called either when the client does not want to - use the workspace object any more or after the remove event to finalize - the destruction of the object. - - - - - - - A zext_workspace_handle_v1 object represents a a workspace that handles a - group of surfaces. - - Each workspace has a name, conveyed to the client with the name event; a - list of states, conveyed to the client with the state event; and - optionally a set of coordinates, conveyed to the client with the - coordinates event. The client may request that the compositor activate or - deactivate the workspace. - - Each workspace can belong to only a single workspace group. - Depepending on the compositor policy, there might be workspaces with - the same name in different workspace groups, but these workspaces are still - separate (e.g. one of them might be active while the other is not). - - - - - This event is emitted immediately after the zext_workspace_handle_v1 is - created and whenever the name of the workspace changes. - - - - - - - This event is used to organize workspaces into an N-dimensional grid - within a workspace group, and if supported, is emitted immediately after - the zext_workspace_handle_v1 is created and whenever the coordinates of - the workspace change. Compositors may not send this event if they do not - conceptually arrange workspaces in this way. If compositors simply - number workspaces, without any geometric interpretation, they may send - 1D coordinates, which clients should not interpret as implying any - geometry. Sending an empty array means that the compositor no longer - orders the workspace geometrically. - - Coordinates have an arbitrary number of dimensions N with an uint32 - position along each dimension. By convention if N > 1, the first - dimension is X, the second Y, the third Z, and so on. The compositor may - chose to utilize these events for a more novel workspace layout - convention, however. No guarantee is made about the grid being filled or - bounded; there may be a workspace at coordinate 1 and another at - coordinate 1000 and none in between. Within a workspace group, however, - workspaces must have unique coordinates of equal dimensionality. - - - - - - - This event is emitted immediately after the zext_workspace_handle_v1 is - created and each time the workspace state changes, either because of a - compositor action or because of a request in this protocol. - - - - - - - The different states that a workspace can have. - - - - - - - The workspace is not visible in its workspace group, and clients - attempting to visualize the compositor workspace state should not - display such workspaces. - - - - - - - This event means the zext_workspace_handle_v1 has been destroyed. It is - guaranteed there won't be any more events for this - zext_workspace_handle_v1. The zext_workspace_handle_v1 becomes inert so - any requests will be ignored except the destroy request. - - - - - - Destroys the zext_workspace_handle_v1 object. - - This request should be called either when the client does not want to - use the workspace object any more or after the remove event to finalize - the destruction of the object. - - - - - - Request that this workspace be activated. - - There is no guarantee the workspace will be actually activated, and - behaviour may be compositor-dependent. For example, activating a - workspace may or may not deactivate all other workspaces in the same - group. - - - - - - Request that this workspace be deactivated. - - There is no guarantee the workspace will be actually deactivated. - - - - - - Request that this workspace be removed. - - There is no guarantee the workspace will be actually removed. - - - - diff --git a/resources/wayland-drm.xml b/resources/protocols/wayland-drm.xml similarity index 100% rename from resources/wayland-drm.xml rename to resources/protocols/wayland-drm.xml diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f441d863..a0e961af 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.60" \ No newline at end of file +channel = "1.61" \ No newline at end of file