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

wlr-export-dmabuf-v1: handle output destroy

Browse source 
We were storing a wlr_output without listening for the destroy
event.

Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3646
This commit is contained in:
Simon Ser 2023-05-10 16:31:48 +02:00 • committed by Alexander Orzechowski
parent 095a63a11c
commit 2a1234a820
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/wlr/types/wlr_export_dmabuf_v1.h
View file

@ -34,6 +34,7 @@ struct wlr_export_dmabuf_frame_v1 {
bool cursor_locked; bool cursor_locked;
struct wl_listener output_commit; struct wl_listener output_commit;
struct wl_listener output_destroy;
}; };
struct wlr_export_dmabuf_manager_v1 *wlr_export_dmabuf_manager_v1_create( struct wlr_export_dmabuf_manager_v1 *wlr_export_dmabuf_manager_v1_create(

9
types/wlr_export_dmabuf_v1.c
View file

@ -41,6 +41,7 @@ static void frame_destroy(struct wlr_export_dmabuf_frame_v1 *frame) {
} }
wl_list_remove(&frame->link); wl_list_remove(&frame->link);
wl_list_remove(&frame->output_commit.link); wl_list_remove(&frame->output_commit.link);
wl_list_remove(&frame->output_destroy.link);
// Make the frame resource inert // Make the frame resource inert
wl_resource_set_user_data(frame->resource, NULL); wl_resource_set_user_data(frame->resource, NULL);
free(frame); free(frame);
@ -93,6 +94,11 @@ static void frame_output_handle_commit(struct wl_listener *listener,
frame_destroy(frame); frame_destroy(frame);
} }
static void frame_output_handle_destroy(struct wl_listener *listener, void *data) {
struct wlr_export_dmabuf_frame_v1 *frame = wl_container_of(listener, frame, output_destroy);
frame_destroy(frame);
}
static const struct zwlr_export_dmabuf_manager_v1_interface manager_impl; static const struct zwlr_export_dmabuf_manager_v1_interface manager_impl;
@ -118,6 +124,7 @@ static void manager_handle_capture_output(struct wl_client *client,
} }
frame->manager = manager; frame->manager = manager;
wl_list_init(&frame->output_commit.link); wl_list_init(&frame->output_commit.link);
wl_list_init(&frame->output_destroy.link);
uint32_t version = wl_resource_get_version(manager_resource); uint32_t version = wl_resource_get_version(manager_resource);
frame->resource = wl_resource_create(client, frame->resource = wl_resource_create(client,
@ -150,6 +157,8 @@ static void manager_handle_capture_output(struct wl_client *client,
wl_list_remove(&frame->output_commit.link); wl_list_remove(&frame->output_commit.link);
wl_signal_add(&output->events.commit, &frame->output_commit); wl_signal_add(&output->events.commit, &frame->output_commit);
frame->output_commit.notify = frame_output_handle_commit; frame->output_commit.notify = frame_output_handle_commit;
wl_signal_add(&output->events.destroy, &frame->output_destroy);
frame->output_destroy.notify = frame_output_handle_destroy;
wlr_output_schedule_frame(output); wlr_output_schedule_frame(output);
} }