diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-19 22:06:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 22:06:09 -0400 |
| commit | 08a69f267a96a5b0591222ef1d0f40208e46d484 (patch) | |
| tree | 0330d86cbbed09e7a408b3f7cc54a2280217bba9 /include/sway/tree | |
| parent | fdcf9275b1259deda94723853a60cbaa9cbb522a (diff) | |
| parent | e1955c5c08d4131fd5d3e2a91ec8af05c3117eca (diff) | |
Merge pull request #2483 from RyanDwyer/floating-emit-reparent
Send enter/leave events for floating views
Diffstat (limited to 'include/sway/tree')
| -rw-r--r-- | include/sway/tree/container.h | 16 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 5eccedc1..cd886cd0 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -138,6 +138,9 @@ struct sway_container { struct sway_container *parent; + // Outputs currently being intersected + list_t *outputs; // struct sway_output + // Indicates that the container is a scratchpad container. // Both hidden and visible scratchpad containers have scratchpad=true. // Hidden scratchpad containers have a NULL parent. @@ -166,12 +169,7 @@ struct sway_container { struct { struct wl_signal destroy; - // Raised after the tree updates, but before arrange_windows - // Passed the previous parent - struct wl_signal reparent; } events; - - struct wl_listener reparent; }; struct sway_container *container_create(enum sway_container_type type); @@ -353,4 +351,12 @@ bool container_is_floating_or_child(struct sway_container *container); */ bool container_is_fullscreen_or_child(struct sway_container *container); +/** + * Return the output which will be used for scale purposes. + * This is the most recently entered output. + */ +struct sway_output *container_get_effective_output(struct sway_container *con); + +void container_discover_outputs(struct sway_container *con); + #endif diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 2747e7c4..5fdecc2b 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -120,7 +120,6 @@ struct sway_view { } events; struct wl_listener surface_new_subsurface; - struct wl_listener container_reparent; }; struct sway_xdg_shell_v6_view { |