From 2c76923282b12c77e6cb30e3bf233e5878ac86fe Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 27 Aug 2020 21:46:20 +0200 Subject: Use wlr_output_event_commit Instead of listening to both transform and scale events, we can listen to the commit event and use the new wlr_output_event_commit struct to decide what to do. This de-duplicates some of the work we were doing twice when an output was re-configured. Depends on [1]. [1]: https://github.com/swaywm/wlroots/pull/2315 --- include/sway/output.h | 3 +-- sway/desktop/output.c | 43 ++++++++++++++++++------------------------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/include/sway/output.h b/include/sway/output.h index f27f6344..16451d81 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -42,9 +42,8 @@ struct sway_output { struct sway_output_state current; struct wl_listener destroy; + struct wl_listener commit; struct wl_listener mode; - struct wl_listener transform; - struct wl_listener scale; struct wl_listener present; struct wl_listener damage_destroy; struct wl_listener damage_frame; diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 90653fa1..cf2456ef 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -832,9 +832,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) { output_begin_destroy(output); wl_list_remove(&output->destroy.link); + wl_list_remove(&output->commit.link); wl_list_remove(&output->mode.link); - wl_list_remove(&output->transform.link); - wl_list_remove(&output->scale.link); wl_list_remove(&output->present.link); transaction_commit_dirty(); @@ -867,34 +866,30 @@ static void handle_mode(struct wl_listener *listener, void *data) { update_output_manager_config(output->server); } -static void handle_transform(struct wl_listener *listener, void *data) { - struct sway_output *output = wl_container_of(listener, output, transform); - if (!output->enabled) { - return; - } - arrange_layers(output); - arrange_output(output); - transaction_commit_dirty(); - - update_output_manager_config(output->server); -} - static void update_textures(struct sway_container *con, void *data) { container_update_title_textures(con); container_update_marks_textures(con); } -static void handle_scale(struct wl_listener *listener, void *data) { - struct sway_output *output = wl_container_of(listener, output, scale); +static void handle_commit(struct wl_listener *listener, void *data) { + struct sway_output *output = wl_container_of(listener, output, commit); + struct wlr_output_event_commit *event = data; + if (!output->enabled) { return; } - arrange_layers(output); - output_for_each_container(output, update_textures, NULL); - arrange_output(output); - transaction_commit_dirty(); - update_output_manager_config(output->server); + if (event->committed & WLR_OUTPUT_STATE_SCALE) { + output_for_each_container(output, update_textures, NULL); + } + + if (event->committed & (WLR_OUTPUT_STATE_TRANSFORM | WLR_OUTPUT_STATE_SCALE)) { + arrange_layers(output); + arrange_output(output); + transaction_commit_dirty(); + + update_output_manager_config(output->server); + } } static void handle_present(struct wl_listener *listener, void *data) { @@ -923,12 +918,10 @@ void handle_new_output(struct wl_listener *listener, void *data) { wl_signal_add(&wlr_output->events.destroy, &output->destroy); output->destroy.notify = handle_destroy; + wl_signal_add(&wlr_output->events.commit, &output->commit); + output->commit.notify = handle_commit; wl_signal_add(&wlr_output->events.mode, &output->mode); output->mode.notify = handle_mode; - wl_signal_add(&wlr_output->events.transform, &output->transform); - output->transform.notify = handle_transform; - wl_signal_add(&wlr_output->events.scale, &output->scale); - output->scale.notify = handle_scale; wl_signal_add(&wlr_output->events.present, &output->present); output->present.notify = handle_present; wl_signal_add(&output->damage->events.frame, &output->damage_frame); -- cgit v1.2.3-54-g00ecf