3 files changed, 15 insertions, 0 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index c3913c79..1f2376d0 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -188,6 +188,7 @@ sway_cmd bar_cmd_bindsym;
 sway_cmd bar_cmd_colors;
 sway_cmd bar_cmd_context_button;
 sway_cmd bar_cmd_font;
+sway_cmd bar_cmd_gaps;
 sway_cmd bar_cmd_mode;
 sway_cmd bar_cmd_modifier;
 sway_cmd bar_cmd_output;
diff --git a/include/sway/config.h b/include/sway/config.h
index 1ff9a104..58b7010e 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -227,6 +227,7 @@ struct bar_config {
         bool strip_workspace_name;
         bool binding_mode_indicator;
         bool verbose;
+        struct side_gaps gaps;
         pid_t pid;
         struct {
                 char *background;
@@ -425,6 +426,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;
@@ -490,6 +493,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);
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 700e6b60..fd7c6ec4 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -42,6 +42,12 @@ struct swaybar_config {
         struct wl_list outputs; // config_output::link
         bool all_outputs;
         int height;
+        struct {
+                int top;
+                int right;
+                int bottom;
+                int left;
+        } gaps;
 
         struct {
                 uint32_t background;