aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-29 09:10:07 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-29 09:11:15 -0500
commitbd3ca70e3d67476f4d66e9bc31c67b11aefb3519 (patch)
tree067b8a56585a9a13edbc2b3ecd6088015e486912 /sway/input/keyboard.c
parentoverwrite old bindings (diff)
downloadsway-bd3ca70e3d67476f4d66e9bc31c67b11aefb3519.tar.gz
sway-bd3ca70e3d67476f4d66e9bc31c67b11aefb3519.tar.zst
sway-bd3ca70e3d67476f4d66e9bc31c67b11aefb3519.zip
fix nitpicks
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 6272dcce..3090d32f 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -67,9 +67,7 @@ static bool keyboard_execute_bindsym(struct sway_keyboard *keyboard,
67 list_t *keysym_bindings = config->current_mode->keysym_bindings; 67 list_t *keysym_bindings = config->current_mode->keysym_bindings;
68 for (int i = 0; i < keysym_bindings->length; ++i) { 68 for (int i = 0; i < keysym_bindings->length; ++i) {
69 struct sway_binding *binding = keysym_bindings->items[i]; 69 struct sway_binding *binding = keysym_bindings->items[i];
70 sway_log(L_DEBUG, "@@ checking binding: %s", binding->command);
71 if (modifiers ^ binding->modifiers || n != binding->keys->length) { 70 if (modifiers ^ binding->modifiers || n != binding->keys->length) {
72 sway_log(L_DEBUG, "@@ modifiers or key num dont match");
73 continue; 71 continue;
74 } 72 }
75 73
@@ -85,7 +83,8 @@ static bool keyboard_execute_bindsym(struct sway_keyboard *keyboard,
85 } 83 }
86 84
87 if (match) { 85 if (match) {
88 sway_log(L_DEBUG, "running command for binding: %s", binding->command); 86 sway_log(L_DEBUG, "running command for binding: %s",
87 binding->command);
89 struct cmd_results *results = handle_command(binding->command); 88 struct cmd_results *results = handle_command(binding->command);
90 if (results->status != CMD_SUCCESS) { 89 if (results->status != CMD_SUCCESS) {
91 sway_log(L_DEBUG, "could not run command for binding: %s", 90 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) {
291 290
292 // handle keycodes 291 // handle keycodes
293 handled = keyboard_execute_bindcode(keyboard); 292 handled = keyboard_execute_bindcode(keyboard);
294 sway_log(L_DEBUG, "@@ handled by bindcode? %d", handled);
295 293
296 // handle translated keysyms 294 // handle translated keysyms
297 const xkb_keysym_t *translated_keysyms; 295 const xkb_keysym_t *translated_keysyms;
@@ -299,8 +297,8 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
299 size_t translated_keysyms_len = 297 size_t translated_keysyms_len =
300 keyboard_keysyms_translated(keyboard, keycode, &translated_keysyms, 298 keyboard_keysyms_translated(keyboard, keycode, &translated_keysyms,
301 &translated_modifiers); 299 &translated_modifiers);
302 pressed_keysyms_update(keyboard->pressed_keysyms_translated, translated_keysyms, 300 pressed_keysyms_update(keyboard->pressed_keysyms_translated,
303 translated_keysyms_len, event->state); 301 translated_keysyms, translated_keysyms_len, event->state);
304 if (event->state == WLR_KEY_PRESSED && !handled) { 302 if (event->state == WLR_KEY_PRESSED && !handled) {
305 handled = keyboard_execute_bindsym(keyboard, 303 handled = keyboard_execute_bindsym(keyboard,
306 keyboard->pressed_keysyms_translated, translated_modifiers, 304 keyboard->pressed_keysyms_translated, translated_modifiers,
@@ -310,9 +308,10 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
310 // Handle raw keysyms 308 // Handle raw keysyms
311 const xkb_keysym_t *raw_keysyms; 309 const xkb_keysym_t *raw_keysyms;
312 uint32_t raw_modifiers; 310 uint32_t raw_modifiers;
313 size_t raw_keysyms_len = keyboard_keysyms_raw(keyboard, keycode, &raw_keysyms, &raw_modifiers); 311 size_t raw_keysyms_len =
314 pressed_keysyms_update(keyboard->pressed_keysyms_raw, raw_keysyms, raw_keysyms_len, 312 keyboard_keysyms_raw(keyboard, keycode, &raw_keysyms, &raw_modifiers);
315 event->state); 313 pressed_keysyms_update(keyboard->pressed_keysyms_raw, raw_keysyms,
314 raw_keysyms_len, event->state);
316 if (event->state == WLR_KEY_PRESSED && !handled) { 315 if (event->state == WLR_KEY_PRESSED && !handled) {
317 handled = keyboard_execute_bindsym(keyboard, 316 handled = keyboard_execute_bindsym(keyboard,
318 keyboard->pressed_keysyms_raw, raw_modifiers, 317 keyboard->pressed_keysyms_raw, raw_modifiers,