diff options
| author | Alexander Orzechowski <alex@ozal.ski> | 2023-10-06 07:29:01 -0400 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2023-10-06 14:39:12 +0300 |
| commit | 4326a26ad6fb64b8f8de7d32c1e7b6423e1f84f3 (patch) | |
| tree | a00b52938423e55323c59916f262f6d6ebbd3b3d | |
| parent | 8a8fb76ec1d0b9a269b86688cff419201d1e6f62 (diff) | |
Chase wlroots!4331
| -rw-r--r-- | sway/desktop/output.c | 11 | ||||
| -rw-r--r-- | sway/lock.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index aed1fdeb..0670b3dd 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -942,12 +942,15 @@ static void handle_commit(struct wl_listener *listener, void *data) { return; } - if (event->committed & WLR_OUTPUT_STATE_SCALE) { + if (event->state->committed & WLR_OUTPUT_STATE_SCALE) { output_for_each_container(output, update_textures, NULL); output_for_each_surface(output, update_output_scale_iterator, NULL); } - if (event->committed & (WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_TRANSFORM | WLR_OUTPUT_STATE_SCALE)) { + if (event->state->committed & ( + WLR_OUTPUT_STATE_MODE | + WLR_OUTPUT_STATE_TRANSFORM | + WLR_OUTPUT_STATE_SCALE)) { arrange_layers(output); arrange_output(output); transaction_commit_dirty(); @@ -955,7 +958,9 @@ static void handle_commit(struct wl_listener *listener, void *data) { update_output_manager_config(output->server); } - if (event->committed & (WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_TRANSFORM)) { + if (event->state->committed & ( + WLR_OUTPUT_STATE_MODE | + WLR_OUTPUT_STATE_TRANSFORM)) { int width, height; wlr_output_transformed_resolution(output->wlr_output, &width, &height); wlr_damage_ring_set_bounds(&output->damage_ring, width, height); diff --git a/sway/lock.c b/sway/lock.c index 70ac3969..199624fc 100644 --- a/sway/lock.c +++ b/sway/lock.c @@ -46,7 +46,7 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) { static void handle_output_commit(struct wl_listener *listener, void *data) { struct wlr_output_event_commit *event = data; struct sway_session_lock_surface *surf = wl_container_of(listener, surf, output_commit); - if (event->committed & ( + if (event->state->committed & ( WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_SCALE | WLR_OUTPUT_STATE_TRANSFORM)) { |