sway

commit 53ec7a74b623373b185f24b0e203bce09518ab11
parent 8ad8ceeeb92ca6609bc40974a8c528b593251566
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 24 Nov 2015 15:32:35 -0500

Merge pull request #252 from sce/fix_binding_cmp

sway_binding_cmp_keys: Differentiate between modifier keys.
Diffstat:
M
sway/config.c
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/sway/config.c b/sway/config.c
@@ -401,6 +401,11 @@ int sway_binding_cmp_keys(const void *a, const void *b) {
 	}
 
 	// Otherwise compare keys
+	if (binda->modifiers > bindb->modifiers) {
+		return 1;
+	} else if (binda->modifiers < bindb->modifiers) {
+		return -1;
+	}
 	for (int i = 0; i < binda->keys->length; i++) {
 		xkb_keysym_t *ka = binda->keys->items[i],
 				*kb = bindb->keys->items[i];