1 files changed, 21 insertions, 4 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 5a355139..4927b8e0 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -100,6 +100,7 @@ struct input_config {
         int middle_emulation;
         int natural_scroll;
         float pointer_accel;
+        float scroll_factor;
         int repeat_delay;
         int repeat_rate;
         int scroll_button;
@@ -168,14 +169,24 @@ struct output_config {
 };
 
 /**
+ * Stores size of gaps for each side
+ */
+struct side_gaps {
+        int top;
+        int right;
+        int bottom;
+        int left;
+};
+
+/**
  * Stores configuration for a workspace, regardless of whether the workspace
  * exists.
  */
 struct workspace_config {
         char *workspace;
-        char *output;
+        list_t *outputs;
         int gaps_inner;
-        int gaps_outer;
+        struct side_gaps gaps_outer;
 };
 
 struct bar_config {
@@ -328,6 +339,12 @@ struct ipc_policy {
         uint32_t features;
 };
 
+enum focus_follows_mouse_mode {
+        FOLLOWS_NO,
+        FOLLOWS_YES,
+        FOLLOWS_ALWAYS
+};
+
 enum focus_wrapping_mode {
         WRAP_NO,
         WRAP_YES,
@@ -379,7 +396,7 @@ struct sway_config {
         enum sway_popup_during_fullscreen popup_during_fullscreen;
 
         // Flags
-        bool focus_follows_mouse;
+        enum focus_follows_mouse_mode focus_follows_mouse;
         enum mouse_warping_mode mouse_warping;
         enum focus_wrapping_mode focus_wrapping;
         bool active;
@@ -393,7 +410,7 @@ struct sway_config {
 
         bool smart_gaps;
         int gaps_inner;
-        int gaps_outer;
+        struct side_gaps gaps_outer;
 
         list_t *config_chain;
         const char *current_config_path;