mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 14:45:58 +01:00
Add display destroy listener to data device
This commit is contained in:
parent
e6d2e72401
commit
c7900663bc
3 changed files with 23 additions and 8 deletions
|
@ -15,6 +15,8 @@ wlr_touch_grab_interface wlr_data_device_touch_drag_interface;
|
|||
|
||||
struct wlr_data_device_manager {
|
||||
struct wl_global *global;
|
||||
|
||||
struct wl_listener display_destroy;
|
||||
};
|
||||
|
||||
struct wlr_data_offer {
|
||||
|
|
|
@ -78,6 +78,9 @@ static void wl_compositor_bind(struct wl_client *wl_client, void *data,
|
|||
}
|
||||
|
||||
void wlr_compositor_destroy(struct wlr_compositor *compositor) {
|
||||
if (compositor == NULL) {
|
||||
return;
|
||||
}
|
||||
wl_list_remove(&compositor->display_destroy.link);
|
||||
wl_global_destroy(compositor->wl_global);
|
||||
free(compositor);
|
||||
|
|
|
@ -949,6 +949,21 @@ static void data_device_manager_bind(struct wl_client *client,
|
|||
NULL, NULL);
|
||||
}
|
||||
|
||||
void wlr_data_device_manager_destroy(struct wlr_data_device_manager *manager) {
|
||||
if (!manager) {
|
||||
return;
|
||||
}
|
||||
wl_list_remove(&manager->display_destroy.link);
|
||||
wl_global_destroy(manager->global);
|
||||
free(manager);
|
||||
}
|
||||
|
||||
static void handle_display_destroy(struct wl_listener *listener, void *data) {
|
||||
struct wlr_data_device_manager *manager =
|
||||
wl_container_of(listener, manager, display_destroy);
|
||||
wlr_data_device_manager_destroy(manager);
|
||||
}
|
||||
|
||||
struct wlr_data_device_manager *wlr_data_device_manager_create(
|
||||
struct wl_display *display) {
|
||||
struct wlr_data_device_manager *manager =
|
||||
|
@ -967,13 +982,8 @@ struct wlr_data_device_manager *wlr_data_device_manager_create(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
manager->display_destroy.notify = handle_display_destroy;
|
||||
wl_display_add_destroy_listener(display, &manager->display_destroy);
|
||||
|
||||
return manager;
|
||||
}
|
||||
|
||||
void wlr_data_device_manager_destroy(struct wlr_data_device_manager *manager) {
|
||||
if (!manager) {
|
||||
return;
|
||||
}
|
||||
wl_global_destroy(manager->global);
|
||||
free(manager);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue