From 3cf7225cec637c90f4a676aa02dee9ad06dadee9 Mon Sep 17 00:00:00 2001 From: Markus Ongyerth Date: Tue, 23 Jan 2018 17:40:12 +0100 Subject: decouples outputenable state and wl_output global This decouples wlr_output_enable and the wl_global. The previously internal functions wlr_output_(destroy/create)_global are exposed and used automatically in the wlr_output_layout to create/tear down the global. The compositor can handle them itself if it wants to, but I think this is the right moment to create/destroy the wl_output when the wlr_output_layout is used. --- backend/headless/backend.c | 2 +- backend/headless/output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/headless') diff --git a/backend/headless/backend.c b/backend/headless/backend.c index cef8eec4..5438f1f4 100644 --- a/backend/headless/backend.c +++ b/backend/headless/backend.c @@ -15,7 +15,7 @@ static bool backend_start(struct wlr_backend *wlr_backend) { struct wlr_headless_output *output; wl_list_for_each(output, &backend->outputs, link) { wl_event_source_timer_update(output->frame_timer, output->frame_delay); - wlr_output_update_enabled(&output->wlr_output, true); + output->wlr_output.enabled = true; wl_signal_emit(&backend->backend.events.output_add, &output->wlr_output); } diff --git a/backend/headless/output.c b/backend/headless/output.c index 9fc92e88..b89d4106 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -139,7 +139,7 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, if (backend->started) { wl_event_source_timer_update(output->frame_timer, output->frame_delay); - wlr_output_update_enabled(wlr_output, true); + wlr_output->enabled = true; wl_signal_emit(&backend->backend.events.output_add, wlr_output); } -- cgit v1.2.3