diff options
| author | outfoxxed <outfoxxed@outfoxxed.me> | 2025-07-08 09:56:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-08 18:56:40 +0200 |
| commit | 78e9eddfb6bfbc6b103fc60c9831b23ef252886b (patch) | |
| tree | 4daf06580d89dec717a282c4ec8729285241c8e8 /src/managers/input/TextInput.cpp | |
| parent | 2f34ef141b0728857d2a6f777c608dfe4c207733 (diff) | |
core: use new typed signals from hu (#10853)
Diffstat (limited to 'src/managers/input/TextInput.cpp')
| -rw-r--r-- | src/managers/input/TextInput.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/managers/input/TextInput.cpp b/src/managers/input/TextInput.cpp index cac64da4..c1ce2062 100644 --- a/src/managers/input/TextInput.cpp +++ b/src/managers/input/TextInput.cpp @@ -19,11 +19,11 @@ void CTextInput::initCallbacks() { if (isV3()) { const auto INPUT = m_v3Input.lock(); - m_listeners.enable = INPUT->m_events.enable.registerListener([this](std::any p) { onEnabled(); }); - m_listeners.disable = INPUT->m_events.disable.registerListener([this](std::any p) { onDisabled(); }); - m_listeners.commit = INPUT->m_events.onCommit.registerListener([this](std::any p) { onCommit(); }); - m_listeners.reset = INPUT->m_events.reset.registerListener([this](std::any p) { onReset(); }); - m_listeners.destroy = INPUT->m_events.destroy.registerListener([this](std::any p) { + m_listeners.enable = INPUT->m_events.enable.listen([this] { onEnabled(); }); + m_listeners.disable = INPUT->m_events.disable.listen([this] { onDisabled(); }); + m_listeners.commit = INPUT->m_events.onCommit.listen([this] { onCommit(); }); + m_listeners.reset = INPUT->m_events.reset.listen([this] { onReset(); }); + m_listeners.destroy = INPUT->m_events.destroy.listen([this] { m_listeners.surfaceUnmap.reset(); m_listeners.surfaceDestroy.reset(); g_pInputManager->m_relay.removeTextInput(this); @@ -36,14 +36,11 @@ void CTextInput::initCallbacks() { } else { const auto INPUT = m_v1Input.lock(); - m_listeners.enable = INPUT->m_events.enable.registerListener([this](std::any p) { - const auto SURFACE = std::any_cast<SP<CWLSurfaceResource>>(p); - onEnabled(SURFACE); - }); - m_listeners.disable = INPUT->m_events.disable.registerListener([this](std::any p) { onDisabled(); }); - m_listeners.commit = INPUT->m_events.onCommit.registerListener([this](std::any p) { onCommit(); }); - m_listeners.reset = INPUT->m_events.reset.registerListener([this](std::any p) { onReset(); }); - m_listeners.destroy = INPUT->m_events.destroy.registerListener([this](std::any p) { + m_listeners.enable = INPUT->m_events.enable.listen([this](const auto& surface) { onEnabled(surface); }); + m_listeners.disable = INPUT->m_events.disable.listen([this] { onDisabled(); }); + m_listeners.commit = INPUT->m_events.onCommit.listen([this] { onCommit(); }); + m_listeners.reset = INPUT->m_events.reset.listen([this] { onReset(); }); + m_listeners.destroy = INPUT->m_events.destroy.listen([this] { m_listeners.surfaceUnmap.reset(); m_listeners.surfaceDestroy.reset(); g_pInputManager->m_relay.removeTextInput(this); @@ -135,7 +132,7 @@ void CTextInput::setFocusedSurface(SP<CWLSurfaceResource> pSurface) { m_listeners.surfaceUnmap.reset(); m_listeners.surfaceDestroy.reset(); - m_listeners.surfaceUnmap = pSurface->m_events.unmap.registerListener([this](std::any d) { + m_listeners.surfaceUnmap = pSurface->m_events.unmap.listen([this] { Debug::log(LOG, "Unmap TI owner1"); if (m_enterLocks) @@ -155,7 +152,7 @@ void CTextInput::setFocusedSurface(SP<CWLSurfaceResource> pSurface) { g_pInputManager->m_relay.deactivateIME(this); }); - m_listeners.surfaceDestroy = pSurface->m_events.destroy.registerListener([this](std::any d) { + m_listeners.surfaceDestroy = pSurface->m_events.destroy.listen([this] { Debug::log(LOG, "Destroy TI owner1"); if (m_enterLocks) |