diff options
| author | Ryan Dwyer <[email protected]> | 2018-07-14 23:14:55 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-07-14 23:14:55 +1000 |
| commit | 2032f85d94f2f222282b242116b3e827dd458f6c (patch) | |
| tree | d6ad82f79521cdd948985be22630b803af58afea /sway/commands/swap.c | |
| parent | 63f28bcf1efa0f60fef7d50d8c5db541295281c7 (diff) | |
Simplify transactions by utilising a dirty flag on containers
This PR changes the way we handle transactions to a more simple method.
The new method is to mark containers as dirty from low level code
(eg. arranging, or container_destroy, and eventually seat_set_focus),
then call transaction_commit_dirty which picks up those containers and
runs them through a transaction. The old methods of using transactions
(arrange_and_commit, or creating one manually) are now no longer
possible.
The highest-level code (execute_command and view implementation
handlers) will call transaction_commit_dirty, so most other code just
needs to set containers as dirty. This is done by arranging, but can
also be done by calling container_set_dirty.
Diffstat (limited to 'sway/commands/swap.c')
| -rw-r--r-- | sway/commands/swap.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sway/commands/swap.c b/sway/commands/swap.c index e052058f..2fc88308 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c @@ -1,7 +1,6 @@ #include <strings.h> #include <wlr/util/log.h> #include "sway/commands.h" -#include "sway/desktop/transaction.h" #include "sway/tree/arrange.h" #include "sway/tree/layout.h" #include "sway/tree/view.h" @@ -79,14 +78,10 @@ struct cmd_results *cmd_swap(int argc, char **argv) { container_swap(current, other); - struct sway_transaction *txn = transaction_create(); - arrange_windows(current->parent, txn); - + arrange_windows(current->parent); if (other->parent != current->parent) { - arrange_windows(other->parent, txn); + arrange_windows(other->parent); } - transaction_commit(txn); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); } |