Differential D21725 Diff 59529 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​ if (QDBusConnection::systemBus().interface()->isServiceRegistered(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.
42​ auto queryAndSet = [](const QByteArray &var, const QByteArray & value) {
43​ QDBusInterface iface(QStringLiteral("org.freedesktop.locale1"), QStringLiteral("/org/freedesktop/locale1"), QStringLiteral("org.freedesktop.locale1"), QDBusConnection::systemBus());
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…
44​
45​ QString r = iface.property(value).toString();
46​ if (!r.isEmpty())
47​ qputenv(var, r.toLatin1());
48​ };
49​
50​ queryAndSet("X11MODEL", "org.freedesktop.locale1.X11Model");
51​ queryAndSet("X11LAYOUT", "org.freedesktop.locale1.X11Layout");
52​ queryAndSet("X11VARIANT", "org.freedesktop.locale1.X11Variant");
53​ queryAndSet("X11OPTIONS", "org.freedesktop.locale1.X11Options");
54​ }
55​
56​ runEnvironmentScripts();
57​
58​ if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {
59​ out << "startplasmacompositor: Could not start D-Bus. Can you call qdbus?\n";
60​ return 1;
61​ }
62​ setupPlasmaEnvironment();
63​ qputenv("XDG_SESSION_TYPE", "wayland");
64​
65​ if (!syncDBusEnvironment()) {
66​ out << "Could not sync environment to dbus.\n";
67​ return 1;
68​ }
69​
70​ runSync(QStringLiteral(KWIN_WAYLAND_BIN_PATH), { QStringLiteral("--xwayland"), QStringLiteral("--libinput"), QStringLiteral("--exit-with-session=" CMAKE_INSTALL_FULL_LIBEXECDIR "/startplasma-waylandsession") });
71​
72​ out << "startplasmacompositor: Shutting down...\n";
73​ cleanupPlasmaEnvironment();
74​ out << "startplasmacompositor: Done.\n";
75​
76​ return 0;
77​}