Merge branch 'master' into next

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index 21b733a6601c943da221c17b5f5a22c0a553c98e..1b25b425f4d21b5e4fe0f5e5ab08fd34174f23bf 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -26,6 +26,14 @@
  */
 Con *workspace_get(const char *num, bool *created);
 
+/*
+ * Returns a pointer to a new workspace in the given output. The workspace
+ * is created attached to the tree hierarchy through the given content
+ * container.
+ *
+ */
+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
@@ -61,31 +69,31 @@ void workspace_show_by_name(const char *num);
  * Returns the next workspace.
  *
  */
-Con* workspace_next();
+Con* workspace_next(void);
 
 /**
  * Returns the previous workspace.
  *
  */
-Con* workspace_prev();
+Con* workspace_prev(void);
 
 /**
  * Returns the next workspace on the same output
  *
  */
-Con* workspace_next_on_output();
+Con* workspace_next_on_output(void);
 
 /**
  * Returns the previous workspace on the same output
  *
  */
-Con* workspace_prev_on_output();
+Con* workspace_prev_on_output(void);
 
 /**
  * Focuses the previously focused workspace.
  *
  */
-void workspace_back_and_forth();
+void workspace_back_and_forth(void);
 
 
 #if 0