From 1c3cfd3bac4d408b3f27cde0d4dca2ce2f77834f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 8 Jan 2021 10:53:36 +0100 Subject: [PATCH] Rename output_layer_for_each_surface_{toplevel,popup} Swap the "surface" part for consistency with wlroots' naming. --- include/sway/output.h | 4 ++-- sway/desktop/output.c | 4 ++-- sway/desktop/render.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sway/output.h b/include/sway/output.h index 300fcd48..96986700 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -124,11 +124,11 @@ void output_layer_for_each_surface(struct sway_output *output, struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, void *user_data); -void output_layer_for_each_surface_toplevel(struct sway_output *output, +void output_layer_for_each_toplevel_surface(struct sway_output *output, struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, void *user_data); -void output_layer_for_each_surface_popup(struct sway_output *output, +void output_layer_for_each_popup_surface(struct sway_output *output, struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, void *user_data); diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 7921d597..5edc8f96 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -243,7 +243,7 @@ void output_layer_for_each_surface(struct sway_output *output, } } -void output_layer_for_each_surface_toplevel(struct sway_output *output, +void output_layer_for_each_toplevel_surface(struct sway_output *output, struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, void *user_data) { struct sway_layer_surface *layer_surface; @@ -257,7 +257,7 @@ void output_layer_for_each_surface_toplevel(struct sway_output *output, } -void output_layer_for_each_surface_popup(struct sway_output *output, +void output_layer_for_each_popup_surface(struct sway_output *output, struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, void *user_data) { struct sway_layer_surface *layer_surface; diff --git a/sway/desktop/render.c b/sway/desktop/render.c index acf503a4..bd85282c 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -171,7 +171,7 @@ static void render_layer_toplevel(struct sway_output *output, .damage = damage, .alpha = 1.0f, }; - output_layer_for_each_surface_toplevel(output, layer_surfaces, + output_layer_for_each_toplevel_surface(output, layer_surfaces, render_surface_iterator, &data); } @@ -181,7 +181,7 @@ static void render_layer_popups(struct sway_output *output, .damage = damage, .alpha = 1.0f, }; - output_layer_for_each_surface_popup(output, layer_surfaces, + output_layer_for_each_popup_surface(output, layer_surfaces, render_surface_iterator, &data); }