From 03da5a3ef55555a76c75f797ed1628478bf8cc9d Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sat, 19 Mar 2022 11:27:19 +0100
Subject: [PATCH] fix crash and log more

---
 src/Compositor.cpp            | 11 +----------
 src/events/Events.cpp         |  2 +-
 src/managers/InputManager.cpp |  8 +++++++-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 2d7c1826..83cce2a0 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -189,15 +189,6 @@ void CCompositor::focusWindow(CWindow* pWindow) {
     // Unfocus last window
     if (m_pLastFocus && windowValidMapped(m_pLastFocus))
         g_pXWaylandManager->activateSurface(g_pXWaylandManager->getWindowSurface(m_pLastFocus), false);
-    if (m_sWLRSeat->keyboard_state.focused_surface){
-        const auto XDGSURFACE = wlr_xdg_surface_from_wlr_surface(m_sWLRSeat->keyboard_state.focused_surface);
-        if (XDGSURFACE)
-            wlr_xdg_toplevel_set_activated(XDGSURFACE->toplevel, false);
-
-        const auto XWLSURFACE = wlr_xwayland_surface_from_wlr_surface(m_sWLRSeat->keyboard_state.focused_surface);
-        if (XWLSURFACE)
-            wlr_xwayland_surface_activate(XWLSURFACE, false);
-    }
 
     const auto KEYBOARD = wlr_seat_get_keyboard(m_sWLRSeat);
     wlr_seat_keyboard_notify_enter(m_sWLRSeat, PWINDOWSURFACE, KEYBOARD->keycodes, KEYBOARD->num_keycodes, &KEYBOARD->modifiers);
@@ -206,7 +197,7 @@ void CCompositor::focusWindow(CWindow* pWindow) {
     
     m_pLastFocus = pWindow;
 
-    Debug::log(LOG, "Set focus to %x", pWindow);
+    Debug::log(LOG, "Set keyboard %x focus to %x, with name: %s", KEYBOARD, pWindow, pWindow->m_szTitle.c_str());
 }
 
 bool CCompositor::windowValidMapped(CWindow* pWindow) {
diff --git a/src/events/Events.cpp b/src/events/Events.cpp
index 5715f026..870525ee 100644
--- a/src/events/Events.cpp
+++ b/src/events/Events.cpp
@@ -222,7 +222,7 @@ void Events::listener_unmapWindow(wl_listener* listener, void* data) {
 void Events::listener_commitWindow(wl_listener* listener, void* data) {
     CWindow* PWINDOW = wl_container_of(listener, PWINDOW, listen_commitWindow);
 
-    Debug::log(LOG, "Window %x committed", PWINDOW);
+    PWINDOW;
 }
 
 void Events::listener_destroyWindow(wl_listener* listener, void* data) {
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index 93318e58..74945ff5 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -93,6 +93,8 @@ void CInputManager::newKeyboard(wlr_input_device* keyboard) {
     wl_signal_add(&keyboard->events.destroy, &PNEWKEYBOARD->listen_keyboardDestroy);
 
     wlr_seat_set_keyboard(g_pCompositor->m_sWLRSeat, keyboard);
+
+    Debug::log(LOG, "New keyboard created, pointers Hypr: %x and WLR: %x", PNEWKEYBOARD, keyboard);
 }
 
 void CInputManager::newMouse(wlr_input_device* mouse) {
@@ -107,6 +109,8 @@ void CInputManager::newMouse(wlr_input_device* mouse) {
     }
 
     wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, mouse);
+
+    Debug::log(LOG, "New mouse created, pointer WLR: %x", mouse);
 }
 
 void CInputManager::destroyKeyboard(SKeyboard* pKeyboard) {
@@ -133,7 +137,9 @@ void CInputManager::onKeyboardKey(wlr_event_keyboard_key* e, SKeyboard* pKeyboar
 
     if (e->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
         // TODO: keybinds
-        
+        Debug::log(LOG, "Keyboard %x key %i pressed on focused window %x", pKeyboard, KEYCODE, g_pCompositor->m_pLastFocus);
+    } else if (e->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+        Debug::log(LOG, "Keyboard %x key %i released on focused window %x", pKeyboard, KEYCODE, g_pCompositor->m_pLastFocus);
     }
 
     wlr_seat_set_keyboard(g_pCompositor->m_sWLRSeat, pKeyboard->keyboard);