blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add display destroy listener in server decoration

This commit is contained in:
emersion 2017-12-07 00:36:05 +01:00
parent dfe11a2b0e
commit 32591d66d6
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_server_decoration.h
View File

@ -33,6 +33,8 @@ struct wlr_server_decoration_manager {
uint32_t default_mode; // enum wlr_server_decoration_manager_mode uint32_t default_mode; // enum wlr_server_decoration_manager_mode
struct wl_listener display_destroy;
struct { struct {
struct wl_signal new_decoration; struct wl_signal new_decoration;
} events; } events;

5
types/wlr_screenshooter.c
View File

@ -28,6 +28,7 @@ struct screenshot_state {
static void screenshot_destroy(struct wlr_screenshot *screenshot) { static void screenshot_destroy(struct wlr_screenshot *screenshot) {
wl_list_remove(&screenshot->link); wl_list_remove(&screenshot->link);
wl_resource_set_user_data(screenshot->resource, NULL);
free(screenshot); free(screenshot);
} }
@ -35,7 +36,9 @@ static void handle_screenshot_resource_destroy(
struct wl_resource *screenshot_resource) { struct wl_resource *screenshot_resource) {
struct wlr_screenshot *screenshot = struct wlr_screenshot *screenshot =
wl_resource_get_user_data(screenshot_resource); wl_resource_get_user_data(screenshot_resource);
screenshot_destroy(screenshot); if (screenshot != NULL) {
screenshot_destroy(screenshot);
}
} }
static void output_frame_notify(struct wl_listener *listener, void *_data) { static void output_frame_notify(struct wl_listener *listener, void *_data) {

46
types/wlr_server_decoration.c
View File

@ -140,6 +140,30 @@ static void server_decoration_manager_bind(struct wl_client *client, void *data,
manager->default_mode); manager->default_mode);
} }
void wlr_server_decoration_manager_destroy(
struct wlr_server_decoration_manager *manager) {
if (manager == NULL) {
return;
}
struct wlr_server_decoration *decoration, *tmp_decoration;
wl_list_for_each_safe(decoration, tmp_decoration, &manager->decorations,
link) {
server_decoration_destroy(decoration);
}
struct wl_resource *resource, *tmp_resource;
wl_resource_for_each_safe(resource, tmp_resource, &manager->wl_resources) {
server_decoration_manager_destroy_resource(resource);
}
wl_global_destroy(manager->wl_global);
free(manager);
}
static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_server_decoration_manager *manager =
wl_container_of(listener, manager, display_destroy);
wlr_server_decoration_manager_destroy(manager);
}
struct wlr_server_decoration_manager *wlr_server_decoration_manager_create( struct wlr_server_decoration_manager *wlr_server_decoration_manager_create(
struct wl_display *display) { struct wl_display *display) {
struct wlr_server_decoration_manager *manager = struct wlr_server_decoration_manager *manager =
@ -158,23 +182,9 @@ struct wlr_server_decoration_manager *wlr_server_decoration_manager_create(
wl_list_init(&manager->wl_resources); wl_list_init(&manager->wl_resources);
wl_list_init(&manager->decorations); wl_list_init(&manager->decorations);
wl_signal_init(&manager->events.new_decoration); wl_signal_init(&manager->events.new_decoration);
manager->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &manager->display_destroy);
return manager; return manager;
} }
void wlr_server_decoration_manager_destroy(
struct wlr_server_decoration_manager *manager) {
if (manager == NULL) {
return;
}
struct wlr_server_decoration *decoration, *tmp_decoration;
wl_list_for_each_safe(decoration, tmp_decoration, &manager->decorations,
link) {
server_decoration_destroy(decoration);
}
struct wl_resource *resource, *tmp_resource;
wl_resource_for_each_safe(resource, tmp_resource, &manager->wl_resources) {
server_decoration_manager_destroy_resource(resource);
}
wl_global_destroy(manager->wl_global);
free(manager);
}