Implement bar bindsym

4 files changed, 95 insertions, 2 deletions

diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c
index ac09a03f..b0df9eff 100644
--- a/sway/commands/bar/bindsym.c
+++ b/sway/commands/bar/bindsym.c
@@ -1,5 +1,7 @@
+#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "list.h"
@@ -7,5 +9,61 @@
 #include "stringop.h"
 
 struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
-        return cmd_results_new(CMD_FAILURE, "bindsym", "TODO"); // TODO
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "bar bindsym", EXPECTED_MORE_THAN, 1))) {
+                return error;
+        }
+        if (!config->current_bar) {
+                return cmd_results_new(CMD_FAILURE, "bar bindsym", "No bar defined.");
+        }
+
+        struct bar_binding *binding = calloc(1, sizeof(struct bar_binding));
+        if (!binding) {
+                return cmd_results_new(CMD_FAILURE, "bar bindsym",
+                                "Unable to allocate bar binding");
+        }
+
+        binding->release = false;
+        if (strcmp("--release", argv[0]) == 0) {
+                binding->release = true;
+                argv++;
+                argc--;
+        }
+
+        binding->button = 0;
+        if (strncasecmp(argv[0], "button", strlen("button")) == 0 &&
+                        strlen(argv[0]) == strlen("button0")) {
+                binding->button = argv[0][strlen("button")] - '1' + 1;
+        }
+        if (binding->button == 0) {
+                free_bar_binding(binding);
+                return cmd_results_new(CMD_FAILURE, "bar bindsym",
+                                "Only button<n> is supported");
+        }
+
+        binding->command = join_args(argv + 1, argc - 1);
+
+        list_t *bindings = config->current_bar->bindings;
+        bool overwritten = false;
+        for (int i = 0; i < bindings->length; i++) {
+                struct bar_binding *other = bindings->items[i];
+                if (other->button == binding->button &&
+                                other->release == binding->release) {
+                        overwritten = true;
+                        bindings->items[i] = binding;
+                        free_bar_binding(other);
+                        wlr_log(WLR_DEBUG, "[bar %s] Updated binding for button%u%s",
+                                        config->current_bar->id, binding->button,
+                                        binding->release ? " (release)" : "");
+                        break;
+                }
+        }
+        if (!overwritten) {
+                list_add(bindings, binding);
+                wlr_log(WLR_DEBUG, "[bar %s] Added binding for button%u%s",
+                                config->current_bar->id, binding->button,
+                                binding->release ? " (release)" : "");
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/config/bar.c b/sway/config/bar.c
index b8695798..f84407c9 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -28,6 +28,16 @@ static void terminate_swaybar(pid_t pid) {
         }
 }
 
+void free_bar_binding(struct bar_binding *binding) {
+        if (!binding) {
+                return;
+        }
+        if (binding->command) {
+                free(binding->command);
+        }
+        free(binding);
+}
+
 void free_bar_config(struct bar_config *bar) {
         if (!bar) {
                 return;
@@ -39,7 +49,11 @@ void free_bar_config(struct bar_config *bar) {
         free(bar->status_command);
         free(bar->font);
         free(bar->separator_symbol);
-        // TODO: Free mouse bindings
+        while (bar->bindings->length) {
+                struct bar_binding *binding = bar->bindings->items[0];
+                list_del(bar->bindings, 0);
+                free_bar_binding(binding);
+        }
         list_free(bar->bindings);
         if (bar->outputs) {
                 free_flat_list(bar->outputs);
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index f02f370b..54d611f2 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -623,6 +623,22 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
 
         json_object_object_add(json, "colors", colors);
 
+        if (bar->bindings->length > 0) {
+                json_object *bindings = json_object_new_array();
+                for (int i = 0; i < bar->bindings->length; ++i) {
+                        struct bar_binding *binding = bar->bindings->items[i];
+                        json_object *bind = json_object_new_object();
+                        json_object_object_add(bind, "input_code",
+                                        json_object_new_int(binding->button));
+                        json_object_object_add(bind, "command",
+                                        json_object_new_string(binding->command));
+                        json_object_object_add(bind, "release",
+                                        json_object_new_boolean(binding->release));
+                        json_object_array_add(bindings, bind);
+                }
+                json_object_object_add(json, "bindings", bindings);
+        }
+
         // Add outputs if defined
         if (bar->outputs && bar->outputs->length > 0) {
                 json_object *outputs = json_object_new_array();
diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd
index 8c7be8e7..6729c9ac 100644
--- a/sway/sway-bar.5.scd
+++ b/sway/sway-bar.5.scd
@@ -60,6 +60,11 @@ Sway allows configuring swaybar in the sway configuration file.
 *height* <height>
         Sets the height of the bar. Default height will match the font size.
 
+*bindsym* [--release] button<n> <command>
+        Executes _command_ when mouse button _n_ has been pressed (or if _released_
+        is given, when mouse button _n_ has been released). To disable the default
+        behavior for a button, use the command _nop_.
+
 ## TRAY
 
 Swaybar provides a system tray where third-party applications may place icons.