1 files changed, 16 insertions, 7 deletions

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e071e6c9..95708a04 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
@@ -108,11 +108,10 @@ 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 {
@@ -132,7 +131,6 @@ 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;
@@ -171,6 +169,7 @@ struct sway_xwayland_unmanaged {
 
         int lx, ly;
 
+        struct wl_listener request_activate;
         struct wl_listener request_configure;
         struct wl_listener request_fullscreen;
         struct wl_listener commit;
@@ -184,7 +183,7 @@ struct sway_xwayland_unmanaged {
 struct sway_view_child;
 
 struct sway_view_child_impl {
-        void (*get_root_coords)(struct sway_view_child *child, int *sx, int *sy);
+        void (*get_view_coords)(struct sway_view_child *child, int *sx, int *sy);
         void (*destroy)(struct sway_view_child *child);
 };
 
@@ -218,7 +217,7 @@ struct sway_subsurface {
 struct sway_xdg_popup {
         struct sway_view_child child;
 
-        struct wlr_xdg_surface *wlr_xdg_surface;
+        struct wlr_xdg_popup *wlr_xdg_popup;
 
         struct wl_listener new_popup;
         struct wl_listener destroy;
@@ -311,12 +310,22 @@ 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_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,