hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-30 07:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

additional logic for identical pid swallowing

Browse source
This commit is contained in:
Vaxry 2022-10-04 10:17:03 +01:00
parent 996938b7e7
commit 3e3f6aef5e
1 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/events/Windows.cpp
View file

@ -392,27 +392,56 @@ void Events::listener_mapWindow(void* owner, void* data) {
if (ppid) { if (ppid) {
// get window by pid // get window by pid
CWindow* found = nullptr; std::vector<CWindow*> found;
CWindow* finalFound = nullptr;
for (auto& w : g_pCompositor->m_vWindows) { for (auto& w : g_pCompositor->m_vWindows) {
if (!w->m_bIsMapped || w->m_bHidden) if (!w->m_bIsMapped || w->m_bHidden)
continue; continue;
if (w->getPID() == ppid) { if (w->getPID() == ppid) {
found = w.get(); found.push_back(w.get());
break; break;
} }
} }
if (found) { if (found.size() > 1) {
for (auto& w : found) {
// try get the focus
if (w == g_pCompositor->m_pLastWindow) {
finalFound = w;
break;
}
}
if (!finalFound) {
// just get the closest (ws)
for (auto& w : found) {
if (w->m_iWorkspaceID == g_pCompositor->m_pLastMonitor->activeWorkspace) {
finalFound = w;
break;
}
}
}
if (!finalFound) {
// what, just use 0
finalFound = found[0];
}
} else if (found.size() == 1) {
finalFound = found[0];
}
if (finalFound) {
// check if it's the window we want // check if it's the window we want
std::regex rgx(*PSWALLOWREGEX); std::regex rgx(*PSWALLOWREGEX);
if (std::regex_match(g_pXWaylandManager->getAppIDClass(found), rgx)) { if (std::regex_match(g_pXWaylandManager->getAppIDClass(finalFound), rgx)) {
// swallow // swallow
PWINDOW->m_pSwallowed = found; PWINDOW->m_pSwallowed = finalFound;
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(found); g_pLayoutManager->getCurrentLayout()->onWindowRemoved(finalFound);
found->m_bHidden = true; finalFound->m_bHidden = true;
} }
} }
} }