sway

commit b054ac9d4973c8803ff8981eb1f1a754434efe4d
parent c8415d7fef53a9efa776dcbbaa2c9c2d76ff8b49
Author: taiyu <taiyu.len@gmail.com>
Date:   Sun, 23 Aug 2015 19:11:06 -0700

Merge branch 'master' of https://github.com/SirCmpwn/sway

merge

Diffstat:
M
sway/handlers.c
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sway/handlers.c b/sway/handlers.c
@@ -298,6 +298,8 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
 
 	struct sway_mode *mode = config->current_mode;
 
+	sym = tolower(sym);
+
 	int i;
 
 	if (state == WLC_KEY_STATE_PRESSED) {
@@ -310,7 +312,7 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
 	for (i = 0; i < mode->bindings->length; ++i) {
 		struct sway_binding *binding = mode->bindings->items[i];
 
-		if ((modifiers->mods & binding->modifiers) == binding->modifiers) {
+		if ((modifiers->mods ^ binding->modifiers) == 0) {
 			bool match;
 			int j;
 			for (j = 0; j < binding->keys->length; ++j) {