diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-22 10:54:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 10:54:15 +0200 |
| commit | 12bf39a715b23b572e3ce213ee1aef8c32ebbc13 (patch) | |
| tree | c372a2212a94bc282876c41649c8c18204ff0761 /include/wlr | |
| parent | 704bc490a7d1ce581ba24ce833919036374293f9 (diff) | |
| parent | 3bce5dfc9f288ffcfa045ae0a80bcc015d0966c5 (diff) | |
Merge pull request #885 from emersion/remove-surface-subsurface
Remove wlr_surface::subsurface, add wlr_subcompositor
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_compositor.h | 7 | ||||
| -rw-r--r-- | include/wlr/types/wlr_surface.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index 922d7c0f..816ff713 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -6,12 +6,19 @@ struct wlr_surface; +struct wlr_subcompositor { + struct wl_global *wl_global; + struct wl_list wl_resources; +}; + struct wlr_compositor { struct wl_global *wl_global; struct wl_list wl_resources; struct wlr_renderer *renderer; struct wl_list surfaces; + struct wlr_subcompositor subcompositor; + struct wl_listener display_destroy; struct { diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 62f03e37..35d47926 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -56,7 +56,8 @@ struct wlr_subsurface { struct wl_list parent_link; struct wl_list parent_pending_link; - struct wl_listener parent_destroy_listener; + struct wl_listener surface_destroy; + struct wl_listener parent_destroy; struct { struct wl_signal destroy; @@ -87,9 +88,7 @@ struct wlr_surface { void (*role_committed)(struct wlr_surface *surface, void *role_data); void *role_data; - // subsurface properties - struct wlr_subsurface *subsurface; - struct wl_list subsurface_list; // wlr_subsurface::parent_link + struct wl_list subsurfaces; // wlr_subsurface::parent_link // wlr_subsurface::parent_pending_link struct wl_list subsurface_pending_list; |