From 28c1545beb826303b5d06e663055ca94fd58f68b Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 24 Nov 2023 13:34:18 +0100 Subject: [PATCH] wayland_server: Initialize integrations in initWorkspace At this point KWin options are available. --- src/wayland_server.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp index 1ab397a5af..3feb35f121 100644 --- a/src/wayland_server.cpp +++ b/src/wayland_server.cpp @@ -358,18 +358,6 @@ bool WaylandServer::init(InitializationFlags flags) m_tabletManagerV2 = new TabletManagerV2Interface(m_display, m_display); m_keyboardShortcutsInhibitManager = new KeyboardShortcutsInhibitManagerV1Interface(m_display, m_display); - auto inputPanelV1Integration = new InputPanelV1Integration(this); - connect(inputPanelV1Integration, &InputPanelV1Integration::windowCreated, - this, &WaylandServer::registerWindow); - - auto xdgShellIntegration = new XdgShellIntegration(this); - connect(xdgShellIntegration, &XdgShellIntegration::windowCreated, - this, &WaylandServer::registerXdgGenericWindow); - - auto layerShellV1Integration = new LayerShellV1Integration(this); - connect(layerShellV1Integration, &LayerShellV1Integration::windowCreated, - this, &WaylandServer::registerWindow); - m_xdgDecorationManagerV1 = new XdgDecorationManagerV1Interface(m_display, m_display); connect(m_xdgDecorationManagerV1, &XdgDecorationManagerV1Interface::decorationCreated, this, [this](XdgToplevelDecorationV1Interface *decoration) { if (XdgToplevelWindow *toplevel = findXdgToplevelWindow(decoration->toplevel()->surface())) { @@ -523,6 +511,18 @@ SurfaceInterface *WaylandServer::findForeignTransientForSurface(SurfaceInterface void WaylandServer::initWorkspace() { + auto inputPanelV1Integration = new InputPanelV1Integration(this); + connect(inputPanelV1Integration, &InputPanelV1Integration::windowCreated, + this, &WaylandServer::registerWindow); + + auto xdgShellIntegration = new XdgShellIntegration(this); + connect(xdgShellIntegration, &XdgShellIntegration::windowCreated, + this, &WaylandServer::registerXdgGenericWindow); + + auto layerShellV1Integration = new LayerShellV1Integration(this); + connect(layerShellV1Integration, &LayerShellV1Integration::windowCreated, + this, &WaylandServer::registerWindow); + new KeyStateInterface(m_display, m_display); VirtualDesktopManager::self()->setVirtualDesktopManagement(m_virtualDesktopManagement);