aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sway/config.h3
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/bind.c173
-rw-r--r--sway/config.c3
-rw-r--r--sway/meson.build1
5 files changed, 180 insertions, 2 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 83ded720..7146623e 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -46,7 +46,8 @@ struct sway_mouse_binding {
*/
struct sway_mode {
char *name;
- list_t *bindings;
+ list_t *keysym_bindings;
+ list_t *keycode_bindings;
};
/**
diff --git a/sway/commands.c b/sway/commands.c
index 34afb6a0..b0078a46 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -127,6 +127,8 @@ struct cmd_results *add_color(const char *name, char *buffer, const char *color)
/* Keep alphabetized */
static struct cmd_handler handlers[] = {
+ { "bindcode", cmd_bindcode },
+ { "bindsym", cmd_bindsym },
{ "exec", cmd_exec },
{ "exec_always", cmd_exec_always },
{ "exit", cmd_exit },
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
new file mode 100644
index 00000000..62aa535a
--- /dev/null
+++ b/sway/commands/bind.c
@@ -0,0 +1,173 @@
+#ifdef __linux__
+#include <linux/input-event-codes.h>
+#elif __FreeBSD__
+#include <dev/evdev/input-event-codes.h>
+#endif
+#include <xkbcommon/xkbcommon.h>
+#include <xkbcommon/xkbcommon-names.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
+#include "util.h"
+
+int binding_order = 0;
+
+void free_sway_binding(struct sway_binding *binding) {
+ if (binding->keys) {
+ for (int i = 0; i < binding->keys->length; i++) {
+ free(binding->keys->items[i]);
+ }
+ list_free(binding->keys);
+ }
+ if (binding->command) {
+ free(binding->command);
+ }
+ free(binding);
+}
+
+struct cmd_results *cmd_bindsym(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "bindsym", EXPECTED_MORE_THAN, 1))) {
+ return error;
+ }
+
+ struct sway_binding *binding = malloc(sizeof(struct sway_binding));
+ if (!binding) {
+ return cmd_results_new(CMD_FAILURE, "bindsym",
+ "Unable to allocate binding");
+ }
+ binding->keys = create_list();
+ binding->modifiers = 0;
+ binding->release = false;
+ binding->bindcode = false;
+
+ // Handle --release
+ if (strcmp("--release", argv[0]) == 0) {
+ if (argc >= 3) {
+ binding->release = true;
+ argv++;
+ argc--;
+ } else {
+ free_sway_binding(binding);
+ return cmd_results_new(CMD_FAILURE, "bindsym",
+ "Invalid bindsym command "
+ "(expected more than 2 arguments, got %d)", argc);
+ }
+ }
+
+ binding->command = join_args(argv + 1, argc - 1);
+
+ list_t *split = split_string(argv[0], "+");
+ for (int i = 0; i < split->length; ++i) {
+ // Check for a modifier key
+ uint32_t mod;
+ if ((mod = get_modifier_mask_by_name(split->items[i])) > 0) {
+ binding->modifiers |= mod;
+ continue;
+ }
+ // Check for xkb key
+ xkb_keysym_t sym = xkb_keysym_from_name(split->items[i],
+ XKB_KEYSYM_CASE_INSENSITIVE);
+
+ // Check for mouse binding
+ if (strncasecmp(split->items[i], "button", strlen("button")) == 0 &&
+ strlen(split->items[i]) == strlen("button0")) {
+ sym = ((char *)split->items[i])[strlen("button")] - '1' + BTN_LEFT;
+ }
+ if (!sym) {
+ struct cmd_results *ret = cmd_results_new(CMD_INVALID, "bindsym",
+ "Unknown key '%s'", (char *)split->items[i]);
+ free_sway_binding(binding);
+ free_flat_list(split);
+ return ret;
+ }
+ xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t));
+ if (!key) {
+ free_sway_binding(binding);
+ free_flat_list(split);
+ return cmd_results_new(CMD_FAILURE, "bindsym",
+ "Unable to allocate binding");
+ }
+ *key = sym;
+ list_add(binding->keys, key);
+ }
+ free_flat_list(split);
+
+ struct sway_mode *mode = config->current_mode;
+ // TODO overwrite the binding if it already exists
+ binding->order = binding_order++;
+ list_add(mode->keysym_bindings, binding);
+
+ sway_log(L_DEBUG, "bindsym - Bound %s to command %s",
+ argv[0], binding->command);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+struct cmd_results *cmd_bindcode(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "bindcode", EXPECTED_MORE_THAN, 1))) {
+ return error;
+ }
+
+ struct sway_binding *binding = malloc(sizeof(struct sway_binding));
+ if (!binding) {
+ return cmd_results_new(CMD_FAILURE, "bindsym",
+ "Unable to allocate binding");
+ }
+ binding->keys = create_list();
+ binding->modifiers = 0;
+ binding->release = false;
+ binding->bindcode = true;
+
+ // Handle --release
+ if (strcmp("--release", argv[0]) == 0) {
+ if (argc >= 3) {
+ binding->release = true;
+ argv++;
+ argc--;
+ } else {
+ free_sway_binding(binding);
+ return cmd_results_new(CMD_FAILURE, "bindcode",
+ "Invalid bindcode command "
+ "(expected more than 2 arguments, got %d)", argc);
+ }
+ }
+
+ binding->command = join_args(argv + 1, argc - 1);
+
+ list_t *split = split_string(argv[0], "+");
+ for (int i = 0; i < split->length; ++i) {
+ // Check for a modifier key
+ uint32_t mod;
+ if ((mod = get_modifier_mask_by_name(split->items[i])) > 0) {
+ binding->modifiers |= mod;
+ continue;
+ }
+ // parse keycode
+ xkb_keycode_t keycode = (int)strtol(split->items[i], NULL, 10);
+ if (!xkb_keycode_is_legal_ext(keycode)) {
+ error =
+ cmd_results_new(CMD_INVALID, "bindcode",
+ "Invalid keycode '%s'", (char *)split->items[i]);
+ free_sway_binding(binding);
+ list_free(split);
+ return error;
+ }
+ xkb_keycode_t *key = malloc(sizeof(xkb_keycode_t));
+ *key = keycode - 8;
+ list_add(binding->keys, key);
+ }
+ free_flat_list(split);
+
+ struct sway_mode *mode = config->current_mode;
+ // TODO overwrite binding if it already exists
+ binding->order = binding_order++;
+ list_add(mode->keycode_bindings, binding);
+
+ sway_log(L_DEBUG, "bindcode - Bound %s to command %s",
+ argv[0], binding->command);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config.c b/sway/config.c
index b591ae9e..312e0779 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -53,7 +53,8 @@ static void config_defaults(struct sway_config *config) {
goto cleanup;
if (!(config->current_mode->name = malloc(sizeof("default")))) goto cleanup;
strcpy(config->current_mode->name, "default");
- if (!(config->current_mode->bindings = create_list())) goto cleanup;
+ if (!(config->current_mode->keysym_bindings = create_list())) goto cleanup;
+ if (!(config->current_mode->keycode_bindings = create_list())) goto cleanup;
list_add(config->modes, config->current_mode);
config->floating_mod = 0;
diff --git a/sway/meson.build b/sway/meson.build
index fee2ddd2..01d5ef36 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -6,6 +6,7 @@ sway_sources = files(
'input/seat.c',
'input/cursor.c',
'input/keyboard.c',
+ 'commands/bind.c',
'commands/exit.c',
'commands/exec.c',
'commands/exec_always.c',
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 09:01:44 +0000