diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-31 18:41:30 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-31 18:41:30 +1000 |
commit | de86d65627e96cffe77f4abf11c4a0b982326ff9 (patch) | |
tree | 1a3a914fdf561884b1bb0425d51d15684b629b3a /sway/tree/view.c | |
parent | Merge pull request #2390 from emersion/fix-fullscreen-segfault (diff) | |
download | sway-de86d65627e96cffe77f4abf11c4a0b982326ff9.tar.gz sway-de86d65627e96cffe77f4abf11c4a0b982326ff9.tar.zst sway-de86d65627e96cffe77f4abf11c4a0b982326ff9.zip |
Fix popups
Fixes the render and container_at order for popups.
Fixes #2210
For rendering:
* render_view_surfaces has been renamed to render_view_toplevels
* render_view_toplevels now uses output_surface_for_each_surface (which
is now public), as that function uses wlr_surface_for_each_surface which
doesn't descend into popups
* Views now have a for_each_popup iterator, which is used by the
renderer to render the focused view's popups
* When rendering a popup, toplevels (xdg subsurfaces) of that popup are
also rendered
For sending frame done, the logic has been updated to match the
rendering logic:
* send_frame_done_container no longer descends into popups
* for_each_popup is used to send frame done to the focused view's popups
and their child toplevels
For container_at:
* floating_container_at is now static, which means it had to be moved
higher in the file.
* container_at now considers popups for the focused view before checking
containers.
* tiling_container_at has been introduced, so that it doesn't call
container_at recursively (it would check popups recursively if it did)
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 8f54cc11..c1207821 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -332,6 +332,16 @@ void view_for_each_surface(struct sway_view *view, | |||
332 | } | 332 | } |
333 | } | 333 | } |
334 | 334 | ||
335 | void view_for_each_popup(struct sway_view *view, | ||
336 | wlr_surface_iterator_func_t iterator, void *user_data) { | ||
337 | if (!view->surface) { | ||
338 | return; | ||
339 | } | ||
340 | if (view->impl->for_each_popup) { | ||
341 | view->impl->for_each_popup(view, iterator, user_data); | ||
342 | } | ||
343 | } | ||
344 | |||
335 | static void view_subsurface_create(struct sway_view *view, | 345 | static void view_subsurface_create(struct sway_view *view, |
336 | struct wlr_subsurface *subsurface); | 346 | struct wlr_subsurface *subsurface); |
337 | 347 | ||