5e9023948e
Summary: In a recent patch the newly added xwayland class ended up being responsible for continuing the startup, calling back into the main app to spawn the workspace. It moves the flow of startup about so it's not very readable or following class structure. This patch moves the code back into main_wayland and removes the duplication between xwayland and non-xwayland modes. There was also a misnaming of methods. Previously: continueStartupWithScreens was called after platform screens are created continueStartupWithScene was called after the scene was created continueStartupWithXwayland was called before xwayland is created This was confusing, so the names have been shuffled around to follow a consistent pattern of what has been done so far. Test Plan: Started kwin_wayland in normal and xwayland mode Ran unit tests (though some failed due to a local unrelated and as yet unindentified bug) Reviewers: #kwin, romangg Reviewed By: #kwin, romangg Subscribers: romangg, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D19232
80 lines
2.3 KiB
C++
80 lines
2.3 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2014 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_MAIN_WAYLAND_H
|
|
#define KWIN_MAIN_WAYLAND_H
|
|
#include "main.h"
|
|
#include <QProcessEnvironment>
|
|
|
|
namespace KWin
|
|
{
|
|
namespace Xwl
|
|
{
|
|
class Xwayland;
|
|
}
|
|
|
|
class ApplicationWayland : public ApplicationWaylandAbstract
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
ApplicationWayland(int &argc, char **argv);
|
|
virtual ~ApplicationWayland();
|
|
|
|
void setStartXwayland(bool start) {
|
|
m_startXWayland = start;
|
|
}
|
|
void setApplicationsToStart(const QStringList &applications) {
|
|
m_applicationsToStart = applications;
|
|
}
|
|
void setInputMethodServerToStart(const QString &inputMethodServer) {
|
|
m_inputMethodServerToStart = inputMethodServer;
|
|
}
|
|
void setProcessStartupEnvironment(const QProcessEnvironment &environment) override {
|
|
m_environment = environment;
|
|
}
|
|
void setSessionArgument(const QString &session) {
|
|
m_sessionArgument = session;
|
|
}
|
|
|
|
QProcessEnvironment processStartupEnvironment() const override {
|
|
return m_environment;
|
|
}
|
|
|
|
protected:
|
|
void performStartup() override;
|
|
|
|
private:
|
|
void createBackend();
|
|
void continueStartupWithScreens();
|
|
void continueStartupWithScene();
|
|
void finalizeStartup();
|
|
void startSession() override;
|
|
|
|
bool m_startXWayland = false;
|
|
QStringList m_applicationsToStart;
|
|
QString m_inputMethodServerToStart;
|
|
QProcessEnvironment m_environment;
|
|
QString m_sessionArgument;
|
|
|
|
Xwl::Xwayland *m_xwayland = nullptr;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|