diff options
author | 2021-01-08 10:46:12 +0100 | |
---|---|---|
committer | 2021-01-12 11:25:34 +0100 | |
commit | 5438cc158a1b9fa3bf76445a6dc986e30c5e78f6 (patch) | |
tree | 7feb4dce6441803e7ddd50b7747ebb6a46a2a485 /include | |
parent | Fix #5940 (diff) | |
download | sway-5438cc158a1b9fa3bf76445a6dc986e30c5e78f6.tar.gz sway-5438cc158a1b9fa3bf76445a6dc986e30c5e78f6.tar.zst sway-5438cc158a1b9fa3bf76445a6dc986e30c5e78f6.zip |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/output.h | 2 | ||||
-rw-r--r-- | include/sway/tree/view.h | 6 |
2 files changed, 4 insertions, 4 deletions
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, | |||
116 | struct sway_view *view, sway_surface_iterator_func_t iterator, | 116 | struct sway_view *view, sway_surface_iterator_func_t iterator, |
117 | void *user_data); | 117 | void *user_data); |
118 | 118 | ||
119 | void output_view_for_each_popup(struct sway_output *output, | 119 | void output_view_for_each_popup_surface(struct sway_output *output, |
120 | struct sway_view *view, sway_surface_iterator_func_t iterator, | 120 | struct sway_view *view, sway_surface_iterator_func_t iterator, |
121 | void *user_data); | 121 | void *user_data); |
122 | 122 | ||
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 { | |||
47 | bool (*wants_floating)(struct sway_view *view); | 47 | bool (*wants_floating)(struct sway_view *view); |
48 | void (*for_each_surface)(struct sway_view *view, | 48 | void (*for_each_surface)(struct sway_view *view, |
49 | wlr_surface_iterator_func_t iterator, void *user_data); | 49 | wlr_surface_iterator_func_t iterator, void *user_data); |
50 | void (*for_each_popup)(struct sway_view *view, | 50 | void (*for_each_popup_surface)(struct sway_view *view, |
51 | wlr_surface_iterator_func_t iterator, void *user_data); | 51 | wlr_surface_iterator_func_t iterator, void *user_data); |
52 | bool (*is_transient_for)(struct sway_view *child, | 52 | bool (*is_transient_for)(struct sway_view *child, |
53 | struct sway_view *ancestor); | 53 | struct sway_view *ancestor); |
@@ -297,9 +297,9 @@ void view_for_each_surface(struct sway_view *view, | |||
297 | wlr_surface_iterator_func_t iterator, void *user_data); | 297 | wlr_surface_iterator_func_t iterator, void *user_data); |
298 | 298 | ||
299 | /** | 299 | /** |
300 | * Iterate all popups recursively. | 300 | * Iterate all popup surfaces of a view. |
301 | */ | 301 | */ |
302 | void view_for_each_popup(struct sway_view *view, | 302 | void view_for_each_popup_surface(struct sway_view *view, |
303 | wlr_surface_iterator_func_t iterator, void *user_data); | 303 | wlr_surface_iterator_func_t iterator, void *user_data); |
304 | 304 | ||
305 | // view implementation | 305 | // view implementation |