core: make inputmgr initialized in priority

hyprwm · Sep 23, 2024 · 34e4a60 · 34e4a60
1 parent 508bde1
commit 34e4a60
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 41 deletions.
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
@@ -568,6 +568,9 @@ void CCompositor::initManagers(eManagersInitStage stage) {
 
             Debug::log(LOG, "Creating the EventManager!");
             g_pEventManager = std::make_unique<CEventManager>();
+
+            Debug::log(LOG, "Creating the InputManager!");
+            g_pInputManager = std::make_unique<CInputManager>();
         } break;
         case STAGE_BASICINIT: {
             Debug::log(LOG, "Creating the CHyprOpenGLImpl!");
@@ -586,9 +589,6 @@ void CCompositor::initManagers(eManagersInitStage stage) {
             Debug::log(LOG, "Creating CHyprCtl");
             g_pHyprCtl = std::make_unique<CHyprCtl>();
 
-            Debug::log(LOG, "Creating the InputManager!");
-            g_pInputManager = std::make_unique<CInputManager>();
-
             Debug::log(LOG, "Creating the HyprRenderer!");
             g_pHyprRenderer = std::make_unique<CHyprRenderer>();
 

diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
@@ -26,48 +26,52 @@
 #include "../../devices/VirtualKeyboard.hpp"
 #include "../../devices/TouchDevice.hpp"
 
-#include "../../managers/PointerManager.hpp"
-#include "../../managers/SeatManager.hpp"
-#include "../../managers/KeybindManager.hpp"
+#include "../PointerManager.hpp"
+#include "../SeatManager.hpp"
+#include "../KeybindManager.hpp"
+#include "../eventLoop/EventLoopManager.hpp"
 
 #include <aquamarine/input/Input.hpp>
 
 CInputManager::CInputManager() {
-    m_sListeners.setCursorShape = PROTO::cursorShape->events.setShape.registerListener([this](std::any data) {
-        if (!cursorImageUnlocked())
-            return;
-
-        auto event = std::any_cast<CCursorShapeProtocol::SSetShapeEvent>(data);
-
-        if (!g_pSeatManager->state.pointerFocusResource)
-            return;
-
-        if (wl_resource_get_client(event.pMgr->resource()) != g_pSeatManager->state.pointerFocusResource->client())
-            return;
+    // Do this later because protocol mgr isn't ready at this point
+    g_pEventLoopManager->doLater([this]() {
+        m_sListeners.setCursorShape = PROTO::cursorShape->events.setShape.registerListener([this](std::any data) {
+            if (!cursorImageUnlocked())
+                return;
 
-        Debug::log(LOG, "cursorImage request: shape {} -> {}", (uint32_t)event.shape, event.shapeName);
+            auto event = std::any_cast<CCursorShapeProtocol::SSetShapeEvent>(data);
 
-        m_sCursorSurfaceInfo.wlSurface->unassign();
-        m_sCursorSurfaceInfo.vHotspot = {};
-        m_sCursorSurfaceInfo.name     = event.shapeName;
-        m_sCursorSurfaceInfo.hidden   = false;
+            if (!g_pSeatManager->state.pointerFocusResource)
+                return;
 
-        m_sCursorSurfaceInfo.inUse = true;
-        g_pHyprRenderer->setCursorFromName(m_sCursorSurfaceInfo.name);
-    });
+            if (wl_resource_get_client(event.pMgr->resource()) != g_pSeatManager->state.pointerFocusResource->client())
+                return;
 
-    m_sListeners.newIdleInhibitor   = PROTO::idleInhibit->events.newIdleInhibitor.registerListener([this](std::any data) { this->newIdleInhibitor(data); });
-    m_sListeners.newVirtualKeyboard = PROTO::virtualKeyboard->events.newKeyboard.registerListener([this](std::any data) {
-        this->newVirtualKeyboard(std::any_cast<SP<CVirtualKeyboardV1Resource>>(data));
-        updateCapabilities();
+            Debug::log(LOG, "cursorImage request: shape {} -> {}", (uint32_t)event.shape, event.shapeName);
+
+            m_sCursorSurfaceInfo.wlSurface->unassign();
+            m_sCursorSurfaceInfo.vHotspot = {};
+            m_sCursorSurfaceInfo.name     = event.shapeName;
+            m_sCursorSurfaceInfo.hidden   = false;
+
+            m_sCursorSurfaceInfo.inUse = true;
+            g_pHyprRenderer->setCursorFromName(m_sCursorSurfaceInfo.name);
+        });
+
+        m_sListeners.newIdleInhibitor   = PROTO::idleInhibit->events.newIdleInhibitor.registerListener([this](std::any data) { this->newIdleInhibitor(data); });
+        m_sListeners.newVirtualKeyboard = PROTO::virtualKeyboard->events.newKeyboard.registerListener([this](std::any data) {
+            this->newVirtualKeyboard(std::any_cast<SP<CVirtualKeyboardV1Resource>>(data));
+            updateCapabilities();
+        });
+        m_sListeners.newVirtualMouse    = PROTO::virtualPointer->events.newPointer.registerListener([this](std::any data) {
+            this->newVirtualMouse(std::any_cast<SP<CVirtualPointerV1Resource>>(data));
+            updateCapabilities();
+        });
+        m_sListeners.setCursor          = g_pSeatManager->events.setCursor.registerListener([this](std::any d) { this->processMouseRequest(d); });
+
+        m_sCursorSurfaceInfo.wlSurface = CWLSurface::create();
     });
-    m_sListeners.newVirtualMouse    = PROTO::virtualPointer->events.newPointer.registerListener([this](std::any data) {
-        this->newVirtualMouse(std::any_cast<SP<CVirtualPointerV1Resource>>(data));
-        updateCapabilities();
-    });
-    m_sListeners.setCursor          = g_pSeatManager->events.setCursor.registerListener([this](std::any d) { this->processMouseRequest(d); });
-
-    m_sCursorSurfaceInfo.wlSurface = CWLSurface::create();
 }
 
 CInputManager::~CInputManager() {

diff --git a/src/managers/input/InputMethodRelay.cpp b/src/managers/input/InputMethodRelay.cpp
@@ -5,14 +5,17 @@
 #include "../../protocols/TextInputV1.hpp"
 #include "../../protocols/InputMethodV2.hpp"
 #include "../../protocols/core/Compositor.hpp"
+#include "../eventLoop/EventLoopManager.hpp"
 
 CInputMethodRelay::CInputMethodRelay() {
-    static auto P =
-        g_pHookSystem->hookDynamic("keyboardFocus", [&](void* self, SCallbackInfo& info, std::any param) { onKeyboardFocus(std::any_cast<SP<CWLSurfaceResource>>(param)); });
+    g_pEventLoopManager->doLater([this]() {
+        static auto P =
+            g_pHookSystem->hookDynamic("keyboardFocus", [&](void* self, SCallbackInfo& info, std::any param) { onKeyboardFocus(std::any_cast<SP<CWLSurfaceResource>>(param)); });
 
-    listeners.newTIV3 = PROTO::textInputV3->events.newTextInput.registerListener([this](std::any ti) { onNewTextInput(std::any_cast<WP<CTextInputV3>>(ti)); });
-    listeners.newTIV1 = PROTO::textInputV1->events.newTextInput.registerListener([this](std::any ti) { onNewTextInput(std::any_cast<WP<CTextInputV1>>(ti)); });
-    listeners.newIME  = PROTO::ime->events.newIME.registerListener([this](std::any ime) { onNewIME(std::any_cast<SP<CInputMethodV2>>(ime)); });
+        listeners.newTIV3 = PROTO::textInputV3->events.newTextInput.registerListener([this](std::any ti) { onNewTextInput(std::any_cast<WP<CTextInputV3>>(ti)); });
+        listeners.newTIV1 = PROTO::textInputV1->events.newTextInput.registerListener([this](std::any ti) { onNewTextInput(std::any_cast<WP<CTextInputV1>>(ti)); });
+        listeners.newIME  = PROTO::ime->events.newIME.registerListener([this](std::any ime) { onNewIME(std::any_cast<SP<CInputMethodV2>>(ime)); });
+    });
 }
 
 void CInputMethodRelay::onNewIME(SP<CInputMethodV2> pIME) {