From 59c94887018bdfa578c4371c4275061ca6e71b3e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 3 Jun 2018 16:35:06 +1000
Subject: WIP: Atomic layout updates ground work

---
 include/sway/desktop/transaction.h | 56 ++++++++++++++++++++++++++++++++++++++
 include/sway/output.h              |  2 ++
 include/sway/tree/arrange.h        | 33 ++++++++++++++++------
 include/sway/tree/container.h      | 29 ++++++++++++++++++++
 include/sway/tree/view.h           | 19 ++++++-------
 5 files changed, 120 insertions(+), 19 deletions(-)
 create mode 100644 include/sway/desktop/transaction.h

(limited to 'include')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
new file mode 100644
index 00000000..575d28c8
--- /dev/null
+++ b/include/sway/desktop/transaction.h
@@ -0,0 +1,56 @@
+#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 {
+	struct wl_event_source *timer;
+	list_t *instructions;   // struct sway_transaction_instruction *
+	list_t *damage;         // struct wlr_box *
+	size_t num_waiting;
+};
+
+/**
+ * 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 ce95cfe9..23cd66dc 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -1,18 +1,33 @@
 #ifndef _SWAY_ARRANGE_H
 #define _SWAY_ARRANGE_H
+#include "sway/desktop/transaction.h"
 
 struct sway_container;
 
-// 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);
+/**
+ * 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);
 
-// Determine the workspace's geometry, then iterate to everything below
-void arrange_workspace(struct sway_container *workspace);
+/**
+ * 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);
 
-// Arrange layout for all the children of the given workspace/container
-void arrange_children_of(struct sway_container *parent);
+// These functions are temporary and are only here to make everything compile.
+// They are wrappers around arrange_and_commit.
+void arrange_root(void);
+void arrange_output(struct sway_container *container);
+void arrange_workspace(struct sway_container *container);
+void arrange_children_of(struct sway_container *container);
 
 #endif
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7ed6aab1..dd5bd47c 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -54,6 +54,28 @@ 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;
+
+	//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 +91,8 @@ struct sway_container {
 	 */
 	size_t id;
 
+	struct sway_container_state pending;
+
 	char *name;            // The view's title (unformatted)
 	char *formatted_title; // The title displayed in the title bar
 
@@ -246,4 +270,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..f47db567 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,7 +211,7 @@ 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);
 
 /**
-- 
cgit v1.2.3


From f9e6d703d298dbdee0770fd9e0c64ab2d7ac7deb Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 6 Jun 2018 19:19:30 +1000
Subject: Make main properties be the pending state

---
 include/sway/tree/container.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index dd5bd47c..a8efd893 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -91,7 +91,9 @@ struct sway_container {
 	 */
 	size_t id;
 
-	struct sway_container_state pending;
+	// 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
-- 
cgit v1.2.3


From bb66e6d578fdc68fb33d0fde921390d74f20bb31 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 6 Jun 2018 22:57:34 +1000
Subject: Refactor everything that needs to arrange windows

* The arrange_foo functions are now replaced with arrange_and_commit, or
with manually created transactions and arrange_windows x2.
* The arrange functions are now only called from the highest level
functions rather than from both high level and low level functions.
* Due to the previous point, view_set_fullscreen_raw and
view_set_fullscreen are both merged into one function again.
* Floating and fullscreen are now working with transactions.
---
 include/sway/desktop/transaction.h | 7 +------
 include/sway/tree/arrange.h        | 7 -------
 include/sway/tree/view.h           | 5 +++++
 3 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 575d28c8..5aff28e9 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -16,12 +16,7 @@
  * the updates all at the same time.
  */
 
-struct sway_transaction {
-	struct wl_event_source *timer;
-	list_t *instructions;   // struct sway_transaction_instruction *
-	list_t *damage;         // struct wlr_box *
-	size_t num_waiting;
-};
+struct sway_transaction;
 
 /**
  * Create a new transaction.
diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index 23cd66dc..897a9392 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -23,11 +23,4 @@ void arrange_windows(struct sway_container *container,
  */
 void arrange_and_commit(struct sway_container *container);
 
-// These functions are temporary and are only here to make everything compile.
-// They are wrappers around arrange_and_commit.
-void arrange_root(void);
-void arrange_output(struct sway_container *container);
-void arrange_workspace(struct sway_container *container);
-void arrange_children_of(struct sway_container *container);
-
 #endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index f47db567..d0093db5 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -214,6 +214,11 @@ const char *view_get_shell(struct sway_view *view);
 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.
-- 
cgit v1.2.3


From 1c89f32533534f6e78c81c95578f40df45bb9016 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 18 Jun 2018 20:42:12 +1000
Subject: Preserve buffers during transactions

* Also fix parts of the rendering where it was rendering the pending
state instead of current.
---
 include/sway/tree/view.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index d0093db5..fc4c8df9 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -72,10 +72,11 @@ struct sway_view {
 	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;
+	// If saved_buffer is set, the main surface of the view will render this
+	// buffer/texture instead of its own. This is used while waiting for
+	// transactions to complete.
+	struct wlr_buffer *saved_buffer;
+	int saved_surface_width, saved_surface_height;
 
 	struct wlr_texture *marks_focused;
 	struct wlr_texture *marks_focused_inactive;
-- 
cgit v1.2.3


From 38398e2d77d57dc06b67ec88a54091c897915602 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 23 Jun 2018 16:24:11 +1000
Subject: Implement atomic layout updates for tree operations

This implements atomic layout updates for when views map, reparent or
unmap.
---
 include/sway/desktop/transaction.h |  9 +++++++++
 include/sway/server.h              |  7 +++++++
 include/sway/tree/container.h      | 16 ++++++++++++----
 include/sway/tree/view.h           | 18 +++++++++---------
 4 files changed, 37 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 5aff28e9..d6adc609 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -1,5 +1,6 @@
 #ifndef _SWAY_TRANSACTION_H
 #define _SWAY_TRANSACTION_H
+#include <wlr/render/wlr_texture.h>
 #include "sway/tree/container.h"
 
 /**
@@ -48,4 +49,12 @@ void transaction_commit(struct sway_transaction *transaction);
  */
 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
diff --git a/include/sway/server.h b/include/sway/server.h
index 65d96e7a..f5f88a5a 100644
--- a/include/sway/server.h
+++ b/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;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index f4e978ea..7e78cbef 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -65,8 +65,8 @@ struct sway_container_state {
 	double gaps_inner;
 	double gaps_outer;
 
-	//struct sway_container *parent;
-	//list_t *children;
+	struct sway_container *parent;
+	list_t *children;
 
 	// View properties
 	double view_x, view_y;
@@ -79,6 +79,10 @@ struct sway_container_state {
 	bool border_bottom;
 	bool border_left;
 	bool border_right;
+
+	// Workspace properties
+	struct sway_view *ws_fullscreen;
+	struct sway_container *ws_floating;
 };
 
 struct sway_container {
@@ -128,8 +132,6 @@ struct sway_container {
 
 	struct sway_container *parent;
 
-	list_t *marks; // list of char*
-
 	float alpha;
 
 	struct wlr_texture *title_focused;
@@ -138,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
@@ -181,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);
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index fc4c8df9..5a615b43 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -37,7 +37,7 @@ struct sway_view_impl {
 	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,15 +68,10 @@ struct sway_view {
 	bool border_left;
 	bool border_right;
 
+	bool destroying;
+
 	list_t *executed_criteria; // struct criteria *
 	list_t *marks;             // char *
-	list_t *instructions;      // struct sway_transaction_instruction *
-
-	// If saved_buffer is set, the main surface of the view will render this
-	// buffer/texture instead of its own. This is used while waiting for
-	// transactions to complete.
-	struct wlr_buffer *saved_buffer;
-	int saved_surface_width, saved_surface_height;
 
 	struct wlr_texture *marks_focused;
 	struct wlr_texture *marks_focused_inactive;
@@ -244,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);
 
-- 
cgit v1.2.3


From 32b865e610dd937af17ce36b8c986e41f55a4627 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 23 Jun 2018 17:47:28 +1000
Subject: Fix crash when deleting last child in a tabbed or stacked container

There was no `current` child because the container was destroyed. This
makes it fall back to looking in the parent's current children list.
---
 include/sway/input/seat.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'include')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 1f7792ba..0e440701 100644
--- a/include/sway/input/seat.h
+++ b/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.
-- 
cgit v1.2.3


From f08a30d6d04b5f986ea1e66a017e81bcd7c77e39 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 24 Jun 2018 12:33:23 +1000
Subject: Force transactions to complete in order

This forces transactions to complete in order by using a singly linked
list stored in the sway server.
---
 include/sway/server.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/sway/server.h b/include/sway/server.h
index b07e86a7..2aa7b7fe 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -47,6 +47,8 @@ struct sway_server {
 
 	bool terminating;
 
+	struct sway_transaction *head_transaction; // singly linked list
+
 	// When a view is being destroyed and is waiting for a transaction to
 	// complete it will be stored here.
 	list_t *destroying_containers;
-- 
cgit v1.2.3


From 1549fb719ae75a498bf319db45281464e72c759e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 24 Jun 2018 23:01:09 +1000
Subject: Implement atomic layout updates for xwayland views

---
 include/sway/desktop/transaction.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index d6adc609..b1da86f1 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -49,6 +49,15 @@ void transaction_commit(struct sway_transaction *transaction);
  */
 void transaction_notify_view_ready(struct sway_view *view, uint32_t serial);
 
+/**
+ * Notify the transaction system that a view is ready for the new layout, but
+ * identifying the instruction by width and height rather than by serial.
+ *
+ * This is used by xwayland views, as they don't have serials.
+ */
+void transaction_notify_view_ready_by_size(struct sway_view *view,
+		int width, int height);
+
 /**
  * Get the texture that should be rendered for a view.
  *
-- 
cgit v1.2.3


From 289d696adc22a4247345cb544454bac0dfd5d828 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 25 Jun 2018 09:09:43 +1000
Subject: Implement transaction timings debug

Launch sway with SWAY_DEBUG=txn_timings to enable it.
---
 include/sway/server.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/sway/server.h b/include/sway/server.h
index 2aa7b7fe..94e8f2a2 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -45,6 +45,8 @@ struct sway_server {
 	struct wlr_wl_shell *wl_shell;
 	struct wl_listener wl_shell_surface;
 
+	bool debug_txn_timings;
+
 	bool terminating;
 
 	struct sway_transaction *head_transaction; // singly linked list
-- 
cgit v1.2.3


From 7a922c65aab27c5f4282cf15de52d240e5ac8052 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 26 Jun 2018 13:15:45 +1000
Subject: Damage output when a fullscreen view unmaps

Also moved the arranging into view_unmap to avoid excessive code
duplication.
---
 include/sway/tree/view.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 5a615b43..0e6f5292 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -245,10 +245,7 @@ void view_destroy(struct sway_view *view);
 
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
 
-/**
- * Unmap the view and return the surviving parent (after reaping).
- */
-struct sway_container *view_unmap(struct sway_view *view);
+void view_unmap(struct sway_view *view);
 
 void view_update_position(struct sway_view *view, double lx, double ly);
 
-- 
cgit v1.2.3


From 50190bc7609d981c45d26cd0b7d6d0fbf66feb05 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 26 Jun 2018 13:18:33 +1000
Subject: Rename view's free callback to destroy

---
 include/sway/tree/view.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 0e6f5292..1bcb0582 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -37,7 +37,7 @@ struct sway_view_impl {
 	void (*for_each_surface)(struct sway_view *view,
 		wlr_surface_iterator_func_t iterator, void *user_data);
 	void (*close)(struct sway_view *view);
-	void (*free)(struct sway_view *view);
+	void (*destroy)(struct sway_view *view);
 };
 
 struct sway_view {
-- 
cgit v1.2.3


From a7b3f29292cad029f010aa8b5fafb56b08ba4ed7 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 26 Jun 2018 20:18:57 +1000
Subject: Remove incorrect assertion and supporting code

Children can exist when destroying a container, such as when destroying
the last output. Sway is not terminating in that case.
---
 include/sway/server.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include')

diff --git a/include/sway/server.h b/include/sway/server.h
index 94e8f2a2..bd96b085 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -47,8 +47,6 @@ struct sway_server {
 
 	bool debug_txn_timings;
 
-	bool terminating;
-
 	struct sway_transaction *head_transaction; // singly linked list
 
 	// When a view is being destroyed and is waiting for a transaction to
-- 
cgit v1.2.3


From be86d3aba602fef7b51fafa8a6e7a39d1e49817f Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 27 Jun 2018 17:46:03 +1000
Subject: Remove transaction_add_damage

Instead, damage each container when applying the transaction.
---
 include/sway/desktop/transaction.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'include')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index b1da86f1..fcfed297 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -30,13 +30,6 @@ struct sway_transaction *transaction_create(void);
 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.
  */
-- 
cgit v1.2.3


From 8773ed39701748ba5500b4698d028795aa6e812e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 27 Jun 2018 17:47:41 +1000
Subject: Fix memleak in container_get_box

Rather than allocate a structure and expect callers to free it, take a
pointer to an existing struct as an argument.

This function is no longer called anywhere though.
---
 include/sway/tree/container.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7e78cbef..728daa84 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -295,6 +295,6 @@ 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);
+void container_get_box(struct sway_container *container, struct wlr_box *box);
 
 #endif
-- 
cgit v1.2.3


From 9652529cc161e943241d946dac93ab16d5e30ee5 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 27 Jun 2018 19:07:48 +1000
Subject: Allow views to skip configures

To do this properly, the transaction queue will only be processed if it
can be completely processed.
---
 include/list.h        | 1 +
 include/sway/server.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/list.h b/include/list.h
index 7eead4ac..d352dbd5 100644
--- a/include/list.h
+++ b/include/list.h
@@ -14,6 +14,7 @@ void list_add(list_t *list, void *item);
 void list_insert(list_t *list, int index, void *item);
 void list_del(list_t *list, int index);
 void list_cat(list_t *list, list_t *source);
+void list_empty(list_t *list);
 // See qsort. Remember to use *_qsort functions as compare functions,
 // because they dereference the left and right arguments first!
 void list_qsort(list_t *list, int compare(const void *left, const void *right));
diff --git a/include/sway/server.h b/include/sway/server.h
index bd96b085..0efc6baa 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -47,7 +47,7 @@ struct sway_server {
 
 	bool debug_txn_timings;
 
-	struct sway_transaction *head_transaction; // singly linked list
+	list_t *transactions;
 
 	// When a view is being destroyed and is waiting for a transaction to
 	// complete it will be stored here.
-- 
cgit v1.2.3


From d7169ee7ffd45318125dbe3013aadbd1482a3e5f Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 29 Jun 2018 19:44:54 +1000
Subject: Replace list_empty with a simple alternative

---
 include/list.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include')

diff --git a/include/list.h b/include/list.h
index d352dbd5..7eead4ac 100644
--- a/include/list.h
+++ b/include/list.h
@@ -14,7 +14,6 @@ void list_add(list_t *list, void *item);
 void list_insert(list_t *list, int index, void *item);
 void list_del(list_t *list, int index);
 void list_cat(list_t *list, list_t *source);
-void list_empty(list_t *list);
 // See qsort. Remember to use *_qsort functions as compare functions,
 // because they dereference the left and right arguments first!
 void list_qsort(list_t *list, int compare(const void *left, const void *right));
-- 
cgit v1.2.3


From 3c81a900b766dd2c049ba7af6e603805893e0926 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 29 Jun 2018 19:52:31 +1000
Subject: Add comment about usage to arrange_windows declaration

---
 include/sway/tree/arrange.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index 6c8c0dba..58235642 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -16,6 +16,10 @@ void add_gaps(struct sway_container *c);
  *
  * Use this function if you need to arrange multiple sections of the tree in one
  * transaction.
+ *
+ * You must set the desired state of the container before calling
+ * arrange_windows, then don't change any state-tracked properties in the
+ * container until you've called transaction_commit.
  */
 void arrange_windows(struct sway_container *container,
 		struct sway_transaction *transaction);
-- 
cgit v1.2.3


From 3a6ed5110c76ef5bed8cc4c26a97759f6201eaac Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 29 Jun 2018 21:13:22 +1000
Subject: Render saved buffers with the surface's dimensions

---
 include/sway/desktop/transaction.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index fcfed297..7ab80eb8 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -52,11 +52,16 @@ void transaction_notify_view_ready_by_size(struct sway_view *view,
 		int width, int height);
 
 /**
- * Get the texture that should be rendered for a view.
+ * Get the saved 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.
+ * The addresses pointed at by the width and height pointers will be populated
+ * with the surface's dimensions, which may be different to the texture's
+ * dimensions if output scaling is used.
+ *
+ * This function should only be called if it is known that the view has
+ * instructions.
  */
-struct wlr_texture *transaction_get_texture(struct sway_view *view);
+struct wlr_texture *transaction_get_saved_texture(struct sway_view *view,
+		int *width, int *height);
 
 #endif
-- 
cgit v1.2.3