Commit 7d81e9cf authored by Martin Flöser's avatar Martin Flöser
Browse files

[plugins/qpa] Implement a custom QPlatformCursor

This makes QCursor::pos and QCursor::setPos function correctly. KWin
actually wouldn't need it as KWin has the KWin::Cursor replacement, but
it allows Qt internal API to have it function correctly and also the
zoom effect does use QCursor::setPos.
parent 44bb78c1
......@@ -98,3 +98,12 @@ add_executable(testPointerInput ${testPointerInput_SRCS})
target_link_libraries( testPointerInput kwin Qt5::Test)
add_test(kwin-testPointerInput testPointerInput)
ecm_mark_as_test(testPointerInput)
########################################################
# PlatformCursorTest
########################################################
set( testPlatformCursor_SRCS platformcursor.cpp kwin_wayland_test.cpp )
add_executable(testPlatformCursor ${testPlatformCursor_SRCS})
target_link_libraries( testPlatformCursor kwin Qt5::Test)
add_test(kwin-testPlatformCursor testPlatformCursor)
ecm_mark_as_test(testPlatformCursor)
/********************************************************************
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 "cursor.h"
#include "abstract_backend.h"
#include "wayland_server.h"
namespace KWin
{
static const QString s_socketName = QStringLiteral("wayland_test_kwin_platform_cursor-0");
class PlatformCursorTest : public QObject
{
Q_OBJECT
private Q_SLOTS:
void initTestCase();
void testPos();
};
void PlatformCursorTest::initTestCase()
{
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
QVERIFY(workspaceCreatedSpy.isValid());
waylandServer()->backend()->setInitialWindowSize(QSize(1280, 1024));
waylandServer()->init(s_socketName.toLocal8Bit());
kwinApp()->start();
QVERIFY(workspaceCreatedSpy.wait());
}
void PlatformCursorTest::testPos()
{
// this test verifies that the PlatformCursor of the QPA plugin forwards ::pos and ::setPos correctly
// that is QCursor should work just like KWin::Cursor
// cursor should be centered on screen
QCOMPARE(Cursor::pos(), QPoint(639, 511));
QCOMPARE(QCursor::pos(), QPoint(639, 511));
// let's set the pos through QCursor API
QCursor::setPos(QPoint(10, 10));
QCOMPARE(Cursor::pos(), QPoint(10, 10));
QCOMPARE(QCursor::pos(), QPoint(10, 10));
// and let's set the pos through Cursor API
QCursor::setPos(QPoint(20, 20));
QCOMPARE(Cursor::pos(), QPoint(20, 20));
QCOMPARE(QCursor::pos(), QPoint(20, 20));
}
}
WAYLANDTEST_MAIN(KWin::PlatformCursorTest)
#include "platformcursor.moc"
......@@ -9,6 +9,7 @@ set(QPA_SOURCES
main.cpp
nativeinterface.cpp
platformcontextwayland.cpp
platformcursor.cpp
screen.cpp
sharingplatformcontext.cpp
window.cpp
......
/********************************************************************
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 "platformcursor.h"
#include "../../cursor.h"
namespace KWin
{
namespace QPA
{
PlatformCursor::PlatformCursor()
: QPlatformCursor()
{
}
PlatformCursor::~PlatformCursor() = default;
QPoint PlatformCursor::pos() const
{
return Cursor::pos();
}
void PlatformCursor::setPos(const QPoint &pos)
{
Cursor::setPos(pos);
}
void PlatformCursor::changeCursor(QCursor *windowCursor, QWindow *window)
{
Q_UNUSED(windowCursor)
Q_UNUSED(window)
// TODO: implement
}
}
}
/********************************************************************
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/>.
*********************************************************************/
#ifndef KWIN_QPA_PLATFORMCURSOR_H
#define KWIN_QPA_PLATFORMCURSOR_H
#include <qpa/qplatformcursor.h>
namespace KWin
{
namespace QPA
{
class PlatformCursor : public QPlatformCursor
{
public:
PlatformCursor();
virtual ~PlatformCursor();
QPoint pos() const override;
void setPos(const QPoint &pos) override;
void changeCursor(QCursor *windowCursor, QWindow *window) override;
};
}
}
#endif
......@@ -18,6 +18,7 @@ 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 "screen.h"
#include "platformcursor.h"
#include <KWayland/Client/output.h>
......@@ -29,6 +30,7 @@ namespace QPA
Screen::Screen(KWayland::Client::Output *o)
: QPlatformScreen()
, m_output(o)
, m_cursor(new PlatformCursor)
{
// TODO: connect to resolution changes
}
......@@ -55,5 +57,10 @@ QSizeF Screen::physicalSize() const
return m_output->physicalSize();
}
QPlatformCursor *Screen::cursor() const
{
return m_cursor.data();
}
}
}
......@@ -34,6 +34,7 @@ namespace KWin
{
namespace QPA
{
class PlatformCursor;
class Screen : public QPlatformScreen
{
......@@ -45,9 +46,11 @@ public:
int depth() const override;
QImage::Format format() const override;
QSizeF physicalSize() const override;
QPlatformCursor *cursor() const override;
private:
KWayland::Client::Output *m_output;
QScopedPointer<PlatformCursor> m_cursor;
};
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment