-
Notifications
You must be signed in to change notification settings - Fork 326
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce a new display server option to run the greeter with. In the future this will be the default display server. This patch contains the most important parts to get the greeter running on Wayland, but it's not possible to select a keyboard layout. At the moment the Wayland socket is assumed to be "wayland-0" but in a multi-seat configuration we would have more than one greeter running, each with a diffent socket and the assumption won't work anymore. In the future we will figure out how to do, after all at the moment this is considered enough for most people. Closes: #440
- Loading branch information
Showing
21 changed files
with
677 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /*************************************************************************** | ||
| * Copyright (c) 2021 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | ||
| * | ||
| * 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, write to the | ||
| * Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| ***************************************************************************/ | ||
|
|
||
| #include "WaylandDisplayServer.h" | ||
|
|
||
| namespace SDDM { | ||
|
|
||
| WaylandDisplayServer::WaylandDisplayServer(Display *parent) | ||
| : DisplayServer(parent) | ||
| { | ||
| } | ||
|
|
||
| WaylandDisplayServer::~WaylandDisplayServer() | ||
| { | ||
| stop(); | ||
| } | ||
|
|
||
| QString WaylandDisplayServer::sessionType() const | ||
| { | ||
| return QStringLiteral("wayland"); | ||
| } | ||
|
|
||
| void WaylandDisplayServer::setDisplayName(const QString &displayName) | ||
| { | ||
| m_display = displayName; | ||
| } | ||
|
|
||
| bool WaylandDisplayServer::start() | ||
| { | ||
| // Check flag | ||
| if (m_started) | ||
| return false; | ||
|
|
||
| // Set flag | ||
| m_started = true; | ||
| emit started(); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| void WaylandDisplayServer::stop() | ||
| { | ||
| // Check flag | ||
| if (!m_started) | ||
| return; | ||
|
|
||
| // Reset flag | ||
| m_started = false; | ||
| emit stopped(); | ||
| } | ||
|
|
||
| void WaylandDisplayServer::finished() | ||
| { | ||
| } | ||
|
|
||
| void WaylandDisplayServer::setupDisplay() | ||
| { | ||
| } | ||
|
|
||
| } // namespace SDDM |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /*************************************************************************** | ||
| * Copyright (c) 2021 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | ||
| * | ||
| * 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, write to the | ||
| * Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| ***************************************************************************/ | ||
|
|
||
| #ifndef SDDM_WAYLANDDISPLAYSERVER_H | ||
| #define SDDM_WAYLANDDISPLAYSERVER_H | ||
|
|
||
| #include "DisplayServer.h" | ||
|
|
||
| namespace SDDM { | ||
|
|
||
| class WaylandDisplayServer : public DisplayServer | ||
| { | ||
| Q_OBJECT | ||
| Q_DISABLE_COPY(WaylandDisplayServer) | ||
| public: | ||
| explicit WaylandDisplayServer(Display *parent); | ||
| ~WaylandDisplayServer(); | ||
|
|
||
| QString sessionType() const; | ||
|
|
||
| void setDisplayName(const QString &displayName); | ||
|
|
||
| public Q_SLOTS: | ||
| bool start(); | ||
| void stop(); | ||
| void finished(); | ||
| void setupDisplay(); | ||
| }; | ||
|
|
||
| } // namespace SDDM | ||
|
|
||
| #endif // SDDM_WAYLANDDISPLAYSERVER_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.