1 files changed, 28 insertions, 10 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 68c06846..5ccc3e77 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -12,6 +12,7 @@
 #include "../include/config.h"
 #include "gesture.h"
 #include "list.h"
+#include "stringop.h"
 #include "swaynag.h"
 #include "tree/container.h"
 #include "sway/input/tablet.h"
@@ -150,14 +151,17 @@ struct input_config {
         int drag;
         int drag_lock;
         int dwt;
+        int dwtp;
         int left_handed;
         int middle_emulation;
         int natural_scroll;
         float pointer_accel;
+        float rotation_angle;
         float scroll_factor;
         int repeat_delay;
         int repeat_rate;
         int scroll_button;
+        int scroll_button_lock;
         int scroll_method;
         int send_events;
         int tap;
@@ -288,6 +292,14 @@ struct output_config {
 };
 
 /**
+ * An output config pre-matched to an output
+ */
+struct matched_output_config {
+        struct sway_output *output;
+        struct output_config *config;
+};
+
+/**
  * Stores size of gaps for each side
  */
 struct side_gaps {
@@ -529,6 +541,7 @@ struct sway_config {
         bool auto_back_and_forth;
         bool show_marks;
         enum alignment title_align;
+        bool primary_selection;
 
         bool tiling_drag;
         int tiling_drag_threshold;
@@ -622,7 +635,7 @@ void run_deferred_bindings(void);
 /**
  * Adds a warning entry to the swaynag instance used for errors.
  */
-void config_add_swaynag_warning(char *fmt, ...);
+void config_add_swaynag_warning(char *fmt, ...) _SWAY_ATTRIB_PRINTF(1, 2);
 
 /**
  * Free config struct
@@ -675,20 +688,25 @@ const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filt
 
 struct output_config *new_output_config(const char *name);
 
-void merge_output_config(struct output_config *dst, struct output_config *src);
+bool apply_output_configs(struct matched_output_config *configs,
+                size_t configs_len, bool test_only, bool degrade_to_off);
 
-bool apply_output_config(struct output_config *oc, struct sway_output *output);
+void apply_all_output_configs(void);
 
-bool test_output_config(struct output_config *oc, struct sway_output *output);
+void sort_output_configs_by_priority(struct matched_output_config *configs,
+                size_t configs_len);
 
-struct output_config *store_output_config(struct output_config *oc);
+/**
+ * store_output_config stores a new output config. An output may be matched by
+ * three different config types, in order of precedence: Identifier, name and
+ * wildcard. When storing a config type of lower precedence, assume that the
+ * user wants the config to take immediate effect by superseding (clearing) the
+ * same values from higher presedence configuration.
+ */
+void store_output_config(struct output_config *oc);
 
 struct output_config *find_output_config(struct sway_output *output);
 
-void apply_output_config_to_outputs(struct output_config *oc);
-
-void reset_outputs(void);
-
 void free_output_config(struct output_config *oc);
 
 bool spawn_swaybg(void);
@@ -718,7 +736,7 @@ void free_workspace_config(struct workspace_config *wsc);
 /**
  * Updates the value of config->font_height based on the metrics for title's
  * font as reported by pango.
- * 
+ *
  * If the height has changed, all containers will be rearranged to take on the
  * new size.
  */