aboutsummaryrefslogtreecommitdiff
path: root/include/sway/container.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/sway/container.h')
-rw-r--r--include/sway/container.h20
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 @@
#define _SWAY_CONTAINER_H
#include <sys/types.h>
#include <wlc/wlc.h>
+#include <wlr/types/wlr_output.h>
#include <stdint.h>
#include "list.h"
@@ -27,6 +28,14 @@ enum swayc_types {
C_TYPES,
};
+enum swayc_view_types {
+ V_WL_SHELL,
+ V_XDG_SHELL_V6,
+ V_XWAYLAND,
+ // Keep last
+ V_TYPES,
+};
+
/**
* Different ways to arrange a container.
*/
@@ -63,12 +72,13 @@ enum swayc_border_types {
* The tree is made of these. Views are containers that cannot have children.
*/
struct sway_container {
- /**
- * If this container maps to a WLC object, this is set to that object's
- * handle. Otherwise, NULL.
- */
+ // TODO WLR: reconcile these
wlc_handle handle;
+ union {
+ struct wlr_output *output;
+ } _handle;
+
/**
* A unique ID to identify this container. Primarily used in the
* get_tree JSON output.
@@ -179,7 +189,7 @@ enum visibility_mask {
/**
* Allocates a new output container.
*/
-swayc_t *new_output(wlc_handle handle);
+swayc_t *new_output(struct wlr_output *wlr_output);
/**
* Allocates a new workspace container.
*/