diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-08-09 14:04:32 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2016-08-11 07:53:36 +0000 |
commit | 5b222098649674042ca721583abcbee22ea60930 (patch) | |
tree | 6430046f63ebcf988829df79dc11c55815cae8b6 /tests | |
parent | 00dd433430b7c2849642aefcd3d826dd4b9bf28f (diff) | |
download | qtwayland-5b222098649674042ca721583abcbee22ea60930.tar.gz |
Compositor API: rename QWaylandInputDevice to QWaylandSeat
The name QWaylandInputDevice could be confusing and misleading:
- A QWaylandInputDevice was not one input device, but a collection of many.
- Classes that sounded like they should inherit from it did not, i.e:
QWaylandKeyboard, QWaylandPointer and QWaylandTouch.
- The Wayland protocol already has another term for this, which is seat.
Change-Id: I9d9690d5b378075d9dddaeb8cf18395c7f47603e
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/compositor/compositor.pro | 4 | ||||
-rw-r--r-- | tests/auto/compositor/testcompositor.cpp | 16 | ||||
-rw-r--r-- | tests/auto/compositor/testcompositor.h | 6 | ||||
-rw-r--r-- | tests/auto/compositor/testkeyboardgrabber.cpp | 4 | ||||
-rw-r--r-- | tests/auto/compositor/testkeyboardgrabber.h | 2 | ||||
-rw-r--r-- | tests/auto/compositor/testseat.cpp (renamed from tests/auto/compositor/testinputdevice.cpp) | 12 | ||||
-rw-r--r-- | tests/auto/compositor/testseat.h (renamed from tests/auto/compositor/testinputdevice.h) | 8 | ||||
-rw-r--r-- | tests/auto/compositor/tst_compositor.cpp | 54 |
8 files changed, 53 insertions, 53 deletions
diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro index 9f9044fd..50378c6d 100644 --- a/tests/auto/compositor/compositor.pro +++ b/tests/auto/compositor/compositor.pro @@ -29,10 +29,10 @@ SOURCES += tst_compositor.cpp \ testkeyboardgrabber.cpp \ mockclient.cpp \ mockseat.cpp \ - testinputdevice.cpp + testseat.cpp HEADERS += testcompositor.h \ testkeyboardgrabber.h \ mockclient.h \ mockseat.h \ - testinputdevice.h + testseat.h diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/testcompositor.cpp index dfa26a54..733bea5b 100644 --- a/tests/auto/compositor/testcompositor.cpp +++ b/tests/auto/compositor/testcompositor.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include "testcompositor.h" -#include "testinputdevice.h" +#include "testseat.h" #include "testkeyboardgrabber.h" #include <wayland-server.h> @@ -35,7 +35,7 @@ TestCompositor::TestCompositor(bool createInputDev) : QWaylandCompositor() , shell(new QWaylandWlShell(this)) - , m_createInputDevice(createInputDev) + , m_createSeat(createInputDev) { setSocketName("wayland-qt-test-0"); } @@ -64,14 +64,14 @@ void TestCompositor::onSurfaceAboutToBeDestroyed(QWaylandSurface *surface) surfaces.removeOne(surface); } -QWaylandInputDevice *TestCompositor::createInputDevice() +QWaylandSeat *TestCompositor::createSeat() { - if (m_createInputDevice) - return new TestInputDevice(this, QWaylandInputDevice::Pointer | QWaylandInputDevice::Keyboard); + if (m_createSeat) + return new TestSeat(this, QWaylandSeat::Pointer | QWaylandSeat::Keyboard); else - return QWaylandCompositor::createInputDevice(); + return QWaylandCompositor::createSeat(); } -QWaylandKeyboard *TestCompositor::createKeyboardDevice(QWaylandInputDevice *inputDevice) { - return new TestKeyboardGrabber(inputDevice); +QWaylandKeyboard *TestCompositor::createKeyboardDevice(QWaylandSeat *seat) { + return new TestKeyboardGrabber(seat); } diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/testcompositor.h index fb5909d1..8eeb7ade 100644 --- a/tests/auto/compositor/testcompositor.h +++ b/tests/auto/compositor/testcompositor.h @@ -43,12 +43,12 @@ public slots: void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface); protected: - QWaylandInputDevice *createInputDevice() Q_DECL_OVERRIDE; - QWaylandKeyboard *createKeyboardDevice(QWaylandInputDevice *inputDevice) Q_DECL_OVERRIDE; + QWaylandSeat *createSeat() Q_DECL_OVERRIDE; + QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE; public: QList<QWaylandSurface *> surfaces; QWaylandWlShell* shell; - bool m_createInputDevice; + bool m_createSeat; }; diff --git a/tests/auto/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/testkeyboardgrabber.cpp index 315b7f4f..a3aa42ac 100644 --- a/tests/auto/compositor/testkeyboardgrabber.cpp +++ b/tests/auto/compositor/testkeyboardgrabber.cpp @@ -28,8 +28,8 @@ #include "testkeyboardgrabber.h" -TestKeyboardGrabber::TestKeyboardGrabber(QWaylandInputDevice *inputDevice) - : QWaylandKeyboard(inputDevice) +TestKeyboardGrabber::TestKeyboardGrabber(QWaylandSeat *seat) + : QWaylandKeyboard(seat) { } diff --git a/tests/auto/compositor/testkeyboardgrabber.h b/tests/auto/compositor/testkeyboardgrabber.h index ca5f5162..0ef59598 100644 --- a/tests/auto/compositor/testkeyboardgrabber.h +++ b/tests/auto/compositor/testkeyboardgrabber.h @@ -32,7 +32,7 @@ class TestKeyboardGrabber : public QWaylandKeyboard { Q_OBJECT public: - TestKeyboardGrabber(QWaylandInputDevice *inputDevice); + TestKeyboardGrabber(QWaylandSeat *seat); void setFocus(QWaylandSurface *surface) Q_DECL_OVERRIDE; void sendKeyModifiers(QWaylandClient *client, uint32_t serial) Q_DECL_OVERRIDE; diff --git a/tests/auto/compositor/testinputdevice.cpp b/tests/auto/compositor/testseat.cpp index 5c02dff8..38227872 100644 --- a/tests/auto/compositor/testinputdevice.cpp +++ b/tests/auto/compositor/testseat.cpp @@ -26,27 +26,27 @@ ** ****************************************************************************/ -#include "testinputdevice.h" +#include "testseat.h" #include <QMouseEvent> -TestInputDevice::TestInputDevice(QWaylandCompositor *compositor, QWaylandInputDevice::CapabilityFlags caps) - : QWaylandInputDevice(compositor, caps) +TestSeat::TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps) + : QWaylandSeat(compositor, caps) { m_queryCount = 0; } -TestInputDevice::~TestInputDevice() +TestSeat::~TestSeat() { } -bool TestInputDevice::isOwner(QInputEvent *event) const +bool TestSeat::isOwner(QInputEvent *event) const { m_queryCount++; QMouseEvent *me = dynamic_cast<QMouseEvent *>(event); return m_events.contains(me); } -QList<QMouseEvent *> TestInputDevice::createMouseEvents(int count) +QList<QMouseEvent *> TestSeat::createMouseEvents(int count) { for (int i = 0; i < count; i++) { m_events.append(new QMouseEvent(QEvent::MouseMove, QPointF(10 + i, 10 + i), Qt::NoButton, Qt::NoButton, Qt::NoModifier)); diff --git a/tests/auto/compositor/testinputdevice.h b/tests/auto/compositor/testseat.h index e6134aa1..54641c07 100644 --- a/tests/auto/compositor/testinputdevice.h +++ b/tests/auto/compositor/testseat.h @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QWaylandInputDevice> +#include <QWaylandSeat> #include <QList> QT_BEGIN_NAMESPACE @@ -34,13 +34,13 @@ class QInputEvent; class QMouseEvent; QT_END_NAMESPACE -class TestInputDevice : public QWaylandInputDevice +class TestSeat : public QWaylandSeat { public: - TestInputDevice(QWaylandCompositor *compositor, QWaylandInputDevice::CapabilityFlags caps); - ~TestInputDevice(); + TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps); + ~TestSeat(); bool isOwner(QInputEvent *inputEvent) const Q_DECL_OVERRIDE; diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/tst_compositor.cpp index cf7178ed..606a7e7a 100644 --- a/tests/auto/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/tst_compositor.cpp @@ -29,11 +29,11 @@ #include "mockclient.h" #include "testcompositor.h" #include "testkeyboardgrabber.h" -#include "testinputdevice.h" +#include "testseat.h" #include "qwaylandview.h" #include "qwaylandbufferref.h" -#include "qwaylandinput.h" +#include "qwaylandseat.h" #include <QtWaylandCompositor/QWaylandXdgShell> #include <QtWaylandCompositor/QWaylandSurface> @@ -48,10 +48,10 @@ class tst_WaylandCompositor : public QObject private slots: void init(); - void inputDeviceCapabilities(); + void seatCapabilities(); void keyboardGrab(); - void inputDeviceCreation(); - void inputDeviceKeyboardFocus(); + void seatCreation(); + void seatKeyboardFocus(); void singleClient(); void multipleClients(); void geometry(); @@ -152,38 +152,38 @@ void tst_WaylandCompositor::keyboardGrab() // Set the focused surface so that key event will flow through QWaylandSurface *waylandSurface = compositor.surfaces.at(0); - QWaylandInputDevice* inputDevice = compositor.defaultInputDevice(); + QWaylandSeat* seat = compositor.defaultSeat(); - TestKeyboardGrabber* grab = static_cast<TestKeyboardGrabber *>(inputDevice->keyboard()); - QTRY_COMPARE(grab, inputDevice->keyboard()); + TestKeyboardGrabber* grab = static_cast<TestKeyboardGrabber *>(seat->keyboard()); + QTRY_COMPARE(grab, seat->keyboard()); QSignalSpy grabFocusSpy(grab, SIGNAL(focusedCalled())); QSignalSpy grabKeyPressSpy(grab, SIGNAL(keyPressCalled())); QSignalSpy grabKeyReleaseSpy(grab, SIGNAL(keyReleaseCalled())); //QSignalSpy grabModifierSpy(grab, SIGNAL(modifiersCalled())); - inputDevice->setKeyboardFocus(waylandSurface); + seat->setKeyboardFocus(waylandSurface); QTRY_COMPARE(grabFocusSpy.count(), 1); QKeyEvent ke(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, 30, 0, 0); QKeyEvent ke1(QEvent::KeyRelease, Qt::Key_A, Qt::NoModifier, 30, 0, 0); - inputDevice->sendFullKeyEvent(&ke); - inputDevice->sendFullKeyEvent(&ke1); + seat->sendFullKeyEvent(&ke); + seat->sendFullKeyEvent(&ke1); QTRY_COMPARE(grabKeyPressSpy.count(), 1); QTRY_COMPARE(grabKeyReleaseSpy.count(), 1); QKeyEvent ke2(QEvent::KeyPress, Qt::Key_Shift, Qt::NoModifier, 50, 0, 0); QKeyEvent ke3(QEvent::KeyRelease, Qt::Key_Shift, Qt::NoModifier, 50, 0, 0); - inputDevice->sendFullKeyEvent(&ke2); - inputDevice->sendFullKeyEvent(&ke3); + seat->sendFullKeyEvent(&ke2); + seat->sendFullKeyEvent(&ke3); //QTRY_COMPARE(grabModifierSpy.count(), 2); // Modifiers are also keys QTRY_COMPARE(grabKeyPressSpy.count(), 2); QTRY_COMPARE(grabKeyReleaseSpy.count(), 2); // Stop grabbing - inputDevice->setKeyboardFocus(Q_NULLPTR); - inputDevice->sendFullKeyEvent(&ke); - inputDevice->sendFullKeyEvent(&ke1); + seat->setKeyboardFocus(Q_NULLPTR); + seat->sendFullKeyEvent(&ke); + seat->sendFullKeyEvent(&ke1); QTRY_COMPARE(grabKeyPressSpy.count(), 2); } @@ -309,7 +309,7 @@ void tst_WaylandCompositor::frameCallback() wl_surface_destroy(surface); } -void tst_WaylandCompositor::inputDeviceCapabilities() +void tst_WaylandCompositor::seatCapabilities() { TestCompositor compositor; compositor.create(); @@ -317,19 +317,19 @@ void tst_WaylandCompositor::inputDeviceCapabilities() MockClient client; Q_UNUSED(client); - QWaylandInputDevice dev(&compositor, QWaylandInputDevice::Pointer); + QWaylandSeat dev(&compositor, QWaylandSeat::Pointer); QTRY_VERIFY(dev.pointer()); QTRY_VERIFY(!dev.keyboard()); QTRY_VERIFY(!dev.touch()); - QWaylandInputDevice dev2(&compositor, QWaylandInputDevice::Keyboard | QWaylandInputDevice::Touch); + QWaylandSeat dev2(&compositor, QWaylandSeat::Keyboard | QWaylandSeat::Touch); QTRY_VERIFY(!dev2.pointer()); QTRY_VERIFY(dev2.keyboard()); QTRY_VERIFY(dev2.touch()); } -void tst_WaylandCompositor::inputDeviceCreation() +void tst_WaylandCompositor::seatCreation() { TestCompositor compositor(true); compositor.create(); @@ -337,15 +337,15 @@ void tst_WaylandCompositor::inputDeviceCreation() MockClient client; Q_UNUSED(client); - TestInputDevice* dev = static_cast<TestInputDevice*>(compositor.defaultInputDevice()); + TestSeat* dev = static_cast<TestSeat*>(compositor.defaultSeat()); // The compositor will create the default input device - QTRY_COMPARE(compositor.defaultInputDevice(), dev); + QTRY_COMPARE(compositor.defaultSeat(), dev); QList<QMouseEvent *> allEvents; allEvents += dev->createMouseEvents(5); foreach (QMouseEvent *me, allEvents) { - compositor.inputDeviceFor(me); + compositor.seatFor(me); } // The default input device will get called exatly the number of times it has created @@ -353,7 +353,7 @@ void tst_WaylandCompositor::inputDeviceCreation() QTRY_COMPARE(dev->queryCount(), 5); } -void tst_WaylandCompositor::inputDeviceKeyboardFocus() +void tst_WaylandCompositor::seatKeyboardFocus() { TestCompositor compositor(true); compositor.create(); @@ -365,14 +365,14 @@ void tst_WaylandCompositor::inputDeviceKeyboardFocus() QTRY_COMPARE(compositor.surfaces.size(), 1); QWaylandSurface *waylandSurface = compositor.surfaces.at(0); - QWaylandInputDevice* dev = compositor.defaultInputDevice(); + QWaylandSeat* dev = compositor.defaultSeat(); dev->setKeyboardFocus(waylandSurface); - QTRY_COMPARE(compositor.defaultInputDevice()->keyboardFocus(), waylandSurface); + QTRY_COMPARE(compositor.defaultSeat()->keyboardFocus(), waylandSurface); wl_surface_destroy(surface); QTRY_VERIFY(compositor.surfaces.size() == 0); - QTRY_VERIFY(!compositor.defaultInputDevice()->keyboardFocus()); + QTRY_VERIFY(!compositor.defaultSeat()->keyboardFocus()); } class XdgTestCompositor: public TestCompositor { |