Changeset View
Changeset View
Standalone View
Standalone View
workspace.cpp
Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s) | |||||
46 | #include "rules.h" | 46 | #include "rules.h" | ||
47 | #include "screenedge.h" | 47 | #include "screenedge.h" | ||
48 | #include "screens.h" | 48 | #include "screens.h" | ||
49 | #include "platform.h" | 49 | #include "platform.h" | ||
50 | #include "scripting/scripting.h" | 50 | #include "scripting/scripting.h" | ||
51 | #ifdef KWIN_BUILD_TABBOX | 51 | #ifdef KWIN_BUILD_TABBOX | ||
52 | #include "tabbox.h" | 52 | #include "tabbox.h" | ||
53 | #endif | 53 | #endif | ||
54 | #include "tabletmodemanager.h" | ||||
54 | #include "unmanaged.h" | 55 | #include "unmanaged.h" | ||
55 | #include "useractions.h" | 56 | #include "useractions.h" | ||
56 | #include "virtualdesktops.h" | 57 | #include "virtualdesktops.h" | ||
57 | #include "shell_client.h" | 58 | #include "shell_client.h" | ||
58 | #include "was_user_interaction_x11_filter.h" | 59 | #include "was_user_interaction_x11_filter.h" | ||
59 | #include "wayland_server.h" | 60 | #include "wayland_server.h" | ||
60 | #include "xcbutils.h" | 61 | #include "xcbutils.h" | ||
61 | #include "main.h" | 62 | #include "main.h" | ||
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s) | 173 | #endif | |||
174 | if (Compositor::self()) { | 175 | if (Compositor::self()) { | ||
175 | m_compositor = Compositor::self(); | 176 | m_compositor = Compositor::self(); | ||
176 | } else { | 177 | } else { | ||
177 | m_compositor = Compositor::create(this); | 178 | m_compositor = Compositor::create(this); | ||
178 | } | 179 | } | ||
179 | connect(this, &Workspace::currentDesktopChanged, m_compositor, &Compositor::addRepaintFull); | 180 | connect(this, &Workspace::currentDesktopChanged, m_compositor, &Compositor::addRepaintFull); | ||
180 | connect(m_compositor, &QObject::destroyed, this, [this] { m_compositor = nullptr; }); | 181 | connect(m_compositor, &QObject::destroyed, this, [this] { m_compositor = nullptr; }); | ||
181 | 182 | | |||
183 | TabletModeManager::create(this); | ||||
graesslin: I would create it in main_wayland.cpp in ApplicationWayland::performStartup just before… | |||||
184 | | ||||
182 | auto decorationBridge = Decoration::DecorationBridge::create(this); | 185 | auto decorationBridge = Decoration::DecorationBridge::create(this); | ||
183 | decorationBridge->init(); | 186 | decorationBridge->init(); | ||
184 | connect(this, &Workspace::configChanged, decorationBridge, &Decoration::DecorationBridge::reconfigure); | 187 | connect(this, &Workspace::configChanged, decorationBridge, &Decoration::DecorationBridge::reconfigure); | ||
185 | 188 | | |||
186 | new DBusInterface(this); | 189 | new DBusInterface(this); | ||
187 | 190 | | |||
188 | Outline::create(this); | 191 | Outline::create(this); | ||
189 | 192 | | |||
▲ Show 20 Lines • Show All 1570 Lines • Show Last 20 Lines |
I would create it in main_wayland.cpp in ApplicationWayland::performStartup just before creating the virtualkeyboard.
Reason: this is currently Wayland only code and we might not want to expose the dbus service on X11. Reason for just before creating virt keyboard: I want to use that to automatically enable the virtual keyboard if we are in tablet mode.