5 files changed, 122 insertions, 21 deletions

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
new file mode 100644
index 00000000..5aff28e9
--- /dev/null
+++ b/include/sway/desktop/transaction.h
@@ -0,0 +1,51 @@
+#ifndef _SWAY_TRANSACTION_H
+#define _SWAY_TRANSACTION_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);
+
+#endif
diff --git a/include/sway/output.h b/include/sway/output.h
index 70f746dc..e6ca0d02 100644
--- a/include/sway/output.h
+++ b/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);
 
diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index a14bc5dc..6c8c0dba 100644
--- a/include/sway/tree/arrange.h
+++ b/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
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index b3406bbe..f4e978ea 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -54,6 +54,33 @@ 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;
+};
+
 struct sway_container {
 	union {
 		// TODO: Encapsulate state for other node types as well like C_CONTAINER
@@ -69,6 +96,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
 
@@ -253,4 +284,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
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 3df38e2d..d0093db5 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -29,8 +29,8 @@ 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);
@@ -70,6 +70,12 @@ struct sway_view {
 
 	list_t *executed_criteria; // struct criteria *
 	list_t *marks;             // char *
+	list_t *instructions;      // struct sway_transaction_instruction *
+
+	// If saved_texture is set, the main surface of the view will render this
+	// texture instead of its own. This is used while waiting for transactions
+	// to complete.
+	struct wlr_texture *saved_texture;
 
 	struct wlr_texture *marks_focused;
 	struct wlr_texture *marks_focused_inactive;
@@ -103,8 +109,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 +123,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 +140,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,10 +211,15 @@ 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.
  */