yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[wayland] Drop pointless xwayland connection check

Browse source 
Xwayland can operate in two modes - rootless and rootful. When Xwayland
operates in the rootful mode, a container window is created where all
native X11 clients are placed. The container window is an xdg-toplevel
surface. Most compositors are not interested in rootful mode.

When Xwayland operates in the rootless mode, every X11 window is going
to be represented with a Wayland surface that has no role assigned to it.
In order to associate a wayland surface with an X11 window, Xwayland
will send a client message of type WL_SURFACE_ID.

Since we want Xwayland operate only in rootless mode, the check that
verifies that a newly created xdg-toplevel surface belongs to Xwayland
is pointless. We are never going to hit that case.
This commit is contained in:
Vlad Zahorodnii 2020-07-13 14:38:12 +03:00 committed by Vlad Zahorodnii
parent 8d861b475d
commit 5463a5427d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wayland_server.cpp
View file

@ -156,9 +156,7 @@ void WaylandServer::registerXdgToplevelClient(XdgToplevelClient *client)
// TODO: Find a better way and more generic to install extensions. // TODO: Find a better way and more generic to install extensions.
SurfaceInterface *surface = client->surface(); SurfaceInterface *surface = client->surface();
if (surface->client() == m_xwayland.client) {
return;
}
if (surface->client() == m_screenLockerClientConnection) { if (surface->client() == m_screenLockerClientConnection) {
ScreenLocker::KSldApp::self()->lockScreenShown(); ScreenLocker::KSldApp::self()->lockScreenShown();
} }