hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

output-layout: stop listening to scale/transform events 

Instead, listen to the commit event only.
This commit is contained in:
Simon Ser 2021-01-10 16:55:14 +01:00
parent f6f46b4ee2
commit aab43b3c76
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
types/wlr_output_layout.c
View File

@ -20,8 +20,7 @@ struct wlr_output_layout_output_state {
bool auto_configured; bool auto_configured;
struct wl_listener mode; struct wl_listener mode;
struct wl_listener scale; struct wl_listener commit;
struct wl_listener transform;
struct wl_listener output_destroy; struct wl_listener output_destroy;
}; };
@ -50,8 +49,7 @@ static void output_layout_output_destroy(
wlr_signal_emit_safe(&l_output->events.destroy, l_output); wlr_signal_emit_safe(&l_output->events.destroy, l_output);
wlr_output_destroy_global(l_output->output); wlr_output_destroy_global(l_output->output);
wl_list_remove(&l_output->state->mode.link); wl_list_remove(&l_output->state->mode.link);
wl_list_remove(&l_output->state->scale.link); wl_list_remove(&l_output->state->commit.link);
wl_list_remove(&l_output->state->transform.link);
wl_list_remove(&l_output->state->output_destroy.link); wl_list_remove(&l_output->state->output_destroy.link);
wl_list_remove(&l_output->link); wl_list_remove(&l_output->link);
free(l_output->state); free(l_output->state);
@ -146,16 +144,14 @@ static void handle_output_mode(struct wl_listener *listener, void *data) {
output_update_global(state->l_output->output); output_update_global(state->l_output->output);
} }
static void handle_output_scale(struct wl_listener *listener, void *data) { static void handle_output_commit(struct wl_listener *listener, void *data) {
struct wlr_output_layout_output_state *state = struct wlr_output_layout_output_state *state =
wl_container_of(listener, state, scale); wl_container_of(listener, state, commit);
output_layout_reconfigure(state->layout); struct wlr_output_event_commit *event = data;
}
static void handle_output_transform(struct wl_listener *listener, void *data) { if (event->committed & (WLR_OUTPUT_STATE_SCALE | WLR_OUTPUT_STATE_TRANSFORM)) {
struct wlr_output_layout_output_state *state = output_layout_reconfigure(state->layout);
wl_container_of(listener, state, transform); }
output_layout_reconfigure(state->layout);
} }
static void handle_output_destroy(struct wl_listener *listener, void *data) { static void handle_output_destroy(struct wl_listener *listener, void *data) {
@ -186,10 +182,8 @@ static struct wlr_output_layout_output *output_layout_output_create(
wl_signal_add(&output->events.mode, &l_output->state->mode); wl_signal_add(&output->events.mode, &l_output->state->mode);
l_output->state->mode.notify = handle_output_mode; l_output->state->mode.notify = handle_output_mode;
wl_signal_add(&output->events.scale, &l_output->state->scale); wl_signal_add(&output->events.commit, &l_output->state->commit);
l_output->state->scale.notify = handle_output_scale; l_output->state->commit.notify = handle_output_commit;
wl_signal_add(&output->events.transform, &l_output->state->transform);
l_output->state->transform.notify = handle_output_transform;
wl_signal_add(&output->events.destroy, &l_output->state->output_destroy); wl_signal_add(&output->events.destroy, &l_output->state->output_destroy);
l_output->state->output_destroy.notify = handle_output_destroy; l_output->state->output_destroy.notify = handle_output_destroy;