Merge branch 'master' into next

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index ad780f1f2013146c86e93f5925d51fed78d125b3..907e959f0347e8903eef96bee29498698570f718 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -95,6 +95,12 @@ Con* workspace_prev_on_output(void);
  */
 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
 /**
@@ -168,4 +174,11 @@ void ws_force_orientation(Con *ws, orientation_t orientation);
  */
 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