yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more closed window checks

Browse source 
The stack contains closed windows, so we need to guard against them.

BUG: 475423
This commit is contained in:
Vlad Zahorodnii 2023-11-28 22:08:53 +02:00
parent c0b387bf5e
commit 5e90452d08
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/layers.cpp
View file

@ -232,7 +232,7 @@ Window *Workspace::topWindowOnDesktop(VirtualDesktop *desktop, Output *output, b
} }
for (int i = list.size() - 1; i >= 0; --i) { for (int i = list.size() - 1; i >= 0; --i) {
auto window = list.at(i); auto window = list.at(i);
if (!window->isClient()) { if (!window->isClient() || window->isDeleted()) {
continue; continue;
} }
if (window->isOnDesktop(desktop) && window->isShown() && window->isOnCurrentActivity() && !window->isShade()) { if (window->isOnDesktop(desktop) && window->isShown() && window->isOnCurrentActivity() && !window->isShade()) {
@ -256,12 +256,18 @@ Window *Workspace::findDesktop(bool topmost, VirtualDesktop *desktop) const
if (topmost) { if (topmost) {
for (int i = stacking_order.size() - 1; i >= 0; i--) { for (int i = stacking_order.size() - 1; i >= 0; i--) {
auto window = stacking_order.at(i); auto window = stacking_order.at(i);
if (window->isDeleted()) {
continue;
}
if (window->isClient() && window->isOnDesktop(desktop) && window->isDesktop() && window->isShown()) { if (window->isClient() && window->isOnDesktop(desktop) && window->isDesktop() && window->isShown()) {
return window; return window;
} }
} }
} else { // bottom-most } else { // bottom-most
for (Window *window : std::as_const(stacking_order)) { for (Window *window : std::as_const(stacking_order)) {
if (window->isDeleted()) {
continue;
}
if (window->isClient() && window->isOnDesktop(desktop) && window->isDesktop() && window->isShown()) { if (window->isClient() && window->isOnDesktop(desktop) && window->isDesktop() && window->isShown()) {
return window; return window;
} }
@ -330,7 +336,7 @@ void Workspace::lowerWindowWithinApplication(Window *window)
// first try to put it below the bottom-most window of the application // first try to put it below the bottom-most window of the application
for (auto it = unconstrained_stacking_order.begin(); it != unconstrained_stacking_order.end(); ++it) { for (auto it = unconstrained_stacking_order.begin(); it != unconstrained_stacking_order.end(); ++it) {
auto other = *it; auto other = *it;
if (!other->isClient()) { if (!other->isClient() || other->isDeleted()) {
continue; continue;
} }
if (Window::belongToSameApplication(other, window)) { if (Window::belongToSameApplication(other, window)) {
@ -386,7 +392,7 @@ void Workspace::raiseWindowWithinApplication(Window *window)
// first try to put it above the top-most window of the application // first try to put it above the top-most window of the application
for (int i = unconstrained_stacking_order.size() - 1; i > -1; --i) { for (int i = unconstrained_stacking_order.size() - 1; i > -1; --i) {
auto other = unconstrained_stacking_order.at(i); auto other = unconstrained_stacking_order.at(i);
if (!other->isClient()) { if (!other->isClient() || other->isDeleted()) {
continue; continue;
} }
if (other == window) { // don't lower it just because it asked to be raised if (other == window) { // don't lower it just because it asked to be raised
@ -473,7 +479,7 @@ void Workspace::restoreSessionStackingOrder(X11Window *window)
unconstrained_stacking_order.removeAll(window); unconstrained_stacking_order.removeAll(window);
for (auto it = unconstrained_stacking_order.begin(); it != unconstrained_stacking_order.end(); ++it) { for (auto it = unconstrained_stacking_order.begin(); it != unconstrained_stacking_order.end(); ++it) {
X11Window *current = qobject_cast<X11Window *>(*it); X11Window *current = qobject_cast<X11Window *>(*it);
if (!current || current->isUnmanaged()) { if (!current || current->isDeleted() || current->isUnmanaged()) {
continue; continue;
} }
if (current->sessionStackingOrder() > window->sessionStackingOrder()) { if (current->sessionStackingOrder() > window->sessionStackingOrder()) {