hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 11:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: deprecate the old layout event instead of replacing it

Browse source
This commit is contained in:
Pasha Fistanto 2024-08-10 19:24:57 +02:00
parent 37acee39b4
commit 3bbc38d2a3
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/managers/input/InputManager.cpp
View file

@ -909,8 +909,12 @@ void CInputManager::setupKeyboard(SP<IKeyboard> keeb) {
g_pKeybindManager->m_mKeyToCodeCache.clear(); g_pKeybindManager->m_mKeyToCodeCache.clear();
} }
g_pEventManager->postEvent(SHyprIPCEvent{"activelayout", PKEEB->hlName + ";" + LAYOUT}); // NOTE: This block is deprecated.
g_pEventManager->postEvent(SHyprIPCEvent{"activelayout", PKEEB->hlName + "," + LAYOUT});
EMIT_HOOK_EVENT("activeLayout", (std::vector<std::any>{PKEEB, LAYOUT})); EMIT_HOOK_EVENT("activeLayout", (std::vector<std::any>{PKEEB, LAYOUT}));
g_pEventManager->postEvent(SHyprIPCEvent{"activelayoutv2", PKEEB->hlName + ";" + LAYOUT});
EMIT_HOOK_EVENT("activeLayoutv2", (std::vector<std::any>{PKEEB, LAYOUT}));
}, },
keeb.get()); keeb.get());
@ -974,9 +978,13 @@ void CInputManager::applyConfigToKeyboard(SP<IKeyboard> pKeyboard) {
const auto LAYOUTSTR = pKeyboard->getActiveLayout(); const auto LAYOUTSTR = pKeyboard->getActiveLayout();
g_pEventManager->postEvent(SHyprIPCEvent{"activelayout", pKeyboard->hlName + ";" + LAYOUTSTR}); // NOTE: This block is deprecated.
g_pEventManager->postEvent(SHyprIPCEvent{"activelayout", pKeyboard->hlName + "," + LAYOUTSTR});
EMIT_HOOK_EVENT("activeLayout", (std::vector<std::any>{pKeyboard, LAYOUTSTR})); EMIT_HOOK_EVENT("activeLayout", (std::vector<std::any>{pKeyboard, LAYOUTSTR}));
g_pEventManager->postEvent(SHyprIPCEvent{"activelayoutv2", pKeyboard->hlName + ";" + LAYOUTSTR});
EMIT_HOOK_EVENT("activeLayoutv2", (std::vector<std::any>{pKeyboard, LAYOUTSTR}));
Debug::log(LOG, "Set the keyboard layout to {} and variant to {} for keyboard \"{}\"", pKeyboard->currentRules.layout, pKeyboard->currentRules.variant, pKeyboard->hlName); Debug::log(LOG, "Set the keyboard layout to {} and variant to {} for keyboard \"{}\"", pKeyboard->currentRules.layout, pKeyboard->currentRules.variant, pKeyboard->hlName);
} }
@ -1341,8 +1349,12 @@ void CInputManager::onKeyboardMod(SP<IKeyboard> pKeyboard) {
Debug::log(LOG, "LAYOUT CHANGED TO {} GROUP {}", LAYOUT, MODS.group); Debug::log(LOG, "LAYOUT CHANGED TO {} GROUP {}", LAYOUT, MODS.group);
g_pEventManager->postEvent(SHyprIPCEvent{"activelayout", pKeyboard->hlName + ";" + LAYOUT}); // NOTE: This block is deprecated.
g_pEventManager->postEvent(SHyprIPCEvent{"activelayout", pKeyboard->hlName + "," + LAYOUT});
EMIT_HOOK_EVENT("activeLayout", (std::vector<std::any>{pKeyboard, LAYOUT})); EMIT_HOOK_EVENT("activeLayout", (std::vector<std::any>{pKeyboard, LAYOUT}));
g_pEventManager->postEvent(SHyprIPCEvent{"activelayoutv2", pKeyboard->hlName + ";" + LAYOUT});
EMIT_HOOK_EVENT("activeLayoutv2", (std::vector<std::any>{pKeyboard, LAYOUT}));
} }
} }