diff options
author | taiyu <taiyu.len@gmail.com> | 2015-08-23 19:11:06 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-08-23 19:11:06 -0700 |
commit | b054ac9d4973c8803ff8981eb1f1a754434efe4d (patch) | |
tree | 4c4f5ca7868eae946f9e85bbe1b56a03fcbb522c | |
parent | c8415d7fef53a9efa776dcbbaa2c9c2d76ff8b49 (diff) | |
parent | f30fb2452c733073290e08ea12e3c031726e5d71 (diff) |
Merge branch 'master' of https://github.com/SirCmpwn/sway
merge
-rw-r--r-- | sway/handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 27f6d294..3a4e31ae 100644 --- 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) { |