alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Switch to wlr_xdg_surface_for_each_popup_surface

Browse source 
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
This commit is contained in:
Simon Ser 2021-01-08 10:46:12 +01:00
parent a7414885d2
commit 5438cc158a
6 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/output.h
View file

@ -116,7 +116,7 @@ void output_view_for_each_surface(struct sway_output *output,
struct sway_view *view, sway_surface_iterator_func_t iterator, struct sway_view *view, sway_surface_iterator_func_t iterator,
void *user_data); 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, struct sway_view *view, sway_surface_iterator_func_t iterator,
void *user_data); void *user_data);

6
include/sway/tree/view.h
View file

@ -47,7 +47,7 @@ struct sway_view_impl {
bool (*wants_floating)(struct sway_view *view); bool (*wants_floating)(struct sway_view *view);
void (*for_each_surface)(struct sway_view *view, void (*for_each_surface)(struct sway_view *view,
wlr_surface_iterator_func_t iterator, void *user_data); 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); wlr_surface_iterator_func_t iterator, void *user_data);
bool (*is_transient_for)(struct sway_view *child, bool (*is_transient_for)(struct sway_view *child,
struct sway_view *ancestor); 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); 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); wlr_surface_iterator_func_t iterator, void *user_data);
// view implementation // view implementation

4
sway/desktop/output.c
View file

@ -179,7 +179,7 @@ void output_view_for_each_surface(struct sway_output *output,
view_for_each_surface(view, output_for_each_surface_iterator, &data); view_for_each_surface(view, output_for_each_surface_iterator, &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, struct sway_view *view, sway_surface_iterator_func_t iterator,
void *user_data) { void *user_data) {
struct surface_iterator_data data = { struct surface_iterator_data data = {
@ -196,7 +196,7 @@ void output_view_for_each_popup(struct sway_output *output,
.rotation = 0, // TODO .rotation = 0, // TODO
}; };
view_for_each_popup(view, output_for_each_surface_iterator, &data); view_for_each_popup_surface(view, output_for_each_surface_iterator, &data);
} }
void output_layer_for_each_surface(struct sway_output *output, void output_layer_for_each_surface(struct sway_output *output,

14
sway/desktop/render.c
View file

@ -265,24 +265,14 @@ static void render_view_toplevels(struct sway_view *view,
render_surface_iterator, &data); render_surface_iterator, &data);
} }
static void render_popup_iterator(struct sway_output *output, struct sway_view *view,
struct wlr_surface *surface, struct wlr_box *box, float rotation,
void *data) {
// Render this popup's surface
render_surface_iterator(output, view, surface, box, rotation, data);
// Render this popup's child toplevels
output_surface_for_each_surface(output, surface, box->x, box->y,
render_surface_iterator, data);
}
static void render_view_popups(struct sway_view *view, static void render_view_popups(struct sway_view *view,
struct sway_output *output, pixman_region32_t *damage, float alpha) { struct sway_output *output, pixman_region32_t *damage, float alpha) {
struct render_data data = { struct render_data data = {
.damage = damage, .damage = damage,
.alpha = alpha, .alpha = alpha,
}; };
output_view_for_each_popup(output, view, render_popup_iterator, &data); output_view_for_each_popup_surface(output, view,
render_surface_iterator, &data);
} }
static void render_saved_view(struct sway_view *view, static void render_saved_view(struct sway_view *view,

7
sway/desktop/xdg_shell.c
View file

@ -211,12 +211,13 @@ static void for_each_surface(struct sway_view *view,
user_data); user_data);
} }
static void for_each_popup(struct sway_view *view, static void for_each_popup_surface(struct sway_view *view,
wlr_surface_iterator_func_t iterator, void *user_data) { wlr_surface_iterator_func_t iterator, void *user_data) {
if (xdg_shell_view_from_view(view) == NULL) { if (xdg_shell_view_from_view(view) == NULL) {
return; return;
} }
wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface, iterator, user_data); wlr_xdg_surface_for_each_popup_surface(view->wlr_xdg_surface, iterator,
user_data);
} }
static bool is_transient_for(struct sway_view *child, static bool is_transient_for(struct sway_view *child,
@ -271,7 +272,7 @@ static const struct sway_view_impl view_impl = {
.set_resizing = set_resizing, .set_resizing = set_resizing,
.wants_floating = wants_floating, .wants_floating = wants_floating,
.for_each_surface = for_each_surface, .for_each_surface = for_each_surface,
.for_each_popup = for_each_popup, .for_each_popup_surface = for_each_popup_surface,
.is_transient_for = is_transient_for, .is_transient_for = is_transient_for,
.close = _close, .close = _close,
.close_popups = close_popups, .close_popups = close_popups,

6
sway/tree/view.c
View file

@ -449,13 +449,13 @@ void view_for_each_surface(struct sway_view *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) { wlr_surface_iterator_func_t iterator, void *user_data) {
if (!view->surface) { if (!view->surface) {
return; return;
} }
if (view->impl->for_each_popup) { if (view->impl->for_each_popup_surface) {
view->impl->for_each_popup(view, iterator, user_data); view->impl->for_each_popup_surface(view, iterator, user_data);
} }
} }