Atomic layout updates

include/sway/desktop/transaction.h

@@ -0,0 +1,60 @@
+#ifndef _SWAY_TRANSACTION_H
+#define _SWAY_TRANSACTION_H
+#include <wlr/render/wlr_texture.h>
+#include "sway/tree/container.h"
+
+/**
+ * Transactions enable us to perform atomic layout updates.
+ *
+ * When we want to make adjustments to the layout, we create a transaction.
+ * A transaction contains a list of affected containers and their new state.
+ * A state might contain a new size, or new border settings, or new parent/child
+ * relationships.
+ *
+ * Calling transaction_commit() makes sway notify of all the affected clients
+ * with their new sizes. We then wait for all the views to respond with their
+ * new surface sizes. When all are ready, or when a timeout has passed, we apply
+ * the updates all at the same time.
+ */
+
+struct sway_transaction;
+
+/**
+ * Create a new transaction.
+ */
+struct sway_transaction *transaction_create(void);
+
+/**
+ * Add a container's pending state to the transaction.
+ */
+void transaction_add_container(struct sway_transaction *transaction,
+		struct sway_container *container);
+
+/**
+ * Add a box to be damaged when the transaction is applied.
+ * The box should be in layout coordinates.
+ */
+void transaction_add_damage(struct sway_transaction *transaction,
+		struct wlr_box *box);
+
+/**
+ * Submit a transaction to the client views for configuration.
+ */
+void transaction_commit(struct sway_transaction *transaction);
+
+/**
+ * Notify the transaction system that a view is ready for the new layout.
+ *
+ * When all views in the transaction are ready, the layout will be applied.
+ */
+void transaction_notify_view_ready(struct sway_view *view, uint32_t serial);
+
+/**
+ * Get the texture that should be rendered for a view.
+ *
+ * In most cases this will return the normal live texture for a view, but if the
+ * view is in a transaction then it'll return a saved texture.
+ */
+struct wlr_texture *transaction_get_texture(struct sway_view *view);
+
+#endif

include/sway/input/seat.h

@@ -118,6 +118,17 @@ struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
 struct sway_container *seat_get_active_child(struct sway_seat *seat,
 		struct sway_container *container);
 
+/**
+ * Return the immediate child of container which was most recently focused, with
+ * fallback to selecting the child in the parent's `current` (rendered) children
+ * list.
+ *
+ * This is useful for when a tabbed container and its children are destroyed but
+ * still being rendered, and we have to render an appropriate child.
+ */
+struct sway_container *seat_get_active_current_child(struct sway_seat *seat,
+		struct sway_container *container);
+
 /**
  * Iterate over the focus-inactive children of the container calling the
  * function on each.

include/sway/output.h

@@ -42,6 +42,8 @@ void output_damage_surface(struct sway_output *output, double ox, double oy,
 void output_damage_from_view(struct sway_output *output,
 	struct sway_view *view);
 
+void output_damage_box(struct sway_output *output, struct wlr_box *box);
+
 void output_damage_whole_container(struct sway_output *output,
 	struct sway_container *con);
 

include/sway/server.h

@@ -12,6 +12,7 @@
 #include <wlr/render/wlr_renderer.h>
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
+#include "list.h"
 
 struct sway_server {
 	struct wl_display *wl_display;
@@ -43,6 +44,12 @@ struct sway_server {
 
 	struct wlr_wl_shell *wl_shell;
 	struct wl_listener wl_shell_surface;
+
+	bool terminating;
+
+	// When a view is being destroyed and is waiting for a transaction to
+	// complete it will be stored here.
+	list_t *destroying_containers;
 };
 
 struct sway_server server;

include/sway/tree/arrange.h

@@ -1,5 +1,6 @@
 #ifndef _SWAY_ARRANGE_H
 #define _SWAY_ARRANGE_H
+#include "sway/desktop/transaction.h"
 
 struct sway_container;
 
@@ -9,16 +10,23 @@ void remove_gaps(struct sway_container *c);
 // Add gaps around container
 void add_gaps(struct sway_container *c);
 
-// Determine the root container's geometry, then iterate to everything below
-void arrange_root(void);
-
-// Determine the output's geometry, then iterate to everything below
-void arrange_output(struct sway_container *output);
-
-// Determine the workspace's geometry, then iterate to everything below
-void arrange_workspace(struct sway_container *workspace);
-
-// Arrange layout for all the children of the given workspace/container
-void arrange_children_of(struct sway_container *parent);
+/**
+ * Arrange layout for all the children of the given container, and add them to
+ * the given transaction.
+ *
+ * Use this function if you need to arrange multiple sections of the tree in one
+ * transaction.
+ */
+void arrange_windows(struct sway_container *container,
+		struct sway_transaction *transaction);
+
+/**
+ * Arrange layout for the given container and commit the transaction.
+ *
+ * This function is a wrapper around arrange_windows, and handles creating and
+ * committing the transaction for you. Use this function if you're only doing
+ * one arrange operation.
+ */
+void arrange_and_commit(struct sway_container *container);
 
 #endif

include/sway/tree/container.h

@@ -54,6 +54,37 @@ struct sway_output;
 struct sway_workspace;
 struct sway_view;
 
+struct sway_container_state {
+	// Container/swayc properties
+	enum sway_container_layout layout;
+	double swayc_x, swayc_y;
+	double swayc_width, swayc_height;
+
+	bool has_gaps;
+	double current_gaps;
+	double gaps_inner;
+	double gaps_outer;
+
+	struct sway_container *parent;
+	list_t *children;
+
+	// View properties
+	double view_x, view_y;
+	double view_width, view_height;
+	bool is_fullscreen;
+
+	enum sway_container_border border;
+	int border_thickness;
+	bool border_top;
+	bool border_bottom;
+	bool border_left;
+	bool border_right;
+
+	// Workspace properties
+	struct sway_view *ws_fullscreen;
+	struct sway_container *ws_floating;
+};
+
 struct sway_container {
 	union {
 		// TODO: Encapsulate state for other node types as well like C_CONTAINER
@@ -69,6 +100,10 @@ struct sway_container {
 	 */
 	size_t id;
 
+	// The pending state is the main container properties, and the current state is in the below struct.
+	// This means most places of the code can refer to the main variables (pending state) and it'll just work.
+	struct sway_container_state current;
+
 	char *name;            // The view's title (unformatted)
 	char *formatted_title; // The title displayed in the title bar
 
@@ -97,8 +132,6 @@ struct sway_container {
 
 	struct sway_container *parent;
 
-	list_t *marks; // list of char*
-
 	float alpha;
 
 	struct wlr_texture *title_focused;
@@ -107,6 +140,10 @@ struct sway_container {
 	struct wlr_texture *title_urgent;
 	size_t title_height;
 
+	list_t *instructions; // struct sway_transaction_instruction *
+
+	bool destroying;
+
 	struct {
 		struct wl_signal destroy;
 		// Raised after the tree updates, but before arrange_windows
@@ -150,6 +187,8 @@ struct sway_container *workspace_create(struct sway_container *output,
 struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
+void container_free(struct sway_container *cont);
+
 struct sway_container *container_destroy(struct sway_container *container);
 
 struct sway_container *container_close(struct sway_container *container);
@@ -253,4 +292,9 @@ void container_set_geometry_from_floating_view(struct sway_container *con);
  */
 bool container_is_floating(struct sway_container *container);
 
+/**
+ * Get a container's box in layout coordinates.
+ */
+struct wlr_box *container_get_box(struct sway_container *container);
+
 #endif

include/sway/tree/view.h

@@ -29,15 +29,15 @@ struct sway_view_impl {
 	const char *(*get_string_prop)(struct sway_view *view,
 			enum sway_view_prop prop);
 	uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop);
-	void (*configure)(struct sway_view *view, double lx, double ly, int width,
-		int height);
+	uint32_t (*configure)(struct sway_view *view, double lx, double ly,
+			int width, int height);
 	void (*set_activated)(struct sway_view *view, bool activated);
 	void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
 	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 (*close)(struct sway_view *view);
-	void (*destroy)(struct sway_view *view);
+	void (*free)(struct sway_view *view);
 };
 
 struct sway_view {
@@ -68,6 +68,8 @@ struct sway_view {
 	bool border_left;
 	bool border_right;
 
+	bool destroying;
+
 	list_t *executed_criteria; // struct criteria *
 	list_t *marks;             // char *
 
@@ -103,8 +105,6 @@ struct sway_xdg_shell_v6_view {
 	struct wl_listener map;
 	struct wl_listener unmap;
 	struct wl_listener destroy;
-
-	int pending_width, pending_height;
 };
 
 struct sway_xdg_shell_view {
@@ -119,8 +119,6 @@ struct sway_xdg_shell_view {
 	struct wl_listener map;
 	struct wl_listener unmap;
 	struct wl_listener destroy;
-
-	int pending_width, pending_height;
 };
 
 struct sway_xwayland_view {
@@ -138,9 +136,6 @@ struct sway_xwayland_view {
 	struct wl_listener map;
 	struct wl_listener unmap;
 	struct wl_listener destroy;
-
-	int pending_lx, pending_ly;
-	int pending_width, pending_height;
 };
 
 struct sway_xwayland_unmanaged {
@@ -212,9 +207,14 @@ uint32_t view_get_window_type(struct sway_view *view);
 
 const char *view_get_shell(struct sway_view *view);
 
-void view_configure(struct sway_view *view, double ox, double oy, int width,
+uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
 	int height);
 
+/**
+ * Center the view in its workspace and build the swayc decorations around it.
+ */
+void view_init_floating(struct sway_view *view);
+
 /**
  * Configure the view's position and size based on the swayc's position and
  * size, taking borders into consideration.
@@ -239,11 +239,16 @@ void view_for_each_surface(struct sway_view *view,
 void view_init(struct sway_view *view, enum sway_view_type type,
 	const struct sway_view_impl *impl);
 
+void view_free(struct sway_view *view);
+
 void view_destroy(struct sway_view *view);
 
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
 
-void view_unmap(struct sway_view *view);
+/**
+ * Unmap the view and return the surviving parent (after reaping).
+ */
+struct sway_container *view_unmap(struct sway_view *view);
 
 void view_update_position(struct sway_view *view, double lx, double ly);
 

sway/commands/border.c

@@ -3,6 +3,7 @@
 #include "sway/config.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
+#include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 
@@ -38,13 +39,11 @@ struct cmd_results *cmd_border(int argc, char **argv) {
 	}
 
 	if (container_is_floating(view->swayc)) {
-		container_damage_whole(view->swayc);
 		container_set_geometry_from_floating_view(view->swayc);
-		container_damage_whole(view->swayc);
-	} else {
-		view_autoconfigure(view);
 	}
 
+	arrange_and_commit(view->swayc);
+
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 	if (seat->cursor) {
 		cursor_send_pointer_motion(seat->cursor, 0, false);

sway/commands/floating.c

@@ -36,5 +36,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
 
 	container_set_floating(container, wants_floating);
 
+	struct sway_container *workspace = container_parent(container, C_WORKSPACE);
+	arrange_and_commit(workspace);
+
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }

sway/commands/fullscreen.c

@@ -1,6 +1,7 @@
 #include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/layout.h"
@@ -32,5 +33,8 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
 
 	view_set_fullscreen(view, wants_fullscreen);
 
+	struct sway_container *workspace = container_parent(container, C_WORKSPACE);
+	arrange_and_commit(workspace->parent);
+
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }