5 files changed, 148 insertions, 146 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 751612e2..93f6bfbb 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_scene.h>
 #include "list.h"
 #include "sway/tree/node.h"
 
@@ -68,11 +69,39 @@ struct sway_container {
         struct sway_node node;
         struct sway_view *view;
 
+        struct wlr_scene_tree *scene_tree;
+
+        struct {
+                struct wlr_scene_tree *tree;
+
+                struct wlr_scene_tree *border;
+                struct wlr_scene_tree *background;
+
+                struct sway_text_node *title_text;
+                struct sway_text_node *marks_text;
+        } title_bar;
+
+        struct {
+                struct wlr_scene_tree *tree;
+
+                struct wlr_scene_rect *top;
+                struct wlr_scene_rect *bottom;
+                struct wlr_scene_rect *left;
+                struct wlr_scene_rect *right;
+        } border;
+
+        struct wlr_scene_tree *content_tree;
+        struct wlr_scene_buffer *output_handler;
+
+        struct wl_listener output_enter;
+        struct wl_listener output_leave;
+
         struct sway_container_state current;
         struct sway_container_state pending;
 
         char *title;           // The view's title (unformatted)
         char *formatted_title; // The title displayed in the title bar
+        int title_width;
 
         enum sway_container_layout prev_split_layout;
 
@@ -100,33 +129,19 @@ struct sway_container {
         double child_total_width;
         double child_total_height;
 
-        // In most cases this is the same as the content x and y, but if the view
-        // refuses to resize to the content dimensions then it can be smaller.
-        // These are in layout coordinates.
-        double surface_x, surface_y;
-
-        // 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.
         bool scratchpad;
 
-        float alpha;
+        // Stores last output size and position for adjusting coordinates of
+        // scratchpad windows.
+        // Unused for non-scratchpad windows.
+        struct wlr_box transform;
 
-        struct wlr_texture *title_focused;
-        struct wlr_texture *title_focused_inactive;
-        struct wlr_texture *title_focused_tab_title;
-        struct wlr_texture *title_unfocused;
-        struct wlr_texture *title_urgent;
+        float alpha;
 
         list_t *marks; // char *
-        struct wlr_texture *marks_focused;
-        struct wlr_texture *marks_focused_inactive;
-        struct wlr_texture *marks_focused_tab_title;
-        struct wlr_texture *marks_unfocused;
-        struct wlr_texture *marks_urgent;
 
         struct {
                 struct wl_signal destroy;
@@ -146,19 +161,6 @@ void container_begin_destroy(struct sway_container *con);
 struct sway_container *container_find_child(struct sway_container *container,
                 bool (*test)(struct sway_container *view, void *data), void *data);
 
-/**
- * Find a container at the given coordinates. Returns the surface and
- * surface-local coordinates of the given layout coordinates if the container
- * is a view and the view contains a surface at those coordinates.
- */
-struct sway_container *container_at(struct sway_workspace *workspace,
-                double lx, double ly, struct wlr_surface **surface,
-                double *sx, double *sy);
-
-struct sway_container *tiling_container_at(
-                struct sway_node *parent, double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy);
-
 void container_for_each_child(struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data), void *data);
 
@@ -175,13 +177,13 @@ bool container_has_ancestor(struct sway_container *container,
 
 void container_update_textures_recursive(struct sway_container *con);
 
-void container_damage_whole(struct sway_container *container);
-
 void container_reap_empty(struct sway_container *con);
 
 struct sway_container *container_flatten(struct sway_container *container);
 
-void container_update_title_textures(struct sway_container *container);
+void container_update_title_bar(struct sway_container *container);
+
+void container_update_marks(struct sway_container *container);
 
 size_t container_build_representation(enum sway_container_layout layout,
                 list_t *children, char *buffer);
@@ -196,6 +198,9 @@ size_t container_titlebar_height(void);
 void floating_calculate_constraints(int *min_width, int *max_width,
                 int *min_height, int *max_height);
 
+void floating_fix_coordinates(struct sway_container *con,
+                struct wlr_box *old, struct wlr_box *new);
+
 void container_floating_resize_and_center(struct sway_container *con);
 
 void container_floating_set_default_size(struct sway_container *con);
@@ -215,11 +220,6 @@ void container_set_geometry_from_content(struct sway_container *con);
 bool container_is_floating(struct sway_container *container);
 
 /**
- * Same as above, but for current container state.
- */
-bool container_is_current_floating(struct sway_container *container);
-
-/**
  * Get a container's box in layout coordinates.
  */
 void container_get_box(struct sway_container *container, struct wlr_box *box);
@@ -281,26 +281,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.
- * If the container is not on any output, return NULL.
- */
-struct sway_output *container_get_effective_output(struct sway_container *con);
-
-void container_discover_outputs(struct sway_container *con);
-
 enum sway_container_layout container_parent_layout(struct sway_container *con);
 
-enum sway_container_layout container_current_parent_layout(
-                struct sway_container *con);
-
 list_t *container_get_siblings(struct sway_container *container);
 
 int container_sibling_index(struct sway_container *child);
 
-list_t *container_get_current_siblings(struct sway_container *container);
-
 void container_handle_fullscreen_reparent(struct sway_container *con);
 
 void container_add_child(struct sway_container *parent,
@@ -348,8 +334,6 @@ bool container_has_mark(struct sway_container *container, char *mark);
 
 void container_add_mark(struct sway_container *container, char *mark);
 
-void container_update_marks_textures(struct sway_container *container);
-
 void container_raise_floating(struct sway_container *con);
 
 bool container_is_scratchpad_hidden(struct sway_container *con);
@@ -373,4 +357,10 @@ bool container_is_sticky_or_child(struct sway_container *con);
  */
 int container_squash(struct sway_container *con);
 
+void container_arrange_title_bar(struct sway_container *con);
+
+void container_update(struct sway_container *con);
+
+void container_update_itself_and_parents(struct sway_container *con);
+
 #endif
diff --git a/include/sway/tree/node.h b/include/sway/tree/node.h
index 470ee3b5..e2dbcdf0 100644
--- a/include/sway/tree/node.h
+++ b/include/sway/tree/node.h
@@ -1,6 +1,8 @@
 #ifndef _SWAY_NODE_H
 #define _SWAY_NODE_H
+#include <wayland-server-core.h>
 #include <stdbool.h>
+#include <wlr/types/wlr_scene.h>
 #include "list.h"
 
 #define MIN_SANE_W 100
@@ -74,4 +76,15 @@ list_t *node_get_children(struct sway_node *node);
 
 bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor);
 
+// when destroying a sway tree, it's not known which order the tree will be
+// destroyed. To prevent freeing of scene_nodes recursing up the tree,
+// let's use this helper function to disown them to the staging node.
+void scene_node_disown_children(struct wlr_scene_tree *tree);
+
+// a helper function used to allocate tree nodes. If an allocation failure
+// occurs a flag is flipped that can be checked later to destroy a parent
+// of this scene node preventing memory leaks.
+struct wlr_scene_tree *alloc_scene_tree(struct wlr_scene_tree *parent,
+                bool *failed);
+
 #endif
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
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 95708a04..7faacdcc 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -2,7 +2,8 @@
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_compositor.h>
-#include "config.h"
+#include <wlr/types/wlr_scene.h>
+#include "sway/config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
@@ -45,10 +46,6 @@ struct sway_view_impl {
         void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
         void (*set_resizing)(struct sway_view *view, bool resizing);
         bool (*wants_floating)(struct sway_view *view);
-        void (*for_each_surface)(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data);
-        void (*for_each_popup_surface)(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data);
         bool (*is_transient_for)(struct sway_view *child,
                         struct sway_view *ancestor);
         void (*close)(struct sway_view *view);
@@ -56,24 +53,20 @@ struct sway_view_impl {
         void (*destroy)(struct sway_view *view);
 };
 
-struct sway_saved_buffer {
-        struct wlr_client_buffer *buffer;
-        int x, y;
-        int width, height;
-        enum wl_output_transform transform;
-        struct wlr_fbox source_box;
-        struct wl_list link; // sway_view::saved_buffers
-};
-
 struct sway_view {
         enum sway_view_type type;
         const struct sway_view_impl *impl;
 
+        struct wlr_scene_tree *scene_tree;
+        struct wlr_scene_tree *content_tree;
+        struct wlr_scene_tree *saved_surface_tree;
+
         struct sway_container *container; // NULL if unmapped and transactions finished
         struct wlr_surface *surface; // NULL for unmapped views
         struct sway_xdg_decoration *xdg_decoration;
 
         pid_t pid;
+        struct launcher_ctx *ctx;
 
         // The size the view would want to be if it weren't tiled.
         // Used when changing a view from tiled to floating.
@@ -87,15 +80,11 @@ struct sway_view {
         bool allow_request_urgent;
         struct wl_event_source *urgent_timer;
 
-        struct wl_list saved_buffers; // sway_saved_buffer::link
-
         // The geometry for whatever the client is committing, regardless of
         // transaction state. Updated on every commit.
         struct wlr_box geometry;
 
-        // The "old" geometry during a transaction. Used to damage the old location
-        // when a transaction is applied.
-        struct wlr_box saved_geometry;
+        struct wlr_ext_foreign_toplevel_handle_v1 *ext_foreign_toplevel;
 
         struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
         struct wl_listener foreign_activate_request;
@@ -118,8 +107,6 @@ struct sway_view {
                 struct wl_signal unmap;
         } events;
 
-        struct wl_listener surface_new_subsurface;
-
         int max_render_time; // In milliseconds
 
         enum seat_config_shortcuts_inhibit shortcuts_inhibit;
@@ -131,6 +118,7 @@ struct sway_xdg_shell_view {
         struct wl_listener commit;
         struct wl_listener request_move;
         struct wl_listener request_resize;
+        struct wl_listener request_maximize;
         struct wl_listener request_fullscreen;
         struct wl_listener set_title;
         struct wl_listener set_app_id;
@@ -143,6 +131,8 @@ struct sway_xdg_shell_view {
 struct sway_xwayland_view {
         struct sway_view view;
 
+        struct wlr_scene_tree *surface_tree;
+
         struct wl_listener commit;
         struct wl_listener request_move;
         struct wl_listener request_resize;
@@ -154,72 +144,55 @@ struct sway_xwayland_view {
         struct wl_listener set_title;
         struct wl_listener set_class;
         struct wl_listener set_role;
+        struct wl_listener set_startup_id;
         struct wl_listener set_window_type;
         struct wl_listener set_hints;
         struct wl_listener set_decorations;
+        struct wl_listener associate;
+        struct wl_listener dissociate;
         struct wl_listener map;
         struct wl_listener unmap;
         struct wl_listener destroy;
         struct wl_listener override_redirect;
+
+        struct wl_listener surface_tree_destroy;
 };
 
 struct sway_xwayland_unmanaged {
         struct wlr_xwayland_surface *wlr_xwayland_surface;
-        struct wl_list link;
 
-        int lx, ly;
+        struct wlr_scene_surface *surface_scene;
 
         struct wl_listener request_activate;
         struct wl_listener request_configure;
         struct wl_listener request_fullscreen;
-        struct wl_listener commit;
         struct wl_listener set_geometry;
+        struct wl_listener associate;
+        struct wl_listener dissociate;
         struct wl_listener map;
         struct wl_listener unmap;
         struct wl_listener destroy;
         struct wl_listener override_redirect;
 };
 #endif
-struct sway_view_child;
-
-struct sway_view_child_impl {
-        void (*get_view_coords)(struct sway_view_child *child, int *sx, int *sy);
-        void (*destroy)(struct sway_view_child *child);
-};
-
-/**
- * A view child is a surface in the view tree, such as a subsurface or a popup.
- */
-struct sway_view_child {
-        const struct sway_view_child_impl *impl;
-        struct wl_list link;
 
+struct sway_popup_desc {
+        struct wlr_scene_node *relative;
         struct sway_view *view;
-        struct sway_view_child *parent;
-        struct wl_list children; // sway_view_child::link
-        struct wlr_surface *surface;
-        bool mapped;
-
-        struct wl_listener surface_commit;
-        struct wl_listener surface_new_subsurface;
-        struct wl_listener surface_map;
-        struct wl_listener surface_unmap;
-        struct wl_listener surface_destroy;
-        struct wl_listener view_unmap;
-};
-
-struct sway_subsurface {
-        struct sway_view_child child;
-
-        struct wl_listener destroy;
 };
 
 struct sway_xdg_popup {
-        struct sway_view_child child;
+        struct sway_view *view;
 
+        struct wlr_scene_tree *scene_tree;
+        struct wlr_scene_tree *xdg_surface_tree;
         struct wlr_xdg_popup *wlr_xdg_popup;
 
+        struct sway_popup_desc desc;
+
+        struct wl_listener surface_commit;
         struct wl_listener new_popup;
+        struct wl_listener reposition;
         struct wl_listener destroy;
 };
 
@@ -268,7 +241,12 @@ void view_set_activated(struct sway_view *view, bool activated);
 /**
  * Called when the view requests to be focused.
  */
-void view_request_activate(struct sway_view *view);
+void view_request_activate(struct sway_view *view, struct sway_seat *seat);
+
+/*
+ * Called when the view requests urgent state
+ */
+void view_request_urgent(struct sway_view *view);
 
 /**
  * If possible, instructs the client to change their decoration mode.
@@ -287,23 +265,9 @@ void view_close(struct sway_view *view);
 
 void view_close_popups(struct sway_view *view);
 
-void view_damage_from(struct sway_view *view);
-
-/**
- * Iterate all surfaces of a view (toplevels + popups).
- */
-void view_for_each_surface(struct sway_view *view,
-        wlr_surface_iterator_func_t iterator, void *user_data);
-
-/**
- * Iterate all popup surfaces of a view.
- */
-void view_for_each_popup_surface(struct sway_view *view,
-        wlr_surface_iterator_func_t iterator, void *user_data);
-
 // view implementation
 
-void view_init(struct sway_view *view, enum sway_view_type type,
+bool view_init(struct sway_view *view, enum sway_view_type type,
         const struct sway_view_impl *impl);
 
 void view_destroy(struct sway_view *view);
@@ -325,14 +289,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 void view_unmap(struct sway_view *view);
 
 void view_update_size(struct sway_view *view);
-void view_center_surface(struct sway_view *view);
-
-void view_child_init(struct sway_view_child *child,
-        const struct sway_view_child_impl *impl, struct sway_view *view,
-        struct wlr_surface *surface);
-
-void view_child_destroy(struct sway_view_child *child);
-
+void view_center_and_clip_surface(struct sway_view *view);
 
 struct sway_view *view_from_wlr_xdg_surface(
         struct wlr_xdg_surface *xdg_surface);
@@ -342,6 +299,8 @@ struct sway_view *view_from_wlr_xwayland_surface(
 #endif
 struct sway_view *view_from_wlr_surface(struct wlr_surface *surface);
 
+void view_update_app_id(struct sway_view *view);
+
 /**
  * Re-read the view's title property and update any relevant title bars.
  * The force argument makes it recreate the title bars even if the title hasn't
@@ -371,4 +330,8 @@ void view_save_buffer(struct sway_view *view);
 
 bool view_is_transient_for(struct sway_view *child, struct sway_view *ancestor);
 
+void view_assign_ctx(struct sway_view *view, struct launcher_ctx *ctx);
+
+void view_send_frame_done(struct sway_view *view);
+
 #endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index b3d93a81..58bde20c 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -2,6 +2,8 @@
 #define _SWAY_WORKSPACE_H
 
 #include <stdbool.h>
+#include <wlr/types/wlr_scene.h>
+#include "sway/config.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 
@@ -22,6 +24,12 @@ struct sway_workspace_state {
 
 struct sway_workspace {
         struct sway_node node;
+
+        struct {
+                struct wlr_scene_tree *tiling;
+                struct wlr_scene_tree *fullscreen;
+        } layers;
+
         struct sway_container *fullscreen;
 
         char *name;