diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-11-24 15:32:35 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-11-24 15:32:35 -0500 |
commit | 53ec7a74b623373b185f24b0e203bce09518ab11 (patch) | |
tree | 5f60434187575272247128958f4d6bcfeb2d72b2 | |
parent | Merge pull request #250 from sce/initial_support_for_criteria_strings (diff) | |
parent | sway_binding_cmp_keys: Differentiate between modifier keys. (diff) | |
download | sway-53ec7a74b623373b185f24b0e203bce09518ab11.tar.gz sway-53ec7a74b623373b185f24b0e203bce09518ab11.tar.zst sway-53ec7a74b623373b185f24b0e203bce09518ab11.zip |
Merge pull request #252 from sce/fix_binding_cmp
sway_binding_cmp_keys: Differentiate between modifier keys.
-rw-r--r-- | sway/config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c index f2523c1f..13865058 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -401,6 +401,11 @@ int sway_binding_cmp_keys(const void *a, const void *b) { | |||
401 | } | 401 | } |
402 | 402 | ||
403 | // Otherwise compare keys | 403 | // Otherwise compare keys |
404 | if (binda->modifiers > bindb->modifiers) { | ||
405 | return 1; | ||
406 | } else if (binda->modifiers < bindb->modifiers) { | ||
407 | return -1; | ||
408 | } | ||
404 | for (int i = 0; i < binda->keys->length; i++) { | 409 | for (int i = 0; i < binda->keys->length; i++) { |
405 | xkb_keysym_t *ka = binda->keys->items[i], | 410 | xkb_keysym_t *ka = binda->keys->items[i], |
406 | *kb = bindb->keys->items[i]; | 411 | *kb = bindb->keys->items[i]; |