Delay maximize button click to next event cycle
Summary: The delay to next cycle dance is needed for Aurorae. Maximizing a window can result in the decoration being destroyed, in which case QtQuick can trigger a crash. A test case is added to simulate the situation and ensure that maximize still works also after the change. BUG: 362772 FIXED-IN: 5.6.5 Reviewers: #plasma Subscribers: plasma-devel Projects: #plasma Differential Revision: https://phabricator.kde.org/D1586icc-effect-5.14.5
parent
440cefff92
commit
6cd0d5a54a
|
@ -134,3 +134,14 @@ add_executable(testDontCrashEmptyDeco ${testDontCrashEmptyDeco_SRCS})
|
|||
target_link_libraries( testDontCrashEmptyDeco kwin Qt5::Test)
|
||||
add_test(kwin-testDontCrashEmptyDeco testDontCrashEmptyDeco)
|
||||
ecm_mark_as_test(testDontCrashEmptyDeco)
|
||||
|
||||
########################################################
|
||||
# Dont Crash Aurorae Destroy Deco
|
||||
########################################################
|
||||
if (XCB_ICCCM_FOUND)
|
||||
set( testDontCrashAuroraeDestroyDeco_SRCS dont_crash_aurorae_destroy_deco.cpp kwin_wayland_test.cpp )
|
||||
add_executable(testDontCrashAuroraeDestroyDeco ${testDontCrashAuroraeDestroyDeco_SRCS})
|
||||
target_link_libraries( testDontCrashAuroraeDestroyDeco kwin Qt5::Test XCB::ICCCM)
|
||||
add_test(kwin-testDontCrashAuroraeDestroyDeco testDontCrashAuroraeDestroyDeco)
|
||||
ecm_mark_as_test(testDontCrashAuroraeDestroyDeco)
|
||||
endif()
|
||||
|
|
|
@ -0,0 +1,155 @@
|
|||
/********************************************************************
|
||||
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 "abstract_backend.h"
|
||||
#include "client.h"
|
||||
#include "cursor.h"
|
||||
#include "screenedge.h"
|
||||
#include "screens.h"
|
||||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "shell_client.h"
|
||||
#include <kwineffects.h>
|
||||
|
||||
#include <KDecoration2/Decoration>
|
||||
|
||||
#include <QQuickItem>
|
||||
|
||||
#include <linux/input.h>
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
||||
static const QString s_socketName = QStringLiteral("wayland_test_kwin_dont_crash_aurorae_destroy_deco-0");
|
||||
|
||||
class DontCrashAuroraeDestroyDecoTest : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
private Q_SLOTS:
|
||||
void initTestCase();
|
||||
void init();
|
||||
void testBorderlessMaximizedWindows();
|
||||
|
||||
};
|
||||
|
||||
void DontCrashAuroraeDestroyDecoTest::initTestCase()
|
||||
{
|
||||
if (!QFile::exists(QStringLiteral("/dev/dri/card0"))) {
|
||||
QSKIP("Needs a dri device");
|
||||
}
|
||||
qRegisterMetaType<KWin::ShellClient*>();
|
||||
qRegisterMetaType<KWin::AbstractClient*>();
|
||||
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
||||
QVERIFY(workspaceCreatedSpy.isValid());
|
||||
waylandServer()->backend()->setInitialWindowSize(QSize(1280, 1024));
|
||||
QMetaObject::invokeMethod(waylandServer()->backend(), "setOutputCount", Qt::DirectConnection, Q_ARG(int, 2));
|
||||
waylandServer()->init(s_socketName.toLocal8Bit());
|
||||
|
||||
KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
|
||||
config->group("org.kde.kdecoration2").writeEntry("library", "org.kde.kwin.aurorae");
|
||||
config->sync();
|
||||
kwinApp()->setConfig(config);
|
||||
|
||||
// this test needs to enforce OpenGL compositing to get into the crashy condition
|
||||
qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2"));
|
||||
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));
|
||||
setenv("QT_QPA_PLATFORM", "wayland", true);
|
||||
waylandServer()->initWorkspace();
|
||||
}
|
||||
|
||||
void DontCrashAuroraeDestroyDecoTest::init()
|
||||
{
|
||||
screens()->setCurrent(0);
|
||||
Cursor::setPos(QPoint(640, 512));
|
||||
}
|
||||
|
||||
void DontCrashAuroraeDestroyDecoTest::testBorderlessMaximizedWindows()
|
||||
{
|
||||
// this test verifies that Aurorae doesn't crash when clicking the maximize button
|
||||
// with kwin config option BorderlessMaximizedWindows
|
||||
// see BUG 362772
|
||||
|
||||
// first adjust the config
|
||||
KConfigGroup group = kwinApp()->config()->group("Windows");
|
||||
group.writeEntry("BorderlessMaximizedWindows", true);
|
||||
group.sync();
|
||||
workspace()->slotReconfigure();
|
||||
QCOMPARE(options->borderlessMaximizedWindows(), true);
|
||||
|
||||
// create an xcb window
|
||||
xcb_connection_t *c = xcb_connect(nullptr, nullptr);
|
||||
QVERIFY(!xcb_connection_has_error(c));
|
||||
|
||||
xcb_window_t w = xcb_generate_id(c);
|
||||
xcb_create_window(c, XCB_COPY_FROM_PARENT, w, rootWindow(), 0, 0, 100, 200, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
||||
xcb_map_window(c, w);
|
||||
xcb_flush(c);
|
||||
|
||||
// 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->isDecorated());
|
||||
QCOMPARE(client->maximizeMode(), MaximizeRestore);
|
||||
QCOMPARE(client->noBorder(), false);
|
||||
// verify that the deco is Aurorae
|
||||
QCOMPARE(qstrcmp(client->decoration()->metaObject()->className(), "Aurorae::Decoration"), 0);
|
||||
// find the maximize button
|
||||
QQuickItem *item = client->decoration()->findChild<QQuickItem*>("maximizeButton");
|
||||
QVERIFY(item);
|
||||
const QPointF scenePoint = item->mapToScene(QPoint(0, 0));
|
||||
|
||||
// mark the window as ready for painting, otherwise it doesn't get input events
|
||||
QMetaObject::invokeMethod(client, "setReadyForPainting");
|
||||
QVERIFY(client->readyForPainting());
|
||||
|
||||
// simulate click on maximize button
|
||||
QSignalSpy maximizedStateChangedSpy(client, static_cast<void (AbstractClient::*)(KWin::AbstractClient*, MaximizeMode)>(&AbstractClient::clientMaximizedStateChanged));
|
||||
QVERIFY(maximizedStateChangedSpy.isValid());
|
||||
quint32 timestamp = 1;
|
||||
waylandServer()->backend()->pointerMotion(client->geometry().topLeft() + scenePoint.toPoint(), timestamp++);
|
||||
waylandServer()->backend()->pointerButtonPressed(BTN_LEFT, timestamp++);
|
||||
waylandServer()->backend()->pointerButtonReleased(BTN_LEFT, timestamp++);
|
||||
QVERIFY(maximizedStateChangedSpy.wait());
|
||||
QCOMPARE(client->maximizeMode(), MaximizeFull);
|
||||
QCOMPARE(client->noBorder(), true);
|
||||
|
||||
// and destroy the window again
|
||||
xcb_unmap_window(c, w);
|
||||
xcb_destroy_window(c, w);
|
||||
xcb_flush(c);
|
||||
xcb_disconnect(c);
|
||||
|
||||
QSignalSpy windowClosedSpy(client, &Client::windowClosed);
|
||||
QVERIFY(windowClosedSpy.isValid());
|
||||
QVERIFY(windowClosedSpy.wait());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
WAYLANDTEST_MAIN(KWin::DontCrashAuroraeDestroyDecoTest)
|
||||
#include "dont_crash_aurorae_destroy_deco.moc"
|
|
@ -343,6 +343,7 @@ Decoration {
|
|||
Component {
|
||||
id: maximizeButtonComponent
|
||||
PlastikButton {
|
||||
objectName: "maximizeButton"
|
||||
buttonType: DecorationOptions.DecorationButtonMaximizeRestore
|
||||
size: root.buttonSize
|
||||
}
|
||||
|
|
|
@ -189,7 +189,12 @@ void DecoratedClientImpl::requestShowWindowMenu()
|
|||
|
||||
void DecoratedClientImpl::requestToggleMaximization(Qt::MouseButtons buttons)
|
||||
{
|
||||
Workspace::self()->performWindowOperation(m_client, options->operationMaxButtonClick(buttons));
|
||||
QMetaObject::invokeMethod(this, "delayedRequestToggleMaximization", Qt::QueuedConnection, Q_ARG(Options::WindowOperation, options->operationMaxButtonClick(buttons)));
|
||||
}
|
||||
|
||||
void DecoratedClientImpl::delayedRequestToggleMaximization(Options::WindowOperation operation)
|
||||
{
|
||||
Workspace::self()->performWindowOperation(m_client, operation);
|
||||
}
|
||||
|
||||
int DecoratedClientImpl::width() const
|
||||
|
|
|
@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*********************************************************************/
|
||||
#ifndef KWIN_DECORATED_CLIENT_H
|
||||
#define KWIN_DECORATED_CLIENT_H
|
||||
#include "options.h"
|
||||
|
||||
#include <KDecoration2/Private/DecoratedClientPrivate>
|
||||
|
||||
|
@ -91,6 +92,9 @@ public:
|
|||
|
||||
void signalShadeChange();
|
||||
|
||||
private Q_SLOTS:
|
||||
void delayedRequestToggleMaximization(Options::WindowOperation operation);
|
||||
|
||||
private:
|
||||
void createRenderer();
|
||||
AbstractClient *m_client;
|
||||
|
|
Loading…
Reference in New Issue