2012-08-30 06:20:26 +00:00
|
|
|
/********************************************************************
|
|
|
|
KWin - the KDE window manager
|
|
|
|
This file is part of the KDE project.
|
|
|
|
|
|
|
|
Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
|
|
|
|
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, see <http://www.gnu.org/licenses/>.
|
|
|
|
*********************************************************************/
|
|
|
|
|
|
|
|
// own
|
|
|
|
#include "dbusinterface.h"
|
2014-06-02 06:51:28 +00:00
|
|
|
#include "compositingadaptor.h"
|
[wayland] Use the new plasma virtual desktop protocol
Summary:
implement virtual desktop support for Wayland.
use the new virtual desktop protocol from D12820
The VirtualDesktopManager class needed some big change in order
to accomodate it, which is where most changes are.
Other than that, it's mostly connections to wire up
VirtualDesktopsManager and VirtualDesktopsManagement(the wayland protocol impl)
Depends on D12820
Other notable detail, is the client visibility updated to reflect the presence
of the client in the plasmavirtualdesktop.
(and the unSetDesktop concept)
Test Plan: used a bit a plasma session together with D12820, D13748 and D13746
Reviewers: #plasma, #kwin, graesslin, davidedmundson
Reviewed By: #plasma, #kwin, davidedmundson
Subscribers: hein, zzag, davidedmundson, kwin
Tags: #kwin
Maniphest Tasks: T4457
Differential Revision: https://phabricator.kde.org/D13887
2018-10-29 22:29:15 +00:00
|
|
|
#include "virtualdesktopmanageradaptor.h"
|
2012-12-29 23:15:30 +00:00
|
|
|
|
2012-08-30 06:20:26 +00:00
|
|
|
// kwin
|
2018-02-12 20:40:05 +00:00
|
|
|
#include "abstract_client.h"
|
2015-01-23 08:06:05 +00:00
|
|
|
#include "atoms.h"
|
2014-06-02 06:51:28 +00:00
|
|
|
#include "composite.h"
|
2016-03-14 09:23:52 +00:00
|
|
|
#include "debug_console.h"
|
2014-06-02 06:51:28 +00:00
|
|
|
#include "main.h"
|
2013-07-28 15:42:21 +00:00
|
|
|
#include "placement.h"
|
2016-05-09 15:32:43 +00:00
|
|
|
#include "platform.h"
|
2012-08-30 06:20:26 +00:00
|
|
|
#include "kwinadaptor.h"
|
2014-06-02 06:51:28 +00:00
|
|
|
#include "scene.h"
|
2012-08-30 06:20:26 +00:00
|
|
|
#include "workspace.h"
|
2012-11-16 07:23:47 +00:00
|
|
|
#include "virtualdesktops.h"
|
2013-04-04 14:14:12 +00:00
|
|
|
#ifdef KWIN_BUILD_ACTIVITIES
|
|
|
|
#include "activities.h"
|
|
|
|
#endif
|
2012-08-30 06:20:26 +00:00
|
|
|
|
2012-12-29 23:15:30 +00:00
|
|
|
// Qt
|
2015-10-30 12:18:30 +00:00
|
|
|
#include <QOpenGLContext>
|
2012-12-29 23:15:30 +00:00
|
|
|
#include <QDBusServiceWatcher>
|
|
|
|
|
2012-08-30 06:20:26 +00:00
|
|
|
namespace KWin
|
|
|
|
{
|
|
|
|
|
|
|
|
DBusInterface::DBusInterface(QObject *parent)
|
|
|
|
: QObject(parent)
|
2014-10-13 20:35:04 +00:00
|
|
|
, m_serviceName(QStringLiteral("org.kde.KWin"))
|
2012-08-30 06:20:26 +00:00
|
|
|
{
|
|
|
|
(void) new KWinAdaptor(this);
|
|
|
|
|
|
|
|
QDBusConnection dbus = QDBusConnection::sessionBus();
|
2013-07-23 05:02:52 +00:00
|
|
|
dbus.registerObject(QStringLiteral("/KWin"), this);
|
2014-10-13 20:35:04 +00:00
|
|
|
const QByteArray dBusSuffix = qgetenv("KWIN_DBUS_SERVICE_SUFFIX");
|
|
|
|
if (!dBusSuffix.isNull()) {
|
2015-11-05 14:14:06 +00:00
|
|
|
m_serviceName = m_serviceName + QLatin1Char('.') + dBusSuffix;
|
2014-10-13 20:35:04 +00:00
|
|
|
}
|
|
|
|
if (!dbus.registerService(m_serviceName)) {
|
|
|
|
QDBusServiceWatcher *dog = new QDBusServiceWatcher(m_serviceName, dbus, QDBusServiceWatcher::WatchForUnregistration, this);
|
2013-05-11 12:09:15 +00:00
|
|
|
connect (dog, SIGNAL(serviceUnregistered(QString)), SLOT(becomeKWinService(QString)));
|
2015-01-23 08:06:05 +00:00
|
|
|
} else {
|
|
|
|
announceService();
|
2012-12-29 23:15:30 +00:00
|
|
|
}
|
2013-07-23 05:02:52 +00:00
|
|
|
dbus.connect(QString(), QStringLiteral("/KWin"), QStringLiteral("org.kde.KWin"), QStringLiteral("reloadConfig"),
|
2012-08-30 06:20:26 +00:00
|
|
|
Workspace::self(), SLOT(slotReloadConfig()));
|
2017-08-23 09:15:37 +00:00
|
|
|
connect(kwinApp(), &Application::x11ConnectionChanged, this, &DBusInterface::announceService);
|
2012-08-30 06:20:26 +00:00
|
|
|
}
|
|
|
|
|
2012-12-29 23:15:30 +00:00
|
|
|
void DBusInterface::becomeKWinService(const QString &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
|
2014-10-13 20:35:04 +00:00
|
|
|
if (service == m_serviceName && QDBusConnection::sessionBus().registerService(m_serviceName) && sender()) {
|
2012-12-29 23:15:30 +00:00
|
|
|
sender()->deleteLater(); // bye doggy :'(
|
2015-01-23 08:06:05 +00:00
|
|
|
announceService();
|
2012-12-29 23:15:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-30 06:20:26 +00:00
|
|
|
DBusInterface::~DBusInterface()
|
|
|
|
{
|
2014-10-13 20:35:04 +00:00
|
|
|
QDBusConnection::sessionBus().unregisterService(m_serviceName);
|
2012-12-29 23:15:30 +00:00
|
|
|
// KApplication automatically also grabs org.kde.kwin, so it's often been used externally - ensure to free it as well
|
2013-07-23 05:02:52 +00:00
|
|
|
QDBusConnection::sessionBus().unregisterService(QStringLiteral("org.kde.kwin"));
|
2017-08-23 09:15:37 +00:00
|
|
|
if (kwinApp()->x11Connection()) {
|
|
|
|
xcb_delete_property(kwinApp()->x11Connection(), kwinApp()->x11RootWindow(), atoms->kwin_dbus_service);
|
|
|
|
}
|
2015-01-23 08:06:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DBusInterface::announceService()
|
|
|
|
{
|
2017-08-23 09:15:37 +00:00
|
|
|
if (!kwinApp()->x11Connection()) {
|
|
|
|
return;
|
|
|
|
}
|
2015-01-23 08:06:05 +00:00
|
|
|
const QByteArray service = m_serviceName.toUtf8();
|
2017-08-23 09:15:37 +00:00
|
|
|
xcb_change_property(kwinApp()->x11Connection(), XCB_PROP_MODE_REPLACE, kwinApp()->x11RootWindow(), atoms->kwin_dbus_service,
|
2015-01-23 08:06:05 +00:00
|
|
|
atoms->utf8_string, 8, service.size(), service.constData());
|
2012-08-30 06:20:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// wrap void methods with no arguments to Workspace
|
|
|
|
#define WRAP(name) \
|
|
|
|
void DBusInterface::name() \
|
|
|
|
{\
|
|
|
|
Workspace::self()->name();\
|
|
|
|
}
|
|
|
|
|
|
|
|
WRAP(reconfigure)
|
2012-11-22 10:07:33 +00:00
|
|
|
|
|
|
|
#undef WRAP
|
|
|
|
|
2013-04-08 12:30:24 +00:00
|
|
|
void DBusInterface::killWindow()
|
|
|
|
{
|
|
|
|
Workspace::self()->slotKillWindow();
|
|
|
|
}
|
|
|
|
|
2012-11-22 10:07:33 +00:00
|
|
|
#define WRAP(name) \
|
|
|
|
void DBusInterface::name() \
|
|
|
|
{\
|
|
|
|
Placement::self()->name();\
|
|
|
|
}
|
|
|
|
|
|
|
|
WRAP(cascadeDesktop)
|
2012-08-30 06:20:26 +00:00
|
|
|
WRAP(unclutterDesktop)
|
|
|
|
|
|
|
|
#undef WRAP
|
|
|
|
|
|
|
|
// wrap returning methods with no arguments to Workspace
|
|
|
|
#define WRAP( rettype, name ) \
|
|
|
|
rettype DBusInterface::name( ) \
|
|
|
|
{\
|
|
|
|
return Workspace::self()->name(); \
|
|
|
|
}
|
|
|
|
|
|
|
|
WRAP(QString, supportInformation)
|
|
|
|
|
|
|
|
#undef WRAP
|
|
|
|
|
2013-04-04 14:14:12 +00:00
|
|
|
bool DBusInterface::startActivity(const QString &in0)
|
|
|
|
{
|
|
|
|
#ifdef KWIN_BUILD_ACTIVITIES
|
2015-07-07 09:48:42 +00:00
|
|
|
if (!Activities::self()) {
|
|
|
|
return false;
|
|
|
|
}
|
2013-04-04 14:14:12 +00:00
|
|
|
return Activities::self()->start(in0);
|
|
|
|
#else
|
2014-11-21 15:48:39 +00:00
|
|
|
Q_UNUSED(in0)
|
2013-04-04 14:14:12 +00:00
|
|
|
return false;
|
|
|
|
#endif
|
2012-08-30 06:20:26 +00:00
|
|
|
}
|
|
|
|
|
2013-04-04 14:14:12 +00:00
|
|
|
bool DBusInterface::stopActivity(const QString &in0)
|
|
|
|
{
|
|
|
|
#ifdef KWIN_BUILD_ACTIVITIES
|
2015-07-07 09:48:42 +00:00
|
|
|
if (!Activities::self()) {
|
|
|
|
return false;
|
|
|
|
}
|
2013-04-04 14:14:12 +00:00
|
|
|
return Activities::self()->stop(in0);
|
|
|
|
#else
|
2014-11-21 15:48:39 +00:00
|
|
|
Q_UNUSED(in0)
|
2013-04-04 14:14:12 +00:00
|
|
|
return false;
|
|
|
|
#endif
|
|
|
|
}
|
2012-08-30 06:20:26 +00:00
|
|
|
|
2012-11-16 07:23:47 +00:00
|
|
|
int DBusInterface::currentDesktop()
|
|
|
|
{
|
|
|
|
return VirtualDesktopManager::self()->current();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool DBusInterface::setCurrentDesktop(int desktop)
|
|
|
|
{
|
|
|
|
return VirtualDesktopManager::self()->setCurrent(desktop);
|
|
|
|
}
|
|
|
|
|
|
|
|
void DBusInterface::nextDesktop()
|
|
|
|
{
|
|
|
|
VirtualDesktopManager::self()->moveTo<DesktopNext>();
|
|
|
|
}
|
|
|
|
|
|
|
|
void DBusInterface::previousDesktop()
|
|
|
|
{
|
|
|
|
VirtualDesktopManager::self()->moveTo<DesktopPrevious>();
|
|
|
|
}
|
|
|
|
|
2016-03-14 09:23:52 +00:00
|
|
|
void DBusInterface::showDebugConsole()
|
|
|
|
{
|
|
|
|
DebugConsole *console = new DebugConsole;
|
|
|
|
console->show();
|
|
|
|
}
|
2014-06-02 06:51:28 +00:00
|
|
|
|
2018-12-08 16:06:51 +00:00
|
|
|
namespace {
|
|
|
|
QVariantMap clientToVariantMap(const AbstractClient *c)
|
|
|
|
{
|
|
|
|
return {
|
|
|
|
{QStringLiteral("resourceClass"), c->resourceClass()},
|
|
|
|
{QStringLiteral("resourceName"), c->resourceName()},
|
|
|
|
{QStringLiteral("desktopFile"), c->desktopFileName()},
|
|
|
|
{QStringLiteral("role"), c->windowRole()},
|
|
|
|
{QStringLiteral("caption"), c->captionNormal()},
|
|
|
|
{QStringLiteral("clientMachine"), c->wmClientMachine(true)},
|
2018-12-23 07:56:15 +00:00
|
|
|
{QStringLiteral("localhost"), c->isLocalhost()},
|
2018-12-08 16:06:51 +00:00
|
|
|
{QStringLiteral("type"), c->windowType()},
|
|
|
|
{QStringLiteral("x"), c->x()},
|
|
|
|
{QStringLiteral("y"), c->y()},
|
|
|
|
{QStringLiteral("width"), c->width()},
|
|
|
|
{QStringLiteral("height"), c->height()},
|
|
|
|
{QStringLiteral("x11DesktopNumber"), c->desktop()},
|
|
|
|
{QStringLiteral("minimized"), c->isMinimized()},
|
|
|
|
{QStringLiteral("shaded"), c->isShade()},
|
|
|
|
{QStringLiteral("fullscreen"), c->isFullScreen()},
|
|
|
|
{QStringLiteral("keepAbove"), c->keepAbove()},
|
|
|
|
{QStringLiteral("keepBelow"), c->keepBelow()},
|
|
|
|
{QStringLiteral("noBorder"), c->noBorder()},
|
|
|
|
{QStringLiteral("skipTaskbar"), c->skipTaskbar()},
|
|
|
|
{QStringLiteral("skipPager"), c->skipPager()},
|
|
|
|
{QStringLiteral("skipSwitcher"), c->skipSwitcher()},
|
|
|
|
{QStringLiteral("maximizeHorizontal"), c->maximizeMode() & MaximizeHorizontal},
|
|
|
|
{QStringLiteral("maximizeVertical"), c->maximizeMode() & MaximizeVertical}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-12 20:40:05 +00:00
|
|
|
QVariantMap DBusInterface::queryWindowInfo()
|
|
|
|
{
|
|
|
|
m_replyQueryWindowInfo = message();
|
|
|
|
setDelayedReply(true);
|
|
|
|
kwinApp()->platform()->startInteractiveWindowSelection(
|
|
|
|
[this] (Toplevel *t) {
|
|
|
|
if (auto c = qobject_cast<AbstractClient*>(t)) {
|
2018-12-08 16:06:51 +00:00
|
|
|
QDBusConnection::sessionBus().send(m_replyQueryWindowInfo.createReply(clientToVariantMap(c)));
|
2018-02-12 20:40:05 +00:00
|
|
|
} else {
|
|
|
|
QDBusConnection::sessionBus().send(m_replyQueryWindowInfo.createErrorReply(QString(), QString()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
return QVariantMap{};
|
|
|
|
}
|
|
|
|
|
2018-12-08 16:06:51 +00:00
|
|
|
QVariantMap DBusInterface::getWindowInfo(const QString &uuid)
|
|
|
|
{
|
|
|
|
const auto id = QUuid::fromString(uuid);
|
|
|
|
const auto client = workspace()->findAbstractClient([&id] (const AbstractClient *c) { return c->internalId() == id; });
|
|
|
|
if (client) {
|
|
|
|
return clientToVariantMap(client);
|
|
|
|
} else {
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-02 06:51:28 +00:00
|
|
|
CompositorDBusInterface::CompositorDBusInterface(Compositor *parent)
|
|
|
|
: QObject(parent)
|
|
|
|
, m_compositor(parent)
|
|
|
|
{
|
|
|
|
connect(m_compositor, &Compositor::compositingToggled, this, &CompositorDBusInterface::compositingToggled);
|
|
|
|
new CompositingAdaptor(this);
|
|
|
|
QDBusConnection dbus = QDBusConnection::sessionBus();
|
|
|
|
dbus.registerObject(QStringLiteral("/Compositor"), this);
|
|
|
|
dbus.connect(QString(), QStringLiteral("/Compositor"), QStringLiteral("org.kde.kwin.Compositing"),
|
|
|
|
QStringLiteral("reinit"), m_compositor, SLOT(slotReinitialize()));
|
|
|
|
}
|
|
|
|
|
|
|
|
QString CompositorDBusInterface::compositingNotPossibleReason() const
|
|
|
|
{
|
2016-05-09 15:32:43 +00:00
|
|
|
return kwinApp()->platform()->compositingNotPossibleReason();
|
2014-06-02 06:51:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
QString CompositorDBusInterface::compositingType() const
|
|
|
|
{
|
|
|
|
if (!m_compositor->hasScene()) {
|
|
|
|
return QStringLiteral("none");
|
|
|
|
}
|
|
|
|
switch (m_compositor->scene()->compositingType()) {
|
|
|
|
case XRenderCompositing:
|
|
|
|
return QStringLiteral("xrender");
|
|
|
|
case OpenGL2Compositing:
|
2015-10-30 12:18:30 +00:00
|
|
|
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
|
|
|
|
return QStringLiteral("gles");
|
|
|
|
} else {
|
|
|
|
return QStringLiteral("gl2");
|
|
|
|
}
|
2014-06-02 06:51:28 +00:00
|
|
|
case QPainterCompositing:
|
2015-01-24 02:13:45 +00:00
|
|
|
return QStringLiteral("qpainter");
|
2014-06-02 06:51:28 +00:00
|
|
|
case NoCompositing:
|
|
|
|
default:
|
|
|
|
return QStringLiteral("none");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CompositorDBusInterface::isActive() const
|
|
|
|
{
|
|
|
|
return m_compositor->isActive();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CompositorDBusInterface::isCompositingPossible() const
|
|
|
|
{
|
2016-05-09 15:32:43 +00:00
|
|
|
return kwinApp()->platform()->compositingPossible();
|
2014-06-02 06:51:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool CompositorDBusInterface::isOpenGLBroken() const
|
|
|
|
{
|
2016-05-09 15:32:43 +00:00
|
|
|
return kwinApp()->platform()->openGLCompositingIsBroken();
|
2014-06-02 06:51:28 +00:00
|
|
|
}
|
|
|
|
|
2016-08-26 10:56:25 +00:00
|
|
|
bool CompositorDBusInterface::platformRequiresCompositing() const
|
|
|
|
{
|
|
|
|
return kwinApp()->platform()->requiresCompositing();
|
|
|
|
}
|
|
|
|
|
2014-06-02 06:51:28 +00:00
|
|
|
void CompositorDBusInterface::resume()
|
|
|
|
{
|
|
|
|
m_compositor->resume(Compositor::ScriptSuspend);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CompositorDBusInterface::suspend()
|
|
|
|
{
|
|
|
|
m_compositor->suspend(Compositor::ScriptSuspend);
|
|
|
|
}
|
|
|
|
|
|
|
|
QStringList CompositorDBusInterface::supportedOpenGLPlatformInterfaces() const
|
|
|
|
{
|
|
|
|
QStringList interfaces;
|
2015-10-30 10:50:31 +00:00
|
|
|
bool supportsGlx = false;
|
|
|
|
#if HAVE_EPOXY_GLX
|
|
|
|
supportsGlx = (kwinApp()->operationMode() == Application::OperationModeX11);
|
|
|
|
#endif
|
2015-10-30 12:18:30 +00:00
|
|
|
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
|
|
|
|
supportsGlx = false;
|
|
|
|
}
|
2014-06-02 06:51:28 +00:00
|
|
|
if (supportsGlx) {
|
|
|
|
interfaces << QStringLiteral("glx");
|
|
|
|
}
|
|
|
|
interfaces << QStringLiteral("egl");
|
|
|
|
return interfaces;
|
|
|
|
}
|
|
|
|
|
[wayland] Use the new plasma virtual desktop protocol
Summary:
implement virtual desktop support for Wayland.
use the new virtual desktop protocol from D12820
The VirtualDesktopManager class needed some big change in order
to accomodate it, which is where most changes are.
Other than that, it's mostly connections to wire up
VirtualDesktopsManager and VirtualDesktopsManagement(the wayland protocol impl)
Depends on D12820
Other notable detail, is the client visibility updated to reflect the presence
of the client in the plasmavirtualdesktop.
(and the unSetDesktop concept)
Test Plan: used a bit a plasma session together with D12820, D13748 and D13746
Reviewers: #plasma, #kwin, graesslin, davidedmundson
Reviewed By: #plasma, #kwin, davidedmundson
Subscribers: hein, zzag, davidedmundson, kwin
Tags: #kwin
Maniphest Tasks: T4457
Differential Revision: https://phabricator.kde.org/D13887
2018-10-29 22:29:15 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
VirtualDesktopManagerDBusInterface::VirtualDesktopManagerDBusInterface(VirtualDesktopManager *parent)
|
|
|
|
: QObject(parent)
|
|
|
|
, m_manager(parent)
|
|
|
|
{
|
|
|
|
qDBusRegisterMetaType<KWin::DBusDesktopDataStruct>();
|
|
|
|
qDBusRegisterMetaType<KWin::DBusDesktopDataVector>();
|
|
|
|
|
|
|
|
new VirtualDesktopManagerAdaptor(this);
|
|
|
|
QDBusConnection::sessionBus().registerObject(QStringLiteral("/VirtualDesktopManager"),
|
|
|
|
QStringLiteral("org.kde.KWin.VirtualDesktopManager"),
|
|
|
|
this
|
|
|
|
);
|
|
|
|
|
|
|
|
connect(m_manager, &VirtualDesktopManager::currentChanged, this,
|
|
|
|
[this](uint previousDesktop, uint newDesktop) {
|
|
|
|
Q_UNUSED(previousDesktop);
|
|
|
|
Q_UNUSED(newDesktop);
|
|
|
|
emit currentChanged(m_manager->currentDesktop()->id());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
connect(m_manager, &VirtualDesktopManager::countChanged, this,
|
|
|
|
[this](uint previousCount, uint newCount) {
|
|
|
|
Q_UNUSED(previousCount);
|
|
|
|
emit countChanged(newCount);
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
connect(m_manager, &VirtualDesktopManager::navigationWrappingAroundChanged, this,
|
|
|
|
[this]() {
|
|
|
|
emit navigationWrappingAroundChanged(isNavigationWrappingAround());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
connect(m_manager, &VirtualDesktopManager::rowsChanged, this, &VirtualDesktopManagerDBusInterface::rowsChanged);
|
|
|
|
|
|
|
|
for (auto *vd : m_manager->desktops()) {
|
|
|
|
connect(vd, &VirtualDesktop::x11DesktopNumberChanged, this,
|
|
|
|
[this, vd]() {
|
|
|
|
DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()};
|
|
|
|
emit desktopDataChanged(vd->id(), data);
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
connect(vd, &VirtualDesktop::nameChanged, this,
|
|
|
|
[this, vd]() {
|
|
|
|
DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()};
|
|
|
|
emit desktopDataChanged(vd->id(), data);
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
connect(m_manager, &VirtualDesktopManager::desktopCreated, this,
|
|
|
|
[this](VirtualDesktop *vd) {
|
|
|
|
connect(vd, &VirtualDesktop::x11DesktopNumberChanged, this,
|
|
|
|
[this, vd]() {
|
|
|
|
DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()};
|
|
|
|
emit desktopDataChanged(vd->id(), data);
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
connect(vd, &VirtualDesktop::nameChanged, this,
|
|
|
|
[this, vd]() {
|
|
|
|
DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()};
|
|
|
|
emit desktopDataChanged(vd->id(), data);
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()};
|
|
|
|
emit desktopCreated(vd->id(), data);
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
connect(m_manager, &VirtualDesktopManager::desktopRemoved, this,
|
|
|
|
[this](VirtualDesktop *vd) {
|
|
|
|
emit desktopRemoved(vd->id());
|
|
|
|
emit desktopsChanged(desktops());
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
uint VirtualDesktopManagerDBusInterface::count() const
|
|
|
|
{
|
|
|
|
return m_manager->count();
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualDesktopManagerDBusInterface::setRows(uint rows)
|
|
|
|
{
|
|
|
|
if (static_cast<uint>(m_manager->grid().height()) == rows) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
m_manager->setRows(rows);
|
|
|
|
m_manager->save();
|
|
|
|
}
|
|
|
|
|
|
|
|
uint VirtualDesktopManagerDBusInterface::rows() const
|
|
|
|
{
|
|
|
|
return m_manager->rows();
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualDesktopManagerDBusInterface::setCurrent(const QString &id)
|
|
|
|
{
|
|
|
|
if (m_manager->currentDesktop()->id() == id) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto *vd = m_manager->desktopForId(id.toUtf8());
|
|
|
|
if (vd) {
|
|
|
|
m_manager->setCurrent(vd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
QString VirtualDesktopManagerDBusInterface::current() const
|
|
|
|
{
|
|
|
|
return m_manager->currentDesktop()->id();
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualDesktopManagerDBusInterface::setNavigationWrappingAround(bool wraps)
|
|
|
|
{
|
|
|
|
if (m_manager->isNavigationWrappingAround() == wraps) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
m_manager->setNavigationWrappingAround(wraps);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool VirtualDesktopManagerDBusInterface::isNavigationWrappingAround() const
|
|
|
|
{
|
|
|
|
return m_manager->isNavigationWrappingAround();
|
|
|
|
}
|
|
|
|
|
|
|
|
DBusDesktopDataVector VirtualDesktopManagerDBusInterface::desktops() const
|
|
|
|
{
|
|
|
|
const auto desks = m_manager->desktops();
|
|
|
|
DBusDesktopDataVector desktopVect;
|
|
|
|
desktopVect.reserve(m_manager->count());
|
|
|
|
|
|
|
|
std::transform(desks.constBegin(), desks.constEnd(),
|
|
|
|
std::back_inserter(desktopVect),
|
|
|
|
[] (const VirtualDesktop *vd) {
|
|
|
|
return DBusDesktopDataStruct{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()};
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
return desktopVect;
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualDesktopManagerDBusInterface::createDesktop(uint position, const QString &name)
|
|
|
|
{
|
2019-01-17 21:12:11 +00:00
|
|
|
m_manager->createVirtualDesktop(position, name);
|
[wayland] Use the new plasma virtual desktop protocol
Summary:
implement virtual desktop support for Wayland.
use the new virtual desktop protocol from D12820
The VirtualDesktopManager class needed some big change in order
to accomodate it, which is where most changes are.
Other than that, it's mostly connections to wire up
VirtualDesktopsManager and VirtualDesktopsManagement(the wayland protocol impl)
Depends on D12820
Other notable detail, is the client visibility updated to reflect the presence
of the client in the plasmavirtualdesktop.
(and the unSetDesktop concept)
Test Plan: used a bit a plasma session together with D12820, D13748 and D13746
Reviewers: #plasma, #kwin, graesslin, davidedmundson
Reviewed By: #plasma, #kwin, davidedmundson
Subscribers: hein, zzag, davidedmundson, kwin
Tags: #kwin
Maniphest Tasks: T4457
Differential Revision: https://phabricator.kde.org/D13887
2018-10-29 22:29:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualDesktopManagerDBusInterface::setDesktopName(const QString &id, const QString &name)
|
|
|
|
{
|
|
|
|
VirtualDesktop *vd = m_manager->desktopForId(id.toUtf8());
|
|
|
|
if (!vd) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (vd->name() == name) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
vd->setName(name);
|
|
|
|
m_manager->save();
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualDesktopManagerDBusInterface::removeDesktop(const QString &id)
|
|
|
|
{
|
|
|
|
m_manager->removeVirtualDesktop(id.toUtf8());
|
|
|
|
}
|
|
|
|
|
2012-08-30 06:20:26 +00:00
|
|
|
} // namespace
|