diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-02-17 16:34:32 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-02-17 16:34:32 -0500 |
| commit | d2c7defa10797b6755904ee43d93bf1275d1777a (patch) | |
| tree | f4e1974892f71ad1724ed64b042f34c002d43fe2 /xwayland | |
| parent | 85871cb666a8adf8221b0b64049697a9d5ade686 (diff) | |
| parent | 088028c570dd5b52f81069654166f0117667fac0 (diff) | |
Merge branch 'master' into output-layout-adjacent
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 { |