aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-07-09 22:54:30 +0100
committerLibravatar emersion <contact@emersion.fr>2018-07-09 22:54:30 +0100
commit63b4bf500020cf35cebfdce2d73f8e359ff495c2 (patch)
tree76624b3d4820551261e5c15f773c403c1a41264e /sway/input/keyboard.c
parentMerge pull request #2223 from RyanDwyer/floating-move (diff)
downloadsway-63b4bf500020cf35cebfdce2d73f8e359ff495c2.tar.gz
sway-63b4bf500020cf35cebfdce2d73f8e359ff495c2.tar.zst
sway-63b4bf500020cf35cebfdce2d73f8e359ff495c2.zip
Update for swaywm/wlroots#1126
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 182536de..580c0d4b 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -108,7 +108,7 @@ static void get_active_binding(const struct sway_shortcut_state *state,
108 } 108 }
109 109
110 if (*current_binding && *current_binding != binding) { 110 if (*current_binding && *current_binding != binding) {
111 wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d", 111 wlr_log(WLR_DEBUG, "encountered duplicate bindings %d and %d",
112 (*current_binding)->order, binding->order); 112 (*current_binding)->order, binding->order);
113 } else { 113 } else {
114 *current_binding = binding; 114 *current_binding = binding;
@@ -122,12 +122,12 @@ static void get_active_binding(const struct sway_shortcut_state *state,
122 */ 122 */
123static void keyboard_execute_command(struct sway_keyboard *keyboard, 123static void keyboard_execute_command(struct sway_keyboard *keyboard,
124 struct sway_binding *binding) { 124 struct sway_binding *binding) {
125 wlr_log(L_DEBUG, "running command for binding: %s", 125 wlr_log(WLR_DEBUG, "running command for binding: %s",
126 binding->command); 126 binding->command);
127 config->handler_context.seat = keyboard->seat_device->sway_seat; 127 config->handler_context.seat = keyboard->seat_device->sway_seat;
128 struct cmd_results *results = execute_command(binding->command, NULL); 128 struct cmd_results *results = execute_command(binding->command, NULL);
129 if (results->status != CMD_SUCCESS) { 129 if (results->status != CMD_SUCCESS) {
130 wlr_log(L_DEBUG, "could not run command for binding: %s (%s)", 130 wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)",
131 binding->command, results->error); 131 binding->command, results->error);
132 } 132 }
133 free_cmd_results(results); 133 free_cmd_results(results);
@@ -386,7 +386,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
386 xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS); 386 xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
387 387
388 if (!keymap) { 388 if (!keymap) {
389 wlr_log(L_DEBUG, "cannot configure keyboard: keymap does not exist"); 389 wlr_log(WLR_DEBUG, "cannot configure keyboard: keymap does not exist");
390 xkb_context_unref(context); 390 xkb_context_unref(context);
391 return; 391 return;
392 } 392 }