Merge branch 'release-4.16.1'

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index 0ff5cd303abba2f264b437fdb8d814fc788d7e5f..28d9eb66cd18f8179bd373e5b8362d6ce0a7bd2f 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -10,6 +10,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include "data.h"
 #include "tree.h"
 #include "randr.h"
@@ -22,6 +24,27 @@
 #define NET_WM_DESKTOP_NONE 0xFFFFFFF0
 #define NET_WM_DESKTOP_ALL 0xFFFFFFFF
 
+/**
+ * Returns the workspace with the given name or NULL if such a workspace does
+ * not exist.
+ *
+ */
+Con *get_existing_workspace_by_name(const char *name);
+
+/**
+ * Returns the workspace with the given number or NULL if such a workspace does
+ * not exist.
+ *
+ */
+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
@@ -50,17 +73,6 @@ void extract_workspace_names_from_bindings(void);
  */
 Con *create_workspace_on_output(Output *output, Con *content);
 
-#if 0
-/**
- * Sets the name (or just its number) for the given workspace. This has to
- * be called for every workspace as the rendering function
- * (render_internal_bar) relies on workspace->name and workspace->name_len
- * being ready-to-use.
- *
- */
-void workspace_set_name(Workspace *ws, const char *name);
-#endif
-
 /**
  * Returns true if the workspace is currently visible. Especially important for
  * multi-monitor environments, as they can have multiple currenlty active
@@ -202,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);