From e04115898892129977a44e76aa39103a2bdd2144 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 2 Apr 2020 12:41:19 +0200 Subject: output: introduce wlr_output_test --- backend/headless/output.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'backend/headless') diff --git a/backend/headless/output.c b/backend/headless/output.c index a2836159..326c9605 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -57,7 +57,7 @@ static bool output_attach_render(struct wlr_output *wlr_output, buffer_age); } -static bool output_commit(struct wlr_output *wlr_output) { +static bool output_test(struct wlr_output *wlr_output) { if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { wlr_log(WLR_DEBUG, "Cannot disable a headless output"); return false; @@ -65,6 +65,17 @@ static bool output_commit(struct wlr_output *wlr_output) { if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) { assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM); + } + + return true; +} + +static bool output_commit(struct wlr_output *wlr_output) { + if (!output_test(wlr_output)) { + return false; + } + + if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) { if (!output_set_custom_mode(wlr_output, wlr_output->pending.custom_mode.width, wlr_output->pending.custom_mode.height, -- cgit v1.2.3