mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-05 04:06:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_scene: Make restack_xwayland_surface_below generic

Browse source 
more stuff will be put here
This commit is contained in:
Alexander Orzechowski 2026-01-07 12:21:24 -05:00
parent 49576469ec
commit edc12e81d9
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
types/scene/wlr_scene.c
View file

@ -569,25 +569,6 @@ static void restack_xwayland_surface(struct wlr_scene_node *node,
data->restack_above = xwayland_surface; data->restack_above = xwayland_surface;
} }
static void restack_xwayland_surface_below(struct wlr_scene_node *node) {
if (node->type == WLR_SCENE_NODE_TREE) {
struct wlr_scene_tree *scene_tree = wlr_scene_tree_from_node(node);
struct wlr_scene_node *child;
wl_list_for_each(child, &scene_tree->children, link) {
restack_xwayland_surface_below(child);
}
return;
}
struct wlr_xwayland_surface *xwayland_surface =
scene_node_try_get_managed_xwayland_surface(node);
if (!xwayland_surface) {
return;
}
wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_BELOW);
}
#endif #endif
static bool scene_node_update_iterator(struct wlr_scene_node *node, static bool scene_node_update_iterator(struct wlr_scene_node *node,
@ -685,17 +666,37 @@ static void scene_update_region(struct wlr_scene *scene,
pixman_region32_fini(&visible); pixman_region32_fini(&visible);
} }
static void scene_node_cleanup_when_disabled(struct wlr_scene_node *node, bool xwayland_restack) {
if (node->type == WLR_SCENE_NODE_TREE) {
struct wlr_scene_tree *scene_tree = wlr_scene_tree_from_node(node);
struct wlr_scene_node *child;
wl_list_for_each(child, &scene_tree->children, link) {
scene_node_cleanup_when_disabled(child, xwayland_restack);
}
return;
}
#if WLR_HAS_XWAYLAND
if (xwayland_restack) {
struct wlr_xwayland_surface *xwayland_surface =
scene_node_try_get_managed_xwayland_surface(node);
if (!xwayland_surface) {
return;
}
wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_BELOW);
}
#endif
}
static void scene_node_update(struct wlr_scene_node *node, static void scene_node_update(struct wlr_scene_node *node,
pixman_region32_t *damage) { pixman_region32_t *damage) {
struct wlr_scene *scene = scene_node_get_root(node); struct wlr_scene *scene = scene_node_get_root(node);
int x, y; int x, y;
if (!wlr_scene_node_coords(node, &x, &y)) { if (!wlr_scene_node_coords(node, &x, &y)) {
#if WLR_HAS_XWAYLAND scene_node_cleanup_when_disabled(node, scene->restack_xwayland_surfaces);
if (scene->restack_xwayland_surfaces) {
restack_xwayland_surface_below(node);
}
#endif
if (damage) { if (damage) {
scene_update_region(scene, damage); scene_update_region(scene, damage);
scene_damage_outputs(scene, damage); scene_damage_outputs(scene, damage);