8c047613c5
Summary: This removes the restart function of the Compositor class and renames the internal reinitialize function. Instead of the restart function reinitialize can be called. Reading again the settings in this case is fine, since it is done rarely. This reduces the code complexity. Test Plan: Manually on Wayland and X. 100% autotests pass. Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: davidedmundson, zzag, kwin Tags: #kwin Maniphest Tasks: T11071 Differential Revision: https://phabricator.kde.org/D22225
169 lines
5.8 KiB
C++
169 lines
5.8 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
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
|
|
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 "abstract_client.h"
|
|
#include "composite.h"
|
|
#include "deleted.h"
|
|
#include "effectloader.h"
|
|
#include "effects.h"
|
|
#include "platform.h"
|
|
#include "screens.h"
|
|
#include "shell_client.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
|
|
#include "effect_builtins.h"
|
|
|
|
#include <KWayland/Client/surface.h>
|
|
#include <KWayland/Client/xdgshell.h>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_dont_crash_reinitialize_compositor-0");
|
|
|
|
class DontCrashReinitializeCompositorTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
void testReinitializeCompositor_data();
|
|
void testReinitializeCompositor();
|
|
};
|
|
|
|
void DontCrashReinitializeCompositorTest::initTestCase()
|
|
{
|
|
qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8());
|
|
|
|
qRegisterMetaType<KWin::AbstractClient *>();
|
|
qRegisterMetaType<KWin::Deleted *>();
|
|
qRegisterMetaType<KWin::ShellClient *>();
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
|
|
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
|
|
KConfigGroup plugins(config, QStringLiteral("Plugins"));
|
|
ScriptedEffectLoader loader;
|
|
const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects();
|
|
for (const QString &name : builtinNames) {
|
|
plugins.writeEntry(name + QStringLiteral("Enabled"), false);
|
|
}
|
|
config->sync();
|
|
kwinApp()->setConfig(config);
|
|
|
|
qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2"));
|
|
qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1"));
|
|
|
|
kwinApp()->start();
|
|
QVERIFY(workspaceCreatedSpy.wait());
|
|
QCOMPARE(screens()->count(), 2);
|
|
QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(screens()->geometry(1), QRect(1280, 0, 1280, 1024));
|
|
waylandServer()->initWorkspace();
|
|
|
|
auto scene = KWin::Compositor::self()->scene();
|
|
QVERIFY(scene);
|
|
QCOMPARE(scene->compositingType(), KWin::OpenGL2Compositing);
|
|
}
|
|
|
|
void DontCrashReinitializeCompositorTest::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection());
|
|
}
|
|
|
|
void DontCrashReinitializeCompositorTest::cleanup()
|
|
{
|
|
// Unload all effects.
|
|
auto effectsImpl = qobject_cast<EffectsHandlerImpl *>(effects);
|
|
QVERIFY(effectsImpl);
|
|
effectsImpl->unloadAllEffects();
|
|
QVERIFY(effectsImpl->loadedEffects().isEmpty());
|
|
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void DontCrashReinitializeCompositorTest::testReinitializeCompositor_data()
|
|
{
|
|
QTest::addColumn<QString>("effectName");
|
|
|
|
QTest::newRow("Fade") << QStringLiteral("kwin4_effect_fade");
|
|
QTest::newRow("Glide") << QStringLiteral("glide");
|
|
QTest::newRow("Scale") << QStringLiteral("kwin4_effect_scale");
|
|
}
|
|
|
|
void DontCrashReinitializeCompositorTest::testReinitializeCompositor()
|
|
{
|
|
// This test verifies that KWin doesn't crash when the compositor settings
|
|
// have been changed while a scripted effect animates the disappearing of
|
|
// a window.
|
|
|
|
// Make sure that we have the right effects ptr.
|
|
auto effectsImpl = qobject_cast<EffectsHandlerImpl *>(effects);
|
|
QVERIFY(effectsImpl);
|
|
|
|
// Create the test client.
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QVERIFY(!surface.isNull());
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
|
|
QVERIFY(!shellSurface.isNull());
|
|
ShellClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
QVERIFY(client);
|
|
|
|
// Make sure that only the test effect is loaded.
|
|
QFETCH(QString, effectName);
|
|
QVERIFY(effectsImpl->loadEffect(effectName));
|
|
QCOMPARE(effectsImpl->loadedEffects().count(), 1);
|
|
QCOMPARE(effectsImpl->loadedEffects().first(), effectName);
|
|
Effect *effect = effectsImpl->findEffect(effectName);
|
|
QVERIFY(effect);
|
|
QVERIFY(!effect->isActive());
|
|
|
|
// Close the test client.
|
|
QSignalSpy windowClosedSpy(client, &ShellClient::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
shellSurface.reset();
|
|
surface.reset();
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
// The test effect should start animating the test client. Is there a better
|
|
// way to verify that the test effect actually animates the test client?
|
|
QVERIFY(effect->isActive());
|
|
|
|
// Re-initialize the compositor, effects will be destroyed and created again.
|
|
Compositor::self()->reinitialize();
|
|
|
|
// By this time, KWin should still be alive.
|
|
}
|
|
|
|
} // namespace KWin
|
|
|
|
WAYLANDTEST_MAIN(KWin::DontCrashReinitializeCompositorTest)
|
|
#include "dont_crash_reinitialize_compositor.moc"
|