1 files changed, 42 insertions, 87 deletions

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e071e6c9..3e5a9bfe 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,8 +1,9 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_surface.h>
-#include "config.h"
+#include <wlr/types/wlr_compositor.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,16 +80,10 @@ 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_foreign_toplevel_handle_v1 *foreign_toplevel;
         struct wl_listener foreign_activate_request;
         struct wl_listener foreign_fullscreen_request;
@@ -108,19 +95,16 @@ struct sway_view {
         list_t *executed_criteria; // struct criteria *
 
         union {
-                struct wlr_xdg_surface *wlr_xdg_surface;
+                struct wlr_xdg_toplevel *wlr_xdg_toplevel;
 #if HAVE_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
 #endif
-                struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };
 
         struct {
                 struct wl_signal unmap;
         } events;
 
-        struct wl_listener surface_new_subsurface;
-
         int max_render_time; // In milliseconds
 
         enum seat_config_shortcuts_inhibit shortcuts_inhibit;
@@ -145,6 +129,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;
@@ -156,70 +142,46 @@ 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_root_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_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_xdg_surface *wlr_xdg_surface;
+        struct wlr_scene_tree *scene_tree;
+        struct wlr_scene_tree *xdg_surface_tree;
+        struct wlr_xdg_popup *wlr_xdg_popup;
 
+        struct wl_listener surface_commit;
         struct wl_listener new_popup;
         struct wl_listener destroy;
 };
@@ -269,7 +231,7 @@ 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);
 
 /**
  * If possible, instructs the client to change their decoration mode.
@@ -288,42 +250,31 @@ 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);
 
 void view_begin_destroy(struct sway_view *view);
 
+/**
+ * Map a view, ie. make it visible in the tree.
+ *
+ * `fullscreen` should be set to true (and optionally `fullscreen_output`
+ * should be populated) if the view should be made fullscreen immediately.
+ *
+ * `decoration` should be set to true if the client prefers CSD. The client's
+ * preference may be ignored.
+ */
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         bool fullscreen, struct wlr_output *fullscreen_output, bool decoration);
 
 void view_unmap(struct sway_view *view);
 
-void view_update_size(struct sway_view *view, int width, int height);
-
-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_update_size(struct sway_view *view);
+void view_center_and_clip_surface(struct sway_view *view);
 
 struct sway_view *view_from_wlr_xdg_surface(
         struct wlr_xdg_surface *xdg_surface);
@@ -362,4 +313,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