refactor tree_move() into src/move.c, change config (!), change testcase

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index dae245ce036ec2060a69d3ed5e006b7e920bba37..b902f4903f988cbd5392e7bde257c05f213ee8d6 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -11,6 +11,7 @@
 #include <xcb/xcb.h>
 
 #include "data.h"
+#include "tree.h"
 #include "randr.h"
 
 #ifndef _WORKSPACE_H
@@ -22,8 +23,9 @@
  * memory and initializing the data structures correctly).
  *
  */
-Workspace *workspace_get(int number);
+Con *workspace_get(const char *num);
 
+#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 +34,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 +42,12 @@ 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);
 
+#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 +90,15 @@ 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.
- *
- */
-int workspace_width(Workspace *ws);
-
-/*
- * Returns the effective height of the workspace (without the internal bar and
- * without dock clients).
- *
- */
-int workspace_height(Workspace *ws);
+void ws_force_orientation(Con *ws, orientation_t orientation);
 
 #endif