From 694b8c66837ab232f32fabd212869f4e2b4606ad Mon Sep 17 00:00:00 2001 From: Kirill Primak Date: Wed, 29 Jun 2022 21:10:08 +0300 Subject: [PATCH] scene: add missing output damage listener This is necessary to handle damage coming from the backend and software cursors. --- include/wlr/types/wlr_scene.h | 1 + types/scene/wlr_scene.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/wlr/types/wlr_scene.h b/include/wlr/types/wlr_scene.h index 74f55288..95f18f37 100644 --- a/include/wlr/types/wlr_scene.h +++ b/include/wlr/types/wlr_scene.h @@ -176,6 +176,7 @@ struct wlr_scene_output { struct wl_listener output_commit; struct wl_listener output_mode; + struct wl_listener output_damage; struct wl_listener output_needs_frame; }; diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c index 0b127e60..a6328a36 100644 --- a/types/scene/wlr_scene.c +++ b/types/scene/wlr_scene.c @@ -1001,6 +1001,15 @@ static void scene_output_handle_mode(struct wl_listener *listener, void *data) { scene_output_update_geometry(scene_output); } +static void scene_output_handle_damage(struct wl_listener *listener, void *data) { + struct wlr_scene_output *scene_output = wl_container_of(listener, + scene_output, output_damage); + struct wlr_output_event_damage *event = data; + if (wlr_damage_ring_add(&scene_output->damage_ring, event->damage)) { + wlr_output_schedule_frame(scene_output->output); + } +} + static void scene_output_handle_needs_frame(struct wl_listener *listener, void *data) { struct wlr_scene_output *scene_output = wl_container_of(listener, scene_output, output_needs_frame); @@ -1045,6 +1054,9 @@ struct wlr_scene_output *wlr_scene_output_create(struct wlr_scene *scene, scene_output->output_mode.notify = scene_output_handle_mode; wl_signal_add(&output->events.mode, &scene_output->output_mode); + scene_output->output_damage.notify = scene_output_handle_damage; + wl_signal_add(&output->events.damage, &scene_output->output_damage); + scene_output->output_needs_frame.notify = scene_output_handle_needs_frame; wl_signal_add(&output->events.needs_frame, &scene_output->output_needs_frame); @@ -1067,6 +1079,7 @@ void wlr_scene_output_destroy(struct wlr_scene_output *scene_output) { wl_list_remove(&scene_output->link); wl_list_remove(&scene_output->output_commit.link); wl_list_remove(&scene_output->output_mode.link); + wl_list_remove(&scene_output->output_damage.link); wl_list_remove(&scene_output->output_needs_frame.link); free(scene_output);