1 files changed, 35 insertions, 4 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index c44533ee..96fe899b 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -6,6 +6,7 @@
 #include <time.h>
 #include <wlr/types/wlr_box.h>
 #include <xkbcommon/xkbcommon.h>
+#include "../include/config.h"
 #include "list.h"
 #include "swaynag.h"
 #include "tree/container.h"
@@ -26,7 +27,8 @@ struct sway_variable {
 enum binding_input_type {
         BINDING_KEYCODE,
         BINDING_KEYSYM,
-        BINDING_MOUSE,
+        BINDING_MOUSECODE,
+        BINDING_MOUSESYM,
 };
 
 enum binding_flags {
@@ -140,6 +142,7 @@ struct seat_config {
         char *name;
         int fallback; // -1 means not set
         list_t *attachments; // list of seat_attachment configs
+        int hide_cursor_timeout;
 };
 
 enum config_dpms {
@@ -224,9 +227,13 @@ struct bar_config {
         bool wrap_scroll;
         char *separator_symbol;
         bool strip_workspace_numbers;
+        bool strip_workspace_name;
         bool binding_mode_indicator;
         bool verbose;
+        struct side_gaps gaps;
         pid_t pid;
+        int status_padding;
+        int status_edge_padding;
         struct {
                 char *background;
                 char *statusline;
@@ -250,6 +257,13 @@ struct bar_config {
                 char *binding_mode_bg;
                 char *binding_mode_text;
         } colors;
+
+#if HAVE_TRAY
+        char *icon_theme;
+        const char *tray_bindings[10]; // mouse buttons 0-9
+        list_t *tray_outputs; // char *
+        int tray_padding;
+#endif
 };
 
 struct bar_binding {
@@ -356,6 +370,12 @@ enum mouse_warping_mode {
         WARP_CONTAINER
 };
 
+enum alignment {
+        ALIGN_LEFT,
+        ALIGN_CENTER,
+        ALIGN_RIGHT
+};
+
 /**
  * The configuration struct. The result of loading a config file.
  */
@@ -390,6 +410,9 @@ struct sway_config {
         size_t font_height;
         size_t font_baseline;
         bool pango_markup;
+        int titlebar_border_thickness;
+        int titlebar_h_padding;
+        int titlebar_v_padding;
         size_t urgent_timeout;
         enum sway_fowa focus_on_window_activation;
         enum sway_popup_during_fullscreen popup_during_fullscreen;
@@ -406,7 +429,10 @@ struct sway_config {
         bool validating;
         bool auto_back_and_forth;
         bool show_marks;
+        enum alignment title_align;
+
         bool tiling_drag;
+        int tiling_drag_threshold;
 
         bool smart_gaps;
         int gaps_inner;
@@ -415,6 +441,8 @@ struct sway_config {
         list_t *config_chain;
         const char *current_config_path;
         const char *current_config;
+        int current_config_line_number;
+        char *current_config_line;
 
         enum sway_container_border border;
         enum sway_container_border floating_border;
@@ -480,6 +508,11 @@ bool read_config(FILE *file, struct sway_config *config,
                 struct swaynag_instance *swaynag);
 
 /**
+ * Adds a warning entry to the swaynag instance used for errors.
+ */
+void config_add_swaynag_warning(char *fmt, ...);
+
+/**
  * Free config struct
  */
 void free_config(struct sway_config *config);
@@ -516,7 +549,7 @@ struct seat_attachment_config *seat_attachment_config_new(void);
 struct seat_attachment_config *seat_config_get_attachment(
                 struct seat_config *seat_config, char *identifier);
 
-void apply_seat_config(struct seat_config *seat);
+struct seat_config *store_seat_config(struct seat_config *seat);
 
 int output_name_cmp(const void *item, const void *data);
 
@@ -535,8 +568,6 @@ void apply_output_config_to_outputs(struct output_config *oc);
 
 void free_output_config(struct output_config *oc);
 
-void create_default_output_configs(void);
-
 int workspace_output_cmp_workspace(const void *a, const void *b);
 
 int sway_binding_cmp(const void *a, const void *b);