1 files changed, 47 insertions, 20 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 2e24c3ae..0be1cd22 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -10,12 +10,15 @@
 #include <xkbcommon/xkbcommon.h>
 #include <xf86drmMode.h>
 #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"
 #include "sway/tree/root.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
+#include <pango/pangocairo.h>
 
 // TODO: Refactor this shit
 
@@ -32,7 +35,8 @@ enum binding_input_type {
         BINDING_KEYSYM,
         BINDING_MOUSECODE,
         BINDING_MOUSESYM,
-        BINDING_SWITCH
+        BINDING_SWITCH, // dummy, only used to call seat_execute_command
+        BINDING_GESTURE // dummy, only used to call seat_execute_command
 };
 
 enum binding_flags {
@@ -45,6 +49,7 @@ enum binding_flags {
         BINDING_RELOAD = 1 << 6, // switch only; (re)trigger binding on reload
         BINDING_INHIBITED = 1 << 7, // keyboard only: ignore shortcut inhibitor
         BINDING_NOREPEAT = 1 << 8, // keyboard only; do not trigger when repeating a held key
+        BINDING_EXACT = 1 << 9, // gesture only; only trigger on exact match
 };
 
 /**
@@ -79,6 +84,16 @@ struct sway_switch_binding {
 };
 
 /**
+ * A gesture binding and an associated command.
+ */
+struct sway_gesture_binding {
+        char *input;
+        uint32_t flags;
+        struct gesture gesture;
+        char *command;
+};
+
+/**
  * Focus on window activation.
  */
 enum sway_fowa {
@@ -97,6 +112,7 @@ struct sway_mode {
         list_t *keycode_bindings;
         list_t *mouse_bindings;
         list_t *switch_bindings;
+        list_t *gesture_bindings;
         bool pango;
 };
 
@@ -135,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;
@@ -232,12 +251,6 @@ struct seat_config {
         } xcursor_theme;
 };
 
-enum config_dpms {
-        DPMS_IGNORE,
-        DPMS_ON,
-        DPMS_OFF,
-};
-
 enum scale_filter_mode {
         SCALE_FILTER_DEFAULT, // the default is currently smart
         SCALE_FILTER_LINEAR,
@@ -259,6 +272,7 @@ enum render_bit_depth {
 struct output_config {
         char *name;
         int enabled;
+        int power;
         int width, height;
         float refresh_rate;
         int custom_mode;
@@ -275,7 +289,14 @@ struct output_config {
         char *background;
         char *background_option;
         char *background_fallback;
-        enum config_dpms dpms_state;
+};
+
+/**
+ * An output config pre-matched to an output
+ */
+struct matched_output_config {
+        struct sway_output *output;
+        struct output_config *config;
 };
 
 /**
@@ -490,7 +511,8 @@ struct sway_config {
         char *floating_scroll_right_cmd;
         enum sway_container_layout default_orientation;
         enum sway_container_layout default_layout;
-        char *font;
+        char *font; // Used for IPC.
+        PangoFontDescription *font_description; // Used internally for rendering and validating.
         int font_height;
         int font_baseline;
         bool pango_markup;
@@ -519,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;
@@ -612,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
@@ -665,20 +688,22 @@ 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 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);
-
-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);
@@ -689,6 +714,8 @@ void free_sway_binding(struct sway_binding *sb);
 
 void free_switch_binding(struct sway_switch_binding *binding);
 
+void free_gesture_binding(struct sway_gesture_binding *binding);
+
 void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding);
 
 void load_swaybar(struct bar_config *bar);
@@ -706,7 +733,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.
  */