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 | Update sway-input.5.scd (diff) | |
| download | sway-4326a26ad6fb64b8f8de7d32c1e7b6423e1f84f3.tar.gz sway-4326a26ad6fb64b8f8de7d32c1e7b6423e1f84f3.tar.zst sway-4326a26ad6fb64b8f8de7d32c1e7b6423e1f84f3.zip | |
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) { | |||
| 942 | return; | 942 | return; |
| 943 | } | 943 | } |
| 944 | 944 | ||
| 945 | if (event->committed & WLR_OUTPUT_STATE_SCALE) { | 945 | if (event->state->committed & WLR_OUTPUT_STATE_SCALE) { |
| 946 | output_for_each_container(output, update_textures, NULL); | 946 | output_for_each_container(output, update_textures, NULL); |
| 947 | output_for_each_surface(output, update_output_scale_iterator, NULL); | 947 | output_for_each_surface(output, update_output_scale_iterator, NULL); |
| 948 | } | 948 | } |
| 949 | 949 | ||
| 950 | if (event->committed & (WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_TRANSFORM | WLR_OUTPUT_STATE_SCALE)) { | 950 | if (event->state->committed & ( |
| 951 | WLR_OUTPUT_STATE_MODE | | ||
| 952 | WLR_OUTPUT_STATE_TRANSFORM | | ||
| 953 | WLR_OUTPUT_STATE_SCALE)) { | ||
| 951 | arrange_layers(output); | 954 | arrange_layers(output); |
| 952 | arrange_output(output); | 955 | arrange_output(output); |
| 953 | transaction_commit_dirty(); | 956 | transaction_commit_dirty(); |
| @@ -955,7 +958,9 @@ static void handle_commit(struct wl_listener *listener, void *data) { | |||
| 955 | update_output_manager_config(output->server); | 958 | update_output_manager_config(output->server); |
| 956 | } | 959 | } |
| 957 | 960 | ||
| 958 | if (event->committed & (WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_TRANSFORM)) { | 961 | if (event->state->committed & ( |
| 962 | WLR_OUTPUT_STATE_MODE | | ||
| 963 | WLR_OUTPUT_STATE_TRANSFORM)) { | ||
| 959 | int width, height; | 964 | int width, height; |
| 960 | wlr_output_transformed_resolution(output->wlr_output, &width, &height); | 965 | wlr_output_transformed_resolution(output->wlr_output, &width, &height); |
| 961 | wlr_damage_ring_set_bounds(&output->damage_ring, width, height); | 966 | 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) { | |||
| 46 | static void handle_output_commit(struct wl_listener *listener, void *data) { | 46 | static void handle_output_commit(struct wl_listener *listener, void *data) { |
| 47 | struct wlr_output_event_commit *event = data; | 47 | struct wlr_output_event_commit *event = data; |
| 48 | struct sway_session_lock_surface *surf = wl_container_of(listener, surf, output_commit); | 48 | struct sway_session_lock_surface *surf = wl_container_of(listener, surf, output_commit); |
| 49 | if (event->committed & ( | 49 | if (event->state->committed & ( |
| 50 | WLR_OUTPUT_STATE_MODE | | 50 | WLR_OUTPUT_STATE_MODE | |
| 51 | WLR_OUTPUT_STATE_SCALE | | 51 | WLR_OUTPUT_STATE_SCALE | |
| 52 | WLR_OUTPUT_STATE_TRANSFORM)) { | 52 | WLR_OUTPUT_STATE_TRANSFORM)) { |