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 | |
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')
-rw-r--r-- | include/sway/output.h | 8 | ||||
-rw-r--r-- | include/sway/tree/container.h | 11 | ||||
-rw-r--r-- | include/sway/tree/view.h | 11 |
3 files changed, 21 insertions, 9 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); |
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index d4a42a71..12ff8a5a 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -230,18 +230,11 @@ struct sway_container *container_parent(struct sway_container *container, | |||
230 | * surface-local coordinates of the given layout coordinates if the container | 230 | * surface-local coordinates of the given layout coordinates if the container |
231 | * is a view and the view contains a surface at those coordinates. | 231 | * is a view and the view contains a surface at those coordinates. |
232 | */ | 232 | */ |
233 | struct sway_container *container_at(struct sway_container *container, | 233 | struct sway_container *container_at(struct sway_container *workspace, |
234 | double ox, double oy, struct wlr_surface **surface, | 234 | double lx, double ly, struct wlr_surface **surface, |
235 | double *sx, double *sy); | 235 | double *sx, double *sy); |
236 | 236 | ||
237 | /** | 237 | /** |
238 | * Same as container_at, but only checks floating views and expects coordinates | ||
239 | * to be layout coordinates, as that's what floating views use. | ||
240 | */ | ||
241 | struct sway_container *floating_container_at(double lx, double ly, | ||
242 | struct wlr_surface **surface, double *sx, double *sy); | ||
243 | |||
244 | /** | ||
245 | * Apply the function for each descendant of the container breadth first. | 238 | * Apply the function for each descendant of the container breadth first. |
246 | */ | 239 | */ |
247 | void container_for_each_descendant_bfs(struct sway_container *container, | 240 | void container_for_each_descendant_bfs(struct sway_container *container, |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 0152ed55..9f6d36fe 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -47,6 +47,8 @@ struct sway_view_impl { | |||
47 | bool (*has_client_side_decorations)(struct sway_view *view); | 47 | bool (*has_client_side_decorations)(struct sway_view *view); |
48 | void (*for_each_surface)(struct sway_view *view, | 48 | void (*for_each_surface)(struct sway_view *view, |
49 | wlr_surface_iterator_func_t iterator, void *user_data); | 49 | wlr_surface_iterator_func_t iterator, void *user_data); |
50 | void (*for_each_popup)(struct sway_view *view, | ||
51 | wlr_surface_iterator_func_t iterator, void *user_data); | ||
50 | void (*close)(struct sway_view *view); | 52 | void (*close)(struct sway_view *view); |
51 | void (*destroy)(struct sway_view *view); | 53 | void (*destroy)(struct sway_view *view); |
52 | }; | 54 | }; |
@@ -248,9 +250,18 @@ void view_close(struct sway_view *view); | |||
248 | 250 | ||
249 | void view_damage_from(struct sway_view *view); | 251 | void view_damage_from(struct sway_view *view); |
250 | 252 | ||
253 | /** | ||
254 | * Iterate all surfaces of a view (toplevels + popups). | ||
255 | */ | ||
251 | void view_for_each_surface(struct sway_view *view, | 256 | void view_for_each_surface(struct sway_view *view, |
252 | wlr_surface_iterator_func_t iterator, void *user_data); | 257 | wlr_surface_iterator_func_t iterator, void *user_data); |
253 | 258 | ||
259 | /** | ||
260 | * Iterate all popups recursively. | ||
261 | */ | ||
262 | void view_for_each_popup(struct sway_view *view, | ||
263 | wlr_surface_iterator_func_t iterator, void *user_data); | ||
264 | |||
254 | // view implementation | 265 | // view implementation |
255 | 266 | ||
256 | void view_init(struct sway_view *view, enum sway_view_type type, | 267 | void view_init(struct sway_view *view, enum sway_view_type type, |