1 files changed, 39 insertions, 11 deletions

diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index 5d4a2f2d..15df0f55 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -3,6 +3,7 @@
 #include <wayland-server-core.h>
 #include <wayland-util.h>
 #include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/render/wlr_texture.h>
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
@@ -16,10 +17,44 @@ struct sway_root {
         struct wlr_output_layout *output_layout;
 
         struct wl_listener output_layout_change;
+
+        // scene node layout:
+        // - root
+        //      - staging
+        //      - layer shell stuff
+        //      - tiling
+        //      - floating
+        //      - fullscreen stuff
+        //      - seat stuff
+        //      - ext_session_lock
+        struct wlr_scene *root_scene;
+
+        // since wlr_scene nodes can't be orphaned and must always
+        // have a parent, use this staging scene_tree so that a
+        // node always have a valid parent. Nothing in this
+        // staging node will be visible.
+        struct wlr_scene_tree *staging;
+
+        // tree containing all layers the compositor will render. Cursor handling
+        // will end up iterating this tree.
+        struct wlr_scene_tree *layer_tree;
+
+        struct {
+                struct wlr_scene_tree *shell_background;
+                struct wlr_scene_tree *shell_bottom;
+                struct wlr_scene_tree *tiling;
+                struct wlr_scene_tree *floating;
+                struct wlr_scene_tree *shell_top;
+                struct wlr_scene_tree *fullscreen;
+                struct wlr_scene_tree *fullscreen_global;
 #if HAVE_XWAYLAND
-        struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
+                struct wlr_scene_tree *unmanaged;
 #endif
-        struct wl_list drag_icons; // sway_drag_icon::link
+                struct wlr_scene_tree *shell_overlay;
+                struct wlr_scene_tree *popup;
+                struct wlr_scene_tree *seat;
+                struct wlr_scene_tree *session_lock;
+        } layers;
 
         // Includes disabled outputs
         struct wl_list all_outputs; // sway_output::link
@@ -28,6 +63,7 @@ struct sway_root {
         double width, height;
 
         list_t *outputs; // struct sway_output
+        list_t *non_desktop_outputs; // struct sway_output_non_desktop
         list_t *scratchpad; // struct sway_container
 
         // For when there's no connected outputs
@@ -40,7 +76,7 @@ struct sway_root {
         } events;
 };
 
-struct sway_root *root_create(void);
+struct sway_root *root_create(struct wl_display *display);
 
 void root_destroy(struct sway_root *root);
 
@@ -68,12 +104,6 @@ void root_scratchpad_show(struct sway_container *con);
  */
 void root_scratchpad_hide(struct sway_container *con);
 
-struct sway_workspace *root_workspace_for_pid(pid_t pid);
-
-void root_record_workspace_pid(pid_t pid);
-
-void root_remove_workspace_pid(pid_t pid);
-
 void root_for_each_workspace(void (*f)(struct sway_workspace *ws, void *data),
                 void *data);
 
@@ -91,6 +121,4 @@ struct sway_container *root_find_container(
 
 void root_get_box(struct sway_root *root, struct wlr_box *box);
 
-void root_rename_pid_workspaces(const char *old_name, const char *new_name);
-
 #endif