Merge pull request #1691 from emersion/view-redesign

Views redesign

12 files changed, 355 insertions, 273 deletions

diff --git a/include/sway/output.h b/include/sway/output.h
index b343ecff..98d0f83f 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -24,6 +24,7 @@ struct sway_output {
         struct wl_listener destroy;
         struct wl_listener mode;
         struct wl_listener transform;
+        struct wl_listener scale;
 
         struct wl_listener damage_destroy;
         struct wl_listener damage_frame;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index aff2e58e..bd02197c 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -70,9 +70,10 @@ struct sway_container {
         enum sway_container_layout prev_layout;
         enum sway_container_layout workspace_layout;
 
-        // TODO convert to layout coordinates
+        // For C_ROOT, this has no meaning
+        // For C_OUTPUT, this is the output position in layout coordinates
+        // For other types, this is the position in output-local coordinates
         double x, y;
-
         // does not include borders or gaps.
         double width, height;
 
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index e1034657..a14152e8 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -20,7 +20,7 @@ struct sway_root {
 
         struct wl_listener output_layout_change;
 
-        struct wl_list unmanaged_views; // sway_view::unmanaged_view_link
+        struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
 
         struct {
                 struct wl_signal new_container;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 3965d2b7..4b84205e 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -4,6 +4,8 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/xwayland.h>
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 
 struct sway_container;
 struct sway_view;
@@ -37,6 +39,13 @@ struct sway_xwayland_surface {
         int pending_width, pending_height;
 };
 
+struct sway_xwayland_unmanaged {
+        struct wlr_xwayland_surface *wlr_xwayland_surface;
+        struct wl_list link;
+
+        struct wl_listener destroy;
+};
+
 struct sway_wl_shell_surface {
         struct sway_view *view;
 
@@ -64,10 +73,21 @@ enum sway_view_prop {
         VIEW_PROP_INSTANCE,
 };
 
+struct sway_view_impl {
+        const char *(*get_prop)(struct sway_view *view,
+                        enum sway_view_prop prop);
+        void (*configure)(struct sway_view *view, double ox, double oy, int width,
+                int height);
+        void (*set_activated)(struct sway_view *view, bool activated);
+        void (*close)(struct sway_view *view);
+};
+
 struct sway_view {
         enum sway_view_type type;
-        struct sway_container *swayc;
-        struct wlr_surface *surface;
+        const struct sway_view_impl *impl;
+
+        struct sway_container *swayc; // NULL for unmanaged views
+        struct wlr_surface *surface; // NULL for unmapped views
         int width, height;
 
         union {
@@ -82,21 +102,15 @@ struct sway_view {
                 struct sway_wl_shell_surface *sway_wl_shell_surface;
         };
 
-        struct {
-                const char *(*get_prop)(struct sway_view *view,
-                                enum sway_view_prop prop);
-                void (*set_size)(struct sway_view *view,
-                                int width, int height);
-                void (*set_position)(struct sway_view *view,
-                                double ox, double oy);
-                void (*set_activated)(struct sway_view *view, bool activated);
-                void (*close)(struct sway_view *view);
-        } iface;
-
         // only used for unmanaged views (shell specific)
-        struct wl_list unmanaged_view_link; // sway_root::unmanaged views
+        struct wl_list unmanaged_view_link; // sway_root::unmanaged_views
 };
 
+struct sway_view *view_create(enum sway_view_type type,
+        const struct sway_view_impl *impl);
+
+void view_destroy(struct sway_view *view);
+
 const char *view_get_title(struct sway_view *view);
 
 const char *view_get_app_id(struct sway_view *view);
@@ -105,18 +119,25 @@ const char *view_get_class(struct sway_view *view);
 
 const char *view_get_instance(struct sway_view *view);
 
-void view_set_size(struct sway_view *view, int width, int height);
-
-void view_set_position(struct sway_view *view, double ox, double oy);
+void view_configure(struct sway_view *view, double ox, double oy, int width,
+        int height);
 
 void view_set_activated(struct sway_view *view, bool activated);
 
 void view_close(struct sway_view *view);
 
-void view_update_outputs(struct sway_view *view, const struct wlr_box *before);
-
 void view_damage_whole(struct sway_view *view);
 
 void view_damage_from(struct sway_view *view);
 
+// view implementation
+
+void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
+
+void view_unmap(struct sway_view *view);
+
+void view_update_position(struct sway_view *view, double ox, double oy);
+
+void view_update_size(struct sway_view *view, int width, int height);
+
 #endif
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 5e8a081c..10ed1f6d 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -39,6 +39,32 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh,
         }
 }
 
+/**
+ * Checks whether a surface at (lx, ly) intersects an output. If `box` is not
+ * NULL, it populates it with the surface box in the output, in output-local
+ * coordinates.
+ */
+static bool surface_intersect_output(struct wlr_surface *surface,
+                struct wlr_output_layout *output_layout, struct wlr_output *wlr_output,
+                double lx, double ly, float rotation, struct wlr_box *box) {
+        double ox = lx, oy = ly;
+        wlr_output_layout_output_coords(output_layout, wlr_output, &ox, &oy);
+
+        if (box != NULL) {
+                box->x = ox * wlr_output->scale;
+                box->y = oy * wlr_output->scale;
+                box->width = surface->current->width * wlr_output->scale;
+                box->height = surface->current->height * wlr_output->scale;
+        }
+
+        struct wlr_box layout_box = {
+                .x = lx, .y = ly,
+                .width = surface->current->width, .height = surface->current->height,
+        };
+        wlr_box_rotated_bounds(&layout_box, rotation, &layout_box);
+        return wlr_output_layout_intersects(output_layout, wlr_output, &layout_box);
+}
+
 static void render_surface(struct wlr_surface *surface,
                 struct wlr_output *wlr_output, struct timespec *when,
                 double lx, double ly, float rotation) {
@@ -48,29 +74,21 @@ static void render_surface(struct wlr_surface *surface,
         if (!wlr_surface_has_buffer(surface)) {
                 return;
         }
+
         struct wlr_output_layout *layout = root_container.sway_root->output_layout;
-        int width = surface->current->width;
-        int height = surface->current->height;
-        int render_width = width * wlr_output->scale;
-        int render_height = height * wlr_output->scale;
-        int owidth, oheight;
-        wlr_output_effective_resolution(wlr_output, &owidth, &oheight);
-
-        // FIXME: view coords are inconsistently assumed to be in output or layout coords
-        struct wlr_box layout_box = {
-                .x = lx + wlr_output->lx, .y = ly + wlr_output->ly,
-                .width = render_width, .height = render_height,
-        };
-        if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) {
-                struct wlr_box render_box = {
-                        .x = lx, .y = ly,
-                        .width = render_width, .height = render_height
-                };
+
+        struct wlr_box box;
+        bool intersects = surface_intersect_output(surface, layout, wlr_output,
+                lx, ly, rotation, &box);
+        if (intersects) {
                 float matrix[9];
-                wlr_matrix_project_box(matrix, &render_box, surface->current->transform,
-                        0, wlr_output->transform_matrix);
-                wlr_render_texture_with_matrix(renderer, surface->texture, matrix,
-                        1.0f); // TODO: configurable alpha
+                enum wl_output_transform transform =
+                        wlr_output_transform_invert(surface->current->transform);
+                wlr_matrix_project_box(matrix, &box, transform, rotation,
+                        wlr_output->transform_matrix);
+
+                // TODO: configurable alpha
+                wlr_render_texture_with_matrix(renderer, surface->texture, matrix, 1.0f);
 
                 wlr_surface_send_frame_done(surface, when);
         }
@@ -80,9 +98,8 @@ static void render_surface(struct wlr_surface *surface,
                 struct wlr_surface_state *state = subsurface->surface->current;
                 double sx = state->subsurface_position.x;
                 double sy = state->subsurface_position.y;
-                double sw = state->buffer_width / state->scale;
-                double sh = state->buffer_height / state->scale;
-                rotate_child_position(&sx, &sy, sw, sh, width, height, rotation);
+                rotate_child_position(&sx, &sy, state->width, state->height,
+                        surface->current->width, surface->current->height, rotation);
 
                 render_surface(subsurface->surface, wlr_output, when,
                         lx + sx, ly + sy, rotation);
@@ -243,15 +260,15 @@ static void render_output(struct sway_output *output, struct timespec *when,
         container_descendants(workspace, C_VIEW, render_view, &rdata);
 
         // render unmanaged views on top
-        struct sway_view *view;
-        wl_list_for_each(view, &root_container.sway_root->unmanaged_views,
-                        unmanaged_view_link) {
-                if (view->type != SWAY_XWAYLAND_VIEW) {
+        struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged;
+        struct sway_xwayland_unmanaged *sway_surface;
+        wl_list_for_each(sway_surface, unmanaged, link) {
+                struct wlr_xwayland_surface *xsurface =
+                        sway_surface->wlr_xwayland_surface;
+                if (xsurface->surface == NULL) {
                         continue;
                 }
 
-                struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-
                 const struct wlr_box view_box = {
                         .x = xsurface->x,
                         .y = xsurface->y,
@@ -263,7 +280,7 @@ static void render_output(struct sway_output *output, struct timespec *when,
                         continue;
                 }
 
-                render_surface(view->surface, wlr_output, &output->last_frame,
+                render_surface(xsurface->surface, wlr_output, &output->last_frame,
                         view_box.x - output_box->x, view_box.y - output_box->y, 0);
         }
 
@@ -341,6 +358,12 @@ static void handle_transform(struct wl_listener *listener, void *data) {
         arrange_windows(output->swayc, -1, -1);
 }
 
+static void handle_scale(struct wl_listener *listener, void *data) {
+        struct sway_output *output = wl_container_of(listener, output, scale);
+        arrange_layers(output);
+        arrange_windows(output->swayc, -1, -1);
+}
+
 void handle_new_output(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server, new_output);
         struct wlr_output *wlr_output = data;
@@ -381,6 +404,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
         output->mode.notify = handle_mode;
         wl_signal_add(&wlr_output->events.transform, &output->transform);
         output->transform.notify = handle_transform;
+        wl_signal_add(&wlr_output->events.scale, &output->scale);
+        output->scale.notify = handle_scale;
 
         wl_signal_add(&output->damage->events.frame, &output->damage_frame);
         output->damage_frame.notify = damage_handle_frame;
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index c44fcf27..6528a397 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -30,28 +30,18 @@ static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
         }
 }
 
-static void set_size(struct sway_view *view, int width, int height) {
+static void configure(struct sway_view *view, double ox, double oy, int width,
+                int height) {
         if (!assert_wl_shell(view)) {
                 return;
         }
+        view_update_position(view, ox, oy);
         view->sway_wl_shell_surface->pending_width = width;
         view->sway_wl_shell_surface->pending_height = height;
         wlr_wl_shell_surface_configure(view->wlr_wl_shell_surface, 0, width, height);
 }
 
-static void set_position(struct sway_view *view, double ox, double oy) {
-        if (!assert_wl_shell(view)) {
-                return;
-        }
-        view->swayc->x = ox;
-        view->swayc->y = oy;
-}
-
-static void set_activated(struct sway_view *view, bool activated) {
-        // no way to activate wl_shell
-}
-
-static void close(struct sway_view *view) {
+static void _close(struct sway_view *view) {
         if (!assert_wl_shell(view)) {
                 return;
         }
@@ -59,14 +49,20 @@ static void close(struct sway_view *view) {
         wl_client_destroy(view->wlr_wl_shell_surface->client);
 }
 
+static const struct sway_view_impl view_impl = {
+        .get_prop = get_prop,
+        .configure = configure,
+        .close = _close,
+};
+
 static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_wl_shell_surface *sway_surface =
                 wl_container_of(listener, sway_surface, commit);
         struct sway_view *view = sway_surface->view;
         // NOTE: We intentionally discard the view's desired width here
         // TODO: Let floating views do whatever
-        view->width = sway_surface->pending_width;
-        view->height = sway_surface->pending_height;
+        view_update_size(view, sway_surface->pending_width,
+                sway_surface->pending_height);
         view_damage_from(view);
 }
 
@@ -75,15 +71,13 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, sway_surface, destroy);
         wl_list_remove(&sway_surface->commit.link);
         wl_list_remove(&sway_surface->destroy.link);
-        struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
-        free(sway_surface->view);
+        view_destroy(sway_surface->view);
         free(sway_surface);
-        arrange_windows(parent, -1, -1);
 }
 
 void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
-        struct sway_server *server = wl_container_of(
-                        listener, server, wl_shell_surface);
+        struct sway_server *server = wl_container_of(listener, server,
+                wl_shell_surface);
         struct wlr_wl_shell_surface *shell_surface = data;
 
         if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) {
@@ -103,20 +97,13 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        struct sway_view *sway_view = calloc(1, sizeof(struct sway_view));
-        if (!sway_assert(sway_view, "Failed to allocate view!")) {
+        struct sway_view *view = view_create(SWAY_WL_SHELL_VIEW, &view_impl);
+        if (!sway_assert(view, "Failed to allocate view")) {
                 return;
         }
-        sway_view->type = SWAY_WL_SHELL_VIEW;
-        sway_view->iface.get_prop = get_prop;
-        sway_view->iface.set_size = set_size;
-        sway_view->iface.set_position = set_position;
-        sway_view->iface.set_activated = set_activated;
-        sway_view->iface.close = close;
-        sway_view->wlr_wl_shell_surface = shell_surface;
-        sway_view->sway_wl_shell_surface = sway_surface;
-        sway_view->surface = shell_surface->surface;
-        sway_surface->view = sway_view;
+        view->wlr_wl_shell_surface = shell_surface;
+        view->sway_wl_shell_surface = sway_surface;
+        sway_surface->view = view;
 
         // TODO:
         // - Wire up listeners
@@ -132,11 +119,5 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
         sway_surface->destroy.notify = handle_destroy;
         wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
 
-        struct sway_seat *seat = input_manager_current_seat(input_manager);
-        struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
-        struct sway_container *cont = container_view_create(focus, sway_view);
-        sway_view->swayc = cont;
-
-        arrange_windows(cont->parent, -1, -1);
-        input_manager_set_focus(input_manager, cont);
+        view_map(view, shell_surface->surface);
 }
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index cffe83fb..49305b39 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -30,23 +30,18 @@ static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
         }
 }
 
-static void set_size(struct sway_view *view, int width, int height) {
+static void configure(struct sway_view *view, double ox, double oy, int width,
+                int height) {
         if (!assert_xdg(view)) {
                 return;
         }
+
+        view_update_position(view, ox, oy);
         view->sway_xdg_surface_v6->pending_width = width;
         view->sway_xdg_surface_v6->pending_height = height;
         wlr_xdg_toplevel_v6_set_size(view->wlr_xdg_surface_v6, width, height);
 }
 
-static void set_position(struct sway_view *view, double ox, double oy) {
-        if (!assert_xdg(view)) {
-                return;
-        }
-        view->swayc->x = ox;
-        view->swayc->y = oy;
-}
-
 static void set_activated(struct sway_view *view, bool activated) {
         if (!assert_xdg(view)) {
                 return;
@@ -57,7 +52,7 @@ static void set_activated(struct sway_view *view, bool activated) {
         }
 }
 
-static void close(struct sway_view *view) {
+static void _close(struct sway_view *view) {
         if (!assert_xdg(view)) {
                 return;
         }
@@ -67,6 +62,13 @@ static void close(struct sway_view *view) {
         }
 }
 
+static const struct sway_view_impl view_impl = {
+        .get_prop = get_prop,
+        .configure = configure,
+        .set_activated = set_activated,
+        .close = _close,
+};
+
 static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_xdg_surface_v6 *sway_surface =
                 wl_container_of(listener, sway_surface, commit);
@@ -74,37 +76,22 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         // NOTE: We intentionally discard the view's desired width here
         // TODO: Store this for restoration when moving to floating plane
         // TODO: Let floating views do whatever
-        view->width = sway_surface->pending_width;
-        view->height = sway_surface->pending_height;
+        view_update_size(view, sway_surface->pending_width,
+                sway_surface->pending_height);
         view_damage_from(view);
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {
         struct sway_xdg_surface_v6 *sway_surface =
                 wl_container_of(listener, sway_surface, unmap);
-        view_damage_whole(sway_surface->view);
-        container_view_destroy(sway_surface->view->swayc);
-        sway_surface->view->swayc = NULL;
-        sway_surface->view->surface = NULL;
+        view_unmap(sway_surface->view);
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_xdg_surface_v6 *sway_surface =
                 wl_container_of(listener, sway_surface, map);
         struct sway_view *view = sway_surface->view;
-
-        sway_surface->view->surface = view->wlr_xdg_surface_v6->surface;
-
-        container_view_destroy(view->swayc);
-
-        struct sway_seat *seat = input_manager_current_seat(input_manager);
-        struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
-        struct sway_container *cont = container_view_create(focus, view);
-        view->swayc = cont;
-        arrange_windows(cont->parent, -1, -1);
-        input_manager_set_focus(input_manager, cont);
-
-        view_damage_whole(sway_surface->view);
+        view_map(view, view->wlr_xdg_surface_v6->surface);
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -112,8 +99,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, sway_xdg_surface, destroy);
         wl_list_remove(&sway_xdg_surface->commit.link);
         wl_list_remove(&sway_xdg_surface->destroy.link);
-        container_view_destroy(sway_xdg_surface->view->swayc);
-        free(sway_xdg_surface->view);
+        wl_list_remove(&sway_xdg_surface->map.link);
+        wl_list_remove(&sway_xdg_surface->unmap.link);
+        view_destroy(sway_xdg_surface->view);
         free(sway_xdg_surface);
 }
 
@@ -138,23 +126,16 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        struct sway_view *sway_view = calloc(1, sizeof(struct sway_view));
-        if (!sway_assert(sway_view, "Failed to allocate view!")) {
+        struct sway_view *view = view_create(SWAY_XDG_SHELL_V6_VIEW, &view_impl);
+        if (!sway_assert(view, "Failed to allocate view")) {
                 return;
         }
-        sway_view->type = SWAY_XDG_SHELL_V6_VIEW;
-        sway_view->iface.get_prop = get_prop;
-        sway_view->iface.set_size = set_size;
-        sway_view->iface.set_position = set_position;
-        sway_view->iface.set_activated = set_activated;
-        sway_view->iface.close = close;
-        sway_view->wlr_xdg_surface_v6 = xdg_surface;
-        sway_view->sway_xdg_surface_v6 = sway_surface;
-        sway_surface->view = sway_view;
+        view->wlr_xdg_surface_v6 = xdg_surface;
+        view->sway_xdg_surface_v6 = sway_surface;
+        sway_surface->view = view;
 
         // TODO:
         // - Look up pid and open on appropriate workspace
-        // - Set new view to maximized so it behaves nicely
         // - Criteria
 
         sway_surface->commit.notify = handle_commit;
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 17f827d9..bfef68cf 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -14,6 +14,33 @@
 #include "sway/input/input-manager.h"
 #include "log.h"
 
+static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *sway_surface =
+                wl_container_of(listener, sway_surface, destroy);
+        wl_list_remove(&sway_surface->destroy.link);
+        wl_list_remove(&sway_surface->link);
+        free(sway_surface);
+}
+
+static void create_unmanaged(struct wlr_xwayland_surface *xsurface) {
+        struct sway_xwayland_unmanaged *sway_surface =
+                calloc(1, sizeof(struct sway_xwayland_unmanaged));
+        if (!sway_assert(sway_surface, "Failed to allocate surface")) {
+                return;
+        }
+
+        sway_surface->wlr_xwayland_surface = xsurface;
+
+        wl_signal_add(&xsurface->events.destroy, &sway_surface->destroy);
+        sway_surface->destroy.notify = unmanaged_handle_destroy;
+
+        wl_list_insert(&root_container.sway_root->xwayland_unmanaged,
+                &sway_surface->link);
+
+        // TODO: damage tracking
+}
+
+
 static bool assert_xwayland(struct sway_view *view) {
         return sway_assert(view->type == SWAY_XWAYLAND_VIEW,
                 "Expected xwayland view!");
@@ -33,22 +60,13 @@ static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
         }
 }
 
-static void set_size(struct sway_view *view, int width, int height) {
+static void configure(struct sway_view *view, double ox, double oy, int width,
+                int height) {
         if (!assert_xwayland(view)) {
                 return;
         }
-        view->sway_xwayland_surface->pending_width = width;
-        view->sway_xwayland_surface->pending_height = height;
-
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        wlr_xwayland_surface_configure(xsurface, xsurface->x, xsurface->y,
-                width, height);
-}
 
-static void set_position(struct sway_view *view, double ox, double oy) {
-        if (!assert_xwayland(view)) {
-                return;
-        }
         struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
         if (!sway_assert(output, "view must be within tree to set position")) {
                 return;
@@ -64,13 +82,12 @@ static void set_position(struct sway_view *view, double ox, double oy) {
                 return;
         }
 
-        view->swayc->x = ox;
-        view->swayc->y = oy;
+        view_update_position(view, ox, oy);
 
-        wlr_xwayland_surface_configure(view->wlr_xwayland_surface,
-                ox + loutput->x, oy + loutput->y,
-                view->wlr_xwayland_surface->width,
-                view->wlr_xwayland_surface->height);
+        view->sway_xwayland_surface->pending_width = width;
+        view->sway_xwayland_surface->pending_height = height;
+        wlr_xwayland_surface_configure(xsurface, ox + loutput->x, oy + loutput->y,
+                width, height);
 }
 
 static void set_activated(struct sway_view *view, bool activated) {
@@ -81,77 +98,58 @@ static void set_activated(struct sway_view *view, bool activated) {
         wlr_xwayland_surface_activate(surface, activated);
 }
 
-static void close_view(struct sway_view *view) {
+static void _close(struct sway_view *view) {
         if (!assert_xwayland(view)) {
                 return;
         }
         wlr_xwayland_surface_close(view->wlr_xwayland_surface);
 }
 
+static const struct sway_view_impl view_impl = {
+        .get_prop = get_prop,
+        .configure = configure,
+        .set_activated = set_activated,
+        .close = _close,
+};
+
 static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_xwayland_surface *sway_surface =
                 wl_container_of(listener, sway_surface, commit);
         struct sway_view *view = sway_surface->view;
         // NOTE: We intentionally discard the view's desired width here
         // TODO: Let floating views do whatever
-        view->width = sway_surface->pending_width;
-        view->height = sway_surface->pending_height;
+        view_update_size(view, sway_surface->pending_width,
+                sway_surface->pending_height);
         view_damage_from(view);
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
         struct sway_xwayland_surface *sway_surface =
                 wl_container_of(listener, sway_surface, destroy);
-
         wl_list_remove(&sway_surface->commit.link);
         wl_list_remove(&sway_surface->destroy.link);
         wl_list_remove(&sway_surface->request_configure.link);
-        wl_list_remove(&sway_surface->view->unmanaged_view_link);
-        container_view_destroy(sway_surface->view->swayc);
-        sway_surface->view->swayc = NULL;
-        sway_surface->view->surface = NULL;
+        wl_list_remove(&sway_surface->map.link);
+        wl_list_remove(&sway_surface->unmap.link);
+        view_destroy(sway_surface->view);
+        free(sway_surface);
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {
         struct sway_xwayland_surface *sway_surface =
                 wl_container_of(listener, sway_surface, unmap);
-        view_damage_whole(sway_surface->view);
-        wl_list_remove(&sway_surface->view->unmanaged_view_link);
-        wl_list_init(&sway_surface->view->unmanaged_view_link);
-        container_view_destroy(sway_surface->view->swayc);
-        sway_surface->view->swayc = NULL;
-        sway_surface->view->surface = NULL;
+        view_unmap(sway_surface->view);
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_xwayland_surface *sway_surface =
                 wl_container_of(listener, sway_surface, map);
         struct wlr_xwayland_surface *xsurface = data;
-
-        sway_surface->view->surface = xsurface->surface;
+        struct sway_view *view = sway_surface->view;
 
         // put it back into the tree
-        if (wlr_xwayland_surface_is_unmanaged(xsurface) ||
-                        xsurface->override_redirect) {
-                wl_list_remove(&sway_surface->view->unmanaged_view_link);
-                wl_list_insert(&root_container.sway_root->unmanaged_views,
-                        &sway_surface->view->unmanaged_view_link);
-        } else {
-                struct sway_view *view = sway_surface->view;
-                container_view_destroy(view->swayc);
-
-                wlr_xwayland_surface_set_maximized(xsurface, true);
-
-                struct sway_seat *seat = input_manager_current_seat(input_manager);
-                struct sway_container *focus = seat_get_focus_inactive(seat,
-                        &root_container);
-                struct sway_container *cont = container_view_create(focus, view);
-                view->swayc = cont;
-                arrange_windows(cont->parent, -1, -1);
-                input_manager_set_focus(input_manager, cont);
-        }
-
-        view_damage_whole(sway_surface->view);
+        wlr_xwayland_surface_set_maximized(xsurface, true);
+        view_map(view, xsurface->surface);
 }
 
 static void handle_request_configure(struct wl_listener *listener, void *data) {
@@ -171,34 +169,32 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
                         listener, server, xwayland_surface);
         struct wlr_xwayland_surface *xsurface = data;
 
+        if (wlr_xwayland_surface_is_unmanaged(xsurface) ||
+                        xsurface->override_redirect) {
+                wlr_log(L_DEBUG, "New xwayland unmanaged surface");
+                create_unmanaged(xsurface);
+                return;
+        }
+
         wlr_log(L_DEBUG, "New xwayland surface title='%s' class='%s'",
-                        xsurface->title, xsurface->class);
+                xsurface->title, xsurface->class);
 
         struct sway_xwayland_surface *sway_surface =
                 calloc(1, sizeof(struct sway_xwayland_surface));
-        if (!sway_assert(sway_surface, "Failed to allocate surface!")) {
+        if (!sway_assert(sway_surface, "Failed to allocate surface")) {
                 return;
         }
 
-        struct sway_view *sway_view = calloc(1, sizeof(struct sway_view));
-        if (!sway_assert(sway_view, "Failed to allocate view!")) {
+        struct sway_view *view = view_create(SWAY_XWAYLAND_VIEW, &view_impl);
+        if (!sway_assert(view, "Failed to allocate view")) {
                 return;
         }
-        sway_view->type = SWAY_XWAYLAND_VIEW;
-        sway_view->iface.get_prop = get_prop;
-        sway_view->iface.set_size = set_size;
-        sway_view->iface.set_position = set_position;
-        sway_view->iface.set_activated = set_activated;
-        sway_view->iface.close = close_view;
-        sway_view->wlr_xwayland_surface = xsurface;
-        sway_view->sway_xwayland_surface = sway_surface;
-        sway_surface->view = sway_view;
-
-        wl_list_init(&sway_view->unmanaged_view_link);
+        view->wlr_xwayland_surface = xsurface;
+        view->sway_xwayland_surface = sway_surface;
+        sway_surface->view = view;
 
         // TODO:
         // - Look up pid and open on appropriate workspace
-        // - Set new view to maximized so it behaves nicely
         // - Criteria
 
         wl_signal_add(&xsurface->surface->events.commit, &sway_surface->commit);
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 7d05e942..97b4473c 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -47,14 +47,15 @@ static struct wlr_surface *layer_surface_at(struct sway_output *output,
 static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
                 struct wlr_surface **surface, double *sx, double *sy) {
         // check for unmanaged views first
-        struct wl_list *unmanaged = &root_container.sway_root->unmanaged_views;
-        struct sway_view *view;
-        wl_list_for_each_reverse(view, unmanaged, unmanaged_view_link) {
-                if (view->type != SWAY_XWAYLAND_VIEW) {
+        struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged;
+        struct sway_xwayland_unmanaged *sway_surface;
+        wl_list_for_each_reverse(sway_surface, unmanaged, link) {
+                struct wlr_xwayland_surface *xsurface =
+                        sway_surface->wlr_xwayland_surface;
+                if (xsurface->surface == NULL) {
                         continue;
                 }
 
-                struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
                 struct wlr_box box = {
                         .x = xsurface->x,
                         .y = xsurface->y,
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 62ae0603..3333f9f1 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -57,7 +57,7 @@ void layout_init(void) {
 
         root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
         root_container.sway_root->output_layout = wlr_output_layout_create();
-        wl_list_init(&root_container.sway_root->unmanaged_views);
+        wl_list_init(&root_container.sway_root->xwayland_unmanaged);
         wl_signal_init(&root_container.sway_root->events.new_container);
 
         root_container.sway_root->output_layout_change.notify =
@@ -287,7 +287,7 @@ void arrange_windows(struct sway_container *container,
                 {
                         container->width = width;
                         container->height = height;
-                        view_set_size(container->sway_view,
+                        view_configure(container->sway_view, container->x, container->y,
                                 container->width, container->height);
                         wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f",
                                         container->width, container->height,
@@ -348,7 +348,8 @@ static void apply_horiz_layout(struct sway_container *container,
                         wlr_log(L_DEBUG,
                                 "Calculating arrangement for %p:%d (will scale %f by %f)",
                                 child, child->type, width, scale);
-                        view_set_position(child->sway_view, child_x, y);
+                        view_configure(child->sway_view, child_x, y, child->width,
+                                child->height);
 
                         if (i == end - 1) {
                                 double remaining_width = x + width - child_x;
@@ -399,7 +400,8 @@ void apply_vert_layout(struct sway_container *container,
                         wlr_log(L_DEBUG,
                                 "Calculating arrangement for %p:%d (will scale %f by %f)",
                                 child, child->type, height, scale);
-                        view_set_position(child->sway_view, x, child_y);
+                        view_configure(child->sway_view, x, child_y, child->width,
+                                child->height);
 
                         if (i == end - 1) {
                                 double remaining_height = y + height - child_y;
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 2331dc2b..0509db23 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -30,6 +30,7 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
         wl_list_remove(&output->sway_output->destroy.link);
         wl_list_remove(&output->sway_output->mode.link);
         wl_list_remove(&output->sway_output->transform.link);
+        wl_list_remove(&output->sway_output->scale.link);
 
         wl_list_remove(&output->sway_output->damage_destroy.link);
         wl_list_remove(&output->sway_output->damage_frame.link);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index b7d1a41b..09c804e4 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
 #include "log.h"
@@ -6,82 +7,117 @@
 #include "sway/tree/layout.h"
 #include "sway/tree/view.h"
 
+struct sway_view *view_create(enum sway_view_type type,
+                const struct sway_view_impl *impl) {
+        struct sway_view *view = calloc(1, sizeof(struct sway_view));
+        if (view == NULL) {
+                return NULL;
+        }
+        view->type = type;
+        view->impl = impl;
+        return view;
+}
+
+void view_destroy(struct sway_view *view) {
+        if (view == NULL) {
+                return;
+        }
+
+        if (view->surface != NULL) {
+                view_unmap(view);
+        }
+
+        container_view_destroy(view->swayc);
+        free(view);
+}
+
 const char *view_get_title(struct sway_view *view) {
-        if (view->iface.get_prop) {
-                return view->iface.get_prop(view, VIEW_PROP_TITLE);
+        if (view->impl->get_prop) {
+                return view->impl->get_prop(view, VIEW_PROP_TITLE);
         }
         return NULL;
 }
 
 const char *view_get_app_id(struct sway_view *view) {
-        if (view->iface.get_prop) {
-                return view->iface.get_prop(view, VIEW_PROP_APP_ID);
+        if (view->impl->get_prop) {
+                return view->impl->get_prop(view, VIEW_PROP_APP_ID);
         }
         return NULL;
 }
 
 const char *view_get_class(struct sway_view *view) {
-        if (view->iface.get_prop) {
-                return view->iface.get_prop(view, VIEW_PROP_CLASS);
+        if (view->impl->get_prop) {
+                return view->impl->get_prop(view, VIEW_PROP_CLASS);
         }
         return NULL;
 }
 
 const char *view_get_instance(struct sway_view *view) {
-        if (view->iface.get_prop) {
-                return view->iface.get_prop(view, VIEW_PROP_INSTANCE);
+        if (view->impl->get_prop) {
+                return view->impl->get_prop(view, VIEW_PROP_INSTANCE);
         }
         return NULL;
 }
 
-void view_set_size(struct sway_view *view, int width, int height) {
-        if (view->iface.set_size) {
-                struct wlr_box box = {
-                        .x = view->swayc->x,
-                        .y = view->swayc->y,
-                        .width = view->width,
-                        .height = view->height,
-                };
-                view->iface.set_size(view, width, height);
-                view_update_outputs(view, &box);
+void view_configure(struct sway_view *view, double ox, double oy, int width,
+                int height) {
+        if (view->impl->configure) {
+                view->impl->configure(view, ox, oy, width, height);
         }
 }
 
-// TODO make view coordinates in layout coordinates
-void view_set_position(struct sway_view *view, double ox, double oy) {
-        if (view->iface.set_position) {
-                struct wlr_box box = {
-                        .x = view->swayc->x,
-                        .y = view->swayc->y,
-                        .width = view->width,
-                        .height = view->height,
-                };
-                view->iface.set_position(view, ox, oy);
-                view_update_outputs(view, &box);
+void view_set_activated(struct sway_view *view, bool activated) {
+        if (view->impl->set_activated) {
+                view->impl->set_activated(view, activated);
         }
 }
 
-void view_set_activated(struct sway_view *view, bool activated) {
-        if (view->iface.set_activated) {
-                view->iface.set_activated(view, activated);
+void view_close(struct sway_view *view) {
+        if (view->impl->close) {
+                view->impl->close(view);
         }
 }
 
-void view_close(struct sway_view *view) {
-        if (view->iface.close) {
-                view->iface.close(view);
+struct sway_container *container_view_destroy(struct sway_container *view) {
+        if (!view) {
+                return NULL;
         }
+        wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
+        struct sway_container *parent = container_destroy(view);
+        arrange_windows(parent, -1, -1);
+        return parent;
+}
+
+void view_damage_whole(struct sway_view *view) {
+        for (int i = 0; i < root_container.children->length; ++i) {
+                struct sway_container *cont = root_container.children->items[i];
+                if (cont->type == C_OUTPUT) {
+                        output_damage_whole_view(cont->sway_output, view);
+                }
+        }
+}
+
+void view_damage_from(struct sway_view *view) {
+        // TODO
+        view_damage_whole(view);
+}
+
+static void view_get_layout_box(struct sway_view *view, struct wlr_box *box) {
+        struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+
+        box->x = output->x + view->swayc->x;
+        box->y = output->y + view->swayc->y;
+        box->width = view->width;
+        box->height = view->height;
 }
 
-void view_update_outputs(struct sway_view *view, const struct wlr_box *before) {
+static void view_update_outputs(struct sway_view *view,
+                const struct wlr_box *before) {
+        struct wlr_box box;
+        view_get_layout_box(view, &box);
+
         struct wlr_output_layout *output_layout =
                 root_container.sway_root->output_layout;
-        struct wlr_box box = {
-                .x = view->swayc->x,
-                .y = view->swayc->y,
-                .width = view->width,
-                .height = view->height,
-        };
         struct wlr_output_layout_output *layout_output;
         wl_list_for_each(layout_output, &output_layout->outputs, link) {
                 bool intersected = before != NULL && wlr_output_layout_intersects(
@@ -97,27 +133,63 @@ void view_update_outputs(struct sway_view *view, const struct wlr_box *before) {
         }
 }
 
-struct sway_container *container_view_destroy(struct sway_container *view) {
-        if (!view) {
-                return NULL;
+void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
+        if (!sway_assert(view->surface == NULL, "cannot map mapped view")) {
+                return;
         }
-        wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
-        struct sway_container *parent = container_destroy(view);
-        arrange_windows(parent, -1, -1);
-        return parent;
+
+        struct sway_seat *seat = input_manager_current_seat(input_manager);
+        struct sway_container *focus = seat_get_focus_inactive(seat,
+                &root_container);
+        struct sway_container *cont = container_view_create(focus, view);
+
+        view->surface = wlr_surface;
+        view->swayc = cont;
+
+        arrange_windows(cont->parent, -1, -1);
+        input_manager_set_focus(input_manager, cont);
+
+        view_damage_whole(view);
+        view_update_outputs(view, NULL);
 }
 
-void view_damage_whole(struct sway_view *view) {
-        struct sway_container *cont = NULL;
-        for (int i = 0; i < root_container.children->length; ++i) {
-                cont = root_container.children->items[i];
-                if (cont->type == C_OUTPUT) {
-                        output_damage_whole_view(cont->sway_output, view);
-                }
+void view_unmap(struct sway_view *view) {
+        if (!sway_assert(view->surface != NULL, "cannot unmap unmapped view")) {
+                return;
         }
+
+        view_damage_whole(view);
+
+        container_view_destroy(view->swayc);
+
+        view->swayc = NULL;
+        view->surface = NULL;
 }
 
-void view_damage_from(struct sway_view *view) {
-        // TODO
+void view_update_position(struct sway_view *view, double ox, double oy) {
+        if (view->swayc->x == ox && view->swayc->y == oy) {
+                return;
+        }
+
+        struct wlr_box box;
+        view_get_layout_box(view, &box);
+        view_damage_whole(view);
+        view->swayc->x = ox;
+        view->swayc->y = oy;
+        view_update_outputs(view, &box);
+        view_damage_whole(view);
+}
+
+void view_update_size(struct sway_view *view, int width, int height) {
+        if (view->width == width && view->height == height) {
+                return;
+        }
+
+        struct wlr_box box;
+        view_get_layout_box(view, &box);
+        view_damage_whole(view);
+        view->width = width;
+        view->height = height;
+        view_update_outputs(view, &box);
         view_damage_whole(view);
 }