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 /include/sway/output.h | |
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 'include/sway/output.h')
-rw-r--r-- | include/sway/output.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index 6283db68..80dcd37b 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -67,10 +67,18 @@ struct sway_container *output_get_active_workspace(struct sway_output *output); | |||
67 | void output_render(struct sway_output *output, struct timespec *when, | 67 | void output_render(struct sway_output *output, struct timespec *when, |
68 | pixman_region32_t *damage); | 68 | pixman_region32_t *damage); |
69 | 69 | ||
70 | void output_surface_for_each_surface(struct sway_output *output, | ||
71 | struct wlr_surface *surface, double ox, double oy, | ||
72 | sway_surface_iterator_func_t iterator, void *user_data); | ||
73 | |||
70 | void output_view_for_each_surface(struct sway_output *output, | 74 | void output_view_for_each_surface(struct sway_output *output, |
71 | struct sway_view *view, sway_surface_iterator_func_t iterator, | 75 | struct sway_view *view, sway_surface_iterator_func_t iterator, |
72 | void *user_data); | 76 | void *user_data); |
73 | 77 | ||
78 | void output_view_for_each_popup(struct sway_output *output, | ||
79 | struct sway_view *view, sway_surface_iterator_func_t iterator, | ||
80 | void *user_data); | ||
81 | |||
74 | void output_layer_for_each_surface(struct sway_output *output, | 82 | void output_layer_for_each_surface(struct sway_output *output, |
75 | struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, | 83 | struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator, |
76 | void *user_data); | 84 | void *user_data); |