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

[effects/slidingpopups] Don't crash when sliding virtual desktops

Browse source 
Summary:
If you switch virtual desktops while krunner is sliding in, then
depending on whether your distro strips assert statements away,
KWin can crash.

The reason why it crashes is the sliding popups effect tries to unref
deleted windows that it hasn't referenced before (if there is an active
full screen effect, then popups won't be slided out, which in its turn
means that we won't reference deleted windows). So, in the end, the
refcount of those windows can be -1. That triggers an assert statement
in the destructor of the Deleted class, which checks whether the
refcount is equal to 0.

Popups are not slided while there is an active full screen effect because
we don't know what the full screen effect does.

This patch adjusts the sliding popups effect so it stops all active
animations when user switches virtual desktops or when a full screen
effect kicks in. We need to do that so the effect won't try to
unreference windows in postPaintWindow.

Visually, it doesn't look quite nice, but for now that's good enough.
A proper fix would be more complex: we would need to make sure that
full screen effects ignore sliding popups (and also maybe docks) and
perform some input redirection.

BUG: 400170
FIXED-IN: 5.14.4

Test Plan: I'm not able anymore to reproduce bug 400170.

Reviewers: #kwin, graesslin

Reviewed By: #kwin, graesslin

Subscribers: davidedmundson, graesslin, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D16731
This commit is contained in:
Vlad Zagorodniy 2018-11-05 14:59:42 +02:00
parent 18ff596996
commit ad28da84e7
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
effects/slidingpopups/slidingpopups.cpp
View file

@ -3,6 +3,7 @@
This file is part of the KDE project.
Copyright (C) 2009 Marco Martin notmart@gmail.com
Copyright (C) 2018 Vlad Zagorodniy <vladzzag@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -53,6 +54,11 @@ SlidingPopupsEffect::SlidingPopupsEffect()
m_atom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_SLIDE"), this);
}
);
connect(effects, qOverload<int, int, EffectWindow *>(&EffectsHandler::desktopChanged),
this, &SlidingPopupsEffect::stopAnimations);
connect(effects, &EffectsHandler::activeFullScreenEffectChanged,
this, &SlidingPopupsEffect::stopAnimations);
reconfigure(ReconfigureAll);
}
@ -434,6 +440,22 @@ void SlidingPopupsEffect::slideOut(EffectWindow *w)
w->addRepaintFull();
}
void SlidingPopupsEffect::stopAnimations()
{
for (auto it = m_animations.constBegin(); it != m_animations.constEnd(); ++it) {
EffectWindow *w = it.key();
if (w->isDeleted()) {
w->unrefWindow();
} else {
w->setData(WindowForceBackgroundContrastRole, QVariant());
w->setData(WindowForceBlurRole, QVariant());
}
}
m_animations.clear();
}
bool SlidingPopupsEffect::isActive() const
{
return !m_animations.isEmpty();

6
effects/slidingpopups/slidingpopups.h
View file

@ -3,6 +3,7 @@
This file is part of the KDE project.
Copyright (C) 2009 Marco Martin notmart@gmail.com
Copyright (C) 2018 Vlad Zagorodniy <vladzzag@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -49,8 +50,6 @@ public:
static bool supported();
// TODO react also on virtual desktop changes
int slideInDuration() const;
int slideOutDuration() const;
@ -62,6 +61,7 @@ private Q_SLOTS:
void slideIn(EffectWindow *w);
void slideOut(EffectWindow *w);
void stopAnimations();
private:
void setupAnimData(EffectWindow *w);
@ -81,7 +81,7 @@ private:
AnimationKind kind;
TimeLine timeLine;
};
QHash<const EffectWindow*, Animation> m_animations;
QHash<EffectWindow *, Animation> m_animations;
enum class Location {
Left,