Merge pull request #2458 from RyanDwyer/cleanup-transactions

Simplify transactions
This commit is contained in:
Drew DeVault 2018-08-15 17:16:32 -04:00 committed by GitHub
commit 98ed05225e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 51 additions and 80 deletions

View file

@ -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

View file

@ -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;