github/hyprEasymotion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't enter submap if no decos were created. Don't create motions for hidden unampped or fading windows

Browse Source
This commit is contained in:
Zakk
2024-04-21 05:37:58 -04:00
parent ea95d8e29c
commit 4a84423ae7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main.cpp
View File

@@ -168,13 +168,16 @@ void easymotionDispatch(std::string args)
for (auto &w : g_pCompositor->m_vWindows) { for (auto &w : g_pCompositor->m_vWindows) {
for (auto &m : g_pCompositor->m_vMonitors) { for (auto &m : g_pCompositor->m_vMonitors) {
if (w->m_pWorkspace == m->activeWorkspace) { if (w->m_pWorkspace == m->activeWorkspace) {
if (w->isHidden() || !w->m_bIsMapped || w->m_bFadingOut)
continue;
std::string lstr = actionDesc.motionKeys.substr(key_idx++, 1); std::string lstr = actionDesc.motionKeys.substr(key_idx++, 1);
addLabelToWindow(w.get(), &actionDesc, lstr); addLabelToWindow(w.get(), &actionDesc, lstr);
} }
} }
} }
HyprlandAPI::invokeHyprctlCommand("dispatch", "submap __easymotionsubmap__"); if (!g_pGlobalState->motionLabels.empty())
HyprlandAPI::invokeHyprctlCommand("dispatch", "submap __easymotionsubmap__");
} }
bool oneasymotionKeypress(void *self, std::any data) { bool oneasymotionKeypress(void *self, std::any data) {
@@ -225,10 +228,10 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
HyprlandAPI::addDispatcher(PHANDLE, "easymotion", easymotionDispatch); HyprlandAPI::addDispatcher(PHANDLE, "easymotion", easymotionDispatch);
HyprlandAPI::addDispatcher(PHANDLE, "easymotionaction", easymotionActionDispatch); HyprlandAPI::addDispatcher(PHANDLE, "easymotionaction", easymotionActionDispatch);
HyprlandAPI::addDispatcher(PHANDLE, "easymotionexit", easymotionExitDispatch); HyprlandAPI::addDispatcher(PHANDLE, "easymotionexit", easymotionExitDispatch);
HyprlandAPI::registerCallbackDynamic(PHANDLE, "keyPress", [&](void *self, SCallbackInfo &info, std::any data) { static auto KPHOOK = HyprlandAPI::registerCallbackDynamic(PHANDLE, "keyPress", [&](void *self, SCallbackInfo &info, std::any data) {
info.cancelled = oneasymotionKeypress(self, data); info.cancelled = oneasymotionKeypress(self, data);
}); });
HyprlandAPI::registerCallbackDynamic(PHANDLE, "configReloaded", [&](void *self, SCallbackInfo&, std::any data) {addEasyMotionKeybinds();}); static auto CRHOOK = HyprlandAPI::registerCallbackDynamic(PHANDLE, "configReloaded", [&](void *self, SCallbackInfo&, std::any data) {addEasyMotionKeybinds();});
HyprlandAPI::reloadConfig(); HyprlandAPI::reloadConfig();