Merge pull request #2392 from ianyfan/commands

Fix commands: criteria, layout, move, workspace

3 files changed, 9 insertions, 2 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 44ff9f7d..16a180f8 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -113,7 +113,7 @@ struct sway_container {
 
         enum sway_container_type type;
         enum sway_container_layout layout;
-        enum sway_container_layout prev_layout;
+        enum sway_container_layout prev_split_layout;
 
         bool is_sticky;
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 37fd02bc..4a3f01e7 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -316,6 +316,11 @@ void view_update_title(struct sway_view *view, bool force);
 void view_execute_criteria(struct sway_view *view);
 
 /**
+ * Find any view that has the given mark and return it.
+ */
+struct sway_view *view_find_mark(char *mark);
+
+/**
  * Find any view that has the given mark and remove the mark from the view.
  * Returns true if it matched a view.
  */
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index 3337f2c8..239cbbdb 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -1,6 +1,7 @@
 #ifndef _SWAY_WORKSPACE_H
 #define _SWAY_WORKSPACE_H
 
+#include <stdbool.h>
 #include "sway/tree/container.h"
 
 struct sway_view;
@@ -17,7 +18,8 @@ extern char *prev_workspace_name;
 
 char *workspace_next_name(const char *output_name);
 
-bool workspace_switch(struct sway_container *workspace);
+bool workspace_switch(struct sway_container *workspace,
+                bool no_auto_back_and_forth);
 
 struct sway_container *workspace_by_number(const char* name);