toplevel-management: Add a move_to_workspace request

pop-os · Dec 6, 2023 · d901216 · d901216
1 parent 5faec87
commit d901216
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/client-toolkit/src/toplevel_management.rs b/client-toolkit/src/toplevel_management.rs
@@ -12,7 +12,7 @@ impl ToplevelManagerState {
         D: Dispatch<zcosmic_toplevel_manager_v1::ZcosmicToplevelManagerV1, ()> + 'static,
     {
         let manager = registry
-            .bind_one::<zcosmic_toplevel_manager_v1::ZcosmicToplevelManagerV1, _, _>(qh, 1..=1, ())
+            .bind_one::<zcosmic_toplevel_manager_v1::ZcosmicToplevelManagerV1, _, _>(qh, 1..=2, ())
             .unwrap();
 
         Self { manager }

diff --git a/src/lib.rs b/src/lib.rs
@@ -58,7 +58,7 @@ pub mod toplevel_management {
     pub mod v1 {
         wayland_protocol!(
             "./unstable/cosmic-toplevel-management-unstable-v1.xml",
-            [crate::toplevel_info::v1]
+            [crate::toplevel_info::v1, crate::workspace::v1]
         );
     }
 }

diff --git a/unstable/cosmic-toplevel-management-unstable-v1.xml b/unstable/cosmic-toplevel-management-unstable-v1.xml
@@ -28,7 +28,7 @@
     THIS SOFTWARE.
   </copyright>
 
-  <interface name="zcosmic_toplevel_manager_v1" version="1">
+  <interface name="zcosmic_toplevel_manager_v1" version="2">
     <description summary="control open apps">
       This protocol allows clients such as a taskbar to request the compositor
       to preform typical actions on open toplevels. The compositor is in all
@@ -167,6 +167,15 @@
       <arg name="height" type="int"/>
     </request>
 
+    <request name = "move_to_workspace" since="2">
+      <description summary="move toplevel to workspace">
+        Move window to workspace, on given output.
+      </description>
+      <arg name="toplevel" type="object" interface="zcosmic_toplevel_handle_v1"/>
+      <arg name="workspace" type="object" interface="zcosmic_workspace_handle_v1"/>
+      <arg name="output" type="object" interface="wl_output"/>
+    </request>
+
     <enum name="error">
       <entry name="invalid_rectangle" value="0"
         summary="the provided rectangle is invalid"/>