From c3ef36d6b5d36f783f41b8860cee321b652f91e3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 15 Aug 2018 10:03:55 +1000 Subject: Simplify transactions Commit 4b8e3a885be74c588291c51f798de80bd81a92db makes it so only one transaction is committed (ie. configures sent) at a time. This commit removes the now-unnecessary code which was used to support concurrent committed transactions. * Instead of containers storing a list of instructions which they've been sent, it now stores a single instruction. * Containers now have an ntxnrefs property. Previously we knew how many references there were by the length of the instruction list. * Instructions no longer need a ready property. It was used to avoid marking an instruction ready twice when they were in a list, but this is now avoided because there is only one instruction and we nullify the container->instruction pointer when it's ready. * When a transaction applies, we no longer need to consider releasing and resaving the surface, as we know there are no other committed transactions. * transaction_notify_view_ready has been renamed to view_notify_view_ready_by_serial to make it consistent with transaction_notify_view_ready_by_size. * Out-of-memory checks have been added when creating transactions and instructions. --- sway/desktop/xdg_shell.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sway/desktop/xdg_shell.c') diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index af9d49b8..6a7a3f7f 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -254,8 +254,9 @@ static void handle_commit(struct wl_listener *listener, void *data) { return; } - if (view->swayc->instructions->length) { - transaction_notify_view_ready(view, xdg_surface->configure_serial); + if (view->swayc->instruction) { + transaction_notify_view_ready_by_serial(view, + xdg_surface->configure_serial); } view_damage_from(view); -- cgit v1.2.3