diff options
author | 2018-08-15 10:03:55 +1000 | |
---|---|---|
committer | 2018-08-15 10:03:55 +1000 | |
commit | c3ef36d6b5d36f783f41b8860cee321b652f91e3 (patch) | |
tree | 4496de9473943b65e0d871b498176b820fea8e7b /include/sway/tree/container.h | |
parent | Merge pull request #2445 from RyanDwyer/resize-tiling-via-cursor (diff) | |
download | sway-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/tree/container.h')
-rw-r--r-- | include/sway/tree/container.h | 7 |
1 files changed, 6 insertions, 1 deletions
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 { | |||
151 | struct wlr_texture *title_urgent; | 151 | struct wlr_texture *title_urgent; |
152 | size_t title_height; | 152 | size_t title_height; |
153 | 153 | ||
154 | list_t *instructions; // struct sway_transaction_instruction * | 154 | // The number of transactions which reference this container. |
155 | size_t ntxnrefs; | ||
156 | |||
157 | // If this container is a view and is waiting for the client to respond to a | ||
158 | // configure then this will be populated, otherwise NULL. | ||
159 | struct sway_transaction_instruction *instruction; | ||
155 | 160 | ||
156 | bool destroying; | 161 | bool destroying; |
157 | 162 | ||