diff options
Diffstat (limited to 'include/sway/container.h')
-rw-r--r-- | include/sway/container.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/include/sway/container.h b/include/sway/container.h index 37192ce3..f6aae7d1 100644 --- a/include/sway/container.h +++ b/include/sway/container.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _SWAY_CONTAINER_H | 2 | #define _SWAY_CONTAINER_H |
3 | #include <sys/types.h> | 3 | #include <sys/types.h> |
4 | #include <wlc/wlc.h> | 4 | #include <wlc/wlc.h> |
5 | #include <wlr/types/wlr_output.h> | ||
5 | #include <stdint.h> | 6 | #include <stdint.h> |
6 | 7 | ||
7 | #include "list.h" | 8 | #include "list.h" |
@@ -27,6 +28,14 @@ enum swayc_types { | |||
27 | C_TYPES, | 28 | C_TYPES, |
28 | }; | 29 | }; |
29 | 30 | ||
31 | enum swayc_view_types { | ||
32 | V_WL_SHELL, | ||
33 | V_XDG_SHELL_V6, | ||
34 | V_XWAYLAND, | ||
35 | // Keep last | ||
36 | V_TYPES, | ||
37 | }; | ||
38 | |||
30 | /** | 39 | /** |
31 | * Different ways to arrange a container. | 40 | * Different ways to arrange a container. |
32 | */ | 41 | */ |
@@ -63,12 +72,13 @@ enum swayc_border_types { | |||
63 | * The tree is made of these. Views are containers that cannot have children. | 72 | * The tree is made of these. Views are containers that cannot have children. |
64 | */ | 73 | */ |
65 | struct sway_container { | 74 | struct sway_container { |
66 | /** | 75 | // TODO WLR: reconcile these |
67 | * If this container maps to a WLC object, this is set to that object's | ||
68 | * handle. Otherwise, NULL. | ||
69 | */ | ||
70 | wlc_handle handle; | 76 | wlc_handle handle; |
71 | 77 | ||
78 | union { | ||
79 | struct wlr_output *output; | ||
80 | } _handle; | ||
81 | |||
72 | /** | 82 | /** |
73 | * A unique ID to identify this container. Primarily used in the | 83 | * A unique ID to identify this container. Primarily used in the |
74 | * get_tree JSON output. | 84 | * get_tree JSON output. |
@@ -179,7 +189,7 @@ enum visibility_mask { | |||
179 | /** | 189 | /** |
180 | * Allocates a new output container. | 190 | * Allocates a new output container. |
181 | */ | 191 | */ |
182 | swayc_t *new_output(wlc_handle handle); | 192 | swayc_t *new_output(struct wlr_output *wlr_output); |
183 | /** | 193 | /** |
184 | * Allocates a new workspace container. | 194 | * Allocates a new workspace container. |
185 | */ | 195 | */ |