diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-14 23:14:55 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-14 23:14:55 +1000 |
commit | 2032f85d94f2f222282b242116b3e827dd458f6c (patch) | |
tree | d6ad82f79521cdd948985be22630b803af58afea /sway/server.c | |
parent | Merge pull request #2244 from RyanDwyer/floating-resize (diff) | |
download | sway-2032f85d94f2f222282b242116b3e827dd458f6c.tar.gz sway-2032f85d94f2f222282b242116b3e827dd458f6c.tar.zst sway-2032f85d94f2f222282b242116b3e827dd458f6c.zip |
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/server.c')
-rw-r--r-- | sway/server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c index 1d8eb964..8566d512 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -125,8 +125,7 @@ bool server_init(struct sway_server *server) { | |||
125 | if (debug != NULL && strcmp(debug, "txn_timings") == 0) { | 125 | if (debug != NULL && strcmp(debug, "txn_timings") == 0) { |
126 | server->debug_txn_timings = true; | 126 | server->debug_txn_timings = true; |
127 | } | 127 | } |
128 | server->destroying_containers = create_list(); | 128 | server->dirty_containers = create_list(); |
129 | |||
130 | server->transactions = create_list(); | 129 | server->transactions = create_list(); |
131 | 130 | ||
132 | input_manager = input_manager_create(server); | 131 | input_manager = input_manager_create(server); |
@@ -136,7 +135,7 @@ bool server_init(struct sway_server *server) { | |||
136 | void server_fini(struct sway_server *server) { | 135 | void server_fini(struct sway_server *server) { |
137 | // TODO: free sway-specific resources | 136 | // TODO: free sway-specific resources |
138 | wl_display_destroy(server->wl_display); | 137 | wl_display_destroy(server->wl_display); |
139 | list_free(server->destroying_containers); | 138 | list_free(server->dirty_containers); |
140 | list_free(server->transactions); | 139 | list_free(server->transactions); |
141 | } | 140 | } |
142 | 141 | ||