5 files changed, 6 insertions, 1 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index d39ac56c..365068ae 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -144,6 +144,7 @@ sway_cmd cmd_splitt;
 sway_cmd cmd_splitv;
 sway_cmd cmd_sticky;
 sway_cmd cmd_swaybg_command;
+sway_cmd cmd_swap;
 sway_cmd cmd_title_format;
 sway_cmd cmd_unmark;
 sway_cmd cmd_workspace;
diff --git a/include/sway/config.h b/include/sway/config.h
index 33f52156..118981e3 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -28,6 +28,7 @@ struct sway_variable {
 struct sway_binding {
 	int order;
 	bool release;
+	bool locked;
 	bool bindcode;
 	list_t *keys;
 	uint32_t modifiers;
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 74da132c..bd3ca0ac 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -18,6 +18,7 @@ struct criteria {
 	char *target; // workspace or output name for `assign` criteria
 
 	pcre *title;
+	pcre *shell;
 	pcre *app_id;
 	pcre *class;
 	pcre *instance;
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index cc999871..2e0f2abf 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -69,4 +69,6 @@ struct sway_container *container_split(struct sway_container *child,
 void container_recursive_resize(struct sway_container *container,
 		double amount, enum resize_edge edge);
 
+void container_swap(struct sway_container *con1, struct sway_container *con2);
+
 #endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 0fb8f1b3..a8bf4955 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -201,7 +201,7 @@ const char *view_get_window_role(struct sway_view *view);
 
 uint32_t view_get_window_type(struct sway_view *view);
 
-const char *view_get_type(struct sway_view *view);
+const char *view_get_shell(struct sway_view *view);
 
 void view_configure(struct sway_view *view, double ox, double oy, int width,
 	int height);