Page MenuHomeFreeBSD
Differential D23579 Diff 67981 x11/sddm/files/patch-src_daemon_Display.cpp

Changeset View

Standalone View

View Options

x11/sddm/files/patch-src_daemon_Display.cpp

VirtualTerminal for Wayland is only present on Linux at the moment. VirtualTerminal for Wayland is only present on Linux at the moment.
As we are only interested in an X11 session at the moment, we therefore As we are only interested in an X11 session at the moment, we therefore
can hide it behind a Q_OS_LINUX. can hide it behind a Q_OS_LINUX.
Only set XDG_CURRENT_DESKTOP and XDG_SESSION_DESKTOP if the xsession .desktop Only set XDG_CURRENT_DESKTOP and XDG_SESSION_DESKTOP if the xsession .desktop
file defines DesktopNames. Our xinitrc.desktop does not set it because that file defines DesktopNames. Our xinitrc.desktop does not set it because that
may confuse the desktop session started from ~/.xinitrc. These environment may confuse the desktop session started from ~/.xinitrc. These environment
variables are used for OnlyShowIn and NotShowIn in .desktop files. variables are used for OnlyShowIn and NotShowIn in .desktop files.
--- src/daemon/Display.cpp.orig 2017-12-05 16:00:16 UTC --- src/daemon/Display.cpp.orig 2019-03-13 09:22:35 UTC
+++ src/daemon/Display.cpp +++ src/daemon/Display.cpp
@@ -30,7 +30,9 @@ @@ -321,11 +321,13 @@ namespace SDDM {
#include "Greeter.h"
#include "Utils.h"
#include "SignalHandler.h"
+#if defined(Q_OS_LINUX)
#include "VirtualTerminal.h"
+#endif
#include <QDebug>
#include <QFile>
@@ -310,8 +312,10 @@ namespace SDDM {
// create new VT for Wayland sessions otherwise use greeter vt
int vt = terminalId();
+#if defined(Q_OS_LINUX)
if (session.xdgSessionType() == QLatin1String("wayland"))
vt = VirtualTerminal::setUpNewVt();
+#endif
m_lastSession.setVt(vt);
QProcessEnvironment env;
@@ -321,11 +325,13 @@ namespace SDDM {
env.insert(QStringLiteral("XDG_SEAT_PATH"), daemonApp->displayManager()->seatPath(seat()->name())); env.insert(QStringLiteral("XDG_SEAT_PATH"), daemonApp->displayManager()->seatPath(seat()->name()));
env.insert(QStringLiteral("XDG_SESSION_PATH"), daemonApp->displayManager()->sessionPath(QStringLiteral("Session%1").arg(daemonApp->newSessionId()))); env.insert(QStringLiteral("XDG_SESSION_PATH"), daemonApp->displayManager()->sessionPath(QStringLiteral("Session%1").arg(daemonApp->newSessionId())));
env.insert(QStringLiteral("DESKTOP_SESSION"), session.desktopSession()); env.insert(QStringLiteral("DESKTOP_SESSION"), session.desktopSession());
+ if (!session.desktopNames().isEmpty()) + if (!session.desktopNames().isEmpty())
env.insert(QStringLiteral("XDG_CURRENT_DESKTOP"), session.desktopNames()); env.insert(QStringLiteral("XDG_CURRENT_DESKTOP"), session.desktopNames());
env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("user")); env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("user"));
env.insert(QStringLiteral("XDG_SESSION_TYPE"), session.xdgSessionType()); env.insert(QStringLiteral("XDG_SESSION_TYPE"), session.xdgSessionType());
env.insert(QStringLiteral("XDG_SEAT"), seat()->name()); env.insert(QStringLiteral("XDG_SEAT"), seat()->name());
+ if (!session.desktopNames().isEmpty()) + if (!session.desktopNames().isEmpty())
env.insert(QStringLiteral("XDG_SESSION_DESKTOP"), session.desktopNames()); env.insert(QStringLiteral("XDG_SESSION_DESKTOP"), session.desktopNames());
if (seat()->name() == QLatin1String("seat0")) { if (seat()->name() == QLatin1String("seat0")) {
env.insert(QStringLiteral("XDG_VTNR"), QString::number(vt)); env.insert(QStringLiteral("XDG_VTNR"), QString::number(vt));
@@ -366,9 +372,11 @@ namespace SDDM {
stateConfig.Last.Session.setDefault();
stateConfig.save();
+#if defined(Q_OS_LINUX)
// switch to the new VT for Wayland sessions
if (m_lastSession.xdgSessionType() == QLatin1String("wayland"))
VirtualTerminal::jumpToVt(m_lastSession.vt());
+#endif
if (m_socket)
emit loginSucceeded(m_socket);