From 5438cc158a1b9fa3bf76445a6dc986e30c5e78f6 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 8 Jan 2021 10:46:12 +0100 Subject: Switch to wlr_xdg_surface_for_each_popup_surface Instead of calling wlr_xdg_surface_for_each_popup and then wlr_surface_for_each_surface, use the new for_each_popup_surface helper introduced in [1] that does it in one go. [1]: https://github.com/swaywm/wlroots/pull/2609 --- include/sway/output.h | 2 +- include/sway/tree/view.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/sway/output.h b/include/sway/output.h index 16451d81..300fcd48 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -116,7 +116,7 @@ void output_view_for_each_surface(struct sway_output *output, struct sway_view *view, sway_surface_iterator_func_t iterator, void *user_data); -void output_view_for_each_popup(struct sway_output *output, +void output_view_for_each_popup_surface(struct sway_output *output, struct sway_view *view, sway_surface_iterator_func_t iterator, void *user_data); diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index dac348ee..e071e6c9 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -47,7 +47,7 @@ struct sway_view_impl { bool (*wants_floating)(struct sway_view *view); void (*for_each_surface)(struct sway_view *view, wlr_surface_iterator_func_t iterator, void *user_data); - void (*for_each_popup)(struct sway_view *view, + void (*for_each_popup_surface)(struct sway_view *view, wlr_surface_iterator_func_t iterator, void *user_data); bool (*is_transient_for)(struct sway_view *child, struct sway_view *ancestor); @@ -297,9 +297,9 @@ void view_for_each_surface(struct sway_view *view, wlr_surface_iterator_func_t iterator, void *user_data); /** - * Iterate all popups recursively. + * Iterate all popup surfaces of a view. */ -void view_for_each_popup(struct sway_view *view, +void view_for_each_popup_surface(struct sway_view *view, wlr_surface_iterator_func_t iterator, void *user_data); // view implementation -- cgit v1.2.3-54-g00ecf