Changeset View
Changeset View
Standalone View
Standalone View
wayland_server.cpp
Show All 16 Lines | |||||
17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License | ||
18 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
19 | *********************************************************************/ | 19 | *********************************************************************/ | ||
20 | #include "wayland_server.h" | 20 | #include "wayland_server.h" | ||
21 | #include "client.h" | 21 | #include "client.h" | ||
22 | #include "platform.h" | 22 | #include "platform.h" | ||
23 | #include "composite.h" | 23 | #include "composite.h" | ||
24 | #include "idle_inhibition.h" | 24 | #include "idle_inhibition.h" | ||
25 | #include "internal_client.h" | ||||
25 | #include "screens.h" | 26 | #include "screens.h" | ||
26 | #include "shell_client.h" | 27 | #include "shell_client.h" | ||
27 | #include "workspace.h" | 28 | #include "workspace.h" | ||
28 | 29 | | |||
29 | // Client | 30 | // Client | ||
30 | #include <KWayland/Client/connection_thread.h> | 31 | #include <KWayland/Client/connection_thread.h> | ||
31 | #include <KWayland/Client/event_queue.h> | 32 | #include <KWayland/Client/event_queue.h> | ||
32 | #include <KWayland/Client/registry.h> | 33 | #include <KWayland/Client/registry.h> | ||
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s) | 147 | { | |||
150 | } | 151 | } | ||
151 | if (surface->client() == m_xwayland.client) { | 152 | if (surface->client() == m_xwayland.client) { | ||
152 | // skip Xwayland clients, those are created using standard X11 way | 153 | // skip Xwayland clients, those are created using standard X11 way | ||
153 | return; | 154 | return; | ||
154 | } | 155 | } | ||
155 | if (surface->client() == m_screenLockerClientConnection) { | 156 | if (surface->client() == m_screenLockerClientConnection) { | ||
156 | ScreenLocker::KSldApp::self()->lockScreenShown(); | 157 | ScreenLocker::KSldApp::self()->lockScreenShown(); | ||
157 | } | 158 | } | ||
158 | auto client = new ShellClient(surface); | 159 | ShellClient *client; | ||
160 | if (surface->client() == waylandServer()->internalConnection()) { | ||||
161 | client = new InternalClient(surface); | ||||
162 | } else { | ||||
163 | client = new ShellClient(surface); | ||||
164 | } | ||||
165 | client = new ShellClient(surface); | ||||
159 | if (ServerSideDecorationInterface *deco = ServerSideDecorationInterface::get(surface->surface())) { | 166 | if (ServerSideDecorationInterface *deco = ServerSideDecorationInterface::get(surface->surface())) { | ||
160 | client->installServerSideDecoration(deco); | 167 | client->installServerSideDecoration(deco); | ||
161 | } | 168 | } | ||
162 | auto it = std::find_if(m_plasmaShellSurfaces.begin(), m_plasmaShellSurfaces.end(), | 169 | auto it = std::find_if(m_plasmaShellSurfaces.begin(), m_plasmaShellSurfaces.end(), | ||
163 | [client] (PlasmaShellSurfaceInterface *surface) { | 170 | [client] (PlasmaShellSurfaceInterface *surface) { | ||
164 | return client->surface() == surface->surface(); | 171 | return client->surface() == surface->surface(); | ||
165 | } | 172 | } | ||
166 | ); | 173 | ); | ||
▲ Show 20 Lines • Show All 587 Lines • Show Last 20 Lines |