diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2016-01-04 17:57:04 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-01-04 17:57:04 -0500 |
| commit | f9b92783c5d8e20273acf7865f628d988249d7a2 (patch) | |
| tree | 24599ce18f690df7dc15390608c530ecb919f1ff | |
| parent | Merge pull request #430 from crondog/swaybarlog (diff) | |
| parent | Fix overwriting current pressed keys. (diff) | |
| download | sway-f9b92783c5d8e20273acf7865f628d988249d7a2.tar.gz sway-f9b92783c5d8e20273acf7865f628d988249d7a2.tar.zst sway-f9b92783c5d8e20273acf7865f628d988249d7a2.zip | |
Merge pull request #432 from mikkeloscar/fix-sway-multikey
Fix overwriting current pressed keys.
| -rw-r--r-- | sway/input_state.c | 4 |
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) { | |||
| 36 | if (0 == key_sym && 0 == key_code && key_state_array[i].key_sym == 0) { | 36 | if (0 == key_sym && 0 == key_code && key_state_array[i].key_sym == 0) { |
| 37 | break; | 37 | break; |
| 38 | } | 38 | } |
| 39 | if (key_state_array[i].key_sym == key_sym | 39 | if (key_sym != 0 && (key_state_array[i].key_sym == key_sym |
| 40 | || key_state_array[i].alt_sym == key_sym) { | 40 | || key_state_array[i].alt_sym == key_sym)) { |
| 41 | break; | 41 | break; |
| 42 | } | 42 | } |
| 43 | if (update && key_state_array[i].key_code == key_code) { | 43 | if (update && key_state_array[i].key_code == key_code) { |