Differential D13745 Diff 37201 libtaskmanager/virtualdesktopinfo.cpp

Changeset View

Standalone View

View Options

libtaskmanager/virtualdesktopinfo.cpp

Show All 14 Lines
15Lesser General Public License for more details. 15​Lesser General Public License for more details.
16 16​
17You should have received a copy of the GNU Lesser General Public 17​You should have received a copy of the GNU Lesser General Public
18License along with this library. If not, see <http://www.gnu.org/licenses/>. 18​License along with this library. If not, see <http://www.gnu.org/licenses/>.
19*********************************************************************/ 19​*********************************************************************/
20 20​
21#include "virtualdesktopinfo.h" 21​#include "virtualdesktopinfo.h"
22 22​
23​#include <KWayland/Client/connection_thread.h>
24​#include <KWayland/Client/plasmavirtualdesktop.h>
25​#include <KWayland/Client/registry.h>
23#include <KWindowSystem> 26​#include <KWindowSystem>
24 27​
25#include <QDBusConnection> 28​#include <QDBusConnection>
26 29​
27#include <config-X11.h> 30​#include <config-X11.h>
28 31​
29#if HAVE_X11 32​#if HAVE_X11
30#include <netwm.h> 33​#include <netwm.h>
31#include <QX11Info> 34​#include <QX11Info>
32#endif 35​#endif
33 36​
34namespace TaskManager 37​namespace TaskManager
35{ 38​{
39​class Q_DECL_HIDDEN VirtualDesktopInfo::Private : public QObject
40​{
41​ Q_OBJECT
36 42​
37VirtualDesktopInfo::VirtualDesktopInfo(QObject *parent) : QObject(parent) 43​public:
44​ Private(VirtualDesktopInfo *q);
45​ virtual ~Private() {}
46​
47​ uint refCount = 1;
48​
49​ virtual void init() = 0;
50​ virtual QVariant currentDesktop() const = 0;
51​ virtual int numberOfDesktops() const = 0;
52​ virtual QVariantList desktopIds() const = 0;
53​ virtual QStringList desktopNames() const = 0;
54​ virtual quint32 position(const QVariant &desktop) const = 0;
55​ virtual int desktopLayoutRows() const = 0;
56​ virtual void requestActivate(const QVariant &desktop) = 0;
57​ virtual bool canManageDesktops() const = 0;
58​
59​Q_SIGNALS:
60​ void currentDesktopChanged() const;
61​ void numberOfDesktopsChanged() const;
62​ void desktopIdsChanged() const;
63​ void desktopNamesChanged() const;
64​ void desktopLayoutRowsChanged() const;
65​
66​protected:
67​ VirtualDesktopInfo *q;
68​};
69​
70​VirtualDesktopInfo::Private::Private(VirtualDesktopInfo *q)
71​ : q(q)
72​{
73​}
74​
75​#if HAVE_X11
76​class Q_DECL_HIDDEN VirtualDesktopInfo::XWindowPrivate : public VirtualDesktopInfo::Private
77​{
78​public:
79​ XWindowPrivate(VirtualDesktopInfo *q);
80​
81​ void init() override;
82​ QVariant currentDesktop() const override;
83​ int numberOfDesktops() const override;
84​ QVariantList desktopIds() const override;
85​ QStringList desktopNames() const override;
86​ quint32 position(const QVariant &desktop) const override;
87​ int desktopLayoutRows() const override;
88​ void requestActivate(const QVariant &desktop) override;
89​ bool canManageDesktops() const override;
90​};
91​
92​VirtualDesktopInfo::XWindowPrivate::XWindowPrivate(VirtualDesktopInfo *q)
93​ : VirtualDesktopInfo::Private(q)
94​{
95​ init();
96​}
97​
98​void VirtualDesktopInfo::XWindowPrivate::init()
38{ 99​{
39 connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, 100​ connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged,
40 this, &VirtualDesktopInfo::currentDesktopChanged); 101​ this, &VirtualDesktopInfo::XWindowPrivate::currentDesktopChanged);
41 102​
42 connect(KWindowSystem::self(), &KWindowSystem::numberOfDesktopsChanged, 103​ connect(KWindowSystem::self(), &KWindowSystem::numberOfDesktopsChanged,
43 this, &VirtualDesktopInfo::numberOfDesktopsChanged); 104​ this, &VirtualDesktopInfo::XWindowPrivate::numberOfDesktopsChanged);
44 105​
45 connect(KWindowSystem::self(), &KWindowSystem::desktopNamesChanged, 106​ connect(KWindowSystem::self(), &KWindowSystem::desktopNamesChanged,
46 this, &VirtualDesktopInfo::desktopNamesChanged); 107​ this, &VirtualDesktopInfo::XWindowPrivate::desktopNamesChanged);
47 108​
48#if HAVE_X11 ​
49 if (KWindowSystem::isPlatformX11()) { ​
50 QDBusConnection dbus = QDBusConnection::sessionBus(); 109​ QDBusConnection dbus = QDBusConnection::sessionBus();
51 dbus.connect(QString(), QStringLiteral("/KWin"), QStringLiteral("org.kde.KWin"), QStringLiteral("reloadConfig"), 110​ dbus.connect(QString(), QStringLiteral("/KWin"), QStringLiteral("org.kde.KWin"), QStringLiteral("reloadConfig"),
52 this, SIGNAL(desktopLayoutRowsChanged())); 111​ this, SIGNAL(desktopLayoutRowsChanged()));
53 } 112​}
54#endif ​
55} ​
56 113​
57VirtualDesktopInfo::~VirtualDesktopInfo() 114​QVariant VirtualDesktopInfo::XWindowPrivate::currentDesktop() const
58{ 115​{
116​ return KWindowSystem::currentDesktop();
59} 117​}
60 118​
61int VirtualDesktopInfo::currentDesktop() const 119​int VirtualDesktopInfo::XWindowPrivate::numberOfDesktops() const
62{ 120​{
63 return KWindowSystem::currentDesktop(); 121​ return KWindowSystem::numberOfDesktops();
64} 122​}
65 123​
66int VirtualDesktopInfo::numberOfDesktops() const 124​QVariantList VirtualDesktopInfo::XWindowPrivate::desktopIds() const
67{ 125​{
68 return KWindowSystem::numberOfDesktops(); 126​ QVariantList ids;
127​
128​ for (int i = 1; i <= KWindowSystem::numberOfDesktops(); ++i) {
129​ ids << i;
69} 130​ }
70 131​
71QStringList VirtualDesktopInfo::desktopNames() const 132​ return ids;
zzagUnsubmitted
Not Done

ids.reserve(KWindowSystem::numberOfDesktops());

zzag: ids.reserve(KWindowSystem::numberOfDesktops());
133​}
134​
135​QStringList VirtualDesktopInfo::XWindowPrivate::desktopNames() const
72{ 136​{
73 QStringList names; 137​ QStringList names;
74 138​
75 // Virtual desktop numbers start at 1. 139​ // Virtual desktop numbers start at 1.
76 for (int i = 1; i <= KWindowSystem::numberOfDesktops(); ++i) { 140​ for (int i = 1; i <= KWindowSystem::numberOfDesktops(); ++i) {
77 names << KWindowSystem::desktopName(i); 141​ names << KWindowSystem::desktopName(i);
78 } 142​ }
79 143​
80 return names; 144​ return names;
81} 145​}
82 146​
83int VirtualDesktopInfo::desktopLayoutRows() const 147​quint32 VirtualDesktopInfo::XWindowPrivate::position(const QVariant &desktop) const
148​{
149​ bool ok = false;
150​
151​ const quint32 desktopNumber = desktop.toUInt(&ok);
152​
153​ if (!ok) {
154​ return -1;
155​ }
156​
157​ return desktopNumber;
158​}
159​
160​int VirtualDesktopInfo::XWindowPrivate::desktopLayoutRows() const
84{ 161​{
85#if HAVE_X11 ​
86 if (KWindowSystem::isPlatformX11()) { ​
87 const NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout); 162​ const NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout);
88 return info.desktopLayoutColumnsRows().height(); 163​ return info.desktopLayoutColumnsRows().height();
89 } 164​}
165​
166​void VirtualDesktopInfo::XWindowPrivate::requestActivate(const QVariant &desktop)
167​{
168​ bool ok = false;
169​ const int desktopNumber = desktop.toInt(&ok);
170​
171​ // Virtual desktop numbers start at 1.
172​ if (ok && desktopNumber > 0 && desktopNumber <= KWindowSystem::numberOfDesktops()) {
173​ KWindowSystem::setCurrentDesktop(desktopNumber);
174​ }
175​}
176​
177​bool VirtualDesktopInfo::XWindowPrivate::canManageDesktops() const
178​{
179​ return true;
180​}
90#endif 181​#endif
91 182​
183​class Q_DECL_HIDDEN VirtualDesktopInfo::WaylandPrivate : public VirtualDesktopInfo::Private
184​{
185​public:
186​ WaylandPrivate(VirtualDesktopInfo *q);
187​
188​ QVariant currentVirtualDesktop;
189​ QStringList virtualDesktops;
190​ KWayland::Client::PlasmaVirtualDesktopManagement *virtualDesktopManagement = nullptr;
191​
192​ void init() override;
193​ void addDesktop(const QString &id, quint32 position);
194​ QVariant currentDesktop() const override;
195​ int numberOfDesktops() const override;
196​ QVariantList desktopIds() const override;
197​ QStringList desktopNames() const override;
198​ quint32 position(const QVariant &desktop) const override;
199​ int desktopLayoutRows() const override;
200​ void requestActivate(const QVariant &desktop) override;
201​ bool canManageDesktops() const override;
202​};
203​
204​VirtualDesktopInfo::WaylandPrivate::WaylandPrivate(VirtualDesktopInfo *q)
205​ : VirtualDesktopInfo::Private(q)
206​{
207​ init();
208​}
209​
210​void VirtualDesktopInfo::WaylandPrivate::init()
211​{
212​ if (!KWindowSystem::isPlatformWayland()) {
213​ return;
214​ }
215​
216​ KWayland::Client::ConnectionThread *connection = KWayland::Client::ConnectionThread::fromApplication(q);
217​
218​ if (!connection) {
219​ return;
220​ }
221​
222​ KWayland::Client::Registry *registry = new KWayland::Client::Registry(q);
223​ registry->create(connection);
224​
225​ QObject::connect(registry, &KWayland::Client::Registry::plasmaVirtualDesktopManagementAnnounced,
226​ [this, registry] (quint32 name, quint32 version) {
227​ virtualDesktopManagement = registry->createPlasmaVirtualDesktopManagement(name, version, q);
228​
229​ const QList<KWayland::Client::PlasmaVirtualDesktop *> &desktops = virtualDesktopManagement->desktops();
230​
231​ for (int i = 0; i < desktops.count(); ++i) {
232​ addDesktop(desktops.at(i)->id(), i);
233​ }
234​
235​ /* FIXME: PlasmaVirtualDesktopManagement doesn't have this ...?
236​ QObject::connect(virtualDesktopManagement, &KWayland::Client::PlasmaVirtualDesktopManagement::interfaceAboutToBeReleased, q,
237​ [this] {
238​ virtualDesktops.clear();
239​ emit numberOfDesktopsChanged();
240​ emit currentDesktopChanged();
241​ emit desktopIdsChanged();
242​ emit desktopNamesChanged();
243​ emit desktopLayoutRowsChanged();
244​ }
245​ );
246​ */
247​
248​ QObject::connect(virtualDesktopManagement, &KWayland::Client::PlasmaVirtualDesktopManagement::desktopCreated, q,
249​ [this](const QString &id, quint32 position) {
250​ addDesktop(id, position);
251​ }
252​ );
253​
254​ QObject::connect(virtualDesktopManagement, &KWayland::Client::PlasmaVirtualDesktopManagement::desktopRemoved, q,
255​ [this](const QString &id) {
256​ virtualDesktops.removeOne(id);
257​
258​ emit numberOfDesktopsChanged();
259​ emit desktopIdsChanged();
260​ emit desktopNamesChanged();
261​
262​ if (currentVirtualDesktop == id) {
263​ currentVirtualDesktop.clear();
264​ emit currentDesktopChanged();
265​ }
266​ }
267​ );
268​ }
269​ );
270​
271​ registry->setup();
272​}
273​
274​void VirtualDesktopInfo::WaylandPrivate::addDesktop(const QString &id, quint32 position)
275​{
276​ if (virtualDesktops.indexOf(id) != -1) {
277​ return;
278​ }
279​
280​ virtualDesktops.insert(position, id);
281​
282​ emit numberOfDesktopsChanged();
283​ emit desktopIdsChanged();
284​ emit desktopNamesChanged();
285​
286​ const KWayland::Client::PlasmaVirtualDesktop *desktop = virtualDesktopManagement->getVirtualDesktop(id);
287​
288​ QObject::connect(desktop, &KWayland::Client::PlasmaVirtualDesktop::activated, q,
289​ [desktop, this]() {
290​ currentVirtualDesktop = desktop->id();
291​ emit currentDesktopChanged();
292​ }
293​ );
294​
295​ if (desktop->isActive()) {
296​ currentVirtualDesktop = id;
297​ emit currentDesktopChanged();
298​ }
299​}
300​
301​QVariant VirtualDesktopInfo::WaylandPrivate::currentDesktop() const
302​{
303​ return currentVirtualDesktop;
304​}
zzagUnsubmitted
Not Done

Call reserve method. Also, why not range based for loop?

zzag: Call reserve method. Also, why not range based for loop?
305​
306​int VirtualDesktopInfo::WaylandPrivate::numberOfDesktops() const
307​{
308​ return virtualDesktops.count();
309​}
310​
311​quint32 VirtualDesktopInfo::WaylandPrivate::position(const QVariant &desktop) const
312​{
313​ return virtualDesktops.indexOf(desktop.toString());
314​}
315​
316​QVariantList VirtualDesktopInfo::WaylandPrivate::desktopIds() const
317​{
318​ QVariantList ids;
319​
320​ foreach (const QString &id, virtualDesktops) {
321​ ids << id;
322​ }
323​
324​ return ids;
325​}
326​
327​QStringList VirtualDesktopInfo::WaylandPrivate::desktopNames() const
328​{
329​ QStringList names;
330​
331​ foreach(const QString &id, virtualDesktops) {
332​ const KWayland::Client::PlasmaVirtualDesktop *desktop = virtualDesktopManagement->getVirtualDesktop(id);
333​
334​ if (desktop) {
335​ names << desktop->name();
336​ }
337​ }
338​
339​ return names;
340​}
341​
342​int VirtualDesktopInfo::WaylandPrivate::desktopLayoutRows() const
343​{
344​ // TODO FIXME: We don't have virtual desktop layout information in the Wayland
345​ // protocol yet.
92 return 0; 346​ return 0;
93} 347​}
94 348​
349​void VirtualDesktopInfo::WaylandPrivate::requestActivate(const QVariant &desktop)
350​{
351​ KWayland::Client::PlasmaVirtualDesktop *desktopObj = virtualDesktopManagement->getVirtualDesktop(desktop.toString());
352​
353​ if (desktopObj) {
354​ desktopObj->requestActivate();
355​ }
356​}
357​
358​bool VirtualDesktopInfo::WaylandPrivate::canManageDesktops() const
359​{
360​ return true;
361​}
362​
363​VirtualDesktopInfo::Private* VirtualDesktopInfo::d = nullptr;
364​
365​VirtualDesktopInfo::VirtualDesktopInfo(QObject *parent) : QObject(parent)
366​{
367​ if (!d) {
368​ #if HAVE_X11
369​ if (KWindowSystem::isPlatformX11()) {
370​ d = new VirtualDesktopInfo::XWindowPrivate(this);
371​ } else
372​ #endif
373​ {
374​ d = new VirtualDesktopInfo::WaylandPrivate(this);
375​ }
376​ } else {
377​ ++d->refCount;
378​ }
379​
380​ connect(d, &VirtualDesktopInfo::Private::currentDesktopChanged,
381​ this, &VirtualDesktopInfo::currentDesktopChanged);
382​ connect(d, &VirtualDesktopInfo::Private::numberOfDesktopsChanged,
383​ this, &VirtualDesktopInfo::numberOfDesktopsChanged);
384​ connect(d, &VirtualDesktopInfo::Private::desktopIdsChanged,
385​ this, &VirtualDesktopInfo::desktopIdsChanged);
386​ connect(d, &VirtualDesktopInfo::Private::desktopNamesChanged,
387​ this, &VirtualDesktopInfo::desktopNamesChanged);
388​ connect(d, &VirtualDesktopInfo::Private::desktopLayoutRowsChanged,
389​ this, &VirtualDesktopInfo::desktopLayoutRowsChanged);
390​}
391​
392​VirtualDesktopInfo::~VirtualDesktopInfo()
393​{
394​ --d->refCount;
395​
396​ if (!d->refCount) {
397​ delete d;
398​ d = nullptr;
399​ }
400​}
401​
402​QVariant VirtualDesktopInfo::currentDesktop() const
403​{
404​ return d->currentDesktop();
405​}
406​
407​int VirtualDesktopInfo::numberOfDesktops() const
408​{
409​ return d->numberOfDesktops();
410​}
411​
412​QVariantList VirtualDesktopInfo::desktopIds() const
413​{
414​ return d->desktopIds();
415​}
416​
417​QStringList VirtualDesktopInfo::desktopNames() const
418​{
419​ return d->desktopNames();
95} 420​}
421​
422​quint32 VirtualDesktopInfo::position(const QVariant &desktop) const
423​{
424​ return d->position(desktop);
425​}
426​
427​int VirtualDesktopInfo::desktopLayoutRows() const
428​{
429​ return d->desktopLayoutRows();
430​}
431​
432​void VirtualDesktopInfo::requestActivate(const QVariant &desktop)
433​{
434​ d->requestActivate(desktop);
435​}
436​
437​bool VirtualDesktopInfo::canManageDesktops() const
438​{
439​ return d->canManageDesktops();
440​}
441​
442​}
443​
444​#include "virtualdesktopinfo.moc"