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

wayland: Fix binding of xwayland surfaces to windows

Browse source 
Surface ids are not unique across clients. If the underlying surface of
an XdgToplevelClient is replaced with an Xwayland's surface, you may see
weird results such as a desktop window having the contents of an X11
window or even worse a crash.

BUG: 428680
This commit is contained in:
Vlad Zahorodnii 2020-11-04 15:35:37 +02:00
parent 5926261505
commit d91da41cef
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wayland_server.cpp
View file

@ -19,6 +19,7 @@
#include "workspace.h"
#include "xdgshellclient.h"
#include "service_utils.h"
#include "unmanaged.h"
// Client
#include <KWayland/Client/connection_thread.h>
@ -348,12 +349,24 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags
// setting surface is only relevat for Xwayland clients
return;
}
auto check = [surface] (const Toplevel *t) {
return t->surfaceId() == surface->id();
};
if (Toplevel *t = ws->findToplevel(check)) {
t->setSurface(surface);
X11Client *client = ws->findClient([surface](const X11Client *client) {
return client->surfaceId() == surface->id();
});
if (client) {
client->setSurface(surface);
return;
}
Unmanaged *unmanaged = ws->findUnmanaged([surface](const Unmanaged *unmanaged) {
return unmanaged->surfaceId() == surface->id();
});
if (unmanaged) {
unmanaged->setSurface(surface);
return;
}
// The surface will be bound later when a WL_SURFACE_ID message is received.
}
);