diff options
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | include/wlr/types/wlr_idle_inhibit_v1.h | 4 | ||||
| -rw-r--r-- | types/wlr_idle_inhibit_v1.c | 37 | ||||
| -rw-r--r-- | types/xdg_shell/wlr_xdg_popup.c | 5 | ||||
| -rw-r--r-- | types/xdg_shell_v6/wlr_xdg_popup_v6.c | 5 |
5 files changed, 36 insertions, 19 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aca308b3..9dd7f504 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -334,9 +334,9 @@ static void subsurface_destroy(struct wlr_subsurface *subsurface) { return; } - wl_resource_set_user_data(subsurface->resource, NULL); - … + + wl_resource_set_user_data(subsurface->resource, NULL); free(subsurface); } diff --git a/include/wlr/types/wlr_idle_inhibit_v1.h b/include/wlr/types/wlr_idle_inhibit_v1.h index a777ff43..8c20d2c8 100644 --- a/include/wlr/types/wlr_idle_inhibit_v1.h +++ b/include/wlr/types/wlr_idle_inhibit_v1.h @@ -25,6 +25,8 @@ struct wlr_idle_inhibit_manager_v1 { struct { struct wl_signal new_inhibitor; } events; + + void *data; }; struct wlr_idle_inhibitor_v1 { @@ -37,6 +39,8 @@ struct wlr_idle_inhibitor_v1 { struct { struct wl_signal destroy; } events; + + void *data; }; struct wlr_idle_inhibit_manager_v1 *wlr_idle_inhibit_v1_create(struct wl_display *display); diff --git a/types/wlr_idle_inhibit_v1.c b/types/wlr_idle_inhibit_v1.c index a36992d5..cfadb4a3 100644 --- a/types/wlr_idle_inhibit_v1.c +++ b/types/wlr_idle_inhibit_v1.c @@ -26,23 +26,30 @@ wlr_idle_inhibitor_v1_from_resource(struct wl_resource *resource) { return wl_resource_get_user_data(resource); } -static void idle_inhibitor_destroy(struct wl_resource *resource) { - struct wlr_idle_inhibitor_v1 *inhibitor = - wlr_idle_inhibitor_v1_from_resource(resource); +static void idle_inhibitor_v1_destroy(struct wlr_idle_inhibitor_v1 *inhibitor) { + if (!inhibitor) { + return; + } wlr_signal_emit_safe(&inhibitor->events.destroy, inhibitor->surface); + wl_resource_set_user_data(inhibitor->resource, NULL); wl_list_remove(&inhibitor->link); wl_list_remove(&inhibitor->surface_destroy.link); free(inhibitor); } +static void idle_inhibitor_v1_handle_resource_destroy(struct wl_resource *resource) { + struct wlr_idle_inhibitor_v1 *inhibitor = + wlr_idle_inhibitor_v1_from_resource(resource); + idle_inhibitor_v1_destroy(inhibitor); +} + static void idle_inhibitor_handle_surface_destroy( struct wl_listener *listener, void *data) { struct wlr_idle_inhibitor_v1 *inhibitor = wl_container_of(listener, inhibitor, surface_destroy); - - wl_resource_destroy(inhibitor->resource); + idle_inhibitor_v1_destroy(inhibitor); } static void idle_inhibitor_v1_handle_destroy(struct wl_client *client, @@ -54,7 +61,7 @@ static const struct zwp_idle_inhibitor_v1_interface idle_inhibitor_impl = { .destroy = idle_inhibitor_v1_handle_destroy, }; -static void manager_create_inhibitor(struct wl_client *client, +static void manager_handle_create_inhibitor(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource) { struct wlr_surface *surface = wlr_surface_from_resource(surface_resource); @@ -85,25 +92,25 @@ static void manager_create_inhibitor(struct wl_client *client, wl_resource_set_implementation(wl_resource, &idle_inhibitor_impl, - inhibitor, idle_inhibitor_destroy); + inhibitor, idle_inhibitor_v1_handle_resource_destroy); wl_list_insert(&manager->inhibitors, &inhibitor->link); wlr_signal_emit_safe(&manager->events.new_inhibitor, inhibitor); } - -static void idle_inhibit_manager_v1_destroy(struct wl_resource *resource) { +static void idle_inhibit_manager_v1_handle_resource_destroy( + struct wl_resource *resource) { wl_list_remove(wl_resource_get_link(resource)); } -static void manager_destroy(struct wl_client *client, +static void manager_handle_destroy(struct wl_client *client, struct wl_resource *manager_resource) { wl_resource_destroy(manager_resource); } static const struct zwp_idle_inhibit_manager_v1_interface idle_inhibit_impl = { - .destroy = manager_destroy, - .create_inhibitor = manager_create_inhibitor, + .destroy = manager_handle_destroy, + .create_inhibitor = manager_handle_create_inhibitor, }; static void handle_display_destroy(struct wl_listener *listener, void *data) { @@ -128,7 +135,7 @@ static void idle_inhibit_bind(struct wl_client *wl_client, void *data, wl_list_insert(&idle_inhibit->wl_resources, wl_resource_get_link(wl_resource)); wl_resource_set_implementation(wl_resource, &idle_inhibit_impl, - idle_inhibit, idle_inhibit_manager_v1_destroy); + idle_inhibit, idle_inhibit_manager_v1_handle_resource_destroy); wlr_log(L_DEBUG, "idle_inhibit bound"); } @@ -142,13 +149,13 @@ void wlr_idle_inhibit_v1_destroy(struct wlr_idle_inhibit_manager_v1 *idle_inhibi struct wlr_idle_inhibitor_v1 *inhibitor; struct wlr_idle_inhibitor_v1 *tmp; wl_list_for_each_safe(inhibitor, tmp, &idle_inhibit->inhibitors, link) { - wl_resource_destroy(inhibitor->resource); + idle_inhibitor_v1_destroy(inhibitor); } struct wl_resource *resource; struct wl_resource *tmp_resource; wl_resource_for_each_safe(resource, tmp_resource, &idle_inhibit->wl_resources) { - wl_resource_destroy(inhibitor->resource); + wl_resource_destroy(resource); } wl_global_destroy(idle_inhibit->global); diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c index 284f36ad..bd969147 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -152,6 +152,9 @@ static void xdg_popup_handle_grab(struct wl_client *client, wlr_xdg_surface_from_popup_resource(resource); struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat_resource); + if (!surface) { + return; + } if (surface->popup->committed) { wl_resource_post_error(surface->popup->resource, @@ -186,7 +189,7 @@ static void xdg_popup_handle_destroy(struct wl_client *client, struct wlr_xdg_surface *surface = wlr_xdg_surface_from_popup_resource(resource); - if (!wl_list_empty(&surface->popups)) { + if (surface && !wl_list_empty(&surface->popups)) { wl_resource_post_error(surface->client->resource, XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP, "xdg_popup was destroyed while it was not the topmost popup"); diff --git a/types/xdg_shell_v6/wlr_xdg_popup_v6.c b/types/xdg_shell_v6/wlr_xdg_popup_v6.c index 334519a5..378ae963 100644 --- a/types/xdg_shell_v6/wlr_xdg_popup_v6.c +++ b/types/xdg_shell_v6/wlr_xdg_popup_v6.c @@ -174,6 +174,9 @@ static void xdg_popup_handle_grab(struct wl_client *client, xdg_surface_from_xdg_popup_resource(resource); struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat_resource); + if (!surface) { + return; + } if (surface->popup->committed) { wl_resource_post_error(surface->popup->resource, @@ -214,7 +217,7 @@ static void xdg_popup_handle_destroy(struct wl_client *client, struct wlr_xdg_surface_v6 *surface = xdg_surface_from_xdg_popup_resource(resource); - if (!wl_list_empty(&surface->popups)) { + if (surface && !wl_list_empty(&surface->popups)) { wl_resource_post_error(surface->client->resource, ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP, "xdg_popup was destroyed while it was not the topmost popup"); |