itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland/shell: don't listen to wlr_surface.events.destroy

Browse Source 
The wlr_xwayland_surface_v1 will be destroyed automatically
from xwl_surface_role_destroy().
master
Kirill Primak 1 year ago committed by Simon Ser
parent 307720d501
commit 529f1b82ee
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
include/wlr/xwayland/shell.h
Unescape View File

@ -46,8 +46,6 @@ struct wlr_xwayland_surface_v1 {
struct wl_list link; struct wl_list link;
struct wlr_xwayland_shell_v1 *shell; struct wlr_xwayland_shell_v1 *shell;
bool added; bool added;
struct wl_listener surface_destroy;
}; };
/** /**

13
xwayland/shell.c
Unescape View File

@ -16,7 +16,6 @@ static const struct xwayland_shell_v1_interface shell_impl;
static const struct xwayland_surface_v1_interface xwl_surface_impl; static const struct xwayland_surface_v1_interface xwl_surface_impl;
static void xwl_surface_destroy(struct wlr_xwayland_surface_v1 *xwl_surface) { static void xwl_surface_destroy(struct wlr_xwayland_surface_v1 *xwl_surface) {
wl_list_remove(&xwl_surface->surface_destroy.link);
wl_list_remove(&xwl_surface->link); wl_list_remove(&xwl_surface->link);
wl_resource_set_user_data(xwl_surface->resource, NULL); // make inert wl_resource_set_user_data(xwl_surface->resource, NULL); // make inert
free(xwl_surface); free(xwl_surface);
@ -95,13 +94,6 @@ static const struct xwayland_surface_v1_interface xwl_surface_impl = {
.set_serial = xwl_surface_handle_set_serial, .set_serial = xwl_surface_handle_set_serial,
}; };
static void xwl_surface_handle_surface_destroy(struct wl_listener *listener,
void *data) {
struct wlr_xwayland_surface_v1 *xwl_surface =
wl_container_of(listener, xwl_surface, surface_destroy);
xwl_surface_destroy(xwl_surface);
}
static void shell_handle_get_xwayland_surface(struct wl_client *client, static void shell_handle_get_xwayland_surface(struct wl_client *client,
struct wl_resource *shell_resource, uint32_t id, struct wl_resource *shell_resource, uint32_t id,
struct wl_resource *surface_resource) { struct wl_resource *surface_resource) {
@ -134,12 +126,9 @@ static void shell_handle_get_xwayland_surface(struct wl_client *client,
wl_resource_set_implementation(xwl_surface->resource, &xwl_surface_impl, wl_resource_set_implementation(xwl_surface->resource, &xwl_surface_impl,
xwl_surface, NULL); xwl_surface, NULL);
wlr_surface_set_role_object(surface, xwl_surface->resource);
wl_list_insert(&shell->surfaces, &xwl_surface->link); wl_list_insert(&shell->surfaces, &xwl_surface->link);
xwl_surface->surface_destroy.notify = xwl_surface_handle_surface_destroy; wlr_surface_set_role_object(surface, xwl_surface->resource);
wl_signal_add(&surface->events.destroy, &xwl_surface->surface_destroy);
} }
static const struct xwayland_shell_v1_interface shell_impl = { static const struct xwayland_shell_v1_interface shell_impl = {

Write Preview
Loading…
Cancel
Save