diff options
| -rw-r--r-- | include/config.h | 1 | ||||
| -rw-r--r-- | sway/commands.c | 75 | ||||
| -rw-r--r-- | sway/config.c | 20 | ||||
| -rw-r--r-- | sway/handlers.c | 13 | ||||
| -rw-r--r-- | sway/input_state.c | 3 |
5 files changed, 105 insertions, 7 deletions
diff --git a/include/config.h b/include/config.h index 1f2bbdd0..e6a85b29 100644 --- a/include/config.h +++ b/include/config.h @@ -23,6 +23,7 @@ struct sway_variable { struct sway_binding { int order; bool release; + bool bindcode; list_t *keys; uint32_t modifiers; char *command; diff --git a/sway/commands.c b/sway/commands.c index f3f7efbf..0025fcb1 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -35,6 +35,7 @@ struct cmd_handler { }; static sway_cmd cmd_bar; +static sway_cmd cmd_bindcode; static sway_cmd cmd_bindsym; static sway_cmd cmd_debuglog; static sway_cmd cmd_exec; @@ -168,6 +169,7 @@ static struct cmd_results *cmd_bindsym(int argc, char **argv) { binding->keys = create_list(); binding->modifiers = 0; binding->release = false; + binding->bindcode = false; // Handle --release if (strcmp("--release", argv[0]) == 0) { @@ -222,6 +224,78 @@ static struct cmd_results *cmd_bindsym(int argc, char **argv) { return cmd_results_new(CMD_SUCCESS, NULL, NULL); } +static 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; + } else if (!config->reading) { + return cmd_results_new(CMD_FAILURE, "bindcode", "Can only be used in config file."); + } + + + struct sway_binding *binding = malloc(sizeof(struct sway_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 { + 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 + int keycode = (int)strtol(split->items[i], NULL, 10); + if (!xkb_keycode_is_legal_x11(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; + list_add(binding->keys, key); + } + free_flat_list(split); + + struct sway_mode *mode = config->current_mode; + int i = list_seq_find(mode->bindings, sway_binding_cmp_keys, binding); + if (i > -1) { + struct sway_binding *dup = mode->bindings->items[i]; + if (dup->bindcode) { + sway_log(L_DEBUG, "bindcode - '%s' already exists, overwriting", argv[0]); + } else { + sway_log(L_DEBUG, "bindcode - '%s' already exists as bindsym, overwriting", argv[0]); + } + free_sway_binding(dup); + list_del(mode->bindings, i); + } + binding->order = binding_order++; + list_add(mode->bindings, binding); + list_qsort(mode->bindings, sway_binding_cmp_qsort); + + sway_log(L_DEBUG, "bindcode - Bound %s to command %s", argv[0], binding->command); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} + static struct cmd_results *cmd_exec_always(int argc, char **argv) { struct cmd_results *error = NULL; if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); @@ -1552,6 +1626,7 @@ static struct cmd_results *cmd_ws_auto_back_and_forth(int argc, char **argv) { /* Keep alphabetized */ static struct cmd_handler handlers[] = { { "bar", cmd_bar }, + { "bindcode", cmd_bindcode }, { "bindsym", cmd_bindsym }, { "debuglog", cmd_debuglog }, { "default_orientation", cmd_orientation }, diff --git a/sway/config.c b/sway/config.c index d923eea5..ae6a02b1 100644 --- a/sway/config.c +++ b/sway/config.c @@ -652,15 +652,27 @@ int sway_binding_cmp_keys(const void *a, const void *b) { } else if (binda->modifiers < bindb->modifiers) { return -1; } + struct wlc_modifiers no_mods = { 0, 0 }; for (int i = 0; i < binda->keys->length; i++) { - xkb_keysym_t *ka = binda->keys->items[i], - *kb = bindb->keys->items[i]; - if (*ka > *kb) { + xkb_keysym_t ka = *(xkb_keysym_t *)binda->keys->items[i], + kb = *(xkb_keysym_t *)bindb->keys->items[i]; + if (binda->bindcode) { + uint32_t *keycode = binda->keys->items[i]; + ka = wlc_keyboard_get_keysym_for_key(*keycode, &no_mods); + } + + if (bindb->bindcode) { + uint32_t *keycode = bindb->keys->items[i]; + kb = wlc_keyboard_get_keysym_for_key(*keycode, &no_mods); + } + + if (ka > kb) { return 1; - } else if (*ka < *kb) { + } else if (ka < kb) { return -1; } } + return 0; } diff --git a/sway/handlers.c b/sway/handlers.c index 76778450..60bfac87 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -363,9 +363,16 @@ static bool handle_bindsym(struct sway_binding *binding) { bool match = false; int i; for (i = 0; i < binding->keys->length; ++i) { - xkb_keysym_t *key = binding->keys->items[i]; - if ((match = check_key(*key, 0)) == false) { - break; + if (binding->bindcode) { + xkb_keycode_t *key = binding->keys->items[i]; + if ((match = check_key(0, *key)) == false) { + break; + } + } else { + xkb_keysym_t *key = binding->keys->items[i]; + if ((match = check_key(*key, 0)) == false) { + break; + } } } diff --git a/sway/input_state.c b/sway/input_state.c index 86868083..41ec5712 100644 --- a/sway/input_state.c +++ b/sway/input_state.c @@ -73,6 +73,9 @@ static uint8_t find_key(uint32_t key_sym, uint32_t key_code, bool update) { key_state_array[i].alt_sym = key_sym; break; } + if (key_sym == 0 && key_code != 0 && key_state_array[i].key_code == key_code) { + break; + } } return i; } |