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

output: simplify layer surface iteration

Browse source
This commit is contained in:
Vyivel 2021-02-06 13:01:18 +03:00 committed by Simon Ser
parent 2e06403548
commit ba6c0eb18b
1 changed files with 28 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
sway/desktop/output.c
View file

@ -206,40 +206,20 @@ void output_layer_for_each_surface(struct sway_output *output,
wl_list_for_each(layer_surface, layer_surfaces, link) { wl_list_for_each(layer_surface, layer_surfaces, link) {
struct wlr_layer_surface_v1 *wlr_layer_surface_v1 = struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
layer_surface->layer_surface; layer_surface->layer_surface;
output_surface_for_each_surface(output, wlr_layer_surface_v1->surface, struct wlr_surface *surface = wlr_layer_surface_v1->surface;
layer_surface->geo.x, layer_surface->geo.y, iterator, struct surface_iterator_data data = {
user_data); .user_iterator = iterator,
.user_data = user_data,
struct wlr_xdg_popup *state; .output = output,
wl_list_for_each(state, &wlr_layer_surface_v1->popups, link) { .view = NULL,
struct wlr_xdg_surface *popup = state->base; .ox = layer_surface->geo.x,
if (!popup->configured) { .oy = layer_surface->geo.y,
continue; .width = surface->current.width,
} .height = surface->current.height,
.rotation = 0,
double popup_sx, popup_sy; };
popup_sx = layer_surface->geo.x + wlr_layer_surface_v1_for_each_surface(wlr_layer_surface_v1,
popup->popup->geometry.x - popup->geometry.x; output_for_each_surface_iterator, &data);
popup_sy = layer_surface->geo.y +
popup->popup->geometry.y - popup->geometry.y;
struct wlr_surface *surface = popup->surface;
struct surface_iterator_data data = {
.user_iterator = iterator,
.user_data = user_data,
.output = output,
.view = NULL,
.ox = popup_sx,
.oy = popup_sy,
.width = surface->current.width,
.height = surface->current.height,
.rotation = 0,
};
wlr_xdg_surface_for_each_surface(
popup, output_for_each_surface_iterator, &data);
}
} }
} }
@ -264,37 +244,20 @@ void output_layer_for_each_popup_surface(struct sway_output *output,
wl_list_for_each(layer_surface, layer_surfaces, link) { wl_list_for_each(layer_surface, layer_surfaces, link) {
struct wlr_layer_surface_v1 *wlr_layer_surface_v1 = struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
layer_surface->layer_surface; layer_surface->layer_surface;
struct wlr_surface *surface = wlr_layer_surface_v1->surface;
struct wlr_xdg_popup *state; struct surface_iterator_data data = {
wl_list_for_each(state, &wlr_layer_surface_v1->popups, link) { .user_iterator = iterator,
struct wlr_xdg_surface *popup = state->base; .user_data = user_data,
if (!popup->configured) { .output = output,
continue; .view = NULL,
} .ox = layer_surface->geo.x,
.oy = layer_surface->geo.y,
double popup_sx, popup_sy; .width = surface->current.width,
popup_sx = layer_surface->geo.x + .height = surface->current.height,
popup->popup->geometry.x - popup->geometry.x; .rotation = 0,
popup_sy = layer_surface->geo.y + };
popup->popup->geometry.y - popup->geometry.y; wlr_layer_surface_v1_for_each_popup_surface(wlr_layer_surface_v1,
output_for_each_surface_iterator, &data);
struct wlr_surface *surface = popup->surface;
struct surface_iterator_data data = {
.user_iterator = iterator,
.user_data = user_data,
.output = output,
.view = NULL,
.ox = popup_sx,
.oy = popup_sy,
.width = surface->current.width,
.height = surface->current.height,
.rotation = 0,
};
wlr_xdg_surface_for_each_surface(
popup, output_for_each_surface_iterator, &data);
}
} }
} }