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

Connect Application::screensCreated to WaylandServer::initOutputs

Browse source 
Summary:
Instead of having the Application invoke initOutputs after creating
the Screens, we can just connect to the signal emitted there.

This allows to make initOutputs a private, WaylandServer internal
method.

Reviewers: #plasma

Subscribers: plasma-devel

Projects: #plasma

Differential Revision: https://phabricator.kde.org/D1482
This commit is contained in:
Martin Gräßlin 2016-04-25 09:45:04 +02:00
parent f8f8e61466
commit 319869881c
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autotests/wayland/kwin_wayland_test.cpp
View file

@ -110,7 +110,6 @@ void WaylandTestApplication::continueStartupWithScreens()
{
disconnect(kwinApp()->platform(), &Platform::screensQueried, this, &WaylandTestApplication::continueStartupWithScreens);
createScreens();
waylandServer()->initOutputs();
createCompositor();
connect(Compositor::self(), &Compositor::sceneCreated, this, &WaylandTestApplication::startXwaylandServer);

1
main_wayland.cpp
View file

@ -145,7 +145,6 @@ void ApplicationWayland::continueStartupWithScreens()
{
disconnect(kwinApp()->platform(), &Platform::screensQueried, this, &ApplicationWayland::continueStartupWithScreens);
createScreens();
waylandServer()->initOutputs();
if (!m_startXWayland) {
continueStartupWithX();

2
wayland_server.cpp
View file

@ -73,6 +73,8 @@ WaylandServer::WaylandServer(QObject *parent)
{
qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *");
qRegisterMetaType<KWayland::Server::OutputInterface::DpmsMode>();
connect(kwinApp(), &Application::screensCreated, this, &WaylandServer::initOutputs);
}
WaylandServer::~WaylandServer()

2
wayland_server.h
View file

@ -74,7 +74,6 @@ public:
virtual ~WaylandServer();
void init(const QByteArray &socketName = QByteArray(), InitalizationFlags flags = InitalizationFlag::NoOptions);
void initOutputs();
void terminateClientConnections();
KWayland::Server::Display *display() {
@ -160,6 +159,7 @@ Q_SIGNALS:
void terminatingInternalClientConnection();
private:
void initOutputs();
quint16 createClientId(KWayland::Server::ClientConnection *c);
void destroyInternalConnection();
void configurationChangeRequested(KWayland::Server::OutputConfigurationInterface *config);