mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-10-01 07:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

run compositor bindings last

Browse source
This commit is contained in:
Tony Crisci 2017-12-27 19:07:17 -05:00
parent ccaedf5b15
commit 27cd633b40
1 changed files with 49 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
sway/input/keyboard.c
View file

@ -34,7 +34,10 @@ static ssize_t pressed_keysyms_index(xkb_keysym_t *pressed_keysyms,
* Returns true if the keysym was handled by a binding and false if the event * Returns true if the keysym was handled by a binding and false if the event
* should be propagated to clients. * should be propagated to clients.
*/ */
static bool keyboard_execute_compositor_binding(xkb_keysym_t keysym) { static bool keyboard_execute_compositor_binding(struct sway_keyboard *keyboard,
xkb_keysym_t *pressed_keysyms, uint32_t modifiers, size_t keysyms_len) {
for (size_t i = 0; i < keysyms_len; ++i) {
xkb_keysym_t keysym = pressed_keysyms[i];
if (keysym >= XKB_KEY_XF86Switch_VT_1 && if (keysym >= XKB_KEY_XF86Switch_VT_1 &&
keysym <= XKB_KEY_XF86Switch_VT_12) { keysym <= XKB_KEY_XF86Switch_VT_12) {
if (wlr_backend_is_multi(server.backend)) { if (wlr_backend_is_multi(server.backend)) {
@ -47,6 +50,7 @@ static bool keyboard_execute_compositor_binding(xkb_keysym_t keysym) {
} }
return true; return true;
} }
}
return false; return false;
} }
@ -58,16 +62,8 @@ static bool keyboard_execute_compositor_binding(xkb_keysym_t keysym) {
* Returns true if the keysym was handled by a binding and false if the event * Returns true if the keysym was handled by a binding and false if the event
* should be propagated to clients. * should be propagated to clients.
*/ */
static bool keyboard_execute_binding(struct sway_keyboard *keyboard, static bool keyboard_execute_bindsym(struct sway_keyboard *keyboard,
xkb_keysym_t *pressed_keysyms, uint32_t modifiers, xkb_keysym_t *pressed_keysyms, uint32_t modifiers, size_t keysyms_len) {
const xkb_keysym_t *keysyms, size_t keysyms_len) {
// compositor bindings
for (size_t i = 0; i < keysyms_len; ++i) {
if (keyboard_execute_compositor_binding(keysyms[i])) {
return true;
}
}
// configured bindings // configured bindings
int n = pressed_keysyms_length(pressed_keysyms); int n = pressed_keysyms_length(pressed_keysyms);
list_t *keysym_bindings = config->current_mode->keysym_bindings; list_t *keysym_bindings = config->current_mode->keysym_bindings;
@ -208,28 +204,48 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
xkb_keycode_t keycode = event->keycode + 8; xkb_keycode_t keycode = event->keycode + 8;
bool handled = false; bool handled = false;
uint32_t modifiers;
const xkb_keysym_t *keysyms; const xkb_keysym_t *keysyms;
size_t keysyms_len;
// handle keycodes
// TODO
handled = keyboard_execute_bindcode(keyboard);
// handle translated keysyms // handle translated keysyms
keysyms_len = keyboard_keysyms_translated(keyboard, keycode, &keysyms, uint32_t translated_modifiers;
&modifiers); size_t translated_keysyms_len =
keyboard_keysyms_translated(keyboard, keycode, &keysyms,
&translated_modifiers);
pressed_keysyms_update(keyboard->pressed_keysyms_translated, keysyms, pressed_keysyms_update(keyboard->pressed_keysyms_translated, keysyms,
keysyms_len, event->state); translated_keysyms_len, event->state);
if (event->state == WLR_KEY_PRESSED) { if (event->state == WLR_KEY_PRESSED && !handled) {
handled = keyboard_execute_binding(keyboard, handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_translated, modifiers, keysyms, keyboard->pressed_keysyms_translated, translated_modifiers,
keysyms_len); translated_keysyms_len);
} }
// Handle raw keysyms // Handle raw keysyms
keysyms_len = keyboard_keysyms_raw(keyboard, keycode, &keysyms, &modifiers); uint32_t raw_modifiers;
pressed_keysyms_update(keyboard->pressed_keysyms_raw, keysyms, keysyms_len, size_t raw_keysyms_len = keyboard_keysyms_raw(keyboard, keycode, &keysyms, &raw_modifiers);
pressed_keysyms_update(keyboard->pressed_keysyms_raw, keysyms, raw_keysyms_len,
event->state); event->state);
if (event->state == WLR_KEY_PRESSED && !handled) { if (event->state == WLR_KEY_PRESSED && !handled) {
handled = keyboard_execute_binding(keyboard, handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_raw, modifiers, keysyms, keysyms_len); keyboard->pressed_keysyms_raw, raw_modifiers,
raw_keysyms_len);
}
// Compositor bindings
if (event->state == WLR_KEY_PRESSED && !handled) {
handled =
keyboard_execute_compositor_binding(keyboard,
keyboard->pressed_keysyms_translated, translated_modifiers,
translated_keysyms_len);
}
if (event->state == WLR_KEY_PRESSED && !handled) {
handled =
keyboard_execute_compositor_binding(keyboard,
keyboard->pressed_keysyms_raw, raw_modifiers,
raw_keysyms_len);
} }
if (!handled) { if (!handled) {