From 78e9eddfb6bfbc6b103fc60c9831b23ef252886b Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Tue, 8 Jul 2025 09:56:40 -0700 Subject: core: use new typed signals from hu (#10853) --- src/devices/Keyboard.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/devices/Keyboard.cpp') diff --git a/src/devices/Keyboard.cpp b/src/devices/Keyboard.cpp index 70abe54d..9ce37e6b 100644 --- a/src/devices/Keyboard.cpp +++ b/src/devices/Keyboard.cpp @@ -23,24 +23,22 @@ CKeyboard::CKeyboard(SP keeb) : m_keyboard(keeb) { if (!keeb) return; - m_listeners.destroy = keeb->events.destroy.registerListener([this](std::any d) { + m_listeners.destroy = keeb->events.destroy.listen([this] { m_keyboard.reset(); m_events.destroy.emit(); }); - m_listeners.key = keeb->events.key.registerListener([this](std::any d) { - auto E = std::any_cast(d); - + m_listeners.key = keeb->events.key.listen([this](const Aquamarine::IKeyboard::SKeyEvent& event) { m_keyboardEvents.key.emit(SKeyEvent{ - .timeMs = E.timeMs, - .keycode = E.key, - .state = E.pressed ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED, + .timeMs = event.timeMs, + .keycode = event.key, + .state = event.pressed ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED, }); - updateXkbStateWithKey(E.key + 8, E.pressed); + updateXkbStateWithKey(event.key + 8, event.pressed); }); - m_listeners.modifiers = keeb->events.modifiers.registerListener([this](std::any d) { + m_listeners.modifiers = keeb->events.modifiers.listen([this] { updateModifiersState(); m_keyboardEvents.modifiers.emit(SModifiersEvent{ -- cgit v1.2.3