diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-01 22:02:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-01 22:02:12 -0400 |
commit | 9564c73c0ddca9d7b45f0476fcaee8bd878d8345 (patch) | |
tree | 4405c7ab30e25c5234a61280a66d406921c52253 /include | |
parent | Merge pull request #2264 from ianyfan/ipc (diff) | |
parent | Close popups when changing focus (diff) | |
download | sway-9564c73c0ddca9d7b45f0476fcaee8bd878d8345.tar.gz sway-9564c73c0ddca9d7b45f0476fcaee8bd878d8345.tar.zst sway-9564c73c0ddca9d7b45f0476fcaee8bd878d8345.zip |
Merge pull request #2391 from RyanDwyer/fix-popups-v2
Fix popups (v2)
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 | 14 |
3 files changed, 24 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 800df073..620c41e0 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -47,7 +47,10 @@ 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); |
53 | void (*close_popups)(struct sway_view *view); | ||
51 | void (*destroy)(struct sway_view *view); | 54 | void (*destroy)(struct sway_view *view); |
52 | }; | 55 | }; |
53 | 56 | ||
@@ -246,11 +249,22 @@ void view_set_tiled(struct sway_view *view, bool tiled); | |||
246 | 249 | ||
247 | void view_close(struct sway_view *view); | 250 | void view_close(struct sway_view *view); |
248 | 251 | ||
252 | void view_close_popups(struct sway_view *view); | ||
253 | |||
249 | void view_damage_from(struct sway_view *view); | 254 | void view_damage_from(struct sway_view *view); |
250 | 255 | ||
256 | /** | ||
257 | * Iterate all surfaces of a view (toplevels + popups). | ||
258 | */ | ||
251 | void view_for_each_surface(struct sway_view *view, | 259 | void view_for_each_surface(struct sway_view *view, |
252 | wlr_surface_iterator_func_t iterator, void *user_data); | 260 | wlr_surface_iterator_func_t iterator, void *user_data); |
253 | 261 | ||
262 | /** | ||
263 | * Iterate all popups recursively. | ||
264 | */ | ||
265 | void view_for_each_popup(struct sway_view *view, | ||
266 | wlr_surface_iterator_func_t iterator, void *user_data); | ||
267 | |||
254 | // view implementation | 268 | // view implementation |
255 | 269 | ||
256 | void view_init(struct sway_view *view, enum sway_view_type type, | 270 | void view_init(struct sway_view *view, enum sway_view_type type, |