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/desktop/output.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/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index a2720885..a9808406 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -492,19 +492,21 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
492 | output->wlr_output->data = NULL; | 492 | output->wlr_output->data = NULL; |
493 | free(output); | 493 | free(output); |
494 | 494 | ||
495 | arrange_and_commit(&root_container); | 495 | arrange_windows(&root_container); |
496 | } | 496 | } |
497 | 497 | ||
498 | static void handle_mode(struct wl_listener *listener, void *data) { | 498 | static void handle_mode(struct wl_listener *listener, void *data) { |
499 | struct sway_output *output = wl_container_of(listener, output, mode); | 499 | struct sway_output *output = wl_container_of(listener, output, mode); |
500 | arrange_layers(output); | 500 | arrange_layers(output); |
501 | arrange_and_commit(output->swayc); | 501 | arrange_windows(output->swayc); |
502 | transaction_commit_dirty(); | ||
502 | } | 503 | } |
503 | 504 | ||
504 | static void handle_transform(struct wl_listener *listener, void *data) { | 505 | static void handle_transform(struct wl_listener *listener, void *data) { |
505 | struct sway_output *output = wl_container_of(listener, output, transform); | 506 | struct sway_output *output = wl_container_of(listener, output, transform); |
506 | arrange_layers(output); | 507 | arrange_layers(output); |
507 | arrange_and_commit(output->swayc); | 508 | arrange_windows(output->swayc); |
509 | transaction_commit_dirty(); | ||
508 | } | 510 | } |
509 | 511 | ||
510 | static void handle_scale_iterator(struct sway_container *view, void *data) { | 512 | static void handle_scale_iterator(struct sway_container *view, void *data) { |
@@ -515,7 +517,8 @@ static void handle_scale(struct wl_listener *listener, void *data) { | |||
515 | struct sway_output *output = wl_container_of(listener, output, scale); | 517 | struct sway_output *output = wl_container_of(listener, output, scale); |
516 | arrange_layers(output); | 518 | arrange_layers(output); |
517 | container_descendants(output->swayc, C_VIEW, handle_scale_iterator, NULL); | 519 | container_descendants(output->swayc, C_VIEW, handle_scale_iterator, NULL); |
518 | arrange_and_commit(output->swayc); | 520 | arrange_windows(output->swayc); |
521 | transaction_commit_dirty(); | ||
519 | } | 522 | } |
520 | 523 | ||
521 | struct sway_output *output_from_wlr_output(struct wlr_output *wlr_output) { | 524 | struct sway_output *output_from_wlr_output(struct wlr_output *wlr_output) { |
@@ -584,5 +587,6 @@ void output_enable(struct sway_output *output) { | |||
584 | output->damage_destroy.notify = damage_handle_destroy; | 587 | output->damage_destroy.notify = damage_handle_destroy; |
585 | 588 | ||
586 | arrange_layers(output); | 589 | arrange_layers(output); |
587 | arrange_and_commit(&root_container); | 590 | arrange_windows(&root_container); |
591 | transaction_commit_dirty(); | ||
588 | } | 592 | } |