mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots: Stop using wlr_xwayland_surface event data

Browse source 
Chases: 27edd024f83892f4af9c5084d47b73f26966aaf1
xwayland: pass NULL as event data
This commit is contained in:
John Lindgren 2023-07-17 02:33:40 -04:00
parent 216056a653
commit b816c16701
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/xwayland.c
View file

@ -201,7 +201,6 @@ handle_destroy(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, destroy); struct view *view = wl_container_of(listener, view, destroy);
struct xwayland_view *xwayland_view = xwayland_view_from_view(view); struct xwayland_view *xwayland_view = xwayland_view_from_view(view);
assert(data && data == xwayland_view->xwayland_surface);
assert(xwayland_view->xwayland_surface->data == view); assert(xwayland_view->xwayland_surface->data == view);
if (view->surface) { if (view->surface) {
@ -355,7 +354,6 @@ handle_set_decorations(struct wl_listener *listener, void *data)
struct xwayland_view *xwayland_view = struct xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_decorations); wl_container_of(listener, xwayland_view, set_decorations);
struct view *view = &xwayland_view->base; struct view *view = &xwayland_view->base;
assert(data && data == xwayland_view->xwayland_surface);
view_set_decorations(view, want_deco(xwayland_view->xwayland_surface)); view_set_decorations(view, want_deco(xwayland_view->xwayland_surface));
} }
@ -366,8 +364,7 @@ handle_override_redirect(struct wl_listener *listener, void *data)
struct xwayland_view *xwayland_view = struct xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, override_redirect); wl_container_of(listener, xwayland_view, override_redirect);
struct view *view = &xwayland_view->base; struct view *view = &xwayland_view->base;
struct wlr_xwayland_surface *xsurface = data; struct wlr_xwayland_surface *xsurface = xwayland_view->xwayland_surface;
assert(xsurface && xsurface == xwayland_view->xwayland_surface);
struct server *server = view->server; struct server *server = view->server;
bool mapped = xsurface->mapped; bool mapped = xsurface->mapped;