From dbf566c78a0118fdfb58b759fc08e04951ff24e3 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Fri, 18 Mar 2022 23:06:45 +0100
Subject: handle keys and focus

---
 src/events/Events.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/events/Events.cpp')

diff --git a/src/events/Events.cpp b/src/events/Events.cpp
index 9acea081..fbc5c71f 100644
--- a/src/events/Events.cpp
+++ b/src/events/Events.cpp
@@ -203,6 +203,7 @@ void Events::listener_mapWindow(wl_listener* listener, void* data) {
 
     // test
     g_pXWaylandManager->setWindowSize(PWINDOW, PMONITOR->vecSize);
+    g_pCompositor->focusWindow(PWINDOW);
 
     Debug::log(LOG, "Map request dispatched.");
 }
@@ -318,11 +319,13 @@ void Events::listener_surfaceXWayland(wl_listener* listener, void* data) {
 }
 
 void Events::listener_keyboardKey(wl_listener* listener, void* data) {
-    g_pInputManager->onKeyboardKey((wlr_event_keyboard_key*)data);
+    SKeyboard* PKEYBOARD = wl_container_of(listener, PKEYBOARD, listen_keyboardKey);
+    g_pInputManager->onKeyboardKey((wlr_event_keyboard_key*)data, PKEYBOARD);
 }
 
 void Events::listener_keyboardMod(wl_listener* listener, void* data) {
-    g_pInputManager->onKeyboardMod(data);
+    SKeyboard* PKEYBOARD = wl_container_of(listener, PKEYBOARD, listen_keyboardMod);
+    g_pInputManager->onKeyboardMod(data, PKEYBOARD);
 }
 
 void Events::listener_mouseFrame(wl_listener* listener, void* data) {
-- 
cgit v1.2.3