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 /include/sway/tree/container.h | |
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 'include/sway/tree/container.h')
-rw-r--r-- | include/sway/tree/container.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index a69da9db..11780916 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -144,6 +144,10 @@ struct sway_container { | |||
144 | 144 | ||
145 | bool destroying; | 145 | bool destroying; |
146 | 146 | ||
147 | // If true, indicates that the container has pending state that differs from | ||
148 | // the current. | ||
149 | bool dirty; | ||
150 | |||
147 | struct { | 151 | struct { |
148 | struct wl_signal destroy; | 152 | struct wl_signal destroy; |
149 | // Raised after the tree updates, but before arrange_windows | 153 | // Raised after the tree updates, but before arrange_windows |
@@ -303,4 +307,10 @@ void container_get_box(struct sway_container *container, struct wlr_box *box); | |||
303 | void container_floating_move_to(struct sway_container *con, | 307 | void container_floating_move_to(struct sway_container *con, |
304 | double lx, double ly); | 308 | double lx, double ly); |
305 | 309 | ||
310 | /** | ||
311 | * Mark a container as dirty if it isn't already. Dirty containers will be | ||
312 | * included in the next transaction then unmarked as dirty. | ||
313 | */ | ||
314 | void container_set_dirty(struct sway_container *container); | ||
315 | |||
306 | #endif | 316 | #endif |