diff options
| author | Dominique Martinet <dominique.martinet@cea.fr> | 2018-02-16 18:52:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 18:52:04 +0100 |
| commit | 4941befeb0fb268e5c60fb6001dc381320407072 (patch) | |
| tree | 54630cfe4990d868a928a55a3bc5563ff3bef11d /xwayland | |
| parent | ac78bdb6bceb8e50fd490570c7d106209c9a0a0a (diff) | |
| parent | 4b354745fedba78de8cb3402873464b33a818806 (diff) | |
| download | wlroots-4941befeb0fb268e5c60fb6001dc381320407072.tar.xz | |
Merge pull request #1 from emersion/martinetd/xdg_shell
Wrap wl_resource_get_user_data into safer helper functions (for xdg-shell stable too)
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/meson.build | 1 | ||||
| -rw-r--r-- | xwayland/xwm.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build index de05cfaa..2ccdf4cb 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -15,6 +15,7 @@ lib_wlr_xwayland = static_library( xcb_image, xcb_render, xcb_icccm, + xkbcommon, pixman, ], ) diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 10bc2e30..94dfdaab 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -742,7 +742,7 @@ static void xwm_handle_surface_id_message(struct wlr_xwm *xwm, struct wl_resource *resource = wl_client_get_object(xwm->xwayland->client, id); if (resource) { - struct wlr_surface *surface = wl_resource_get_user_data(resource); + struct wlr_surface *surface = wlr_surface_from_resource(resource); xsurface->surface_id = 0; xwm_map_shell_surface(xwm, xsurface, surface); } else { |