wayland_server: Initialize integrations in initWorkspace
At this point KWin options are available.
This commit is contained in:
parent
214e471a50
commit
28c1545beb
1 changed files with 12 additions and 12 deletions
|
@ -358,18 +358,6 @@ bool WaylandServer::init(InitializationFlags flags)
|
||||||
m_tabletManagerV2 = new TabletManagerV2Interface(m_display, m_display);
|
m_tabletManagerV2 = new TabletManagerV2Interface(m_display, m_display);
|
||||||
m_keyboardShortcutsInhibitManager = new KeyboardShortcutsInhibitManagerV1Interface(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);
|
m_xdgDecorationManagerV1 = new XdgDecorationManagerV1Interface(m_display, m_display);
|
||||||
connect(m_xdgDecorationManagerV1, &XdgDecorationManagerV1Interface::decorationCreated, this, [this](XdgToplevelDecorationV1Interface *decoration) {
|
connect(m_xdgDecorationManagerV1, &XdgDecorationManagerV1Interface::decorationCreated, this, [this](XdgToplevelDecorationV1Interface *decoration) {
|
||||||
if (XdgToplevelWindow *toplevel = findXdgToplevelWindow(decoration->toplevel()->surface())) {
|
if (XdgToplevelWindow *toplevel = findXdgToplevelWindow(decoration->toplevel()->surface())) {
|
||||||
|
@ -523,6 +511,18 @@ SurfaceInterface *WaylandServer::findForeignTransientForSurface(SurfaceInterface
|
||||||
|
|
||||||
void WaylandServer::initWorkspace()
|
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);
|
new KeyStateInterface(m_display, m_display);
|
||||||
|
|
||||||
VirtualDesktopManager::self()->setVirtualDesktopManagement(m_virtualDesktopManagement);
|
VirtualDesktopManager::self()->setVirtualDesktopManagement(m_virtualDesktopManagement);
|
||||||
|
|
Loading…
Reference in a new issue