diff options
Diffstat (limited to 'include')
-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 { | |||
138 | 138 | ||
139 | struct sway_container *parent; | 139 | struct sway_container *parent; |
140 | 140 | ||
141 | // Outputs currently being intersected | ||
142 | list_t *outputs; // struct sway_output | ||
143 | |||
141 | // Indicates that the container is a scratchpad container. | 144 | // Indicates that the container is a scratchpad container. |
142 | // Both hidden and visible scratchpad containers have scratchpad=true. | 145 | // Both hidden and visible scratchpad containers have scratchpad=true. |
143 | // Hidden scratchpad containers have a NULL parent. | 146 | // Hidden scratchpad containers have a NULL parent. |
@@ -166,12 +169,7 @@ struct sway_container { | |||
166 | 169 | ||
167 | struct { | 170 | struct { |
168 | struct wl_signal destroy; | 171 | struct wl_signal destroy; |
169 | // Raised after the tree updates, but before arrange_windows | ||
170 | // Passed the previous parent | ||
171 | struct wl_signal reparent; | ||
172 | } events; | 172 | } events; |
173 | |||
174 | struct wl_listener reparent; | ||
175 | }; | 173 | }; |
176 | 174 | ||
177 | struct sway_container *container_create(enum sway_container_type type); | 175 | struct sway_container *container_create(enum sway_container_type type); |
@@ -353,4 +351,12 @@ bool container_is_floating_or_child(struct sway_container *container); | |||
353 | */ | 351 | */ |
354 | bool container_is_fullscreen_or_child(struct sway_container *container); | 352 | bool container_is_fullscreen_or_child(struct sway_container *container); |
355 | 353 | ||
354 | /** | ||
355 | * Return the output which will be used for scale purposes. | ||
356 | * This is the most recently entered output. | ||
357 | */ | ||
358 | struct sway_output *container_get_effective_output(struct sway_container *con); | ||
359 | |||
360 | void container_discover_outputs(struct sway_container *con); | ||
361 | |||
356 | #endif | 362 | #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 { | |||
120 | } events; | 120 | } events; |
121 | 121 | ||
122 | struct wl_listener surface_new_subsurface; | 122 | struct wl_listener surface_new_subsurface; |
123 | struct wl_listener container_reparent; | ||
124 | }; | 123 | }; |
125 | 124 | ||
126 | struct sway_xdg_shell_v6_view { | 125 | struct sway_xdg_shell_v6_view { |