diff options
| -rw-r--r-- | include/config.h | 13 | ||||
| -rw-r--r-- | sway/commands.c | 42 | ||||
| -rw-r--r-- | sway/config.c | 27 |
3 files changed, 81 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h index a8370532..0fc8202c 100644 --- a/include/config.h +++ b/include/config.h @@ -27,6 +27,14 @@ struct sway_binding { }; /** + * A mouse binding and an associated command. + */ +struct sway_mouse_binding { + uint32_t button; + char *command; +}; + +/** * A "mode" of keybindings created via the `mode` command. */ struct sway_mode { @@ -81,6 +89,7 @@ struct bar_config { char *id; uint32_t modifier; enum desktop_shell_panel_position position; + list_t *bindings; char *status_command; char *font; int bar_height; @@ -163,6 +172,10 @@ int sway_binding_cmp(const void *a, const void *b); int sway_binding_cmp_keys(const void *a, const void *b); void free_sway_binding(struct sway_binding *sb); +int sway_mouse_binding_cmp(const void *a, const void *b); +int sway_mouse_binding_cmp_buttons(const void *a, const void *b); +void free_sway_mouse_binding(struct sway_mouse_binding *smb); + /** * Global config singleton. */ diff --git a/sway/commands.c b/sway/commands.c index aa4cb89e..053f40fc 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -65,6 +65,7 @@ static sway_cmd cmd_sticky; static sway_cmd cmd_workspace; static sway_cmd cmd_ws_auto_back_and_forth; +static sway_cmd bar_cmd_bindsym; static sway_cmd bar_cmd_mode; static sway_cmd bar_cmd_hidden_state; static sway_cmd bar_cmd_id; @@ -1132,6 +1133,7 @@ static struct cmd_results *cmd_bar(int argc, char **argv) { bar->hidden_state = strdup(config->bar.hidden_state); bar->modifier = config->bar.modifier; bar->position = config->bar.position; + bar->bindings = create_list(); bar->status_command = strdup(config->bar.status_command); bar->font = strdup(config->bar.font); bar->bar_height = config->bar.bar_height; @@ -1539,6 +1541,44 @@ static struct cmd_handler handlers[] = { { "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth }, }; +static struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "bindsym", EXPECTED_MORE_THAN, 1))) { + return error; + } else if (!config->reading) { + return cmd_results_new(CMD_FAILURE, "bindsym", "Can only be used in config file."); + } + + if (!config->current_bar) { + return cmd_results_new(CMD_FAILURE, "bindsym", "No bar defined."); + } + + if (strlen(argv[1]) != 7) { + return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]); + } + uint32_t numbutton = (uint32_t)atoi(argv[1] + 6); + if (numbutton < 1 || numbutton > 5 || strncmp(argv[1], "button", 6) != 0) { + return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]); + } + struct sway_mouse_binding *binding = malloc(sizeof(struct sway_mouse_binding)); + binding->button = numbutton; + binding->command = join_args(argv + 1, argc - 1); + + struct bar_config *bar = config->current_bar; + int i = list_seq_find(bar->bindings, sway_mouse_binding_cmp_buttons, binding); + if (i > -1) { + sway_log(L_DEBUG, "bindsym - '%s' for swaybar already exists, overwriting", argv[0]); + struct sway_mouse_binding *dup = bar->bindings->items[i]; + free_sway_mouse_binding(dup); + list_del(bar->bindings, i); + } + list_add(bar->bindings, binding); + list_sort(bar->bindings, sway_mouse_binding_cmp); + + sway_log(L_DEBUG, "bindsym - Bound %s to command %s when clicking swaybar", argv[0], binding->command); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} + static struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) { struct cmd_results *error = NULL; if ((error = checkarg(argc, "hidden_state", EXPECTED_EQUAL_TO, 1))) { @@ -1723,7 +1763,7 @@ static struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { static struct cmd_handler bar_handlers[] = { { "binding_mode_indicator", NULL }, - { "bindsym", NULL }, + { "bindsym", bar_cmd_bindsym }, { "colors", NULL }, { "font", NULL }, { "hidden_state", bar_cmd_hidden_state }, diff --git a/sway/config.c b/sway/config.c index 2a1f0310..2c2cc025 100644 --- a/sway/config.c +++ b/sway/config.c @@ -519,3 +519,30 @@ void free_sway_binding(struct sway_binding *binding) { } free(binding); } + +int sway_mouse_binding_cmp_buttons(const void *a, const void *b) { + const struct sway_mouse_binding *binda = a, *bindb = b; + if (binda->button > bindb->button) { + return 1; + } + if (binda->button < bindb->button) { + return -1; + } + return 0; +} + +int sway_mouse_binding_cmp(const void *a, const void *b) { + int cmp = 0; + if ((cmp = sway_binding_cmp_keys(a, b)) != 0) { + return cmp; + } + const struct sway_mouse_binding *binda = a, *bindb = b; + return lenient_strcmp(binda->command, bindb->command); +} + +void free_sway_mouse_binding(struct sway_mouse_binding *binding) { + if (binding->command) { + free(binding->command); + } + free(binding); +} |