Introduce common functions to create, map, unmap, destroy views

4 files changed, 96 insertions, 122 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 0d706c52..6c97ac37 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);
@@ -338,6 +355,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;
@@ -378,6 +401,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 4fcc6317..ab969b17 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -75,15 +75,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 +101,18 @@ 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);
+	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->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;
 
 	// TODO:
 	// - Wire up listeners
@@ -132,11 +128,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 = sway_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);
-	sway_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 713437f2..77a35b13 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -82,29 +82,14 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 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 = sway_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);
-	sway_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 +97,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 +124,21 @@ 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);
+	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->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;
 
 	// 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 273ca2bf..e1c2ad08 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -102,56 +102,35 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 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);
+		view_map_unmanaged(view, xsurface->surface);
 	} 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 = sway_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);
-		sway_input_manager_set_focus(input_manager, cont);
+		view_map(view, xsurface->surface);
 	}
-
-	view_damage_whole(sway_surface->view);
 }
 
 static void handle_request_configure(struct wl_listener *listener, void *data) {
@@ -180,25 +159,21 @@ void handle_xwayland_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_XWAYLAND_VIEW);
+	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->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;
 
 	// 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);