workspaces: Update to cosmic-protocols
This commit is contained in:
Victoria Brekenfeld
parent
488fe6f186
commit
85fe582d1d
5 changed files with 78 additions and 392 deletions
50
Cargo.lock
generated
50
Cargo.lock
generated
|
|
@ -430,6 +430,7 @@ dependencies = [
|
||||||
"calloop",
|
"calloop",
|
||||||
"cascade",
|
"cascade",
|
||||||
"cosmic-panel-config",
|
"cosmic-panel-config",
|
||||||
|
"cosmic-protocols",
|
||||||
"gio 0.15.12",
|
"gio 0.15.12",
|
||||||
"gtk4",
|
"gtk4",
|
||||||
"i18n-embed",
|
"i18n-embed",
|
||||||
|
|
@ -441,9 +442,8 @@ dependencies = [
|
||||||
"rust-embed",
|
"rust-embed",
|
||||||
"tokio",
|
"tokio",
|
||||||
"wayland-backend",
|
"wayland-backend",
|
||||||
"wayland-client 0.30.0-beta.5",
|
"wayland-client 0.30.0-beta.7",
|
||||||
"wayland-commons",
|
"wayland-commons",
|
||||||
"wayland-scanner 0.30.0-beta.5",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -478,18 +478,30 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cosmic-panel-config"
|
name = "cosmic-panel-config"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/pop-os/cosmic-panel#791937b3515534f4df9bb47c1a6bd5189ff00644"
|
source = "git+https://github.com/pop-os/cosmic-panel#c0b4c8b42616dfc8c49f96f0c7adcab364287925"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"gtk4",
|
"gtk4",
|
||||||
"ron",
|
"ron",
|
||||||
"serde",
|
"serde",
|
||||||
"slog",
|
"slog",
|
||||||
"wayland-protocols",
|
"wayland-protocols 0.29.4",
|
||||||
"xdg",
|
"xdg",
|
||||||
"xdg-shell-wrapper-config",
|
"xdg-shell-wrapper-config",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cosmic-protocols"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/pop-os/cosmic-protocols#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",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cpufeatures"
|
name = "cpufeatures"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
|
|
@ -2756,9 +2768,9 @@ checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-backend"
|
name = "wayland-backend"
|
||||||
version = "0.1.0-beta.5"
|
version = "0.1.0-beta.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "96e1d0d399007c9f43d313eff1120caa96c8cbb92470f8bf645e9af08368589c"
|
checksum = "a861eb7cd51f67de60f228a570f142396d94759babcb427f861071ffb0757c9e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"downcast-rs",
|
"downcast-rs",
|
||||||
|
|
@ -2786,9 +2798,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-client"
|
name = "wayland-client"
|
||||||
version = "0.30.0-beta.5"
|
version = "0.30.0-beta.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b415e9f804abeb39d800f5cc2dfec90bfd19822acfcabdae490b1fcdfaf9e5d0"
|
checksum = "2dca5290499da69c21fcf64b4021886963511b888af056dbfb6bebfb7e1587e6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
|
|
@ -2797,7 +2809,7 @@ dependencies = [
|
||||||
"nix 0.24.1",
|
"nix 0.24.1",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"wayland-backend",
|
"wayland-backend",
|
||||||
"wayland-scanner 0.30.0-beta.5",
|
"wayland-scanner 0.30.0-beta.7",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2824,6 +2836,18 @@ dependencies = [
|
||||||
"wayland-scanner 0.29.4",
|
"wayland-scanner 0.29.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wayland-protocols"
|
||||||
|
version = "0.30.0-beta.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d64adbf2e145b9da69ff0e9bb72fc513182978c826fc6f704c05f0f80b663a6d"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"wayland-backend",
|
||||||
|
"wayland-client 0.30.0-beta.7",
|
||||||
|
"wayland-scanner 0.30.0-beta.7",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-scanner"
|
name = "wayland-scanner"
|
||||||
version = "0.29.4"
|
version = "0.29.4"
|
||||||
|
|
@ -2837,9 +2861,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-scanner"
|
name = "wayland-scanner"
|
||||||
version = "0.30.0-beta.5"
|
version = "0.30.0-beta.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a3db6ef8dd5a77ff178149e071269de02594de0abd2595190ac3f2f91f25aacd"
|
checksum = "e3baff545c2f5a0c32d796595d0b3c8fafccf29e72e557ff1969fe552ff093d6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|
@ -2972,10 +2996,10 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xdg-shell-wrapper-config"
|
name = "xdg-shell-wrapper-config"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/pop-os/xdg-shell-wrapper#e523530fd900ae1985e664cce84c4066b23afea1"
|
source = "git+https://github.com/pop-os/xdg-shell-wrapper#f93027e8e52106852bff5b38e8676b9ca465b725"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"wayland-protocols",
|
"wayland-protocols 0.29.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,8 @@ edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"] }
|
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"] }
|
||||||
|
cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"] }
|
||||||
cascade = "1.0.0"
|
cascade = "1.0.0"
|
||||||
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
|
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
|
||||||
once_cell = "1.9.0"
|
once_cell = "1.9.0"
|
||||||
|
|
@ -18,9 +19,8 @@ i18n-embed-fl = "0.6.4"
|
||||||
rust-embed = "6.3.0"
|
rust-embed = "6.3.0"
|
||||||
tokio = { version = "1.16.1", features = ["sync"] }
|
tokio = { version = "1.16.1", features = ["sync"] }
|
||||||
wayland-commons = "0.29.4"
|
wayland-commons = "0.29.4"
|
||||||
wayland-backend = { version = "=0.1.0-beta.5" }
|
wayland-backend = { version = "0.1.0-beta.7" }
|
||||||
wayland-scanner = { version = "=0.30.0-beta.5" }
|
wayland-client = { version = "0.30.0-beta.7" }
|
||||||
wayland-client = { version = "0.30.0-beta.5" }
|
|
||||||
calloop = "*"
|
calloop = "*"
|
||||||
nix = "*"
|
nix = "*"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
use std::{env, path::PathBuf, process::Command};
|
use std::{env, path::PathBuf, process::Command};
|
||||||
// use wayland_scanner::{generate_client_code};
|
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
if let Some(output) = Command::new("git")
|
if let Some(output) = Command::new("git")
|
||||||
|
|
@ -15,12 +14,4 @@ fn main() {
|
||||||
"data/resources/resources.gresource.xml",
|
"data/resources/resources.gresource.xml",
|
||||||
"compiled.gresource",
|
"compiled.gresource",
|
||||||
);
|
);
|
||||||
// let dest = PathBuf::from(&env::var("OUT_DIR").unwrap());
|
|
||||||
// // Location of the xml file, relative to the `Cargo.toml`
|
|
||||||
// let ext_workspace_protocol_file = "data/resources/ext-workspace-unstable-v1.xml";
|
|
||||||
// // Target directory for the generate files
|
|
||||||
// generate_client_code!(
|
|
||||||
// ext_workspace_protocol_file,
|
|
||||||
// &dest.join("ext_workspace.rs"),
|
|
||||||
// );
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,306 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<protocol name="ext_workspace_unstable_v1">
|
|
||||||
<copyright>
|
|
||||||
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.
|
|
||||||
</copyright>
|
|
||||||
|
|
||||||
<interface name="zext_workspace_manager_v1" version="1">
|
|
||||||
<description summary="list and control workspaces">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<event name="workspace_group">
|
|
||||||
<description summary="a workspace group has been created">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="workspace_group" type="new_id" interface="zext_workspace_group_handle_v1"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<request name="commit">
|
|
||||||
<description summary="all requests about the workspaces have been sent">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<event name="done">
|
|
||||||
<description summary="all information about the workspace groups has been sent">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="finished">
|
|
||||||
<description summary="the compositor has finished with the workspace_manager">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<request name="stop">
|
|
||||||
<description summary="stop sending events">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
</interface>
|
|
||||||
|
|
||||||
<interface name="zext_workspace_group_handle_v1" version="1">
|
|
||||||
<description summary="a workspace group assigned to a set of outputs">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<event name="output_enter">
|
|
||||||
<description summary="output assigned to workspace group">
|
|
||||||
This event is emitted whenever an output is assigned to the workspace
|
|
||||||
group.
|
|
||||||
</description>
|
|
||||||
<arg name="output" type="object" interface="wl_output"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="output_leave">
|
|
||||||
<description summary="output removed from workspace group">
|
|
||||||
This event is emitted whenever an output is removed from the workspace
|
|
||||||
group.
|
|
||||||
</description>
|
|
||||||
<arg name="output" type="object" interface="wl_output"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="workspace">
|
|
||||||
<description summary="workspace added to 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.
|
|
||||||
</description>
|
|
||||||
<arg name="workspace" type="new_id" interface="zext_workspace_handle_v1"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="remove">
|
|
||||||
<description summary="this workspace group has been destroyed">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<request name="create_workspace">
|
|
||||||
<description summary="create a new workspace">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="workspace" type="string"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="destroy" type="destructor">
|
|
||||||
<description summary="destroy the zext_workspace_handle_v1 object">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
</interface>
|
|
||||||
|
|
||||||
<interface name="zext_workspace_handle_v1" version="1">
|
|
||||||
<description summary="a workspace handing a group of surfaces">
|
|
||||||
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).
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<event name="name">
|
|
||||||
<description summary="workspace name changed">
|
|
||||||
This event is emitted immediately after the zext_workspace_handle_v1 is
|
|
||||||
created and whenever the name of the workspace changes.
|
|
||||||
</description>
|
|
||||||
<arg name="name" type="string"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="coordinates">
|
|
||||||
<description summary="workspace coordinates changed">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="coordinates" type="array"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="state">
|
|
||||||
<description summary="the state of the workspace changed">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="state" type="array"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<enum name="state">
|
|
||||||
<description summary="types of states on the workspace">
|
|
||||||
The different states that a workspace can have.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<entry name="active" value="0" summary="the workspace is active"/>
|
|
||||||
<entry name="urgent" value="1" summary="the workspace requests attention"/>
|
|
||||||
<entry name="hidden" value="2">
|
|
||||||
<description summary="the workspace is not visible">
|
|
||||||
The workspace is not visible in its workspace group, and clients
|
|
||||||
attempting to visualize the compositor workspace state should not
|
|
||||||
display such workspaces.
|
|
||||||
</description>
|
|
||||||
</entry>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<event name="remove">
|
|
||||||
<description summary="this workspace has been destroyed">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<request name="destroy" type="destructor">
|
|
||||||
<description summary="destroy the zext_workspace_handle_v1 object">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="activate">
|
|
||||||
<description summary="activate the workspace">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="deactivate">
|
|
||||||
<description summary="activate the workspace">
|
|
||||||
Request that this workspace be deactivated.
|
|
||||||
|
|
||||||
There is no guarantee the workspace will be actually deactivated.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="remove">
|
|
||||||
<description summary="remove the workspace">
|
|
||||||
Request that this workspace be removed.
|
|
||||||
|
|
||||||
There is no guarantee the workspace will be actually removed.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
</interface>
|
|
||||||
</protocol>
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
use crate::{
|
use crate::{
|
||||||
utils::{Activate, WorkspaceEvent},
|
utils::{Activate, WorkspaceEvent},
|
||||||
wayland::generated::client::zext_workspace_manager_v1::ZextWorkspaceManagerV1,
|
|
||||||
wayland_source::WaylandSource,
|
wayland_source::WaylandSource,
|
||||||
};
|
};
|
||||||
use cosmic_panel_config::CosmicPanelConfig;
|
use cosmic_panel_config::CosmicPanelConfig;
|
||||||
|
|
@ -19,36 +18,12 @@ use wayland_client::{
|
||||||
},
|
},
|
||||||
ConnectError, Proxy,
|
ConnectError, Proxy,
|
||||||
};
|
};
|
||||||
|
use cosmic_protocols::workspace::v1::client::{
|
||||||
use wayland_client::{Connection, Dispatch, QueueHandle};
|
zcosmic_workspace_manager_v1::{self, ZcosmicWorkspaceManagerV1},
|
||||||
|
zcosmic_workspace_group_handle_v1::{self, ZcosmicWorkspaceGroupHandleV1},
|
||||||
/// Generated protocol definitions
|
zcosmic_workspace_handle_v1::{self, ZcosmicWorkspaceHandleV1},
|
||||||
mod generated {
|
|
||||||
#![allow(dead_code, non_camel_case_types, unused_unsafe, unused_variables)]
|
|
||||||
#![allow(non_upper_case_globals, non_snake_case, unused_imports)]
|
|
||||||
#![allow(missing_docs, clippy::all)]
|
|
||||||
|
|
||||||
pub mod client {
|
|
||||||
//! Client-side API of this protocol
|
|
||||||
use wayland_client;
|
|
||||||
use wayland_client::protocol::*;
|
|
||||||
|
|
||||||
pub mod __interfaces {
|
|
||||||
use wayland_client::protocol::__interfaces::*;
|
|
||||||
wayland_scanner::generate_interfaces!("src/ext-workspace-unstable-v1.xml");
|
|
||||||
}
|
|
||||||
use self::__interfaces::*;
|
|
||||||
|
|
||||||
wayland_scanner::generate_client_code!("src/ext-workspace-unstable-v1.xml");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
use generated::client::zext_workspace_manager_v1;
|
|
||||||
|
|
||||||
use self::generated::client::{
|
|
||||||
zext_workspace_group_handle_v1::{self, ZextWorkspaceGroupHandleV1},
|
|
||||||
zext_workspace_handle_v1::{self, ZextWorkspaceHandleV1},
|
|
||||||
};
|
};
|
||||||
|
use wayland_client::{Connection, Dispatch, QueueHandle};
|
||||||
use calloop::channel::*;
|
use calloop::channel::*;
|
||||||
|
|
||||||
pub fn spawn_workspaces(tx: glib::Sender<State>) -> SyncSender<WorkspaceEvent> {
|
pub fn spawn_workspaces(tx: glib::Sender<State>) -> SyncSender<WorkspaceEvent> {
|
||||||
|
|
@ -166,7 +141,7 @@ pub struct State {
|
||||||
tx: glib::Sender<State>,
|
tx: glib::Sender<State>,
|
||||||
configured_output: String,
|
configured_output: String,
|
||||||
expected_output: Option<WlOutput>,
|
expected_output: Option<WlOutput>,
|
||||||
workspace_manager: Option<zext_workspace_manager_v1::ZextWorkspaceManagerV1>,
|
workspace_manager: Option<ZcosmicWorkspaceManagerV1>,
|
||||||
workspace_groups: Vec<WorkspaceGroup>,
|
workspace_groups: Vec<WorkspaceGroup>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -188,14 +163,14 @@ impl State {
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
struct WorkspaceGroup {
|
struct WorkspaceGroup {
|
||||||
workspace_group_handle: ZextWorkspaceGroupHandleV1,
|
workspace_group_handle: ZcosmicWorkspaceGroupHandleV1,
|
||||||
output: Option<WlOutput>,
|
output: Option<WlOutput>,
|
||||||
workspaces: Vec<Workspace>,
|
workspaces: Vec<Workspace>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
struct Workspace {
|
struct Workspace {
|
||||||
workspace_handle: ZextWorkspaceHandleV1,
|
workspace_handle: ZcosmicWorkspaceHandleV1,
|
||||||
name: String,
|
name: String,
|
||||||
coordinates: Vec<u8>,
|
coordinates: Vec<u8>,
|
||||||
state: u32,
|
state: u32,
|
||||||
|
|
@ -217,9 +192,9 @@ impl Dispatch<wl_registry::WlRegistry, ()> for State {
|
||||||
} = event
|
} = event
|
||||||
{
|
{
|
||||||
match &interface[..] {
|
match &interface[..] {
|
||||||
"zext_workspace_manager_v1" => {
|
"zcosmic_workspace_manager_v1" => {
|
||||||
let workspace_manager = registry
|
let workspace_manager = registry
|
||||||
.bind::<zext_workspace_manager_v1::ZextWorkspaceManagerV1, _, _>(
|
.bind::<ZcosmicWorkspaceManagerV1, _, _>(
|
||||||
name,
|
name,
|
||||||
1,
|
1,
|
||||||
qh,
|
qh,
|
||||||
|
|
@ -237,49 +212,49 @@ impl Dispatch<wl_registry::WlRegistry, ()> for State {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Dispatch<zext_workspace_manager_v1::ZextWorkspaceManagerV1, ()> for State {
|
impl Dispatch<ZcosmicWorkspaceManagerV1, ()> for State {
|
||||||
fn event(
|
fn event(
|
||||||
&mut self,
|
&mut self,
|
||||||
_: &zext_workspace_manager_v1::ZextWorkspaceManagerV1,
|
_: &ZcosmicWorkspaceManagerV1,
|
||||||
event: zext_workspace_manager_v1::Event,
|
event: zcosmic_workspace_manager_v1::Event,
|
||||||
_: &(),
|
_: &(),
|
||||||
_: &Connection,
|
_: &Connection,
|
||||||
_: &QueueHandle<Self>,
|
_: &QueueHandle<Self>,
|
||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
zext_workspace_manager_v1::Event::WorkspaceGroup { workspace_group } => {
|
zcosmic_workspace_manager_v1::Event::WorkspaceGroup { workspace_group } => {
|
||||||
self.workspace_groups.push(WorkspaceGroup {
|
self.workspace_groups.push(WorkspaceGroup {
|
||||||
workspace_group_handle: workspace_group,
|
workspace_group_handle: workspace_group,
|
||||||
output: None,
|
output: None,
|
||||||
workspaces: Vec::new(),
|
workspaces: Vec::new(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
zext_workspace_manager_v1::Event::Done => {
|
zcosmic_workspace_manager_v1::Event::Done => {
|
||||||
let _ = self.tx.send(self.clone());
|
let _ = self.tx.send(self.clone());
|
||||||
}
|
}
|
||||||
zext_workspace_manager_v1::Event::Finished => {
|
zcosmic_workspace_manager_v1::Event::Finished => {
|
||||||
self.workspace_manager.take();
|
self.workspace_manager.take();
|
||||||
}
|
}
|
||||||
|
_ => {}
|
||||||
}
|
}
|
||||||
// wl_compositor has no event
|
|
||||||
}
|
}
|
||||||
|
|
||||||
event_created_child!(State, ZextWorkspaceManagerV1, [
|
event_created_child!(State, ZcosmicWorkspaceManagerV1, [
|
||||||
0 => (ZextWorkspaceGroupHandleV1, ())
|
0 => (ZcosmicWorkspaceGroupHandleV1, ())
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Dispatch<ZextWorkspaceGroupHandleV1, ()> for State {
|
impl Dispatch<ZcosmicWorkspaceGroupHandleV1, ()> for State {
|
||||||
fn event(
|
fn event(
|
||||||
&mut self,
|
&mut self,
|
||||||
group: &ZextWorkspaceGroupHandleV1,
|
group: &ZcosmicWorkspaceGroupHandleV1,
|
||||||
event: zext_workspace_group_handle_v1::Event,
|
event: zcosmic_workspace_group_handle_v1::Event,
|
||||||
_: &(),
|
_: &(),
|
||||||
_: &Connection,
|
_: &Connection,
|
||||||
_: &QueueHandle<Self>,
|
_: &QueueHandle<Self>,
|
||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
zext_workspace_group_handle_v1::Event::OutputEnter { output } => {
|
zcosmic_workspace_group_handle_v1::Event::OutputEnter { output } => {
|
||||||
if let Some(group) = self
|
if let Some(group) = self
|
||||||
.workspace_groups
|
.workspace_groups
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
|
|
@ -288,14 +263,14 @@ impl Dispatch<ZextWorkspaceGroupHandleV1, ()> for State {
|
||||||
group.output = Some(output);
|
group.output = Some(output);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zext_workspace_group_handle_v1::Event::OutputLeave { output } => {
|
zcosmic_workspace_group_handle_v1::Event::OutputLeave { output } => {
|
||||||
if let Some(group) = self.workspace_groups.iter_mut().find(|g| {
|
if let Some(group) = self.workspace_groups.iter_mut().find(|g| {
|
||||||
&g.workspace_group_handle == group && g.output.as_ref() == Some(&output)
|
&g.workspace_group_handle == group && g.output.as_ref() == Some(&output)
|
||||||
}) {
|
}) {
|
||||||
group.output = None;
|
group.output = None;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zext_workspace_group_handle_v1::Event::Workspace { workspace } => {
|
zcosmic_workspace_group_handle_v1::Event::Workspace { workspace } => {
|
||||||
if let Some(group) = self
|
if let Some(group) = self
|
||||||
.workspace_groups
|
.workspace_groups
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
|
|
@ -309,7 +284,7 @@ impl Dispatch<ZextWorkspaceGroupHandleV1, ()> for State {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zext_workspace_group_handle_v1::Event::Remove => {
|
zcosmic_workspace_group_handle_v1::Event::Remove => {
|
||||||
if let Some(group) = self
|
if let Some(group) = self
|
||||||
.workspace_groups
|
.workspace_groups
|
||||||
.iter()
|
.iter()
|
||||||
|
|
@ -318,25 +293,26 @@ impl Dispatch<ZextWorkspaceGroupHandleV1, ()> for State {
|
||||||
self.workspace_groups.remove(group);
|
self.workspace_groups.remove(group);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
event_created_child!(State, ZextWorkspaceGroupHandleV1, [
|
event_created_child!(State, ZcosmicWorkspaceGroupHandleV1, [
|
||||||
2 => (ZextWorkspaceHandleV1, ())
|
3 => (ZcosmicWorkspaceHandleV1, ())
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Dispatch<ZextWorkspaceHandleV1, ()> for State {
|
impl Dispatch<ZcosmicWorkspaceHandleV1, ()> for State {
|
||||||
fn event(
|
fn event(
|
||||||
&mut self,
|
&mut self,
|
||||||
workspace: &ZextWorkspaceHandleV1,
|
workspace: &ZcosmicWorkspaceHandleV1,
|
||||||
event: zext_workspace_handle_v1::Event,
|
event: zcosmic_workspace_handle_v1::Event,
|
||||||
_: &(),
|
_: &(),
|
||||||
_: &Connection,
|
_: &Connection,
|
||||||
_: &QueueHandle<Self>,
|
_: &QueueHandle<Self>,
|
||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
zext_workspace_handle_v1::Event::Name { name } => {
|
zcosmic_workspace_handle_v1::Event::Name { name } => {
|
||||||
if let Some(w) = self.workspace_groups.iter_mut().find_map(|g| {
|
if let Some(w) = self.workspace_groups.iter_mut().find_map(|g| {
|
||||||
g.workspaces
|
g.workspaces
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
|
|
@ -345,7 +321,7 @@ impl Dispatch<ZextWorkspaceHandleV1, ()> for State {
|
||||||
w.name = name;
|
w.name = name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zext_workspace_handle_v1::Event::Coordinates { coordinates } => {
|
zcosmic_workspace_handle_v1::Event::Coordinates { coordinates } => {
|
||||||
if let Some(w) = self.workspace_groups.iter_mut().find_map(|g| {
|
if let Some(w) = self.workspace_groups.iter_mut().find_map(|g| {
|
||||||
g.workspaces
|
g.workspaces
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
|
|
@ -354,7 +330,7 @@ impl Dispatch<ZextWorkspaceHandleV1, ()> for State {
|
||||||
w.coordinates = coordinates;
|
w.coordinates = coordinates;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zext_workspace_handle_v1::Event::State { state } => {
|
zcosmic_workspace_handle_v1::Event::State { state } => {
|
||||||
if let Some(w) = self.workspace_groups.iter_mut().find_map(|g| {
|
if let Some(w) = self.workspace_groups.iter_mut().find_map(|g| {
|
||||||
g.workspaces
|
g.workspaces
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
|
|
@ -368,7 +344,7 @@ impl Dispatch<ZextWorkspaceHandleV1, ()> for State {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zext_workspace_handle_v1::Event::Remove => {
|
zcosmic_workspace_handle_v1::Event::Remove => {
|
||||||
if let Some((g, w_i)) = self.workspace_groups.iter_mut().find_map(|g| {
|
if let Some((g, w_i)) = self.workspace_groups.iter_mut().find_map(|g| {
|
||||||
g.workspaces
|
g.workspaces
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
|
|
@ -378,6 +354,7 @@ impl Dispatch<ZextWorkspaceHandleV1, ()> for State {
|
||||||
g.workspaces.remove(w_i);
|
g.workspaces.remove(w_i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue