diff options
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 14 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell_v6.h | 14 | ||||
| -rw-r--r-- | types/xdg_shell/wlr_xdg_surface.c | 25 | ||||
| -rw-r--r-- | types/xdg_shell_v6/wlr_xdg_surface_v6.c | 25 |
4 files changed, 72 insertions, 6 deletions
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index 01dc17fe..d2dfaacb 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -352,11 +352,19 @@ struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface( void wlr_xdg_surface_get_geometry(struct wlr_xdg_surface *surface, struct wlr_box *box); /** - * Call `iterator` on each surface in the xdg-surface tree, with the surface's - * position relative to the root xdg-surface. The function is called from root to - * leaves (in rendering order). + * Call `iterator` on each surface and popup in the xdg-surface tree, with the + * surface's position 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); +/** + * Call `iterator` on each popup in the xdg-surface tree, with the popup's + * position relative to the root xdg-surface. The function is called from root + * to leaves (in rendering order). + */ +void wlr_xdg_surface_for_each_popup(struct wlr_xdg_surface *surface, + wlr_surface_iterator_func_t iterator, void *user_data); + #endif diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 5f98eb13..38f85635 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -329,11 +329,19 @@ struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_from_wlr_surface( void wlr_xdg_surface_v6_get_geometry(struct wlr_xdg_surface_v6 *surface, struct wlr_box *box); /** - * Call `iterator` on each surface in the xdg-surface tree, with the surface's - * position relative to the root xdg-surface. The function is called from root to - * leaves (in rendering order). + * Call `iterator` on each surface and popup in the xdg-surface tree, with the + * surface's position 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); +/** + * Call `iterator` on each popup in the xdg-surface tree, with the popup's + * position relative to the root xdg-surface. The function is called from root + * to leaves (in rendering order). + */ +void wlr_xdg_surface_v6_for_each_popup(struct wlr_xdg_surface_v6 *surface, + wlr_surface_iterator_func_t iterator, void *user_data); + #endif diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c index 6931b92f..9eda8aa1 100644 --- a/types/xdg_shell/wlr_xdg_surface.c +++ b/types/xdg_shell/wlr_xdg_surface.c @@ -557,11 +557,36 @@ static void xdg_surface_for_each_surface(struct wlr_xdg_surface *surface, } } +static void xdg_surface_for_each_popup(struct wlr_xdg_surface *surface, + int x, int y, wlr_surface_iterator_func_t iterator, void *user_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; + xdg_popup_get_position(popup_state, &popup_sx, &popup_sy); + iterator(popup->surface, x + popup_sx, y + popup_sy, user_data); + + xdg_surface_for_each_popup(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); } +void wlr_xdg_surface_for_each_popup(struct wlr_xdg_surface *surface, + wlr_surface_iterator_func_t iterator, void *user_data) { + xdg_surface_for_each_popup(surface, 0, 0, iterator, user_data); +} + void wlr_xdg_surface_get_geometry(struct wlr_xdg_surface *surface, struct wlr_box *box) { wlr_surface_get_extends(surface->surface, box); /* The client never set the geometry */ diff --git a/types/xdg_shell_v6/wlr_xdg_surface_v6.c b/types/xdg_shell_v6/wlr_xdg_surface_v6.c index 7343906f..046dd4ed 100644 --- a/types/xdg_shell_v6/wlr_xdg_surface_v6.c +++ b/types/xdg_shell_v6/wlr_xdg_surface_v6.c @@ -536,11 +536,36 @@ static void xdg_surface_v6_for_each_surface(struct wlr_xdg_surface_v6 *surface, } } +static void xdg_surface_v6_for_each_popup(struct wlr_xdg_surface_v6 *surface, + int x, int y, wlr_surface_iterator_func_t iterator, void *user_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; + xdg_popup_v6_get_position(popup_state, &popup_sx, &popup_sy); + iterator(popup->surface, x + popup_sx, y + popup_sy, user_data); + + xdg_surface_v6_for_each_popup(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); } +void wlr_xdg_surface_v6_for_each_popup(struct wlr_xdg_surface_v6 *surface, + wlr_surface_iterator_func_t iterator, void *user_data) { + xdg_surface_v6_for_each_popup(surface, 0, 0, iterator, user_data); +} + void wlr_xdg_surface_v6_get_geometry(struct wlr_xdg_surface_v6 *surface, struct wlr_box *box) { wlr_surface_get_extends(surface->surface, box); /* The client never set the geometry */ |