mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #523 from mikkeloscar/slack-key-handler

Browse source 
Make key handling less strict
This commit is contained in:
Drew DeVault 2016-03-19 09:10:42 -04:00
commit 00c1ce4fda
2 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands.c
View file

@ -317,7 +317,7 @@ static struct cmd_results *cmd_bindcode(int argc, char **argv) {
} }
// parse keycode // parse keycode
int keycode = (int)strtol(split->items[i], NULL, 10); int keycode = (int)strtol(split->items[i], NULL, 10);
if (!xkb_keycode_is_legal_x11(keycode)) { if (!xkb_keycode_is_legal_ext(keycode)) {
error = cmd_results_new(CMD_INVALID, "bindcode", "Invalid keycode '%s'", (char *)split->items[i]); error = cmd_results_new(CMD_INVALID, "bindcode", "Invalid keycode '%s'", (char *)split->items[i]);
free_sway_binding(binding); free_sway_binding(binding);
list_free(split); list_free(split);

48
sway/handlers.c
View file

@ -405,7 +405,28 @@ static void handle_binding_command(struct sway_binding *binding) {
free_cmd_results(res); free_cmd_results(res);
} }
static bool handle_bindsym(struct sway_binding *binding) { static bool handle_bindsym(struct sway_binding *binding, uint32_t keysym, uint32_t keycode) {
int i;
for (i = 0; i < binding->keys->length; ++i) {
if (binding->bindcode) {
xkb_keycode_t *key = binding->keys->items[i];
if (keycode == *key) {
handle_binding_command(binding);
return true;
}
} else {
xkb_keysym_t *key = binding->keys->items[i];
if (keysym == *key) {
handle_binding_command(binding);
return true;
}
}
}
return false;
}
static bool valid_bindsym(struct sway_binding *binding) {
bool match = false; bool match = false;
int i; int i;
for (i = 0; i < binding->keys->length; ++i) { for (i = 0; i < binding->keys->length; ++i) {
@ -422,12 +443,7 @@ static bool handle_bindsym(struct sway_binding *binding) {
} }
} }
if (match) { return match;
handle_binding_command(binding);
return true;
}
return false;
} }
static bool handle_bindsym_release(struct sway_binding *binding) { static bool handle_bindsym_release(struct sway_binding *binding) {
@ -489,18 +505,19 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
modifiers_state_update(modifiers->mods); modifiers_state_update(modifiers->mods);
// handle bindings // handle bindings
list_t *candidates = create_list();
for (i = 0; i < mode->bindings->length; ++i) { for (i = 0; i < mode->bindings->length; ++i) {
struct sway_binding *binding = mode->bindings->items[i]; struct sway_binding *binding = mode->bindings->items[i];
if ((modifiers->mods ^ binding->modifiers) == 0) { if ((modifiers->mods ^ binding->modifiers) == 0) {
switch (state) { switch (state) {
case WLC_KEY_STATE_PRESSED: { case WLC_KEY_STATE_PRESSED: {
if (!binding->release && handle_bindsym(binding)) { if (!binding->release && valid_bindsym(binding)) {
return EVENT_HANDLED; list_add(candidates, binding);
} }
break;
} }
case WLC_KEY_STATE_RELEASED: case WLC_KEY_STATE_RELEASED:
if (binding->release && handle_bindsym_release(binding)) { if (binding->release && handle_bindsym_release(binding)) {
list_free(candidates);
return EVENT_HANDLED; return EVENT_HANDLED;
} }
break; break;
@ -508,6 +525,17 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
} }
} }
for (i = 0; i < candidates->length; ++i) {
struct sway_binding *binding = candidates->items[i];
if (state == WLC_KEY_STATE_PRESSED) {
if (!binding->release && handle_bindsym(binding, sym, key)) {
list_free(candidates);
return EVENT_HANDLED;
}
}
}
list_free(candidates);
return EVENT_PASSTHROUGH; return EVENT_PASSTHROUGH;
} }