Differential D21725 Diff 59752 startkde/startplasma-wayland.cpp

Changeset View

Standalone View

View Options

startkde/startplasma-wayland.cpp

  • This file was added.
1​/* This file is part of the KDE project
2​ Copyright (C) 2019 Aleix Pol Gonzalez <aleixpol@kde.org>
3​
4​ This library is free software; you can redistribute it and/or
5​ modify it under the terms of the GNU Library General Public
6​ License as published by the Free Software Foundation; either
7​ version 2 of the License, or (at your option) any later version.
8​
9​ This library is distributed in the hope that it will be useful,
10​ but WITHOUT ANY WARRANTY; without even the implied warranty of
11​ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12​ Library General Public License for more details.
13​
14​ You should have received a copy of the GNU Library General Public License
15​ along with this library; see the file COPYING.LIB. If not, write to
16​ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17​ Boston, MA 02110-1301, USA.
18​*/
19​
20​#include "startplasma.h"
21​#include <KConfig>
22​#include <KConfigGroup>
23​#include <QDBusConnection>
24​#include <QDBusInterface>
25​
26​int main(int /*argc*/, char** /*argv*/)
27​{
28​ createConfigDirectory();
29​ setupCursor(true);
30​
31​ {
32​ KConfig fonts(QStringLiteral("kcmfonts"));
33​ KConfigGroup group = fonts.group("General");
34​ auto dpiSetting = group.readEntry("forceFontDPIWayland", 96);
35​ auto dpi = dpiSetting == 0 ? 96 : dpiSetting;
36​ qputenv("QT_WAYLAND_FORCE_DPI", QByteArray::number(dpi));
37​ }
38​
39​ // Query whether org.freedesktop.locale1 is available. If it is, try to
40​ // set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
41​ {
42​ const QString locale1Service = QStringLiteral("org.freedesktop.locale1");
fvogtUnsubmitted
Done

AFAICT this won't work as expected: localed is only launched on demand, which isServiceRegistered does not care about.

fvogt: AFAICT this won't work as expected: localed is only launched on demand, which…
broulikUnsubmitted
Done

Indeed. When it's not registered, query

"org.freedesktop.DBus",
"/org/freedesktop/DBus",
"org.freedesktop.DBus",
"ListActivatableNames"

(unfortunately no Qt API for that) and then call startService()

broulik: Indeed. When it's not registered, query ``` "org.freedesktop.DBus", "/org/freedesktop/DBus"…
davidedmundsonUnsubmitted
Done

Generally it's easier and faster to just call the method you want to call and see if it fails.

davidedmundson: Generally it's easier and faster to just call the method you want to call and see if it fails.
43​ const QString locale1Path = QStringLiteral("/org/freedesktop/locale1");
44​ QDBusMessage message = QDBusMessage::createMethodCall(locale1Service,
broulikUnsubmitted
Done

Please use a DBus-interface generated from XML instead of QDBusInterface to avoid doing a blocking introspection call.
You also might want to move the object outside the lamda so it's not recreated for every call you do below.

broulik: Please use a DBus-interface generated from XML instead of `QDBusInterface` to avoid doing a…
45​ locale1Path,
46​ QStringLiteral("org.freedesktop.DBus.Properties"),
47​ QLatin1String("GetAll"));
48​ message << locale1Service;
49​ QDBusMessage resultMessage = QDBusConnection::systemBus().call(message);
50​ if (resultMessage.type() == QDBusMessage::ReplyMessage) {
51​ QVariantMap result;
52​ QDBusArgument dbusArgument = resultMessage.arguments().at(0).value<QDBusArgument>();
53​ while (!dbusArgument.atEnd()) {
54​ dbusArgument >> result;
55​ }
56​
57​ auto queryAndSet = [&](const QByteArray &var, const QString & value) {
58​ const auto r = result.value(value).toString();
59​ if (!r.isEmpty())
60​ qputenv(var, r.toUtf8());
61​ };
62​
63​ queryAndSet("X11MODEL", QStringLiteral("X11Model"));
64​ queryAndSet("X11LAYOUT", QStringLiteral("X11Layout"));
65​ queryAndSet("X11VARIANT", QStringLiteral("X11Variant"));
66​ queryAndSet("X11OPTIONS", QStringLiteral("X11Options"));
67​ } else {
68​ qWarning() << "not a reply org.freedesktop.locale1" << resultMessage;
69​ }
70​ }
71​ runEnvironmentScripts();
72​
73​ if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {
74​ out << "startplasmacompositor: Could not start D-Bus. Can you call qdbus?\n";
75​ return 1;
76​ }
77​ setupPlasmaEnvironment();
78​ qputenv("XDG_SESSION_TYPE", "wayland");
79​
80​ if (!syncDBusEnvironment()) {
81​ out << "Could not sync environment to dbus.\n";
82​ return 1;
83​ }
84​
85​ runSync(QStringLiteral(KWIN_WAYLAND_BIN_PATH), { QStringLiteral("--xwayland"), QStringLiteral("--libinput"), QStringLiteral("--exit-with-session=" CMAKE_INSTALL_FULL_LIBEXECDIR "/startplasma-waylandsession") });
86​
87​ out << "startplasmacompositor: Shutting down...\n";
88​ cleanupPlasmaEnvironment();
89​ out << "startplasmacompositor: Done.\n";
90​
91​ return 0;
92​}