From 5d1ba0f44687f49cd28fcd8f69abac3cb0e07eb8 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 16 Aug 2019 19:41:56 +0300 Subject: output: re-introduce atomic mode, enabled, scale and transform This reverts commit 01f903874b7e27539488fad7f31476d5bcbc6ac9 and re-applies commit ee5f98ad49fed0439f3313ec685307831d1d1d05. Updates: https://github.com/swaywm/wlroots/issues/1640 (Atomic output updates issue) See also: https://github.com/swaywm/wlroots/pull/1762 (Atomic output updates original PR) See also: https://github.com/swaywm/wlroots/issues/1780 (Issue caused by atomic output updates) See also: https://github.com/swaywm/sway/issues/4419 (Issue caused by atomic output updates) See also: https://github.com/swaywm/wlroots/pull/1781 (Revert PR) --- backend/noop/output.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'backend/noop') diff --git a/backend/noop/output.c b/backend/noop/output.c index 1022ac6f..15c84941 100644 --- a/backend/noop/output.c +++ b/backend/noop/output.c @@ -12,19 +12,30 @@ static struct wlr_noop_output *noop_output_from_output( return (struct wlr_noop_output *)wlr_output; } -static bool output_set_custom_mode(struct wlr_output *wlr_output, - int32_t width, int32_t height, int32_t refresh) { - wlr_output_update_custom_mode(wlr_output, width, height, refresh); - return true; -} - static bool output_attach_render(struct wlr_output *wlr_output, int *buffer_age) { return false; } static bool output_commit(struct wlr_output *wlr_output) { - return false; + if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { + wlr_log(WLR_DEBUG, "Cannot disable a noop output"); + return false; + } + + if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) { + assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM); + wlr_output_update_custom_mode(wlr_output, + wlr_output->pending.custom_mode.width, + wlr_output->pending.custom_mode.height, + wlr_output->pending.custom_mode.refresh); + } + + if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { + return false; + } + + return true; } static void output_destroy(struct wlr_output *wlr_output) { @@ -37,7 +48,6 @@ static void output_destroy(struct wlr_output *wlr_output) { } static const struct wlr_output_impl output_impl = { - .set_custom_mode = output_set_custom_mode, .destroy = output_destroy, .attach_render = output_attach_render, .commit = output_commit, -- cgit v1.2.3