From ee5f98ad49fed0439f3313ec685307831d1d1d05 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 18 Jul 2019 21:38:12 +0300 Subject: output: atomic mode, enabled, scale and transform This commit makes more output properties (mode, enabled, scale and transform) atomic. This means that they are double-buffered and only applied on commit. Compositors now need to call wlr_output_commit after setting any of those properties. Internally, backends still apply properties sequentially. The behaviour should be exactly the same as before. Future commits will update some backends to take advantage of the atomic interface. Some backends are non-atomic by design, e.g. the X11 backend or the legacy DRM backend. Updates: https://github.com/swaywm/wlroots/issues/1640 --- rootston/output.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'rootston/output.c') diff --git a/rootston/output.c b/rootston/output.c index 66a43694..f24c4345 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -470,8 +470,10 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) { wl_list_for_each(config_head, &config->heads, link) { struct wlr_output *wlr_output = config_head->state.output; if (!config_head->state.enabled) { - ok &= wlr_output_enable(wlr_output, false); + wlr_output_enable(wlr_output, false); wlr_output_layout_remove(desktop->layout, wlr_output); + + ok &= wlr_output_commit(wlr_output); } } @@ -481,11 +483,12 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) { if (!config_head->state.enabled) { continue; } - ok &= wlr_output_enable(wlr_output, true); + + wlr_output_enable(wlr_output, true); if (config_head->state.mode != NULL) { - ok &= wlr_output_set_mode(wlr_output, config_head->state.mode); + wlr_output_set_mode(wlr_output, config_head->state.mode); } else { - ok &= wlr_output_set_custom_mode(wlr_output, + wlr_output_set_custom_mode(wlr_output, config_head->state.custom_mode.width, config_head->state.custom_mode.height, config_head->state.custom_mode.refresh); @@ -494,6 +497,8 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) { config_head->state.x, config_head->state.y); wlr_output_set_transform(wlr_output, config_head->state.transform); wlr_output_set_scale(wlr_output, config_head->state.scale); + + ok &= wlr_output_commit(wlr_output); } if (ok) { @@ -674,6 +679,7 @@ void handle_new_output(struct wl_listener *listener, void *data) { } wlr_output_layout_add_auto(desktop->layout, wlr_output); } + wlr_output_commit(wlr_output); struct roots_seat *seat; wl_list_for_each(seat, &input->seats, link) { -- cgit v1.2.3