Merge pull request #2458 from RyanDwyer/cleanup-transactions

Simplify transactions

2 files changed, 10 insertions, 2 deletions

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 56361d94..7ac924e7 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -20,6 +20,8 @@
  * create and commits a transaction from the dirty containers.
  */
 
+struct sway_transaction_instruction;
+
 /**
  * Find all dirty containers, create and commit a transaction containing them,
  * and unmark them as dirty.
@@ -31,7 +33,8 @@ void transaction_commit_dirty(void);
  *
  * 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);
+void transaction_notify_view_ready_by_serial(struct sway_view *view,
+                uint32_t serial);
 
 /**
  * Notify the transaction system that a view is ready for the new layout, but
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 2a22f196..b64a2e63 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -151,7 +151,12 @@ struct sway_container {
         struct wlr_texture *title_urgent;
         size_t title_height;
 
-        list_t *instructions; // struct sway_transaction_instruction *
+        // The number of transactions which reference this container.
+        size_t ntxnrefs;
+
+        // If this container is a view and is waiting for the client to respond to a
+        // configure then this will be populated, otherwise NULL.
+        struct sway_transaction_instruction *instruction;
 
         bool destroying;