Merge branch 'master' into next

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index aebf13656d866e8b15e3de5a03678f3bb9f3baed..8e682bb0298405504799c1652e590a8fbffb839b 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -1,21 +1,20 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * workspace.c: Modifying workspaces, accessing them, moving containers to
+ *              workspaces.
  *
  */
+#ifndef _WORKSPACE_H
+#define _WORKSPACE_H
 
 #include "data.h"
 #include "tree.h"
 #include "randr.h"
 
-#ifndef _WORKSPACE_H
-#define _WORKSPACE_H
-
 /**
  * Returns a pointer to the workspace with the given number (starting at 0),
  * creating the workspace if necessary (by allocating the necessary amount of
@@ -27,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
@@ -46,20 +53,48 @@ void workspace_set_name(Workspace *ws, const char *name);
  */
 bool workspace_is_visible(Con *ws);
 
-/** Switches to the given workspace */
-void workspace_show(const char *num);
+/**
+ * Switches to the given workspace
+ *
+ */
+void workspace_show(Con *ws);
+
+/**
+ * Looks up the workspace by name and switches to it.
+ *
+ */
+void workspace_show_by_name(const char *num);
+
+/**
+ * Returns the next workspace.
+ *
+ */
+Con* workspace_next();
 
 /**
- * Focuses the next workspace.
+ * Returns the previous workspace.
  *
  */
-void workspace_next();
+Con* workspace_prev();
 
 /**
- * Focuses the previous workspace.
+ * Returns the next workspace on the same output
  *
  */
-void workspace_prev();
+Con* workspace_next_on_output();
+
+/**
+ * Returns the previous workspace on the same output
+ *
+ */
+Con* workspace_prev_on_output();
+
+/**
+ * Focuses the previously focused workspace.
+ *
+ */
+void workspace_back_and_forth();
+
 
 #if 0
 /**