aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/desktop
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-15 10:03:55 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-15 10:03:55 +1000
commitc3ef36d6b5d36f783f41b8860cee321b652f91e3 (patch)
tree4496de9473943b65e0d871b498176b820fea8e7b /include/sway/desktop
parentMerge pull request #2445 from RyanDwyer/resize-tiling-via-cursor (diff)
downloadsway-c3ef36d6b5d36f783f41b8860cee321b652f91e3.tar.gz
sway-c3ef36d6b5d36f783f41b8860cee321b652f91e3.tar.zst
sway-c3ef36d6b5d36f783f41b8860cee321b652f91e3.zip
Simplify transactions
Commit 4b8e3a885be74c588291c51f798de80bd81a92db makes it so only one transaction is committed (ie. configures sent) at a time. This commit removes the now-unnecessary code which was used to support concurrent committed transactions. * Instead of containers storing a list of instructions which they've been sent, it now stores a single instruction. * Containers now have an ntxnrefs property. Previously we knew how many references there were by the length of the instruction list. * Instructions no longer need a ready property. It was used to avoid marking an instruction ready twice when they were in a list, but this is now avoided because there is only one instruction and we nullify the container->instruction pointer when it's ready. * When a transaction applies, we no longer need to consider releasing and resaving the surface, as we know there are no other committed transactions. * transaction_notify_view_ready has been renamed to view_notify_view_ready_by_serial to make it consistent with transaction_notify_view_ready_by_size. * Out-of-memory checks have been added when creating transactions and instructions.
Diffstat (limited to 'include/sway/desktop')
-rw-r--r--include/sway/desktop/transaction.h5
1 files changed, 4 insertions, 1 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 @@
20 * create and commits a transaction from the dirty containers. 20 * create and commits a transaction from the dirty containers.
21 */ 21 */
22 22
23struct sway_transaction_instruction;
24
23/** 25/**
24 * Find all dirty containers, create and commit a transaction containing them, 26 * Find all dirty containers, create and commit a transaction containing them,
25 * and unmark them as dirty. 27 * and unmark them as dirty.
@@ -31,7 +33,8 @@ void transaction_commit_dirty(void);
31 * 33 *
32 * When all views in the transaction are ready, the layout will be applied. 34 * When all views in the transaction are ready, the layout will be applied.
33 */ 35 */
34void transaction_notify_view_ready(struct sway_view *view, uint32_t serial); 36void transaction_notify_view_ready_by_serial(struct sway_view *view,
37 uint32_t serial);
35 38
36/** 39/**
37 * Notify the transaction system that a view is ready for the new layout, but 40 * Notify the transaction system that a view is ready for the new layout, but