mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-21 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix nitpicks

Browse source
This commit is contained in:
Tony Crisci 2017-12-29 09:10:07 -05:00
parent 62b7ab3959
commit bd3ca70e3d
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sway/input/keyboard.c
View file

@ -67,9 +67,7 @@ static bool keyboard_execute_bindsym(struct sway_keyboard *keyboard,
list_t *keysym_bindings = config->current_mode->keysym_bindings;
for (int i = 0; i < keysym_bindings->length; ++i) {
struct sway_binding *binding = keysym_bindings->items[i];
sway_log(L_DEBUG, "@@ checking binding: %s", binding->command);
if (modifiers ^ binding->modifiers || n != binding->keys->length) {
sway_log(L_DEBUG, "@@ modifiers or key num dont match");
continue;
}
@ -85,7 +83,8 @@ static bool keyboard_execute_bindsym(struct sway_keyboard *keyboard,
}
if (match) {
sway_log(L_DEBUG, "running command for binding: %s", binding->command);
sway_log(L_DEBUG, "running command for binding: %s",
binding->command);
struct cmd_results *results = handle_command(binding->command);
if (results->status != CMD_SUCCESS) {
sway_log(L_DEBUG, "could not run command for binding: %s",
@ -291,7 +290,6 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
// handle keycodes
handled = keyboard_execute_bindcode(keyboard);
sway_log(L_DEBUG, "@@ handled by bindcode? %d", handled);
// handle translated keysyms
const xkb_keysym_t *translated_keysyms;
@ -299,8 +297,8 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
size_t translated_keysyms_len =
keyboard_keysyms_translated(keyboard, keycode, &translated_keysyms,
&translated_modifiers);
pressed_keysyms_update(keyboard->pressed_keysyms_translated, translated_keysyms,
translated_keysyms_len, event->state);
pressed_keysyms_update(keyboard->pressed_keysyms_translated,
translated_keysyms, translated_keysyms_len, event->state);
if (event->state == WLR_KEY_PRESSED && !handled) {
handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_translated, translated_modifiers,
@ -310,9 +308,10 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
// Handle raw keysyms
const xkb_keysym_t *raw_keysyms;
uint32_t raw_modifiers;
size_t raw_keysyms_len = keyboard_keysyms_raw(keyboard, keycode, &raw_keysyms, &raw_modifiers);
pressed_keysyms_update(keyboard->pressed_keysyms_raw, raw_keysyms, raw_keysyms_len,
event->state);
size_t raw_keysyms_len =
keyboard_keysyms_raw(keyboard, keycode, &raw_keysyms, &raw_modifiers);
pressed_keysyms_update(keyboard->pressed_keysyms_raw, raw_keysyms,
raw_keysyms_len, event->state);
if (event->state == WLR_KEY_PRESSED && !handled) {
handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_raw, raw_modifiers,