02bbefda20
This modifies `bar_cmd_tray_bindsym` to use `get_mouse_bindsym` for parsing mouse buttons. This also introduces `bar_cmd_tray_bindcode`, which will use `get_mouse_bindcode` for parsing mouse buttons. Like with sway bindings, the two commands are encapsulated in a single file to maximize shared code. This also modifies tray bindings to work off of events codes rather than x11 buttons, which allows for any mouse buttons to be used. For `get_bar_config`, `event_code` has been added to the `tray_bindings` section and will include to event code for the button. If the event code can be mapped to a x11 button, `input_code` will still be the x11 button number. Otherwise, `input_code` will be `0`.
85 lines
2.3 KiB
C
85 lines
2.3 KiB
C
#include <libevdev/libevdev.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/input/cursor.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
#include "stringop.h"
|
|
|
|
static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) {
|
|
const char *command = code ? "bar bindcode" : "bar bindsym";
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, command, EXPECTED_AT_LEAST, 2))) {
|
|
return error;
|
|
}
|
|
if (!config->current_bar) {
|
|
return cmd_results_new(CMD_FAILURE, "No bar defined.");
|
|
}
|
|
|
|
struct bar_binding *binding = calloc(1, sizeof(struct bar_binding));
|
|
if (!binding) {
|
|
return cmd_results_new(CMD_FAILURE, "Unable to allocate bar binding");
|
|
}
|
|
|
|
binding->release = false;
|
|
if (strcmp("--release", argv[0]) == 0) {
|
|
binding->release = true;
|
|
argv++;
|
|
argc--;
|
|
}
|
|
|
|
char *message = NULL;
|
|
if (code) {
|
|
binding->button = get_mouse_bindcode(argv[0], &message);
|
|
} else {
|
|
binding->button = get_mouse_bindsym(argv[0], &message);
|
|
}
|
|
if (message) {
|
|
free_bar_binding(binding);
|
|
error = cmd_results_new(CMD_INVALID, message);
|
|
free(message);
|
|
return error;
|
|
} else if (!binding->button) {
|
|
free_bar_binding(binding);
|
|
return cmd_results_new(CMD_INVALID, "Unknown button %s", argv[0]);
|
|
}
|
|
const char *name = get_mouse_button_name(binding->button);
|
|
|
|
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 %u (%s)%s",
|
|
config->current_bar->id, binding->button, name,
|
|
binding->release ? " - release" : "");
|
|
break;
|
|
}
|
|
}
|
|
if (!overwritten) {
|
|
list_add(bindings, binding);
|
|
wlr_log(WLR_DEBUG, "[bar %s] Added binding for %u (%s)%s",
|
|
config->current_bar->id, binding->button, name,
|
|
binding->release ? " - release" : "");
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
|
|
struct cmd_results *bar_cmd_bindcode(int argc, char **argv) {
|
|
return bar_cmd_bind(argc, argv, true);
|
|
}
|
|
|
|
struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
|
|
return bar_cmd_bind(argc, argv, false);
|
|
}
|