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

Revert "subcompositor: emit new_subsurface immediately"

Browse source 
new_subsurface emitted immediately isn't actually that useful. Revert the change
and document that this event is special.

This reverts commit 504b9491f0.
This commit is contained in:
Kirill Primak 2023-11-24 12:57:59 +03:00 committed by Isaac Freund
parent 36cc698bc5
commit 87346b3393
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/wlr/types/wlr_compositor.h
View file

@ -190,7 +190,12 @@ struct wlr_surface {
*/ */
struct wl_signal unmap; struct wl_signal unmap;
struct wl_signal new_subsurface; /**
* Note: unlike other new_* signals, new_subsurface is emitted when
* the subsurface is added to the parent surface's current state,
* not when the object is created.
*/
struct wl_signal new_subsurface; // struct wlr_subsurface
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;

4
types/wlr_subcompositor.c
View file

@ -289,6 +289,8 @@ void subsurface_handle_parent_commit(struct wlr_subsurface *subsurface) {
if (!subsurface->added) { if (!subsurface->added) {
subsurface->added = true; subsurface->added = true;
wl_signal_emit_mutable(&subsurface->parent->events.new_subsurface,
subsurface);
subsurface_consider_map(subsurface); subsurface_consider_map(subsurface);
} }
} }
@ -362,8 +364,6 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client,
wl_list_init(&subsurface->current.link); wl_list_init(&subsurface->current.link);
wl_list_insert(parent->pending.subsurfaces_above.prev, wl_list_insert(parent->pending.subsurfaces_above.prev,
&subsurface->pending.link); &subsurface->pending.link);
wl_signal_emit_mutable(&subsurface->parent->events.new_subsurface, subsurface);
} }
static const struct wl_subcompositor_interface subcompositor_impl = { static const struct wl_subcompositor_interface subcompositor_impl = {