Merge branch 'tree' into next

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index f3bdd565ad0502064282ff4f4dfc3a50c50e2201..aebf13656d866e8b15e3de5a03678f3bb9f3baed 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -3,15 +3,15 @@
  *
  * i3 - an improved dynamic tiling window manager
  *
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
  */
-#include <xcb/xcb.h>
 
 #include "data.h"
-#include "xinerama.h"
+#include "tree.h"
+#include "randr.h"
 
 #ifndef _WORKSPACE_H
 #define _WORKSPACE_H
@@ -21,9 +21,13 @@
  * creating the workspace if necessary (by allocating the necessary amount of
  * memory and initializing the data structures correctly).
  *
+ * If created is not NULL, *created will be set to whether or not the
+ * workspace has just been created.
+ *
  */
-Workspace *workspace_get(int number);
+Con *workspace_get(const char *num, bool *created);
 
+#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
@@ -32,6 +36,7 @@ Workspace *workspace_get(int number);
  *
  */
 void workspace_set_name(Workspace *ws, const char *name);
+#endif
 
 /**
  * Returns true if the workspace is currently visible. Especially important for
@@ -39,10 +44,34 @@ void workspace_set_name(Workspace *ws, const char *name);
  * workspaces.
  *
  */
-bool workspace_is_visible(Workspace *ws);
+bool workspace_is_visible(Con *ws);
 
 /** Switches to the given workspace */
-void workspace_show(xcb_connection_t *conn, int workspace);
+void workspace_show(const char *num);
+
+/**
+ * Focuses the next workspace.
+ *
+ */
+void workspace_next();
+
+/**
+ * Focuses the previous workspace.
+ *
+ */
+void workspace_prev();
+
+#if 0
+/**
+ * Assigns the given workspace to the given screen by correctly updating its
+ * state and reconfiguring all the clients on this workspace.
+ *
+ * This is called when initializing a screen and when re-assigning it to a
+ * different screen which just got available (if you configured it to be on
+ * screen 1 and you just plugged in screen 1).
+ *
+ */
+void workspace_assign_to(Workspace *ws, Output *screen, bool hide_it);
 
 /**
  * Initializes the given workspace if it is not already initialized. The given
@@ -51,14 +80,14 @@ void workspace_show(xcb_connection_t *conn, int workspace);
  * the screen is not attached at the moment.
  *
  */
-void workspace_initialize(Workspace *ws, i3Screen *screen);
+void workspace_initialize(Workspace *ws, Output *screen, bool recheck);
 
 /**
  * Gets the first unused workspace for the given screen, taking into account
  * the preferred_screen setting of every workspace (workspace assignments).
  *
  */
-Workspace *get_first_workspace_for_screen(struct screens_head *slist, i3Screen *screen);
+Workspace *get_first_workspace_for_output(Output *screen);
 
 /**
  * Unmaps all clients (and stack windows) of the given workspace.
@@ -75,25 +104,33 @@ void workspace_unmap_clients(xcb_connection_t *conn, Workspace *u_ws);
  *
  */
 void workspace_map_clients(xcb_connection_t *conn, Workspace *ws);
+#endif
 
 /**
  * Goes through all clients on the given workspace and updates the workspace’s
  * urgent flag accordingly.
  *
  */
-void workspace_update_urgent_flag(Workspace *ws);
+void workspace_update_urgent_flag(Con *ws);
 
-/*
- * Returns the width of the workspace.
+/**
+ * 'Forces' workspace orientation by moving all cons into a new split-con with
+ * the same orientation as the workspace and then changing the workspace
+ * orientation.
  *
  */
-int workspace_width(Workspace *ws);
+void ws_force_orientation(Con *ws, orientation_t orientation);
 
-/*
- * Returns the effective height of the workspace (without the internal bar and
- * without dock clients).
+/**
+ * Called when a new con (with a window, not an empty or split con) should be
+ * attached to the workspace (for example when managing a new window or when
+ * moving an existing window to the workspace level).
+ *
+ * Depending on the workspace_layout setting, this function either returns the
+ * workspace itself (default layout) or creates a new stacked/tabbed con and
+ * returns that.
  *
  */
-int workspace_height(Workspace *ws);
+Con *workspace_attach_to(Con *ws);
 
 #endif