Merge branch 'master' into bar-bindsym

2 files changed, 8 insertions, 2 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 48228a98..ab2da1a9 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -95,7 +95,7 @@ struct cmd_results *add_color(const char *name,
 /**
  * TODO: Move this function and its dependent functions to container.c.
  */
-bool container_resize_tiled(struct sway_container *parent, enum wlr_edges edge,
+void container_resize_tiled(struct sway_container *parent, enum wlr_edges edge,
                 int amount);
 
 sway_cmd cmd_assign;
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;