0.30
This commit is contained in:
Ashley Wulber
parent
c1039be812
commit
d991f59c90
5 changed files with 470 additions and 73 deletions
76
Cargo.lock
generated
76
Cargo.lock
generated
|
|
@ -368,11 +368,11 @@ dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"pretty_env_logger",
|
"pretty_env_logger",
|
||||||
"rust-embed",
|
"rust-embed",
|
||||||
"smithay-client-toolkit",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"wayland-client",
|
"wayland-backend",
|
||||||
|
"wayland-client 0.30.0-beta.4",
|
||||||
"wayland-commons",
|
"wayland-commons",
|
||||||
"wayland-scanner",
|
"wayland-scanner 0.30.0-beta.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1829,6 +1829,12 @@ dependencies = [
|
||||||
"winapi-util",
|
"winapi-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "scoped-tls"
|
||||||
|
version = "1.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "scopeguard"
|
name = "scopeguard"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
|
|
@ -1978,7 +1984,7 @@ dependencies = [
|
||||||
"memmap2",
|
"memmap2",
|
||||||
"nix 0.22.3",
|
"nix 0.22.3",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
"wayland-client",
|
"wayland-client 0.29.4",
|
||||||
"wayland-cursor",
|
"wayland-cursor",
|
||||||
"wayland-protocols",
|
"wayland-protocols",
|
||||||
]
|
]
|
||||||
|
|
@ -2231,6 +2237,20 @@ version = "0.11.0+wasi-snapshot-preview1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wayland-backend"
|
||||||
|
version = "0.1.0-beta.4"
|
||||||
|
source = "git+https://github.com/smithay/wayland-rs.git#797f697a66f8541327cbaac319692ec8d2395a38"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"downcast-rs",
|
||||||
|
"log",
|
||||||
|
"nix 0.24.1",
|
||||||
|
"scoped-tls",
|
||||||
|
"smallvec",
|
||||||
|
"wayland-sys 0.30.0-beta.4",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-client"
|
name = "wayland-client"
|
||||||
version = "0.29.4"
|
version = "0.29.4"
|
||||||
|
|
@ -2242,8 +2262,23 @@ dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"nix 0.22.3",
|
"nix 0.22.3",
|
||||||
"wayland-commons",
|
"wayland-commons",
|
||||||
"wayland-scanner",
|
"wayland-scanner 0.29.4",
|
||||||
"wayland-sys",
|
"wayland-sys 0.29.4",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wayland-client"
|
||||||
|
version = "0.30.0-beta.4"
|
||||||
|
source = "git+https://github.com/smithay/wayland-rs.git#797f697a66f8541327cbaac319692ec8d2395a38"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"futures-channel",
|
||||||
|
"futures-core",
|
||||||
|
"log",
|
||||||
|
"nix 0.24.1",
|
||||||
|
"thiserror",
|
||||||
|
"wayland-backend",
|
||||||
|
"wayland-scanner 0.30.0-beta.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2255,7 +2290,7 @@ dependencies = [
|
||||||
"nix 0.22.3",
|
"nix 0.22.3",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"wayland-sys",
|
"wayland-sys 0.29.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2265,7 +2300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd"
|
checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"nix 0.22.3",
|
"nix 0.22.3",
|
||||||
"wayland-client",
|
"wayland-client 0.29.4",
|
||||||
"xcursor",
|
"xcursor",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
@ -2276,9 +2311,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741"
|
checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"wayland-client",
|
"wayland-client 0.29.4",
|
||||||
"wayland-commons",
|
"wayland-commons",
|
||||||
"wayland-scanner",
|
"wayland-scanner 0.29.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2292,6 +2327,17 @@ dependencies = [
|
||||||
"xml-rs",
|
"xml-rs",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wayland-scanner"
|
||||||
|
version = "0.30.0-beta.4"
|
||||||
|
source = "git+https://github.com/smithay/wayland-rs.git#797f697a66f8541327cbaac319692ec8d2395a38"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
"xml-rs",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-sys"
|
name = "wayland-sys"
|
||||||
version = "0.29.4"
|
version = "0.29.4"
|
||||||
|
|
@ -2301,6 +2347,16 @@ dependencies = [
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wayland-sys"
|
||||||
|
version = "0.30.0-beta.4"
|
||||||
|
source = "git+https://github.com/smithay/wayland-rs.git#797f697a66f8541327cbaac319692ec8d2395a38"
|
||||||
|
dependencies = [
|
||||||
|
"dlib",
|
||||||
|
"log",
|
||||||
|
"pkg-config",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wepoll-ffi"
|
name = "wepoll-ffi"
|
||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,10 @@ i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-request
|
||||||
i18n-embed-fl = "0.6.4"
|
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-client = "0.29.4"
|
|
||||||
wayland-commons = "0.29.4"
|
wayland-commons = "0.29.4"
|
||||||
sctk = { package = "smithay-client-toolkit", git = "https://github.com/wash2/client-toolkit.git", default-features = false, features = ["calloop"] }
|
wayland-scanner = { git = "https://github.com/smithay/wayland-rs.git", version = "0.30.0-beta.4"}
|
||||||
|
wayland-backend = { version = "0.1.0-beta.4", git = "https://github.com/smithay/wayland-rs.git" }
|
||||||
|
wayland-client = { version = "0.30.0-beta.4", git = "https://github.com/smithay/wayland-rs.git" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
gio = "0.15.10"
|
gio = "0.15.10"
|
||||||
wayland-scanner = "0.29"
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
extern crate wayland_scanner;
|
|
||||||
|
|
||||||
use std::{env, path::PathBuf, process::Command};
|
use std::{env, path::PathBuf, process::Command};
|
||||||
use wayland_scanner::{generate_code, Side};
|
// use wayland_scanner::{generate_client_code};
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
if let Some(output) = Command::new("git")
|
if let Some(output) = Command::new("git")
|
||||||
|
|
@ -17,13 +15,12 @@ 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());
|
// let dest = PathBuf::from(&env::var("OUT_DIR").unwrap());
|
||||||
// Location of the xml file, relative to the `Cargo.toml`
|
// // Location of the xml file, relative to the `Cargo.toml`
|
||||||
let ext_workspace_protocol_file = "data/resources/ext-workspace-unstable-v1.xml";
|
// let ext_workspace_protocol_file = "data/resources/ext-workspace-unstable-v1.xml";
|
||||||
// Target directory for the generate files
|
// // Target directory for the generate files
|
||||||
generate_code(
|
// generate_client_code!(
|
||||||
ext_workspace_protocol_file,
|
// ext_workspace_protocol_file,
|
||||||
&dest.join("ext_workspace.rs"),
|
// &dest.join("ext_workspace.rs"),
|
||||||
Side::Client,
|
// );
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,306 @@
|
||||||
|
<?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,68 +1,67 @@
|
||||||
use crate::utils::{Activate, Workspace};
|
use crate::utils::{Activate, Workspace};
|
||||||
use std::{
|
use std::{
|
||||||
num::ParseIntError,
|
os::unix::{net::UnixStream}, env, path::PathBuf,
|
||||||
os::unix::prelude::RawFd,
|
|
||||||
sync::{Arc, Mutex},
|
|
||||||
};
|
};
|
||||||
|
use wayland_client::{ConnectError, DelegateDispatch, protocol::wl_registry};
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use wayland_client::{protocol::wl_registry, Display, GlobalManager};
|
|
||||||
use generated::client::{zext_workspace_manager_v1, zext_workspace_group_handle_v1, zext_workspace_handle_v1};
|
use wayland_client::{
|
||||||
use sctk::environment::{SimpleGlobal, Environment};
|
Connection, Dispatch, QueueHandle,
|
||||||
use sctk::environment;
|
};
|
||||||
|
|
||||||
|
/// Generated protocol definitions
|
||||||
mod generated {
|
mod generated {
|
||||||
// The generated code tends to trigger a lot of warnings
|
#![allow(dead_code,non_camel_case_types,unused_unsafe,unused_variables)]
|
||||||
// so we isolate it into a very permissive module
|
#![allow(non_upper_case_globals,non_snake_case,unused_imports)]
|
||||||
#![allow(dead_code, non_camel_case_types, unused_unsafe, unused_variables)]
|
#![allow(missing_docs, clippy::all)]
|
||||||
#![allow(non_upper_case_globals, non_snake_case, unused_imports)]
|
|
||||||
|
|
||||||
pub mod client {
|
pub mod client {
|
||||||
// These imports are used by the generated code
|
//! Client-side API of this protocol
|
||||||
pub(crate) use wayland_commons::map::{Object, ObjectMetadata};
|
use wayland_client;
|
||||||
pub(crate) use wayland_commons::smallvec;
|
use wayland_client::protocol::*;
|
||||||
pub(crate) use wayland_commons::wire::{Argument, ArgumentType, Message, MessageDesc};
|
|
||||||
pub(crate) use wayland_commons::{Interface, MessageGroup};
|
pub mod __interfaces {
|
||||||
pub(crate) use wayland_client::protocol::wl_output;
|
use wayland_client::protocol::__interfaces::*;
|
||||||
pub(crate) use wayland_client::sys;
|
wayland_scanner::generate_interfaces!("src/ext-workspace-unstable-v1.xml");
|
||||||
pub(crate) use wayland_client::{AnonymousObject, Main, Proxy, ProxyMap};
|
}
|
||||||
include!(concat!(env!("OUT_DIR"), "/ext_workspace.rs"));
|
use self::__interfaces::*;
|
||||||
|
|
||||||
|
wayland_scanner::generate_client_code!("src/ext-workspace-unstable-v1.xml");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
use generated::client::zext_workspace_manager_v1;
|
||||||
struct State {
|
|
||||||
workspace_manager: SimpleGlobal<zext_workspace_manager_v1::ZextWorkspaceManagerV1>,
|
|
||||||
}
|
|
||||||
|
|
||||||
environment!(State,
|
|
||||||
singles = [
|
|
||||||
zext_workspace_manager_v1::ZextWorkspaceManagerV1 => workspace_manager,
|
|
||||||
],
|
|
||||||
multis = []
|
|
||||||
);
|
|
||||||
|
|
||||||
pub fn spawn_workspaces(tx: mpsc::Sender<Vec<Workspace>>) -> mpsc::Sender<Activate> {
|
pub fn spawn_workspaces(tx: mpsc::Sender<Vec<Workspace>>) -> mpsc::Sender<Activate> {
|
||||||
let (workspaces_tx, mut workspaces_rx) = mpsc::channel(100);
|
let (workspaces_tx, mut workspaces_rx) = mpsc::channel(100);
|
||||||
if let Ok(display) = std::env::var("HOST_WAYLAND_DISPLAY")
|
if let Ok(Ok(conn)) = std::env::var("HOST_WAYLAND_DISPLAY")
|
||||||
.map_err(anyhow::Error::msg)
|
.map_err(anyhow::Error::msg)
|
||||||
.and_then(|fd| Display::connect_to_name(fd).map_err(anyhow::Error::msg))
|
.map(|fd| {
|
||||||
|
let mut socket_path = env::var_os("XDG_RUNTIME_DIR")
|
||||||
|
.map(Into::<PathBuf>::into)
|
||||||
|
.ok_or(ConnectError::NoCompositor)?;
|
||||||
|
socket_path.push(env::var_os("WAYLAND_DISPLAY").ok_or(ConnectError::NoCompositor)?);
|
||||||
|
|
||||||
|
Ok(UnixStream::connect(socket_path).map_err(|_| ConnectError::NoCompositor)?)
|
||||||
|
})
|
||||||
|
.and_then(|s| s.map(|s| Connection::from_socket(s).map_err(anyhow::Error::msg)))
|
||||||
{
|
{
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
let mut event_queue = display.create_event_queue();
|
let mut event_queue= conn.new_event_queue::<State>();
|
||||||
let attached_display = display.attach(event_queue.token());
|
let qhandle = event_queue.handle();
|
||||||
let env = State {
|
|
||||||
workspace_manager: SimpleGlobal::new(),
|
let display = conn.display();
|
||||||
|
display.get_registry(&qhandle, ()).unwrap();
|
||||||
|
|
||||||
|
let mut state = State {
|
||||||
|
workspace_manager: None,
|
||||||
|
tx,
|
||||||
|
running: true,
|
||||||
};
|
};
|
||||||
let env = Environment::new(&attached_display, &mut event_queue, env).expect("Failed to create environment");
|
|
||||||
|
while state.running {
|
||||||
let workspace_manager = env.require_global::<zext_workspace_manager_v1::ZextWorkspaceManagerV1>();
|
event_queue.blocking_dispatch(&mut state).unwrap();
|
||||||
dbg!(workspace_manager);
|
}
|
||||||
// let globals = GlobalManager::new(&attached_display);
|
|
||||||
// let _ = event_queue.sync_roundtrip(&mut (), |_, _, _| unreachable!());
|
|
||||||
|
|
||||||
// println!("Globals: ");
|
|
||||||
// for (name, interface, version) in globals.list() {
|
|
||||||
// println!("{}: {} (version {})", name, interface, version);
|
|
||||||
// }
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
eprintln!("ENV variable HOST_WAYLAND_DISPLAY is missing. Exiting...");
|
eprintln!("ENV variable HOST_WAYLAND_DISPLAY is missing. Exiting...");
|
||||||
|
|
@ -74,5 +73,44 @@ pub fn spawn_workspaces(tx: mpsc::Sender<Vec<Workspace>>) -> mpsc::Sender<Activa
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
struct State {
|
||||||
|
running: bool,
|
||||||
|
tx: mpsc::Sender<Vec<Workspace>>,
|
||||||
|
workspace_manager: Option<zext_workspace_manager_v1::ZextWorkspaceManagerV1>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Dispatch<wl_registry::WlRegistry, ()> for State {
|
||||||
|
fn event(
|
||||||
|
&mut self,
|
||||||
|
registry: &wl_registry::WlRegistry,
|
||||||
|
event: wl_registry::Event,
|
||||||
|
_: &(),
|
||||||
|
_: &Connection,
|
||||||
|
qh: &QueueHandle<Self>,
|
||||||
|
) {
|
||||||
|
if let wl_registry::Event::Global { name, interface, version } = event {
|
||||||
|
println!("[{}] {} (v{})", name, interface, version);
|
||||||
|
match &interface[..] {
|
||||||
|
"zext_workspace_manager_v1" => {
|
||||||
|
println!("binding to workspace manager");
|
||||||
|
registry.bind::<zext_workspace_manager_v1::ZextWorkspaceManagerV1, _, _>(name, 1, qh, ()).unwrap();
|
||||||
|
},
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Dispatch<zext_workspace_manager_v1::ZextWorkspaceManagerV1, ()> for State {
|
||||||
|
fn event(
|
||||||
|
&mut self,
|
||||||
|
_: &zext_workspace_manager_v1::ZextWorkspaceManagerV1,
|
||||||
|
_: zext_workspace_manager_v1::Event,
|
||||||
|
_: &(),
|
||||||
|
_: &Connection,
|
||||||
|
_: &QueueHandle<Self>,
|
||||||
|
) {
|
||||||
|
todo!()
|
||||||
|
// wl_compositor has no event
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue