diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-15 10:03:55 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-15 10:03:55 +1000 |
commit | c3ef36d6b5d36f783f41b8860cee321b652f91e3 (patch) | |
tree | 4496de9473943b65e0d871b498176b820fea8e7b /sway/desktop/xwayland.c | |
parent | Merge pull request #2445 from RyanDwyer/resize-tiling-via-cursor (diff) | |
download | sway-c3ef36d6b5d36f783f41b8860cee321b652f91e3.tar.gz sway-c3ef36d6b5d36f783f41b8860cee321b652f91e3.tar.zst sway-c3ef36d6b5d36f783f41b8860cee321b652f91e3.zip |
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.
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r-- | sway/desktop/xwayland.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 5e8afa65..14f59b9c 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -284,7 +284,7 @@ static void handle_commit(struct wl_listener *listener, void *data) { | |||
284 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; | 284 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; |
285 | struct wlr_surface_state *surface_state = &xsurface->surface->current; | 285 | struct wlr_surface_state *surface_state = &xsurface->surface->current; |
286 | 286 | ||
287 | if (view->swayc->instructions->length) { | 287 | if (view->swayc->instruction) { |
288 | transaction_notify_view_ready_by_size(view, | 288 | transaction_notify_view_ready_by_size(view, |
289 | surface_state->width, surface_state->height); | 289 | surface_state->width, surface_state->height); |
290 | } else if (container_is_floating(view->swayc)) { | 290 | } else if (container_is_floating(view->swayc)) { |