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

[wayland] Fix checking id to Surface in xwayland client message

Browse source 
We need to also pass the client to the verification.
This commit is contained in:
Martin Gräßlin 2015-04-02 09:49:39 +02:00
parent e1e437135b
commit bb404f7d67
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
events.cpp
View file

@ -67,6 +67,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "x11eventfilter.h" #include "x11eventfilter.h"
#if HAVE_WAYLAND #if HAVE_WAYLAND
#include "wayland_server.h"
#include <KWayland/Server/surface_interface.h> #include <KWayland/Server/surface_interface.h>
#endif #endif
@ -1698,7 +1699,9 @@ void Toplevel::clientMessageEvent(xcb_client_message_event_t *e)
if (e->type == atoms->wl_surface_id) { if (e->type == atoms->wl_surface_id) {
m_surfaceId = e->data.data32[0]; m_surfaceId = e->data.data32[0];
#if HAVE_WAYLAND #if HAVE_WAYLAND
m_surface = KWayland::Server::SurfaceInterface::get(m_surfaceId); if (auto w = waylandServer()) {
m_surface = KWayland::Server::SurfaceInterface::get(m_surfaceId, w->xWaylandConnection());
}
#endif #endif
emit surfaceIdChanged(m_surfaceId); emit surfaceIdChanged(m_surfaceId);
} }

4
wayland_server.h
View file

@ -79,6 +79,10 @@ public:
**/ **/
int createQtConnection(); int createQtConnection();
KWayland::Server::ClientConnection *xWaylandConnection() const {
return m_xwaylandConnection;
}
private: private:
KWayland::Server::Display *m_display = nullptr; KWayland::Server::Display *m_display = nullptr;
KWayland::Server::CompositorInterface *m_compositor = nullptr; KWayland::Server::CompositorInterface *m_compositor = nullptr;