fb69b791a1
Summary: When windows get added some effects grab the window and want to be the only one animating this window. For this the grab roles exists. An effect being notified later on evaluates the grab state and does not start the animation. This process failed due to being dependent on the order the effects are loaded. Window Added/Closed are signals emitted by EffectsHandler, thus first come, first serve. The requested effect order does not play into it. Due to that it could happen that an Effect which should not animate, started to animate as the grab was still there. This change adds the possibility to be notified whenever the window data changes. A new signal is added to EffectsHandler which is emitted whenever the windowData changes. The interested effects connect to it and cancel their (just started) animation for the window. Adjusted effects are: * ScaleIn * Fade * WobblyWindows In case of WobblyWindows an additional logical error was fixed that the animations were only run when an effect grabbed instead of the other way around. BUG: 336866 FIXED-IN: 5.8.4 Reviewers: #kwin, #plasma, broulik Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D3211
375 lines
15 KiB
C++
375 lines
15 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2016 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
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
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "kwin_wayland_test.h"
|
|
#include "composite.h"
|
|
#include "effects.h"
|
|
#include "effectloader.h"
|
|
#include "cursor.h"
|
|
#include "platform.h"
|
|
#include "scene_qpainter.h"
|
|
#include "shell_client.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
#include "effect_builtins.h"
|
|
|
|
#include <KConfigGroup>
|
|
|
|
#include <KWayland/Client/connection_thread.h>
|
|
#include <KWayland/Client/registry.h>
|
|
#include <KWayland/Client/surface.h>
|
|
#include <KWayland/Client/shell.h>
|
|
#include <KWayland/Client/slide.h>
|
|
|
|
#include <netwm.h>
|
|
#include <xcb/xcb_icccm.h>
|
|
|
|
using namespace KWin;
|
|
static const QString s_socketName = QStringLiteral("wayland_test_effects_slidingpopups-0");
|
|
|
|
class SlidingPopupsTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
void testWithOtherEffect_data();
|
|
void testWithOtherEffect();
|
|
void testWithOtherEffectWayland_data();
|
|
void testWithOtherEffectWayland();
|
|
};
|
|
|
|
void SlidingPopupsTest::initTestCase()
|
|
{
|
|
qRegisterMetaType<KWin::ShellClient*>();
|
|
qRegisterMetaType<KWin::AbstractClient*>();
|
|
qRegisterMetaType<KWin::Effect*>();
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
|
|
// disable all effects - we don't want to have it interact with the rendering
|
|
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
|
|
KConfigGroup plugins(config, QStringLiteral("Plugins"));
|
|
ScriptedEffectLoader loader;
|
|
const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects();
|
|
for (QString name : builtinNames) {
|
|
plugins.writeEntry(name + QStringLiteral("Enabled"), false);
|
|
}
|
|
|
|
config->sync();
|
|
kwinApp()->setConfig(config);
|
|
// TODO: make effects use KWin's config directly
|
|
KSharedConfig::openConfig(QStringLiteral(KWIN_CONFIG), KConfig::NoGlobals)->group("Effect-Wobbly").writeEntry(QStringLiteral("Settings"), QStringLiteral("Custom"));
|
|
KSharedConfig::openConfig(QStringLiteral(KWIN_CONFIG), KConfig::NoGlobals)->group("Effect-Wobbly").writeEntry(QStringLiteral("OpenEffect"), true);
|
|
KSharedConfig::openConfig(QStringLiteral(KWIN_CONFIG), KConfig::NoGlobals)->group("Effect-Wobbly").writeEntry(QStringLiteral("CloseEffect"), true);
|
|
|
|
if (QFile::exists(QStringLiteral("/dev/dri/card0"))) {
|
|
qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2"));
|
|
}
|
|
qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1");
|
|
kwinApp()->start();
|
|
QVERIFY(workspaceCreatedSpy.wait());
|
|
QVERIFY(Compositor::self());
|
|
}
|
|
|
|
void SlidingPopupsTest::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection(s_socketName, Test::AdditionalWaylandInterface::Decoration));
|
|
}
|
|
|
|
void SlidingPopupsTest::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
EffectsHandlerImpl *e = static_cast<EffectsHandlerImpl*>(effects);
|
|
while (!e->loadedEffects().isEmpty()) {
|
|
const QString effect = e->loadedEffects().first();
|
|
e->unloadEffect(effect);
|
|
QVERIFY(!e->isEffectLoaded(effect));
|
|
}
|
|
}
|
|
|
|
struct XcbConnectionDeleter
|
|
{
|
|
static inline void cleanup(xcb_connection_t *pointer)
|
|
{
|
|
xcb_disconnect(pointer);
|
|
}
|
|
};
|
|
|
|
|
|
void SlidingPopupsTest::testWithOtherEffect_data()
|
|
{
|
|
QTest::addColumn<QStringList>("effectsToLoad");
|
|
|
|
QTest::newRow("scale, slide") << QStringList{QStringLiteral("kwin4_effect_scalein"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, scale") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("kwin4_effect_scalein")};
|
|
QTest::newRow("fade, slide") << QStringList{QStringLiteral("kwin4_effect_fade"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, fade") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("kwin4_effect_fade")};
|
|
|
|
if (effects->compositingType() & KWin::OpenGLCompositing) {
|
|
QTest::newRow("glide, slide") << QStringList{QStringLiteral("glide"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, glide") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("glide")};
|
|
QTest::newRow("wobblywindows, slide") << QStringList{QStringLiteral("wobblywindows"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, wobblywindows") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("wobblywindows")};
|
|
QTest::newRow("fallapart, slide") << QStringList{QStringLiteral("fallapart"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, fallapart") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("fallapart")};
|
|
}
|
|
}
|
|
|
|
void SlidingPopupsTest::testWithOtherEffect()
|
|
{
|
|
// this test verifies that slidingpopups effect grabs the window added role
|
|
// independently of the sequence how the effects are loaded.
|
|
// see BUG 336866
|
|
EffectsHandlerImpl *e = static_cast<EffectsHandlerImpl*>(effects);
|
|
// find the effectsloader
|
|
auto effectloader = e->findChild<AbstractEffectLoader*>();
|
|
QVERIFY(effectloader);
|
|
QSignalSpy effectLoadedSpy(effectloader, &AbstractEffectLoader::effectLoaded);
|
|
QVERIFY(effectLoadedSpy.isValid());
|
|
|
|
Effect *slidingPoupus = nullptr;
|
|
Effect *otherEffect = nullptr;
|
|
QFETCH(QStringList, effectsToLoad);
|
|
for (const QString &effectName : effectsToLoad) {
|
|
QVERIFY(!e->isEffectLoaded(effectName));
|
|
QVERIFY(e->loadEffect(effectName));
|
|
QVERIFY(e->isEffectLoaded(effectName));
|
|
|
|
QCOMPARE(effectLoadedSpy.count(), 1);
|
|
Effect *effect = effectLoadedSpy.first().first().value<Effect*>();
|
|
if (effectName == QStringLiteral("slidingpopups")) {
|
|
slidingPoupus = effect;
|
|
} else {
|
|
otherEffect = effect;
|
|
}
|
|
effectLoadedSpy.clear();
|
|
}
|
|
QVERIFY(slidingPoupus);
|
|
QVERIFY(otherEffect);
|
|
|
|
QVERIFY(!slidingPoupus->isActive());
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
// give the compositor some time to render
|
|
QTest::qWait(50);
|
|
|
|
QSignalSpy windowAddedSpy(effects, &EffectsHandler::windowAdded);
|
|
QVERIFY(windowAddedSpy.isValid());
|
|
|
|
// create an xcb window
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
const QRect windowGeometry(0, 0, 100, 200);
|
|
xcb_window_t w = xcb_generate_id(c.data());
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
windowGeometry.x(),
|
|
windowGeometry.y(),
|
|
windowGeometry.width(),
|
|
windowGeometry.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints;
|
|
memset(&hints, 0, sizeof(hints));
|
|
xcb_icccm_size_hints_set_position(&hints, 1, windowGeometry.x(), windowGeometry.y());
|
|
xcb_icccm_size_hints_set_size(&hints, 1, windowGeometry.width(), windowGeometry.height());
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
NETWinInfo winInfo(c.data(), w, rootWindow(), NET::Properties(), NET::Properties2());
|
|
winInfo.setWindowType(NET::Normal);
|
|
|
|
// and get the slide atom
|
|
const QByteArray effectAtomName = QByteArrayLiteral("_KDE_SLIDE");
|
|
xcb_intern_atom_cookie_t atomCookie = xcb_intern_atom_unchecked(c.data(), false, effectAtomName.length(), effectAtomName.constData());
|
|
const int size = 2;
|
|
int32_t data[size];
|
|
data[0] = 0;
|
|
data[1] = 0;
|
|
QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> atom(xcb_intern_atom_reply(c.data(), atomCookie, nullptr));
|
|
QVERIFY(!atom.isNull());
|
|
xcb_change_property(c.data(), XCB_PROP_MODE_REPLACE, w, atom->atom, atom->atom, 32, size, data);
|
|
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
// we should get a client for it
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
Client *client = windowCreatedSpy.first().first().value<Client*>();
|
|
QVERIFY(client);
|
|
QCOMPARE(client->window(), w);
|
|
QVERIFY(client->isNormalWindow());
|
|
|
|
// sliding popups should be active
|
|
QVERIFY(windowAddedSpy.wait());
|
|
QTRY_VERIFY(slidingPoupus->isActive());
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
// wait till effect ends
|
|
QTRY_VERIFY(!slidingPoupus->isActive());
|
|
QTest::qWait(300);
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
// and destroy the window again
|
|
xcb_unmap_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
QSignalSpy windowClosedSpy(client, &Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
|
|
QSignalSpy windowDeletedSpy(effects, &EffectsHandler::windowDeleted);
|
|
QVERIFY(windowDeletedSpy.isValid());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
// again we should have the sliding popups active
|
|
QVERIFY(slidingPoupus->isActive());
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
QVERIFY(windowDeletedSpy.wait());
|
|
|
|
QCOMPARE(windowDeletedSpy.count(), 1);
|
|
QTRY_VERIFY(!slidingPoupus->isActive());
|
|
QTest::qWait(300);
|
|
QVERIFY(!otherEffect->isActive());
|
|
xcb_destroy_window(c.data(), w);
|
|
c.reset();
|
|
}
|
|
|
|
void SlidingPopupsTest::testWithOtherEffectWayland_data()
|
|
{
|
|
QTest::addColumn<QStringList>("effectsToLoad");
|
|
|
|
QTest::newRow("scale, slide") << QStringList{QStringLiteral("kwin4_effect_scalein"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, scale") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("kwin4_effect_scalein")};
|
|
QTest::newRow("fade, slide") << QStringList{QStringLiteral("kwin4_effect_fade"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, fade") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("kwin4_effect_fade")};
|
|
|
|
if (effects->compositingType() & KWin::OpenGLCompositing) {
|
|
QTest::newRow("glide, slide") << QStringList{QStringLiteral("glide"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, glide") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("glide")};
|
|
QTest::newRow("wobblywindows, slide") << QStringList{QStringLiteral("wobblywindows"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, wobblywindows") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("wobblywindows")};
|
|
QTest::newRow("fallapart, slide") << QStringList{QStringLiteral("fallapart"), QStringLiteral("slidingpopups")};
|
|
QTest::newRow("slide, fallapart") << QStringList{QStringLiteral("slidingpopups"), QStringLiteral("fallapart")};
|
|
}
|
|
}
|
|
|
|
void SlidingPopupsTest::testWithOtherEffectWayland()
|
|
{
|
|
// this test verifies that slidingpopups effect grabs the window added role
|
|
// independently of the sequence how the effects are loaded.
|
|
// see BUG 336866
|
|
// the test is like testWithOtherEffect, but simulates using a Wayland window
|
|
EffectsHandlerImpl *e = static_cast<EffectsHandlerImpl*>(effects);
|
|
// find the effectsloader
|
|
auto effectloader = e->findChild<AbstractEffectLoader*>();
|
|
QVERIFY(effectloader);
|
|
QSignalSpy effectLoadedSpy(effectloader, &AbstractEffectLoader::effectLoaded);
|
|
QVERIFY(effectLoadedSpy.isValid());
|
|
|
|
Effect *slidingPoupus = nullptr;
|
|
Effect *otherEffect = nullptr;
|
|
QFETCH(QStringList, effectsToLoad);
|
|
for (const QString &effectName : effectsToLoad) {
|
|
QVERIFY(!e->isEffectLoaded(effectName));
|
|
QVERIFY(e->loadEffect(effectName));
|
|
QVERIFY(e->isEffectLoaded(effectName));
|
|
|
|
QCOMPARE(effectLoadedSpy.count(), 1);
|
|
Effect *effect = effectLoadedSpy.first().first().value<Effect*>();
|
|
if (effectName == QStringLiteral("slidingpopups")) {
|
|
slidingPoupus = effect;
|
|
} else {
|
|
otherEffect = effect;
|
|
}
|
|
effectLoadedSpy.clear();
|
|
}
|
|
QVERIFY(slidingPoupus);
|
|
QVERIFY(otherEffect);
|
|
|
|
QVERIFY(!slidingPoupus->isActive());
|
|
QVERIFY(!otherEffect->isActive());
|
|
QSignalSpy windowAddedSpy(effects, &EffectsHandler::windowAdded);
|
|
QVERIFY(windowAddedSpy.isValid());
|
|
|
|
using namespace KWayland::Client;
|
|
// the test created the slide protocol, let's create a Registry and listen for it
|
|
QScopedPointer<Registry> registry(new Registry);
|
|
registry->create(Test::waylandConnection());
|
|
|
|
QSignalSpy interfacesAnnouncedSpy(registry.data(), &Registry::interfacesAnnounced);
|
|
QVERIFY(interfacesAnnouncedSpy.isValid());
|
|
registry->setup();
|
|
QVERIFY(interfacesAnnouncedSpy.wait());
|
|
auto slideInterface = registry->interface(Registry::Interface::Slide);
|
|
QVERIFY(slideInterface.name != 0);
|
|
QScopedPointer<SlideManager> slideManager(registry->createSlideManager(slideInterface.name, slideInterface.version));
|
|
QVERIFY(slideManager);
|
|
|
|
// create Wayland window
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QVERIFY(surface);
|
|
QScopedPointer<Slide> slide(slideManager->createSlide(surface.data()));
|
|
slide->setLocation(Slide::Location::Left);
|
|
slide->commit();
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
QVERIFY(shellSurface);
|
|
QCOMPARE(windowAddedSpy.count(), 0);
|
|
auto client = Test::renderAndWaitForShown(surface.data(), QSize(10, 20), Qt::blue);
|
|
QVERIFY(client);
|
|
QVERIFY(client->isNormalWindow());
|
|
|
|
// sliding popups should be active
|
|
QCOMPARE(windowAddedSpy.count(), 1);
|
|
QTRY_VERIFY(slidingPoupus->isActive());
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
// wait till effect ends
|
|
QTRY_VERIFY(!slidingPoupus->isActive());
|
|
QTest::qWait(300);
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
// and destroy the window again
|
|
shellSurface.reset();
|
|
surface.reset();
|
|
|
|
QSignalSpy windowClosedSpy(client, &Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
|
|
QSignalSpy windowDeletedSpy(effects, &EffectsHandler::windowDeleted);
|
|
QVERIFY(windowDeletedSpy.isValid());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
// again we should have the sliding popups active
|
|
QVERIFY(slidingPoupus->isActive());
|
|
QVERIFY(!otherEffect->isActive());
|
|
|
|
QVERIFY(windowDeletedSpy.wait());
|
|
|
|
QCOMPARE(windowDeletedSpy.count(), 1);
|
|
QTRY_VERIFY(!slidingPoupus->isActive());
|
|
QTest::qWait(300);
|
|
QVERIFY(!otherEffect->isActive());
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(SlidingPopupsTest)
|
|
#include "slidingpopups_test.moc"
|