diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-10 17:07:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 17:07:02 +0200 |
commit | 0a36d14d7a694a88580da1d9b83837afe608a2eb (patch) | |
tree | e21f0b633212c6b8084348f08fc68cec2efece8b /sway/commands/bar | |
parent | 782ed19bc30378126f44272c1e46f2a05a9b2db1 (diff) | |
parent | cd6917d4a821fe904a2c242dff673967aa3ad4b2 (diff) |
Merge pull request #2798 from RedSoxFan/bar-bindsym
Implement bar bindsym
Diffstat (limited to 'sway/commands/bar')
-rw-r--r-- | sway/commands/bar/bindsym.c | 60 |
1 files changed, 59 insertions, 1 deletions
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c index ac09a03f..4eea3e6a 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")] - '0'; + } + if (binding->button < 1 || binding->button > 9) { + free_bar_binding(binding); + return cmd_results_new(CMD_FAILURE, "bar bindsym", + "Only button<1-9> 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); } |