summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar minus <minus@mnus.de>2015-08-25 22:38:16 +0200
committerLibravatar minus <minus@mnus.de>2015-08-25 22:38:16 +0200
commitbfdff821c3509ca7f76b68f98a23e80d24bd08d8 (patch)
tree417322fc589d685bfeed59095a8c57f535da6a01
parentMerge pull request #131 from nicklaswj/master (diff)
downloadsway-bfdff821c3509ca7f76b68f98a23e80d24bd08d8.tar.gz
sway-bfdff821c3509ca7f76b68f98a23e80d24bd08d8.tar.zst
sway-bfdff821c3509ca7f76b68f98a23e80d24bd08d8.zip
fixed keyboard handling
handle_key does not get the keysym from wlc anymore
-rw-r--r--sway/handlers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/handlers.c b/sway/handlers.c
index 4d1dc56c..5624124f 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -296,7 +296,7 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s
296 296
297 297
298static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers, 298static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers,
299 uint32_t key, uint32_t sym, enum wlc_key_state state) { 299 uint32_t key, enum wlc_key_state state) {
300 300
301 if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) { 301 if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) {
302 return EVENT_PASSTHROUGH; 302 return EVENT_PASSTHROUGH;
@@ -309,7 +309,7 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
309 309
310 struct sway_mode *mode = config->current_mode; 310 struct sway_mode *mode = config->current_mode;
311 311
312 sym = tolower(sym); 312 uint32_t sym = tolower(wlc_keyboard_get_keysym_for_key(key, modifiers));
313 313
314 int i; 314 int i;
315 315