yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ::destroy to Client::Keyboard and Client::Pointer

Browse source 
This makes the API more consistent and allows to properly cleanup
Keyboard and Pointer if the connection dies. Like with Shell and
ShellSurface signals are emitted from Seat when the interface is
going to be released or destroyed. These are connected to the
methods of the created Pointer and Keyboard.
This commit is contained in:
Martin Gräßlin 2014-09-22 13:12:08 +02:00
parent 6ea3abc56d
commit 53b9b5b9b2
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/wayland/autotests/client/test_wayland_seat.cpp
View file

@ -522,6 +522,20 @@ void TestWaylandSeat::testCast()
void TestWaylandSeat::testDestroy()
{
using namespace KWayland::Client;
QSignalSpy keyboardSpy(m_seat, SIGNAL(hasKeyboardChanged(bool)));
QVERIFY(keyboardSpy.isValid());
m_seatInterface->setHasKeyboard(true);
QVERIFY(keyboardSpy.wait());
Keyboard *k = m_seat->createKeyboard(m_seat);
QVERIFY(k->isValid());
QSignalSpy pointerSpy(m_seat, SIGNAL(hasPointerChanged(bool)));
QVERIFY(pointerSpy.isValid());
m_seatInterface->setHasPointer(true);
QVERIFY(pointerSpy.wait());
Pointer *p = m_seat->createPointer(m_seat);
QVERIFY(p->isValid());
delete m_compositor;
m_compositor = nullptr;
connect(m_connection, &ConnectionThread::connectionDied, m_seat, &Seat::destroy);
@ -537,9 +551,13 @@ void TestWaylandSeat::testDestroy()
// now the seat should be destroyed;
QVERIFY(!m_seat->isValid());
QVERIFY(!k->isValid());
QVERIFY(!p->isValid());
// calling destroy again should not fail
m_seat->destroy();
k->destroy();
p->destroy();
}
QTEST_MAIN(TestWaylandSeat)