Merge branch 'master' into bar-bindsym

1 files changed, 7 insertions, 1 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 549d2677..bc02c0fd 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -331,6 +331,12 @@ enum focus_wrapping_mode {
 	WRAP_FORCE
 };
 
+enum mouse_warping_mode {
+	WARP_NO,
+	WARP_OUTPUT,
+	WARP_CONTAINER
+};
+
 /**
  * The configuration struct. The result of loading a config file.
  */
@@ -372,7 +378,7 @@ struct sway_config {
 	// Flags
 	bool focus_follows_mouse;
 	bool raise_floating;
-	bool mouse_warping;
+	enum mouse_warping_mode mouse_warping;
 	enum focus_wrapping_mode focus_wrapping;
 	bool active;
 	bool failed;