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

Expose all ClientConnections in Display

Browse source
This commit is contained in:
Martin Gräßlin 2014-11-17 18:13:28 +01:00
parent 4a7af2c665
commit b770cbb140
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/wayland/autotests/server/test_display.cpp
View file

@ -126,6 +126,7 @@ void TestWaylandServerDisplay::testClientConnection()
QVERIFY(client);
QVERIFY(connectedSpy.isEmpty());
QVERIFY(display.connections().isEmpty());
ClientConnection *connection = display.getConnection(client);
QVERIFY(connection);
QCOMPARE(connection->client(), client);
@ -138,6 +139,8 @@ void TestWaylandServerDisplay::testClientConnection()
QCOMPARE((wl_client*)constRef, client);
QCOMPARE(connectedSpy.count(), 1);
QCOMPARE(connectedSpy.first().first().value<ClientConnection*>(), connection);
QCOMPARE(display.connections().count(), 1);
QCOMPARE(display.connections().first(), connection);
QCOMPARE(connection, display.getConnection(client));
QCOMPARE(connectedSpy.count(), 1);
@ -153,6 +156,9 @@ void TestWaylandServerDisplay::testClientConnection()
QCOMPARE(connectedSpy.count(), 2);
QCOMPARE(connectedSpy.first().first().value<ClientConnection*>(), connection);
QCOMPARE(connectedSpy.last().first().value<ClientConnection*>(), connection2);
QCOMPARE(display.connections().count(), 2);
QCOMPARE(display.connections().first(), connection);
QCOMPARE(display.connections().last(), connection2);
// and destroy
QVERIFY(disconnectedSpy.isEmpty());
@ -164,6 +170,7 @@ void TestWaylandServerDisplay::testClientConnection()
close(sv[1]);
close(sv2[0]);
close(sv2[1]);
QVERIFY(display.connections().isEmpty());
}
QTEST_GUILESS_MAIN(TestWaylandServerDisplay)

5
src/wayland/display.cpp
View file

@ -274,5 +274,10 @@ ClientConnection *Display::getConnection(wl_client *client)
return c;
}
QVector< ClientConnection* > Display::connections() const
{
return d->clients;
}
}
}

1
src/wayland/display.h
View file

@ -99,6 +99,7 @@ public:
* @return The ClientConnection for the given native client
**/
ClientConnection *getConnection(wl_client *client);
QVector<ClientConnection*> connections() const;
Q_SIGNALS:
void socketNameChanged(const QString&);