aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-04 23:26:40 +0100
committerMikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-04 23:26:40 +0100
commite62c49f83cd9de0343ce7e71db1b2446d11bb22e (patch)
tree723d89fea97299d1d1fc6f5919b1ca81765d19e1
parent7d5ef6bc8456d43a9a8c0f3e68d3c1fd2506de6e (diff)
downloadsway-e62c49f83cd9de0343ce7e71db1b2446d11bb22e.tar.xz
Fix overwriting current pressed keys.
This fixes a bug where the key at index 0 in the `key_state_array` would be overwritten by the next pressed key. This broke any bindings consisting of multiple non-mod keys like: `$mod+a+b`.
-rw-r--r--sway/input_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input_state.c b/sway/input_state.c
index 25308a77..58619d1f 100644
--- a/sway/input_state.c
+++ b/sway/input_state.c
@@ -36,8 +36,8 @@ static uint8_t find_key(uint32_t key_sym, uint32_t key_code, bool update) {
if (0 == key_sym && 0 == key_code && key_state_array[i].key_sym == 0) {
break;
}
- if (key_state_array[i].key_sym == key_sym
- || key_state_array[i].alt_sym == key_sym) {
+ if (key_sym != 0 && (key_state_array[i].key_sym == key_sym
+ || key_state_array[i].alt_sym == key_sym)) {
break;
}
if (update && key_state_array[i].key_code == key_code) {