mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wl_shell: listen for wlr_surface destroy signal

Browse source
This commit is contained in:
emersion 2017-09-28 01:31:31 +02:00
parent eaa414bbd8
commit a04462ba8b
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wlr/types/wlr_wl_shell.h
View file

@ -53,6 +53,8 @@ struct wlr_wl_shell_surface {
char *title;
char *class;
struct wl_listener surface_destroy_listener;
struct {
struct wl_signal destroy;
struct wl_signal ping_timeout;

26
types/wlr_wl_shell.c
View file

@ -4,6 +4,7 @@
#include <assert.h>
#include <wayland-server.h>
#include <wlr/util/log.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h>
#include <stdlib.h>
#include <wayland-server-protocol.h>
@ -273,10 +274,11 @@ struct wl_shell_surface_interface shell_surface_interface = {
.set_class = shell_surface_set_class,
};
static void destroy_shell_surface(struct wl_resource *resource) {
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
static void wl_shell_surface_destroy(struct wlr_wl_shell_surface *surface) {
wl_signal_emit(&surface->events.destroy, surface);
wl_resource_set_user_data(surface->resource, NULL);
wl_list_remove(&surface->link);
wl_list_remove(&surface->surface_destroy_listener.link);
free(surface->transient_state);
free(surface->popup_state);
free(surface->title);
@ -284,6 +286,20 @@ static void destroy_shell_surface(struct wl_resource *resource) {
free(surface);
}
static void wl_shell_surface_resource_destroy(struct wl_resource *resource) {
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
if (surface != NULL) {
wl_shell_surface_destroy(surface);
}
}
static void handle_wlr_surface_destroyed(struct wl_listener *listener,
void *data) {
struct wlr_wl_shell_surface *surface =
wl_container_of(listener, surface, surface_destroy_listener);
wl_shell_surface_destroy(surface);
}
static int wlr_wl_shell_surface_ping_timeout(void *user_data) {
struct wlr_wl_shell_surface *surface = user_data;
wl_signal_emit(&surface->events.ping_timeout, surface);
@ -312,7 +328,7 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
wl_resource_get_version(resource), id);
wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface, wl_surface->resource);
wl_resource_set_implementation(wl_surface->resource,
&shell_surface_interface, wl_surface, destroy_shell_surface);
&shell_surface_interface, wl_surface, wl_shell_surface_resource_destroy);
wl_signal_init(&wl_surface->events.destroy);
wl_signal_init(&wl_surface->events.ping_timeout);
@ -324,6 +340,10 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
wl_signal_init(&wl_surface->events.set_title);
wl_signal_init(&wl_surface->events.set_class);
wl_signal_add(&wl_surface->surface->signals.destroy,
&wl_surface->surface_destroy_listener);
wl_surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed;
struct wl_display *display = wl_client_get_display(client);
struct wl_event_loop *loop = wl_display_get_event_loop(display);
wl_surface->ping_timer = wl_event_loop_add_timer(loop,