Differential D8919 Diff 22670 src/client/registry.cpp

Changeset View

Standalone View

View Options

src/client/registry.cpp

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)
46#include "shell.h" 46​#include "shell.h"
47#include "shm_pool.h" 47​#include "shm_pool.h"
48#include "subcompositor.h" 48​#include "subcompositor.h"
49#include "textinput_p.h" 49​#include "textinput_p.h"
50#include "xdgshell.h" 50​#include "xdgshell.h"
51#include "xdgshell_p.h" 51​#include "xdgshell_p.h"
52#include "wayland_pointer_p.h" 52​#include "wayland_pointer_p.h"
53#include "xdgforeign_v2.h" 53​#include "xdgforeign_v2.h"
54​#include "appmenu.h"
54// Qt 55​// Qt
55#include <QDebug> 56​#include <QDebug>
56// wayland 57​// wayland
57#include <wayland-client-protocol.h> 58​#include <wayland-client-protocol.h>
58#include <wayland-fullscreen-shell-client-protocol.h> 59​#include <wayland-fullscreen-shell-client-protocol.h>
59#include <wayland-plasma-shell-client-protocol.h> 60​#include <wayland-plasma-shell-client-protocol.h>
60#include <wayland-plasma-window-management-client-protocol.h> 61​#include <wayland-plasma-window-management-client-protocol.h>
61#include <wayland-idle-client-protocol.h> 62​#include <wayland-idle-client-protocol.h>
Show All 10 Lines
72#include <wayland-text-input-v0-client-protocol.h> 73​#include <wayland-text-input-v0-client-protocol.h>
73#include <wayland-text-input-v2-client-protocol.h> 74​#include <wayland-text-input-v2-client-protocol.h>
74#include <wayland-xdg-shell-v5-client-protocol.h> 75​#include <wayland-xdg-shell-v5-client-protocol.h>
75#include <wayland-xdg-shell-v6-client-protocol.h> 76​#include <wayland-xdg-shell-v6-client-protocol.h>
76#include <wayland-relativepointer-unstable-v1-client-protocol.h> 77​#include <wayland-relativepointer-unstable-v1-client-protocol.h>
77#include <wayland-pointer-gestures-unstable-v1-client-protocol.h> 78​#include <wayland-pointer-gestures-unstable-v1-client-protocol.h>
78#include <wayland-pointer-constraints-unstable-v1-client-protocol.h> 79​#include <wayland-pointer-constraints-unstable-v1-client-protocol.h>
79#include <wayland-xdg-foreign-unstable-v2-client-protocol.h> 80​#include <wayland-xdg-foreign-unstable-v2-client-protocol.h>
81​#include <wayland-appmenu-client-protocol.h>
80 82​
81/***** 83​/*****
82 * How to add another interface: 84​ * How to add another interface:
83 * * define a new enum value in Registry::Interface 85​ * * define a new enum value in Registry::Interface
84 * * define the bind<InterfaceName> method 86​ * * define the bind<InterfaceName> method
85 * * define the create<InterfaceName> method 87​ * * define the create<InterfaceName> method
86 * * define the <interfaceName>Announced signal 88​ * * define the <interfaceName>Announced signal
87 * * define the <interfaceName>Removed signal 89​ * * define the <interfaceName>Removed signal
▲ Show 20 Lines • Show All 221 Lines • ▼ Show 20 Line(s)306 {Registry::Interface::XdgShellUnstableV6, {
309 &Registry::xdgShellUnstableV6Removed 311​ &Registry::xdgShellUnstableV6Removed
310 }}, 312​ }},
311 {Registry::Interface::IdleInhibitManagerUnstableV1, { 313​ {Registry::Interface::IdleInhibitManagerUnstableV1, {
312 1, 314​ 1,
313 QByteArrayLiteral("zwp_idle_inhibit_manager_v1"), 315​ QByteArrayLiteral("zwp_idle_inhibit_manager_v1"),
314 &zwp_idle_inhibit_manager_v1_interface, 316​ &zwp_idle_inhibit_manager_v1_interface,
315 &Registry::idleInhibitManagerUnstableV1Announced, 317​ &Registry::idleInhibitManagerUnstableV1Announced,
316 &Registry::idleInhibitManagerUnstableV1Removed 318​ &Registry::idleInhibitManagerUnstableV1Removed
319​ }},
320​ {Registry::Interface::AppMenu, {
321​ 1,
322​ QByteArrayLiteral("org_kde_kwin_appmenu_manager"),
323​ &org_kde_kwin_appmenu_manager_interface,
324​ &Registry::appMenuAnnounced,
325​ &Registry::appMenuRemoved
317 }} 326​ }}
318}; 327​};
319 328​
320static quint32 maxVersion(const Registry::Interface &interface) 329​static quint32 maxVersion(const Registry::Interface &interface)
321{ 330​{
322 auto it = s_interfaces.find(interface); 331​ auto it = s_interfaces.find(interface);
323 if (it != s_interfaces.end()) { 332​ if (it != s_interfaces.end()) {
324 return it.value().maxVersion; 333​ return it.value().maxVersion;
▲ Show 20 Lines • Show All 293 Lines • ▼ Show 20 Line(s)
618BIND(XdgExporterUnstableV2, zxdg_exporter_v2) 627​BIND(XdgExporterUnstableV2, zxdg_exporter_v2)
619BIND(XdgImporterUnstableV2, zxdg_importer_v2) 628​BIND(XdgImporterUnstableV2, zxdg_importer_v2)
620BIND(IdleInhibitManagerUnstableV1, zwp_idle_inhibit_manager_v1) 629​BIND(IdleInhibitManagerUnstableV1, zwp_idle_inhibit_manager_v1)
621BIND2(ShadowManager, Shadow, org_kde_kwin_shadow_manager) 630​BIND2(ShadowManager, Shadow, org_kde_kwin_shadow_manager)
622BIND2(BlurManager, Blur, org_kde_kwin_blur_manager) 631​BIND2(BlurManager, Blur, org_kde_kwin_blur_manager)
623BIND2(ContrastManager, Contrast, org_kde_kwin_contrast_manager) 632​BIND2(ContrastManager, Contrast, org_kde_kwin_contrast_manager)
624BIND2(SlideManager, Slide, org_kde_kwin_slide_manager) 633​BIND2(SlideManager, Slide, org_kde_kwin_slide_manager)
625BIND2(DpmsManager, Dpms, org_kde_kwin_dpms_manager) 634​BIND2(DpmsManager, Dpms, org_kde_kwin_dpms_manager)
635​BIND2(AppMenuManager, AppMenu, org_kde_kwin_appmenu_manager)
626 636​
627#undef BIND 637​#undef BIND
628#undef BIND2 638​#undef BIND2
629 639​
630template <class T, typename WL> 640​template <class T, typename WL>
631T *Registry::Private::create(quint32 name, quint32 version, QObject *parent, WL *(Registry::*bindMethod)(uint32_t, uint32_t) const) 641​T *Registry::Private::create(quint32 name, quint32 version, QObject *parent, WL *(Registry::*bindMethod)(uint32_t, uint32_t) const)
632{ 642​{
633 T *t = new T(parent); 643​ T *t = new T(parent);
Show All 33 Lines
667CREATE(OutputDevice) 677​CREATE(OutputDevice)
668CREATE(ShadowManager) 678​CREATE(ShadowManager)
669CREATE(BlurManager) 679​CREATE(BlurManager)
670CREATE(ContrastManager) 680​CREATE(ContrastManager)
671CREATE(SlideManager) 681​CREATE(SlideManager)
672CREATE(DpmsManager) 682​CREATE(DpmsManager)
673CREATE(ServerSideDecorationManager) 683​CREATE(ServerSideDecorationManager)
674CREATE2(ShmPool, Shm) 684​CREATE2(ShmPool, Shm)
685​CREATE(AppMenuManager)
675 686​
676#undef CREATE 687​#undef CREATE
677#undef CREATE2 688​#undef CREATE2
678 689​
679XdgExporter *Registry::createXdgExporter(quint32 name, quint32 version, QObject *parent) 690​XdgExporter *Registry::createXdgExporter(quint32 name, quint32 version, QObject *parent)
680{ 691​{
681 //only V1 supported for now 692​ //only V1 supported for now
682 return d->create<XdgExporterUnstableV2>(name, version, parent, &Registry::bindXdgExporterUnstableV2); 693​ return d->create<XdgExporterUnstableV2>(name, version, parent, &Registry::bindXdgExporterUnstableV2);
▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines