3 files changed, 27 insertions, 23 deletions

diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index ab969b17..e0909a03 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -47,10 +47,6 @@ static void set_position(struct sway_view *view, double ox, double oy) {
 	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) {
 	if (!assert_wl_shell(view)) {
 		return;
@@ -59,6 +55,13 @@ 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,
+	.set_size = set_size,
+	.set_position = set_position,
+	.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);
@@ -101,15 +104,10 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct sway_view *view = view_create(SWAY_WL_SHELL_VIEW);
+	struct sway_view *view = view_create(SWAY_WL_SHELL_VIEW, &view_impl);
 	if (!sway_assert(view, "Failed to allocate view")) {
 		return;
 	}
-	view->iface.get_prop = get_prop;
-	view->iface.set_size = set_size;
-	view->iface.set_position = set_position;
-	view->iface.set_activated = set_activated;
-	view->iface.close = close;
 	view->wlr_wl_shell_surface = shell_surface;
 	view->sway_wl_shell_surface = sway_surface;
 	sway_surface->view = view;
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 77a35b13..c1adc7fe 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -67,6 +67,14 @@ static void close(struct sway_view *view) {
 	}
 }
 
+static const struct sway_view_impl view_impl = {
+	.get_prop = get_prop,
+	.set_size = set_size,
+	.set_position = set_position,
+	.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);
@@ -124,15 +132,10 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct sway_view *view = view_create(SWAY_XDG_SHELL_V6_VIEW);
+	struct sway_view *view = view_create(SWAY_XDG_SHELL_V6_VIEW, &view_impl);
 	if (!sway_assert(view, "Failed to allocate view")) {
 		return;
 	}
-	view->iface.get_prop = get_prop;
-	view->iface.set_size = set_size;
-	view->iface.set_position = set_position;
-	view->iface.set_activated = set_activated;
-	view->iface.close = close;
 	view->wlr_xdg_surface_v6 = xdg_surface;
 	view->sway_xdg_surface_v6 = sway_surface;
 	sway_surface->view = view;
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index e1c2ad08..93c78228 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -81,13 +81,21 @@ 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,
+	.set_size = set_size,
+	.set_position = set_position,
+	.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);
@@ -159,15 +167,10 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct sway_view *view = view_create(SWAY_XWAYLAND_VIEW);
+	struct sway_view *view = view_create(SWAY_XWAYLAND_VIEW, &view_impl);
 	if (!sway_assert(view, "Failed to allocate view")) {
 		return;
 	}
-	view->iface.get_prop = get_prop;
-	view->iface.set_size = set_size;
-	view->iface.set_position = set_position;
-	view->iface.set_activated = set_activated;
-	view->iface.close = close_view;
 	view->wlr_xwayland_surface = xsurface;
 	view->sway_xwayland_surface = sway_surface;
 	sway_surface->view = view;