mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 09:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chase wlroots!4331

Browse source
This commit is contained in:
Alexander Orzechowski 2023-10-06 07:29:01 -04:00 committed by Kirill Primak
parent 8a8fb76ec1
commit 4326a26ad6
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/desktop/output.c
View file

@ -942,12 +942,15 @@ static void handle_commit(struct wl_listener *listener, void *data) {
return; 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_container(output, update_textures, NULL);
output_for_each_surface(output, update_output_scale_iterator, 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_layers(output);
arrange_output(output); arrange_output(output);
transaction_commit_dirty(); transaction_commit_dirty();
@ -955,7 +958,9 @@ static void handle_commit(struct wl_listener *listener, void *data) {
update_output_manager_config(output->server); 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; int width, height;
wlr_output_transformed_resolution(output->wlr_output, &width, &height); wlr_output_transformed_resolution(output->wlr_output, &width, &height);
wlr_damage_ring_set_bounds(&output->damage_ring, width, height); wlr_damage_ring_set_bounds(&output->damage_ring, width, height);

2
sway/lock.c
View file

@ -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) { static void handle_output_commit(struct wl_listener *listener, void *data) {
struct wlr_output_event_commit *event = data; struct wlr_output_event_commit *event = data;
struct sway_session_lock_surface *surf = wl_container_of(listener, surf, output_commit); 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_MODE |
WLR_OUTPUT_STATE_SCALE | WLR_OUTPUT_STATE_SCALE |
WLR_OUTPUT_STATE_TRANSFORM)) { WLR_OUTPUT_STATE_TRANSFORM)) {