Merge branch 'release-4.16.1'

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index 1cb249399f81572c910e983c97244f5af0ae8afe..28d9eb66cd18f8179bd373e5b8362d6ce0a7bd2f 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -38,6 +38,13 @@ Con *get_existing_workspace_by_name(const char *name);
  */
 Con *get_existing_workspace_by_num(int num);
 
+/**
+ * Returns true if the first output assigned to a workspace with the given
+ * workspace assignment is the same as the given output.
+ *
+ */
+bool output_triggers_assignment(Output *output, struct Workspace_Assignment *assignment);
+
 /**
  * Returns a pointer to the workspace with the given number (starting at 0),
  * creating the workspace if necessary (by allocating the necessary amount of
@@ -207,4 +214,4 @@ Con *workspace_encapsulate(Con *ws);
  * This returns true if and only if moving the workspace was successful.
  *
  */
-bool workspace_move_to_output(Con *ws, const char *output);
+bool workspace_move_to_output(Con *ws, Output *output);