diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-15 17:16:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-15 17:16:32 -0400 |
commit | 98ed05225e06618533fa0439fdc83463cb9f1d2e (patch) | |
tree | fa71845d227eb8c78a4eb283238498f3da25cf21 /include | |
parent | Merge pull request #2459 from RyanDwyer/fix-workspace-prev-next (diff) | |
parent | Simplify transactions (diff) | |
download | sway-98ed05225e06618533fa0439fdc83463cb9f1d2e.tar.gz sway-98ed05225e06618533fa0439fdc83463cb9f1d2e.tar.zst sway-98ed05225e06618533fa0439fdc83463cb9f1d2e.zip |
Merge pull request #2458 from RyanDwyer/cleanup-transactions
Simplify transactions
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/desktop/transaction.h | 5 | ||||
-rw-r--r-- | include/sway/tree/container.h | 7 |
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 @@ | |||
20 | * create and commits a transaction from the dirty containers. | 20 | * create and commits a transaction from the dirty containers. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | struct 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 | */ |
34 | void transaction_notify_view_ready(struct sway_view *view, uint32_t serial); | 36 | void 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 |
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 | ||