From 8006447efa27409bb6b55254ebb61c401d96228f Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Sat, 6 Oct 2018 17:45:57 +0100 Subject: [PATCH] output: clean up output_damage_view Since it was only used once, its logic was moved to output_damage_from_view, and the iterator changed since the variable 'whole' is now always false. Also removed unused function output_damage_whole_container_iterator. --- sway/desktop/output.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index cfb5a710f..9c06c8a85 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -392,10 +392,7 @@ void output_damage_whole(struct sway_output *output) { static void damage_surface_iterator(struct sway_output *output, struct wlr_surface *surface, struct wlr_box *_box, float rotation, - void *_data) { - bool *data = _data; - bool whole = *data; - + void *data) { struct wlr_box box = *_box; scale_box(&box, output->wlr_output->scale); @@ -426,11 +423,6 @@ static void damage_surface_iterator(struct sway_output *output, pixman_region32_fini(&damage); } - if (whole) { - wlr_box_rotated_bounds(&box, rotation, &box); - wlr_output_damage_add_box(output->damage, &box); - } - wlr_output_schedule_frame(output->wlr_output); } @@ -440,17 +432,12 @@ void output_damage_surface(struct sway_output *output, double ox, double oy, damage_surface_iterator, &whole); } -static void output_damage_view(struct sway_output *output, - struct sway_view *view, bool whole) { +void output_damage_from_view(struct sway_output *output, + struct sway_view *view) { if (!view_is_visible(view)) { return; } - output_view_for_each_surface(output, view, damage_surface_iterator, &whole); -} - -void output_damage_from_view(struct sway_output *output, - struct sway_view *view) { - output_damage_view(output, view, false); + output_view_for_each_surface(output, view, damage_surface_iterator, NULL); } // Expecting an unscaled box in layout coordinates @@ -463,15 +450,6 @@ void output_damage_box(struct sway_output *output, struct wlr_box *_box) { wlr_output_damage_add_box(output->damage, &box); } -static void output_damage_whole_container_iterator(struct sway_container *con, - void *data) { - if (!sway_assert(con->view, "expected a view")) { - return; - } - struct sway_output *output = data; - output_damage_view(output, con->view, true); -} - void output_damage_whole_container(struct sway_output *output, struct sway_container *con) { // Pad the box by 1px, because the width is a double and might be a fraction