yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add an env var KWIN_DBUS_SERVICE_SUFFIX to set a different dbus service name

Browse source 
Signed-off-by: Axel Davy <axel.davy@ens.fr>

REVIEW: 120028
This commit is contained in:
Axel Davy 2014-10-13 22:35:04 +02:00 committed by Martin Gräßlin
parent 98b2402688
commit 1e38c38c1f
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dbusinterface.cpp
View file

@ -43,13 +43,18 @@ namespace KWin
DBusInterface::DBusInterface(QObject *parent) DBusInterface::DBusInterface(QObject *parent)
: QObject(parent) : QObject(parent)
, m_serviceName(QStringLiteral("org.kde.KWin"))
{ {
(void) new KWinAdaptor(this); (void) new KWinAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus(); QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject(QStringLiteral("/KWin"), this); dbus.registerObject(QStringLiteral("/KWin"), this);
if (!dbus.registerService(QStringLiteral("org.kde.KWin"))) { const QByteArray dBusSuffix = qgetenv("KWIN_DBUS_SERVICE_SUFFIX");
QDBusServiceWatcher *dog = new QDBusServiceWatcher(QStringLiteral("org.kde.KWin"), dbus, QDBusServiceWatcher::WatchForUnregistration, this); if (!dBusSuffix.isNull()) {
m_serviceName = m_serviceName + QStringLiteral(".") + dBusSuffix;
}
if (!dbus.registerService(m_serviceName)) {
QDBusServiceWatcher *dog = new QDBusServiceWatcher(m_serviceName, dbus, QDBusServiceWatcher::WatchForUnregistration, this);
connect (dog, SIGNAL(serviceUnregistered(QString)), SLOT(becomeKWinService(QString))); connect (dog, SIGNAL(serviceUnregistered(QString)), SLOT(becomeKWinService(QString)));
} }
dbus.connect(QString(), QStringLiteral("/KWin"), QStringLiteral("org.kde.KWin"), QStringLiteral("reloadConfig"), dbus.connect(QString(), QStringLiteral("/KWin"), QStringLiteral("org.kde.KWin"), QStringLiteral("reloadConfig"),
@ -60,14 +65,14 @@ void DBusInterface::becomeKWinService(const QString &service)
{ {
// TODO: this watchdog exists to make really safe that we at some point get the service // TODO: this watchdog exists to make really safe that we at some point get the service
// but it's probably no longer needed since we explicitly unregister the service with the deconstructor // but it's probably no longer needed since we explicitly unregister the service with the deconstructor
if (service == QStringLiteral("org.kde.KWin") && QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.KWin")) && sender()) { if (service == m_serviceName && QDBusConnection::sessionBus().registerService(m_serviceName) && sender()) {
sender()->deleteLater(); // bye doggy :'( sender()->deleteLater(); // bye doggy :'(
} }
} }
DBusInterface::~DBusInterface() DBusInterface::~DBusInterface()
{ {
QDBusConnection::sessionBus().unregisterService(QStringLiteral("org.kde.KWin")); // this is the long standing legal service QDBusConnection::sessionBus().unregisterService(m_serviceName);
// KApplication automatically also grabs org.kde.kwin, so it's often been used externally - ensure to free it as well // KApplication automatically also grabs org.kde.kwin, so it's often been used externally - ensure to free it as well
QDBusConnection::sessionBus().unregisterService(QStringLiteral("org.kde.kwin")); QDBusConnection::sessionBus().unregisterService(QStringLiteral("org.kde.kwin"));
} }

3
dbusinterface.h
View file

@ -67,6 +67,9 @@ public Q_SLOTS: // METHODS
private Q_SLOTS: private Q_SLOTS:
void becomeKWinService(const QString &service); void becomeKWinService(const QString &service);
private:
QString m_serviceName;
}; };
class CompositorDBusInterface : public QObject class CompositorDBusInterface : public QObject