X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fworkspace.h;h=907e959f0347e8903eef96bee29498698570f718;hb=71ccb4bef2850bd5beab8a4ef4669bf53b5a9781;hp=dae245ce036ec2060a69d3ed5e006b7e920bba37;hpb=8d648b4e371cd7959a332d80aa288a3fa390cc7e;p=i3%2Fi3

diff --git a/include/workspace.h b/include/workspace.h
index dae245ce..907e959f 100644
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -1,29 +1,40 @@
 /*
- * 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.
  *
  */
-#include <xcb/xcb.h>
+#ifndef I3_WORKSPACE_H
+#define I3_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
  * 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.
+ *
+ */
+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.
+ *
  */
-Workspace *workspace_get(int number);
+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
@@ -32,6 +43,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,11 +51,58 @@ 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);
+/**
+ * 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(void);
+
+/**
+ * Returns the previous workspace.
+ *
+ */
+Con* workspace_prev(void);
+
+/**
+ * Returns the next workspace on the same output
+ *
+ */
+Con* workspace_next_on_output(void);
+
+/**
+ * Returns the previous workspace on the same output
+ *
+ */
+Con* workspace_prev_on_output(void);
+
+/**
+ * Focuses the previously focused workspace.
+ *
+ */
+void workspace_back_and_forth(void);
+
+/**
+ * Returns the previously focused workspace con, or NULL if unavailable.
+ *
+ */
+Con *workspace_back_and_forth_get(void);
+
+
+#if 0
 /**
  * Assigns the given workspace to the given screen by correctly updating its
  * state and reconfiguring all the clients on this workspace.
@@ -86,25 +145,40 @@ 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);
 
+/**
+ * Creates a new container and re-parents all of children from the given
+ * workspace into it.
+ *
+ * The container inherits the layout from the workspace.
+ */
+Con *workspace_encapsulate(Con *ws);
 #endif