diff options
| author | Simon Ser <contact@emersion.fr> | 2023-05-10 16:31:48 +0200 |
|---|---|---|
| committer | Alexander Orzechowski <alex@ozal.ski> | 2023-05-10 20:45:48 +0000 |
| commit | 2a1234a820393025063a36b750dfbbf240ba9bdd (patch) | |
| tree | 23128d6fbcbbb6183cb07242b8831cea5920b4b1 | |
| parent | 095a63a11cb2f2624b7bf5977bc4ecba541037f8 (diff) | |
wlr-export-dmabuf-v1: handle output destroy
We were storing a wlr_output without listening for the destroy
event.
Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3646
| -rw-r--r-- | include/wlr/types/wlr_export_dmabuf_v1.h | 1 | ||||
| -rw-r--r-- | types/wlr_export_dmabuf_v1.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/wlr/types/wlr_export_dmabuf_v1.h b/include/wlr/types/wlr_export_dmabuf_v1.h index 39e83be7..ba2d8bd8 100644 --- a/include/wlr/types/wlr_export_dmabuf_v1.h +++ b/include/wlr/types/wlr_export_dmabuf_v1.h @@ -34,6 +34,7 @@ struct wlr_export_dmabuf_frame_v1 { bool cursor_locked; struct wl_listener output_commit; + struct wl_listener output_destroy; }; struct wlr_export_dmabuf_manager_v1 *wlr_export_dmabuf_manager_v1_create( diff --git a/types/wlr_export_dmabuf_v1.c b/types/wlr_export_dmabuf_v1.c index c1d26e60..138c52d1 100644 --- a/types/wlr_export_dmabuf_v1.c +++ b/types/wlr_export_dmabuf_v1.c @@ -41,6 +41,7 @@ static void frame_destroy(struct wlr_export_dmabuf_frame_v1 *frame) { } wl_list_remove(&frame->link); wl_list_remove(&frame->output_commit.link); + wl_list_remove(&frame->output_destroy.link); // Make the frame resource inert wl_resource_set_user_data(frame->resource, NULL); free(frame); @@ -93,6 +94,11 @@ static void frame_output_handle_commit(struct wl_listener *listener, 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; @@ -118,6 +124,7 @@ static void manager_handle_capture_output(struct wl_client *client, } frame->manager = manager; wl_list_init(&frame->output_commit.link); + wl_list_init(&frame->output_destroy.link); uint32_t version = wl_resource_get_version(manager_resource); 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_signal_add(&output->events.commit, &frame->output_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); } |