mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-04 13:29:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify transactions by utilising a dirty flag on containers

Browse source 
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.
This commit is contained in:
Ryan Dwyer 2018-07-14 23:14:55 +10:00
parent 63f28bcf1e
commit 2032f85d94
29 changed files with 139 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sway/tree/container.c
View file

@ -159,14 +159,6 @@ void container_free(struct sway_container *cont) {
wlr_texture_destroy(cont->title_focused_inactive);
wlr_texture_destroy(cont->title_unfocused);
wlr_texture_destroy(cont->title_urgent);
for (int i = 0; i < server.destroying_containers->length; ++i) {
if (server.destroying_containers->items[i] == cont) {
list_del(server.destroying_containers, i);
break;
}
}
list_free(cont->instructions);
list_free(cont->children);
list_free(cont->current.children);
@ -325,7 +317,7 @@ static struct sway_container *container_destroy_noreaping(
}
con->destroying = true;
list_add(server.destroying_containers, con);
container_set_dirty(con);
if (!con->parent) {
return NULL;
@ -1069,9 +1061,15 @@ void container_floating_move_to(struct sway_container *con,
if (old_workspace != new_workspace) {
container_remove_child(con);
container_add_child(new_workspace->sway_workspace->floating, con);
struct sway_transaction *transaction = transaction_create();
arrange_windows(old_workspace, transaction);
arrange_windows(new_workspace, transaction);
transaction_commit(transaction);
arrange_windows(old_workspace);
arrange_windows(new_workspace);
}
}
void container_set_dirty(struct sway_container *container) {
if (container->dirty) {
return;
}
container->dirty = true;
list_add(server.dirty_containers, container);
}