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

window: properly break cycles in X11TransientFor

Browse source 
ref #8045
This commit is contained in:
Vaxry 2024-10-16 22:22:36 +01:00
parent 09581d32fd
commit b57086aa43
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/desktop/Window.cpp
View file

@ -451,15 +451,21 @@ PHLWINDOW CWindow::X11TransientFor() {
if (!m_pXWaylandSurface || !m_pXWaylandSurface->parent) if (!m_pXWaylandSurface || !m_pXWaylandSurface->parent)
return nullptr; return nullptr;
auto s = m_pXWaylandSurface->parent; auto s = m_pXWaylandSurface->parent;
auto oldParent = s; std::vector<SP<CXWaylandSurface>> visited;
while (s) { while (s) {
// break cyclic loop of m_pXWaylandSurface being parent of itself, #TODO reject this from even being created? // break loops. Some X apps make them, and it seems like it's valid behavior?!?!?!
if (!s->parent || s->parent == oldParent) // TODO: we should reject loops being created in the first place.
if (std::find(visited.begin(), visited.end(), s) != visited.end())
break; break;
visited.emplace_back(s.lock());
s = s->parent; s = s->parent;
} }
if (s == m_pXWaylandSurface)
return nullptr; // dead-ass circle
for (auto const& w : g_pCompositor->m_vWindows) { for (auto const& w : g_pCompositor->m_vWindows) {
if (w->m_pXWaylandSurface != s) if (w->m_pXWaylandSurface != s)
continue; continue;