1 files changed, 111 insertions, 4 deletions

diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 706f968d..097f9161 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -6,6 +6,7 @@
 #include <wlr/util/log.h>
 #include "swaybar/config.h"
 #include "swaybar/ipc.h"
+#include "config.h"
 #include "ipc-client.h"
 #include "list.h"
 
@@ -153,18 +154,21 @@ static bool ipc_parse_config(
                 return false;
         }
         json_object *markup, *mode, *hidden_state, *position, *status_command;
-        json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers;
-        json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs;
-        json_object *bindings;
+        json_object *font, *gaps, *bar_height, *wrap_scroll, *workspace_buttons;
+        json_object *strip_workspace_numbers, *strip_workspace_name;
+        json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol;
+        json_object *outputs, *bindings, *status_padding, *status_edge_padding;
         json_object_object_get_ex(bar_config, "mode", &mode);
         json_object_object_get_ex(bar_config, "hidden_state", &hidden_state);
         json_object_object_get_ex(bar_config, "position", &position);
         json_object_object_get_ex(bar_config, "status_command", &status_command);
         json_object_object_get_ex(bar_config, "font", &font);
+        json_object_object_get_ex(bar_config, "gaps", &gaps);
         json_object_object_get_ex(bar_config, "bar_height", &bar_height);
         json_object_object_get_ex(bar_config, "wrap_scroll", &wrap_scroll);
         json_object_object_get_ex(bar_config, "workspace_buttons", &workspace_buttons);
         json_object_object_get_ex(bar_config, "strip_workspace_numbers", &strip_workspace_numbers);
+        json_object_object_get_ex(bar_config, "strip_workspace_name", &strip_workspace_name);
         json_object_object_get_ex(bar_config, "binding_mode_indicator", &binding_mode_indicator);
         json_object_object_get_ex(bar_config, "verbose", &verbose);
         json_object_object_get_ex(bar_config, "separator_symbol", &sep_symbol);
@@ -172,6 +176,9 @@ static bool ipc_parse_config(
         json_object_object_get_ex(bar_config, "outputs", &outputs);
         json_object_object_get_ex(bar_config, "pango_markup", &markup);
         json_object_object_get_ex(bar_config, "bindings", &bindings);
+        json_object_object_get_ex(bar_config, "status_padding", &status_padding);
+        json_object_object_get_ex(bar_config, "status_edge_padding",
+                        &status_edge_padding);
         if (status_command) {
                 free(config->status_command);
                 config->status_command = strdup(json_object_get_string(status_command));
@@ -190,6 +197,9 @@ static bool ipc_parse_config(
         if (strip_workspace_numbers) {
                 config->strip_workspace_numbers = json_object_get_boolean(strip_workspace_numbers);
         }
+        if (strip_workspace_name) {
+                config->strip_workspace_name = json_object_get_boolean(strip_workspace_name);
+        }
         if (binding_mode_indicator) {
                 config->binding_mode_indicator = json_object_get_boolean(binding_mode_indicator);
         }
@@ -202,6 +212,30 @@ static bool ipc_parse_config(
         if (bar_height) {
                 config->height = json_object_get_int(bar_height);
         }
+        if (status_padding) {
+                config->status_padding = json_object_get_int(status_padding);
+        }
+        if (status_edge_padding) {
+                config->status_edge_padding = json_object_get_int(status_edge_padding);
+        }
+        if (gaps) {
+                json_object *top = json_object_object_get(gaps, "top");
+                if (top) {
+                        config->gaps.top = json_object_get_int(top);
+                }
+                json_object *right = json_object_object_get(gaps, "right");
+                if (right) {
+                        config->gaps.right = json_object_get_int(right);
+                }
+                json_object *bottom = json_object_object_get(gaps, "bottom");
+                if (bottom) {
+                        config->gaps.bottom = json_object_get_int(bottom);
+                }
+                json_object *left = json_object_object_get(gaps, "left");
+                if (left) {
+                        config->gaps.left = json_object_get_int(left);
+                }
+        }
         if (markup) {
                 config->pango_markup = json_object_get_boolean(markup);
         }
@@ -212,7 +246,7 @@ static bool ipc_parse_config(
                         struct swaybar_binding *binding =
                                 calloc(1, sizeof(struct swaybar_binding));
                         binding->button = json_object_get_int(
-                                        json_object_object_get(bindobj, "input_code"));
+                                        json_object_object_get(bindobj, "event_code"));
                         binding->command = strdup(json_object_get_string(
                                         json_object_object_get(bindobj, "command")));
                         binding->release = json_object_get_boolean(
@@ -258,6 +292,40 @@ static bool ipc_parse_config(
                 ipc_parse_colors(config, colors);
         }
 
+#if HAVE_TRAY
+        json_object *tray_outputs, *tray_padding, *tray_bindings, *icon_theme;
+
+        if ((json_object_object_get_ex(bar_config, "tray_outputs", &tray_outputs))) {
+                config->tray_outputs = create_list();
+                int length = json_object_array_length(tray_outputs);
+                for (int i = 0; i < length; ++i) {
+                        json_object *o = json_object_array_get_idx(tray_outputs, i);
+                        list_add(config->tray_outputs, strdup(json_object_get_string(o)));
+                }
+                config->tray_hidden = strcmp(config->tray_outputs->items[0], "none") == 0;
+        }
+
+        if ((json_object_object_get_ex(bar_config, "tray_padding", &tray_padding))) {
+                config->tray_padding = json_object_get_int(tray_padding);
+        }
+
+        if ((json_object_object_get_ex(bar_config, "tray_bindings", &tray_bindings))) {
+                int length = json_object_array_length(tray_bindings);
+                for (int i = 0; i < length; ++i) {
+                        json_object *bind = json_object_array_get_idx(tray_bindings, i);
+                        json_object *button, *command;
+                        json_object_object_get_ex(bind, "input_code", &button);
+                        json_object_object_get_ex(bind, "command", &command);
+                        config->tray_bindings[json_object_get_int(button)] =
+                                strdup(json_object_get_string(command));
+                }
+        }
+
+        if ((json_object_object_get_ex(bar_config, "icon_theme", &icon_theme))) {
+                config->icon_theme = strdup(json_object_get_string(icon_theme));
+        }
+#endif
+
         json_object_put(bar_config);
         return true;
 }
@@ -298,6 +366,24 @@ bool ipc_get_workspaces(struct swaybar *bar) {
                                         calloc(1, sizeof(struct swaybar_workspace));
                                 ws->num = json_object_get_int(num);
                                 ws->name = strdup(json_object_get_string(name));
+                                ws->label = strdup(ws->name);
+                                // ws->num will be -1 if workspace name doesn't begin with int.
+                                if (ws->num != -1) {
+                                        size_t len_offset = numlen(ws->num);
+                                        if (bar->config->strip_workspace_name) {
+                                                free(ws->label);
+                                                ws->label = malloc(len_offset + 1 * sizeof(char));
+                                                ws->label[len_offset] = '\0';
+                                                strncpy(ws->label, ws->name, len_offset);
+                                        } else if (bar->config->strip_workspace_numbers) {
+                                                len_offset += ws->label[len_offset] == ':';
+                                                if (strlen(ws->name) > len_offset) {
+                                                        free(ws->label);
+                                                        // Strip number prefix [1-?:] using len_offset.
+                                                        ws->label = strdup(ws->name + len_offset);
+                                                }
+                                        }
+                                }
                                 ws->visible = json_object_get_boolean(visible);
                                 ws->focused = json_object_get_boolean(focused);
                                 if (ws->focused) {
@@ -423,6 +509,27 @@ static bool handle_barconfig_update(struct swaybar *bar,
         config->mode = strdup(json_object_get_string(json_mode));
         wlr_log(WLR_DEBUG, "Changing bar mode to %s", config->mode);
 
+        json_object *gaps;
+        json_object_object_get_ex(json_config, "gaps", &gaps);
+        if (gaps) {
+                json_object *top = json_object_object_get(gaps, "top");
+                if (top) {
+                        config->gaps.top = json_object_get_int(top);
+                }
+                json_object *right = json_object_object_get(gaps, "right");
+                if (right) {
+                        config->gaps.right = json_object_get_int(right);
+                }
+                json_object *bottom = json_object_object_get(gaps, "bottom");
+                if (bottom) {
+                        config->gaps.bottom = json_object_get_int(bottom);
+                }
+                json_object *left = json_object_object_get(gaps, "left");
+                if (left) {
+                        config->gaps.left = json_object_get_int(left);
+                }
+        }
+
         return determine_bar_visibility(bar, true);
 }