hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-30 00:15:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #825 from emersion/surface-iterators

Browse source 
Add surface iterators
This commit is contained in:
Drew DeVault 2018-04-05 23:06:29 -04:00 committed by GitHub
commit ae4cef9e41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 303 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/wlr/types/wlr_surface.h
View file

@ -93,9 +93,13 @@ struct wlr_surface {
// wlr_subsurface::parent_pending_link // wlr_subsurface::parent_pending_link
struct wl_list subsurface_pending_list; struct wl_list subsurface_pending_list;
void *data; void *data;
}; };
typedef void (*wlr_surface_iterator_func_t)(struct wlr_surface *surface,
int sx, int sy, void *data);
struct wlr_renderer; struct wlr_renderer;
struct wlr_surface *wlr_surface_create(struct wl_resource *res, struct wlr_surface *wlr_surface_create(struct wl_resource *res,
struct wlr_renderer *renderer); struct wlr_renderer *renderer);
@ -160,4 +164,12 @@ void wlr_surface_set_role_committed(struct wlr_surface *surface,
struct wlr_surface *wlr_surface_from_resource(struct wl_resource *resource); struct wlr_surface *wlr_surface_from_resource(struct wl_resource *resource);
/**
* Call `iterator` on each surface in the surface tree, with the surface's
* positon relative to the root surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_surface_for_each_surface(struct wlr_surface *surface,
wlr_surface_iterator_func_t iterator, void *user_data);
#endif #endif

8
include/wlr/types/wlr_wl_shell.h
View file

@ -155,4 +155,12 @@ bool wlr_surface_is_wl_shell_surface(struct wlr_surface *surface);
struct wlr_wl_surface *wlr_wl_shell_surface_from_wlr_surface( struct wlr_wl_surface *wlr_wl_shell_surface_from_wlr_surface(
struct wlr_surface *surface); struct wlr_surface *surface);
/**
* Call `iterator` on each surface in the shell surface tree, with the surface's
* positon relative to the root xdg-surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_wl_shell_surface_for_each_surface(struct wlr_wl_shell_surface *surface,
wlr_surface_iterator_func_t iterator, void *user_data);
#endif #endif

8
include/wlr/types/wlr_xdg_shell.h
View file

@ -234,4 +234,12 @@ bool wlr_surface_is_xdg_surface(struct wlr_surface *surface);
struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface( struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface(
struct wlr_surface *surface); struct wlr_surface *surface);
/**
* Call `iterator` on each surface in the xdg-surface tree, with the surface's
* positon relative to the root xdg-surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_xdg_surface_for_each_surface(struct wlr_xdg_surface *surface,
wlr_surface_iterator_func_t iterator, void *user_data);
#endif #endif

8
include/wlr/types/wlr_xdg_shell_v6.h
View file

@ -294,4 +294,12 @@ bool wlr_surface_is_xdg_surface_v6(struct wlr_surface *surface);
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_from_wlr_surface( struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_from_wlr_surface(
struct wlr_surface *surface); struct wlr_surface *surface);
/**
* Call `iterator` on each surface in the xdg-surface tree, with the surface's
* positon relative to the root xdg-surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_xdg_surface_v6_for_each_surface(struct wlr_xdg_surface_v6 *surface,
wlr_surface_iterator_func_t iterator, void *user_data);
#endif #endif

275
rootston/output.c
View file

@ -17,9 +17,6 @@
#include "rootston/output.h" #include "rootston/output.h"
#include "rootston/server.h" #include "rootston/server.h"
typedef void (*surface_iterator_func_t)(struct wlr_surface *surface,
double lx, double ly, float rotation, void *data);
/** /**
* Rotate a child's position relative to a parent. The parent size is (pw, ph), * Rotate a child's position relative to a parent. The parent size is (pw, ph),
* the child position is (*sx, *sy) and its size is (sw, sh). * the child position is (*sx, *sy) and its size is (sw, sh).
@ -38,132 +35,58 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh,
} }
} }
static void surface_for_each_surface(struct wlr_surface *surface, double lx, struct layout_data {
double ly, float rotation, surface_iterator_func_t iterator, double x, y;
void *user_data) { int width, height;
iterator(surface, lx, ly, rotation, user_data); float rotation;
};
struct wlr_subsurface *subsurface; static void get_layout_position(struct layout_data *data, double *lx, double *ly,
wl_list_for_each(subsurface, &surface->subsurface_list, parent_link) { const struct wlr_surface *surface, int sx, int sy) {
struct wlr_surface_state *state = subsurface->surface->current; double _sx = sx, _sy = sy;
double sx = state->subsurface_position.x; rotate_child_position(&_sx, &_sy, surface->current->width,
double sy = state->subsurface_position.y; surface->current->height, data->width, data->height, data->rotation);
rotate_child_position(&sx, &sy, state->width, state->height, *lx = data->x + _sx;
surface->current->width, surface->current->height, rotation); *ly = data->y + _sy;
surface_for_each_surface(subsurface->surface, lx + sx, ly + sy,
rotation, iterator, user_data);
}
} }
static void xdg_surface_v6_for_each_surface(struct wlr_xdg_surface_v6 *surface, static void surface_for_each_surface(struct wlr_surface *surface,
double base_x, double base_y, float rotation, double lx, double ly, float rotation, struct layout_data *layout_data,
surface_iterator_func_t iterator, void *user_data) { wlr_surface_iterator_func_t iterator, void *user_data) {
double width = surface->surface->current->width; layout_data->x = lx;
double height = surface->surface->current->height; layout_data->y = ly;
layout_data->width = surface->current->width;
layout_data->height = surface->current->height;
layout_data->rotation = rotation;
struct wlr_xdg_popup_v6 *popup_state; wlr_surface_for_each_surface(surface, iterator, user_data);
wl_list_for_each(popup_state, &surface->popups, link) {
struct wlr_xdg_surface_v6 *popup = popup_state->base;
if (!popup->configured) {
continue;
}
double popup_width = popup->surface->current->width;
double popup_height = popup->surface->current->height;
double popup_sx, popup_sy;
wlr_xdg_surface_v6_popup_get_position(popup, &popup_sx, &popup_sy);
rotate_child_position(&popup_sx, &popup_sy, popup_width, popup_height,
width, height, rotation);
surface_for_each_surface(popup->surface, base_x + popup_sx,
base_y + popup_sy, rotation, iterator, user_data);
xdg_surface_v6_for_each_surface(popup, base_x + popup_sx,
base_y + popup_sy, rotation, iterator, user_data);
}
}
static void xdg_surface_for_each_surface(struct wlr_xdg_surface *surface,
double base_x, double base_y, float rotation,
surface_iterator_func_t iterator, void *user_data) {
double width = surface->surface->current->width;
double height = surface->surface->current->height;
struct wlr_xdg_popup *popup_state;
wl_list_for_each(popup_state, &surface->popups, link) {
struct wlr_xdg_surface *popup = popup_state->base;
if (!popup->configured) {
continue;
}
double popup_width = popup->surface->current->width;
double popup_height = popup->surface->current->height;
double popup_sx, popup_sy;
wlr_xdg_surface_popup_get_position(popup, &popup_sx, &popup_sy);
rotate_child_position(&popup_sx, &popup_sy, popup_width, popup_height,
width, height, rotation);
surface_for_each_surface(popup->surface, base_x + popup_sx,
base_y + popup_sy, rotation, iterator, user_data);
xdg_surface_for_each_surface(popup, base_x + popup_sx,
base_y + popup_sy, rotation, iterator, user_data);
}
}
static void wl_shell_surface_for_each_surface(
struct wlr_wl_shell_surface *surface, double lx, double ly,
float rotation, bool is_child, surface_iterator_func_t iterator,
void *user_data) {
if (is_child || surface->state != WLR_WL_SHELL_SURFACE_STATE_POPUP) {
surface_for_each_surface(surface->surface, lx, ly, rotation, iterator,
user_data);
double width = surface->surface->current->width;
double height = surface->surface->current->height;
struct wlr_wl_shell_surface *popup;
wl_list_for_each(popup, &surface->popups, popup_link) {
double popup_width = popup->surface->current->width;
double popup_height = popup->surface->current->height;
double popup_x = popup->transient_state->x;
double popup_y = popup->transient_state->y;
rotate_child_position(&popup_x, &popup_y, popup_width, popup_height,
width, height, rotation);
wl_shell_surface_for_each_surface(popup, lx + popup_x, ly + popup_y,
rotation, true, iterator, user_data);
}
}
} }
static void view_for_each_surface(struct roots_view *view, static void view_for_each_surface(struct roots_view *view,
surface_iterator_func_t iterator, void *user_data) { struct layout_data *layout_data, wlr_surface_iterator_func_t iterator,
void *user_data) {
layout_data->x = view->x;
layout_data->y = view->y;
layout_data->width = view->wlr_surface->current->width;
layout_data->height = view->wlr_surface->current->height;
layout_data->rotation = view->rotation;
switch (view->type) { switch (view->type) {
case ROOTS_XDG_SHELL_V6_VIEW: case ROOTS_XDG_SHELL_V6_VIEW:
surface_for_each_surface(view->wlr_surface, view->x, view->y, wlr_xdg_surface_v6_for_each_surface(view->xdg_surface_v6, iterator,
view->rotation, iterator, user_data); user_data);
xdg_surface_v6_for_each_surface(view->xdg_surface_v6, view->x, view->y,
view->rotation, iterator, user_data);
break; break;
case ROOTS_XDG_SHELL_VIEW: case ROOTS_XDG_SHELL_VIEW:
surface_for_each_surface(view->wlr_surface, view->x, view->y, wlr_xdg_surface_for_each_surface(view->xdg_surface, iterator,
view->rotation, iterator, user_data); user_data);
xdg_surface_for_each_surface(view->xdg_surface, view->x, view->y,
view->rotation, iterator, user_data);
break; break;
case ROOTS_WL_SHELL_VIEW: case ROOTS_WL_SHELL_VIEW:
wl_shell_surface_for_each_surface(view->wl_shell_surface, view->x, wlr_wl_shell_surface_for_each_surface(view->wl_shell_surface, iterator,
view->y, view->rotation, false, iterator, user_data); user_data);
break; break;
#ifdef WLR_HAS_XWAYLAND #ifdef WLR_HAS_XWAYLAND
case ROOTS_XWAYLAND_VIEW: case ROOTS_XWAYLAND_VIEW:
if (view->wlr_surface != NULL) { wlr_surface_for_each_surface(view->wlr_surface, iterator, user_data);
surface_for_each_surface(view->wlr_surface, view->x, view->y,
view->rotation, iterator, user_data);
}
break; break;
#endif #endif
} }
@ -172,20 +95,23 @@ static void view_for_each_surface(struct roots_view *view,
#ifdef WLR_HAS_XWAYLAND #ifdef WLR_HAS_XWAYLAND
static void xwayland_children_for_each_surface( static void xwayland_children_for_each_surface(
struct wlr_xwayland_surface *surface, struct wlr_xwayland_surface *surface,
surface_iterator_func_t iterator, void *user_data) { wlr_surface_iterator_func_t iterator, struct layout_data *layout_data,
void *user_data) {
struct wlr_xwayland_surface *child; struct wlr_xwayland_surface *child;
wl_list_for_each(child, &surface->children, parent_link) { wl_list_for_each(child, &surface->children, parent_link) {
if (child->surface != NULL && child->added) { if (child->mapped) {
surface_for_each_surface(child->surface, child->x, child->y, 0, surface_for_each_surface(child->surface, child->x, child->y, 0,
iterator, user_data); layout_data, iterator, user_data);
} }
xwayland_children_for_each_surface(child, iterator, user_data); xwayland_children_for_each_surface(child, iterator, layout_data,
user_data);
} }
} }
#endif #endif
static void drag_icons_for_each_surface(struct roots_input *input, static void drag_icons_for_each_surface(struct roots_input *input,
surface_iterator_func_t iterator, void *user_data) { wlr_surface_iterator_func_t iterator, struct layout_data *layout_data,
void *user_data) {
struct roots_seat *seat; struct roots_seat *seat;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
struct roots_drag_icon *drag_icon; struct roots_drag_icon *drag_icon;
@ -194,13 +120,15 @@ static void drag_icons_for_each_surface(struct roots_input *input,
continue; continue;
} }
surface_for_each_surface(drag_icon->wlr_drag_icon->surface, surface_for_each_surface(drag_icon->wlr_drag_icon->surface,
drag_icon->x, drag_icon->y, 0, iterator, user_data); drag_icon->x, drag_icon->y, 0, layout_data,
iterator, user_data);
} }
} }
} }
struct render_data { struct render_data {
struct layout_data layout;
struct roots_output *output; struct roots_output *output;
struct timespec *when; struct timespec *when;
pixman_region32_t *damage; pixman_region32_t *damage;
@ -257,18 +185,23 @@ static void scissor_output(struct roots_output *output, pixman_box32_t *rect) {
wlr_renderer_scissor(renderer, &box); wlr_renderer_scissor(renderer, &box);
} }
static void render_surface(struct wlr_surface *surface, double lx, double ly, static void render_surface(struct wlr_surface *surface, int sx, int sy,
float rotation, void *_data) { void *_data) {
struct render_data *data = _data; struct render_data *data = _data;
struct roots_output *output = data->output; struct roots_output *output = data->output;
struct wlr_renderer *renderer = float rotation = data->layout.rotation;
wlr_backend_get_renderer(output->wlr_output->backend);
assert(renderer);
if (!wlr_surface_has_buffer(surface)) { if (!wlr_surface_has_buffer(surface)) {
return; return;
} }
struct wlr_renderer *renderer =
wlr_backend_get_renderer(output->wlr_output->backend);
assert(renderer);
double lx, ly;
get_layout_position(&data->layout, &lx, &ly, surface, sx, sy);
struct wlr_box box; struct wlr_box box;
bool intersects = surface_intersect_output(surface, output->desktop->layout, bool intersects = surface_intersect_output(surface, output->desktop->layout,
output->wlr_output, lx, ly, rotation, &box); output->wlr_output, lx, ly, rotation, &box);
@ -299,7 +232,8 @@ static void render_surface(struct wlr_surface *surface, double lx, double ly,
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) { for (int i = 0; i < nrects; ++i) {
scissor_output(output, &rects[i]); scissor_output(output, &rects[i]);
wlr_render_texture_with_matrix(renderer, surface->texture, matrix, data->alpha); wlr_render_texture_with_matrix(renderer, surface->texture, matrix,
data->alpha);
} }
damage_finish: damage_finish:
@ -381,7 +315,7 @@ static void render_view(struct roots_view *view, struct render_data *data) {
data->alpha = view->alpha; data->alpha = view->alpha;
render_decorations(view, data); render_decorations(view, data);
view_for_each_surface(view, render_surface, data); view_for_each_surface(view, &data->layout, render_surface, data);
} }
static bool has_standalone_surface(struct roots_view *view) { static bool has_standalone_surface(struct roots_view *view) {
@ -404,11 +338,15 @@ static bool has_standalone_surface(struct roots_view *view) {
return true; return true;
} }
static void surface_send_frame_done(struct wlr_surface *surface, double lx, static void surface_send_frame_done(struct wlr_surface *surface, int sx, int sy,
double ly, float rotation, void *_data) { void *_data) {
struct render_data *data = _data; struct render_data *data = _data;
struct roots_output *output = data->output; struct roots_output *output = data->output;
struct timespec *when = data->when; struct timespec *when = data->when;
float rotation = data->layout.rotation;
double lx, ly;
get_layout_position(&data->layout, &lx, &ly, surface, sx, sy);
if (!surface_intersect_output(surface, output->desktop->layout, if (!surface_intersect_output(surface, output->desktop->layout,
output->wlr_output, lx, ly, rotation, NULL)) { output->wlr_output, lx, ly, rotation, NULL)) {
@ -418,18 +356,17 @@ static void surface_send_frame_done(struct wlr_surface *surface, double lx,
wlr_surface_send_frame_done(surface, when); wlr_surface_send_frame_done(surface, when);
} }
static void render_layer( static void render_layer(struct roots_output *output,
struct roots_output *output, const struct wlr_box *output_layout_box, struct render_data *data,
const struct wlr_box *output_layout_box,
struct render_data *data,
struct wl_list *layer) { struct wl_list *layer) {
struct roots_layer_surface *roots_surface; struct roots_layer_surface *roots_surface;
wl_list_for_each(roots_surface, layer, link) { wl_list_for_each(roots_surface, layer, link) {
struct wlr_layer_surface *layer = roots_surface->layer_surface; struct wlr_layer_surface *layer = roots_surface->layer_surface;
render_surface(layer->surface,
roots_surface->geo.x + output_layout_box->x, surface_for_each_surface(layer->surface,
roots_surface->geo.y + output_layout_box->y, roots_surface->geo.x + output_layout_box->x,
0, data); roots_surface->geo.y + output_layout_box->y,
0, &data->layout, render_surface, data);
} }
} }
@ -542,7 +479,7 @@ static void render_output(struct roots_output *output) {
} }
if (view->wlr_surface != NULL) { if (view->wlr_surface != NULL) {
view_for_each_surface(view, render_surface, &data); view_for_each_surface(view, &data.layout, render_surface, &data);
} }
// During normal rendering the xwayland window tree isn't traversed // During normal rendering the xwayland window tree isn't traversed
@ -551,7 +488,7 @@ static void render_output(struct roots_output *output) {
#ifdef WLR_HAS_XWAYLAND #ifdef WLR_HAS_XWAYLAND
if (view->type == ROOTS_XWAYLAND_VIEW) { if (view->type == ROOTS_XWAYLAND_VIEW) {
xwayland_children_for_each_surface(view->xwayland_surface, xwayland_children_for_each_surface(view->xwayland_surface,
render_surface, &data); render_surface, &data.layout, &data);
} }
#endif #endif
} else { } else {
@ -567,7 +504,8 @@ static void render_output(struct roots_output *output) {
// Render drag icons // Render drag icons
data.alpha = 1.0; data.alpha = 1.0;
drag_icons_for_each_surface(server->input, render_surface, &data); drag_icons_for_each_surface(server->input, render_surface, &data.layout,
&data);
render_layer(output, output_box, &data, render_layer(output, output_box, &data,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
@ -591,22 +529,24 @@ damage_finish:
return; return;
} }
view_for_each_surface(view, surface_send_frame_done, &data); view_for_each_surface(view, &data.layout, surface_send_frame_done,
&data);
#ifdef WLR_HAS_XWAYLAND #ifdef WLR_HAS_XWAYLAND
if (view->type == ROOTS_XWAYLAND_VIEW) { if (view->type == ROOTS_XWAYLAND_VIEW) {
xwayland_children_for_each_surface(view->xwayland_surface, xwayland_children_for_each_surface(view->xwayland_surface,
surface_send_frame_done, &data); surface_send_frame_done, &data.layout, &data);
} }
#endif #endif
} else { } else {
struct roots_view *view; struct roots_view *view;
wl_list_for_each_reverse(view, &desktop->views, link) { wl_list_for_each_reverse(view, &desktop->views, link) {
view_for_each_surface(view, surface_send_frame_done, &data); view_for_each_surface(view, &data.layout, surface_send_frame_done,
&data);
} }
drag_icons_for_each_surface(server->input, surface_send_frame_done, drag_icons_for_each_surface(server->input, surface_send_frame_done,
&data); &data.layout, &data);
} }
layers_send_done(output, data.when); layers_send_done(output, data.when);
} }
@ -642,9 +582,19 @@ static bool view_accept_damage(struct roots_output *output,
return false; return false;
} }
static void damage_whole_surface(struct wlr_surface *surface, struct damage_data {
double lx, double ly, float rotation, void *data) { struct layout_data layout;
struct roots_output *output = data; struct roots_output *output;
};
static void damage_whole_surface(struct wlr_surface *surface, int sx, int sy,
void *_data) {
struct damage_data *data = _data;
struct roots_output *output = data->output;
float rotation = data->layout.rotation;
double lx, ly;
get_layout_position(&data->layout, &lx, &ly, surface, sx, sy);
if (!wlr_surface_has_buffer(surface)) { if (!wlr_surface_has_buffer(surface)) {
return; return;
@ -669,9 +619,9 @@ void output_damage_whole_local_surface(struct roots_output *output,
struct wlr_surface *surface, double ox, double oy, float rotation) { struct wlr_surface *surface, double ox, double oy, float rotation) {
struct wlr_output_layout_output *layout = wlr_output_layout_get( struct wlr_output_layout_output *layout = wlr_output_layout_get(
output->desktop->layout, output->wlr_output); output->desktop->layout, output->wlr_output);
damage_whole_surface(surface, ox + layout->x, oy + layout->y, struct damage_data data = { .output = output };
rotation, output); surface_for_each_surface(surface, ox + layout->x, oy + layout->y, 0,
// TODO: subsurfaces &data.layout, damage_whole_surface, &data);
} }
static void damage_whole_decoration(struct roots_view *view, static void damage_whole_decoration(struct roots_view *view,
@ -695,19 +645,27 @@ void output_damage_whole_view(struct roots_output *output,
} }
damage_whole_decoration(view, output); damage_whole_decoration(view, output);
view_for_each_surface(view, damage_whole_surface, output);
struct damage_data data = { .output = output };
view_for_each_surface(view, &data.layout, damage_whole_surface, &data);
} }
void output_damage_whole_drag_icon(struct roots_output *output, void output_damage_whole_drag_icon(struct roots_output *output,
struct roots_drag_icon *icon) { struct roots_drag_icon *icon) {
struct damage_data data = { .output = output };
surface_for_each_surface(icon->wlr_drag_icon->surface, icon->x, icon->y, 0, surface_for_each_surface(icon->wlr_drag_icon->surface, icon->x, icon->y, 0,
damage_whole_surface, output); &data.layout, damage_whole_surface, &data);
} }
static void damage_from_surface(struct wlr_surface *surface, static void damage_from_surface(struct wlr_surface *surface, int sx, int sy,
double lx, double ly, float rotation, void *data) { void *_data) {
struct roots_output *output = data; struct damage_data *data = _data;
struct roots_output *output = data->output;
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
float rotation = data->layout.rotation;
double lx, ly;
get_layout_position(&data->layout, &lx, &ly, surface, sx, sy);
if (!wlr_surface_has_buffer(surface)) { if (!wlr_surface_has_buffer(surface)) {
return; return;
@ -743,9 +701,9 @@ void output_damage_from_local_surface(struct roots_output *output,
struct wlr_surface *surface, double ox, double oy, float rotation) { struct wlr_surface *surface, double ox, double oy, float rotation) {
struct wlr_output_layout_output *layout = wlr_output_layout_get( struct wlr_output_layout_output *layout = wlr_output_layout_get(
output->desktop->layout, output->wlr_output); output->desktop->layout, output->wlr_output);
damage_from_surface(surface, ox + layout->x, oy + layout->y, struct damage_data data = { .output = output };
rotation, output); surface_for_each_surface(surface, ox + layout->x, oy + layout->y, 0,
// TODO: Subsurfaces &data.layout, damage_from_surface, &data);
} }
void output_damage_from_view(struct roots_output *output, void output_damage_from_view(struct roots_output *output,
@ -754,7 +712,8 @@ void output_damage_from_view(struct roots_output *output,
return; return;
} }
view_for_each_surface(view, damage_from_surface, output); struct damage_data data = { .output = output };
view_for_each_surface(view, &data.layout, damage_from_surface, &data);
} }
static void set_mode(struct wlr_output *output, static void set_mode(struct wlr_output *output,

20
types/wlr_surface.c
View file

@ -951,3 +951,23 @@ void wlr_surface_set_role_committed(struct wlr_surface *surface,
surface->role_committed = role_committed; surface->role_committed = role_committed;
surface->role_data = role_data; surface->role_data = role_data;
} }
static void surface_for_each_surface(struct wlr_surface *surface, int x, int y,
wlr_surface_iterator_func_t iterator, void *user_data) {
iterator(surface, x, y, user_data);
struct wlr_subsurface *subsurface;
wl_list_for_each(subsurface, &surface->subsurface_list, parent_link) {
struct wlr_surface_state *state = subsurface->surface->current;
int sx = state->subsurface_position.x;
int sy = state->subsurface_position.y;
surface_for_each_surface(subsurface->surface, x + sx, y + sy,
iterator, user_data);
}
}
void wlr_surface_for_each_surface(struct wlr_surface *surface,
wlr_surface_iterator_func_t iterator, void *user_data) {
surface_for_each_surface(surface, 0, 0, iterator, user_data);
}

39
types/wlr_wl_shell.c
View file

@ -678,3 +678,42 @@ struct wlr_surface *wlr_wl_shell_surface_surface_at(
return wlr_surface_surface_at(surface->surface, sx, sy, sub_sx, sub_sy); return wlr_surface_surface_at(surface->surface, sx, sy, sub_sx, sub_sy);
} }
struct wl_shell_surface_iterator_data {
wlr_surface_iterator_func_t user_iterator;
void *user_data;
int x, y;
};
static void wl_shell_surface_iterator(struct wlr_surface *surface,
int sx, int sy, void *data) {
struct wl_shell_surface_iterator_data *iter_data = data;
iter_data->user_iterator(surface, iter_data->x + sx, iter_data->y + sy,
iter_data->user_data);
}
static void wl_shell_surface_for_each_surface(
struct wlr_wl_shell_surface *surface, int x, int y,
wlr_surface_iterator_func_t iterator, void *user_data) {
struct wl_shell_surface_iterator_data data = {
.user_iterator = iterator,
.user_data = user_data,
.x = x, .y = y,
};
wlr_surface_for_each_surface(surface->surface, wl_shell_surface_iterator,
&data);
struct wlr_wl_shell_surface *popup;
wl_list_for_each(popup, &surface->popups, popup_link) {
double popup_x = popup->transient_state->x;
double popup_y = popup->transient_state->y;
wl_shell_surface_for_each_surface(popup, x + popup_x, y + popup_y,
iterator, user_data);
}
}
void wlr_wl_shell_surface_for_each_surface(struct wlr_wl_shell_surface *surface,
wlr_surface_iterator_func_t iterator, void *user_data) {
wl_shell_surface_for_each_surface(surface, 0, 0, iterator, user_data);
}

46
types/wlr_xdg_shell.c
View file

@ -1659,3 +1659,49 @@ struct wlr_surface *wlr_xdg_surface_surface_at(
return wlr_surface_surface_at(surface->surface, sx, sy, sub_x, sub_y); return wlr_surface_surface_at(surface->surface, sx, sy, sub_x, sub_y);
} }
struct xdg_surface_iterator_data {
wlr_surface_iterator_func_t user_iterator;
void *user_data;
int x, y;
};
static void xdg_surface_iterator(struct wlr_surface *surface,
int sx, int sy, void *data) {
struct xdg_surface_iterator_data *iter_data = data;
iter_data->user_iterator(surface, iter_data->x + sx, iter_data->y + sy,
iter_data->user_data);
}
static void xdg_surface_for_each_surface(struct wlr_xdg_surface *surface,
int x, int y, wlr_surface_iterator_func_t iterator, void *user_data) {
struct xdg_surface_iterator_data data = {
.user_iterator = iterator,
.user_data = user_data,
.x = x, .y = y,
};
wlr_surface_for_each_surface(surface->surface, xdg_surface_iterator,
&data);
struct wlr_xdg_popup *popup_state;
wl_list_for_each(popup_state, &surface->popups, link) {
struct wlr_xdg_surface *popup = popup_state->base;
if (!popup->configured) {
continue;
}
double popup_sx, popup_sy;
wlr_xdg_surface_popup_get_position(popup, &popup_sx, &popup_sy);
xdg_surface_for_each_surface(popup,
x + popup_sx,
y + popup_sy,
iterator, user_data);
}
}
void wlr_xdg_surface_for_each_surface(struct wlr_xdg_surface *surface,
wlr_surface_iterator_func_t iterator, void *user_data) {
xdg_surface_for_each_surface(surface, 0, 0, iterator, user_data);
}

45
types/wlr_xdg_shell_v6.c
View file

@ -1884,3 +1884,48 @@ void wlr_positioner_v6_invert_y(
positioner->gravity |= ZXDG_POSITIONER_V6_GRAVITY_TOP; positioner->gravity |= ZXDG_POSITIONER_V6_GRAVITY_TOP;
} }
} }
struct xdg_surface_v6_iterator_data {
wlr_surface_iterator_func_t user_iterator;
void *user_data;
int x, y;
};
static void xdg_surface_v6_iterator(struct wlr_surface *surface,
int sx, int sy, void *data) {
struct xdg_surface_v6_iterator_data *iter_data = data;
iter_data->user_iterator(surface, iter_data->x + sx, iter_data->y + sy,
iter_data->user_data);
}
static void xdg_surface_v6_for_each_surface(struct wlr_xdg_surface_v6 *surface,
int x, int y, wlr_surface_iterator_func_t iterator, void *user_data) {
struct xdg_surface_v6_iterator_data data = {
.user_iterator = iterator,
.user_data = user_data,
.x = x, .y = y,
};
wlr_surface_for_each_surface(surface->surface, xdg_surface_v6_iterator,
&data);
struct wlr_xdg_popup_v6 *popup_state;
wl_list_for_each(popup_state, &surface->popups, link) {
struct wlr_xdg_surface_v6 *popup = popup_state->base;
if (!popup->configured) {
continue;
}
double popup_sx, popup_sy;
wlr_xdg_surface_v6_popup_get_position(popup, &popup_sx, &popup_sy);
xdg_surface_v6_for_each_surface(popup,
x + popup_sx,
y + popup_sy,
iterator, user_data);
}
}
void wlr_xdg_surface_v6_for_each_surface(struct wlr_xdg_surface_v6 *surface,
wlr_surface_iterator_func_t iterator, void *user_data) {
xdg_surface_v6_for_each_surface(surface, 0, 0, iterator, user_data);
}