aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-01-08 10:53:36 +0100
committerSimon Ser <contact@emersion.fr>2021-01-12 11:25:34 +0100
commit1c3cfd3bac4d408b3f27cde0d4dca2ce2f77834f (patch)
treee1721c911942a01b1e6e675101270aa021500a28
parent5438cc158a1b9fa3bf76445a6dc986e30c5e78f6 (diff)
Rename output_layer_for_each_surface_{toplevel,popup}
Swap the "surface" part for consistency with wlroots' naming.
-rw-r--r--include/sway/output.h4
-rw-r--r--sway/desktop/output.c4
-rw-r--r--sway/desktop/render.c4
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);
}