1 files changed, 85 insertions, 45 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 59f22ae2..0be1cd22 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -5,16 +5,20 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/interfaces/wlr_switch.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/util/box.h>
 #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
 
@@ -31,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 {
@@ -44,10 +49,11 @@ 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
 };
 
 /**
- * A key binding and an associated command.
+ * A key (or mouse) binding and an associated command.
  */
 struct sway_binding {
         enum binding_input_type type;
@@ -61,12 +67,10 @@ struct sway_binding {
         char *command;
 };
 
-/**
- * A mouse binding and an associated command.
- */
-struct sway_mouse_binding {
-        uint32_t button;
-        char *command;
+enum sway_switch_trigger {
+        SWAY_SWITCH_TRIGGER_OFF,
+        SWAY_SWITCH_TRIGGER_ON,
+        SWAY_SWITCH_TRIGGER_TOGGLE,
 };
 
 /**
@@ -74,12 +78,22 @@ struct sway_mouse_binding {
  */
 struct sway_switch_binding {
         enum wlr_switch_type type;
-        enum wlr_switch_state state;
+        enum sway_switch_trigger trigger;
         uint32_t flags;
         char *command;
 };
 
 /**
+ * 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 {
@@ -98,6 +112,7 @@ struct sway_mode {
         list_t *keycode_bindings;
         list_t *mouse_bindings;
         list_t *switch_bindings;
+        list_t *gesture_bindings;
         bool pango;
 };
 
@@ -136,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;
@@ -233,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,
@@ -246,6 +258,12 @@ enum scale_filter_mode {
         SCALE_FILTER_SMART,
 };
 
+enum render_bit_depth {
+        RENDER_BIT_DEPTH_DEFAULT, // the default is currently 8
+        RENDER_BIT_DEPTH_8,
+        RENDER_BIT_DEPTH_10,
+};
+
 /**
  * Size and position configuration for a particular output.
  *
@@ -254,9 +272,11 @@ enum scale_filter_mode {
 struct output_config {
         char *name;
         int enabled;
+        int power;
         int width, height;
         float refresh_rate;
         int custom_mode;
+        drmModeModeInfo drm_mode;
         int x, y;
         float scale;
         enum scale_filter_mode scale_filter;
@@ -264,11 +284,19 @@ struct output_config {
         enum wl_output_subpixel subpixel;
         int max_render_time; // In milliseconds
         int adaptive_sync;
+        enum render_bit_depth render_bit_depth;
 
         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;
 };
 
 /**
@@ -281,6 +309,12 @@ struct side_gaps {
         int left;
 };
 
+enum smart_gaps_mode {
+        SMART_GAPS_OFF,
+        SMART_GAPS_ON,
+        SMART_GAPS_INVERSE_OUTER,
+};
+
 /**
  * Stores configuration for a workspace, regardless of whether the workspace
  * exists.
@@ -292,6 +326,12 @@ struct workspace_config {
         struct side_gaps gaps_outer;
 };
 
+enum pango_markup_config {
+        PANGO_MARKUP_DISABLED = false,
+        PANGO_MARKUP_ENABLED = true,
+        PANGO_MARKUP_DEFAULT // The default is font dependent ("pango:" prefix)
+};
+
 struct bar_config {
         char *swaybar_command;
         struct wl_client *client;
@@ -323,7 +363,7 @@ struct bar_config {
         char *position;
         list_t *bindings;
         char *status_command;
-        bool pango_markup;
+        enum pango_markup_config pango_markup;
         char *font;
         int height; // -1 not defined
         bool workspace_buttons;
@@ -410,14 +450,6 @@ enum sway_popup_during_fullscreen {
         POPUP_LEAVE,
 };
 
-enum command_context {
-        CONTEXT_CONFIG = 1 << 0,
-        CONTEXT_BINDING = 1 << 1,
-        CONTEXT_IPC = 1 << 2,
-        CONTEXT_CRITERIA = 1 << 3,
-        CONTEXT_ALL = 0xFFFFFFFF,
-};
-
 enum focus_follows_mouse_mode {
         FOLLOWS_NO,
         FOLLOWS_YES,
@@ -479,9 +511,10 @@ struct sway_config {
         char *floating_scroll_right_cmd;
         enum sway_container_layout default_orientation;
         enum sway_container_layout default_layout;
-        char *font;
-        size_t font_height;
-        size_t font_baseline;
+        char *font; // Used for IPC.
+        PangoFontDescription *font_description; // Used internally for rendering and validating.
+        int font_height;
+        int font_baseline;
         bool pango_markup;
         int titlebar_border_thickness;
         int titlebar_h_padding;
@@ -508,11 +541,12 @@ 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;
 
-        bool smart_gaps;
+        enum smart_gaps_mode smart_gaps;
         int gaps_inner;
         struct side_gaps gaps_outer;
 
@@ -535,12 +569,15 @@ struct sway_config {
         struct {
                 struct border_colors focused;
                 struct border_colors focused_inactive;
+                struct border_colors focused_tab_title;
                 struct border_colors unfocused;
                 struct border_colors urgent;
                 struct border_colors placeholder;
                 float background[4];
         } border_colors;
 
+        bool has_focused_tab_title;
+
         // floating view
         int32_t floating_maximum_width;
         int32_t floating_maximum_height;
@@ -559,7 +596,7 @@ struct sway_config {
                 struct sway_node *node;
                 struct sway_container *container;
                 struct sway_workspace *workspace;
-                bool using_criteria;
+                bool node_overridden; // True if the node is selected by means other than focus
                 struct {
                         int argc;
                         char **argv;
@@ -598,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
@@ -651,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);
@@ -675,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);
@@ -690,14 +731,13 @@ void free_bar_binding(struct bar_binding *binding);
 void free_workspace_config(struct workspace_config *wsc);
 
 /**
- * Updates the value of config->font_height based on the max title height
- * reported by each container. If recalculate is true, the containers will
- * recalculate their heights before reporting.
+ * 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.
  */
-void config_update_font_height(bool recalculate);
+void config_update_font_height(void);
 
 /**
  * Convert bindsym into bindcode using the first configured layout.