diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-01-17 08:27:47 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-01-17 08:27:47 -0500 |
| commit | 43896af90fbd6c743be1e54a0659d7c0f89eaa00 (patch) | |
| tree | c9d0907dbdc9932b593cf154f4ebce6db5a27e2d /backend/headless | |
| parent | b40a5f084abeb5530b3a0097c946ba720c897262 (diff) | |
| parent | f2698a896085a5a2dd651a7f1d4fb623d567acf4 (diff) | |
Merge branch 'master' into modifier-fixes
Diffstat (limited to 'backend/headless')
| -rw-r--r-- | backend/headless/backend.c | 2 | ||||
| -rw-r--r-- | backend/headless/output.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/backend/headless/backend.c b/backend/headless/backend.c index f95e3897..cef8eec4 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_create_global(&output->wlr_output, backend->display); + wlr_output_update_enabled(&output->wlr_output, 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 511c2c53..9fc92e88 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -105,7 +105,8 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, return NULL; } output->backend = backend; - wlr_output_init(&output->wlr_output, &backend->backend, &output_impl); + wlr_output_init(&output->wlr_output, &backend->backend, &output_impl, + backend->display); struct wlr_output *wlr_output = &output->wlr_output; output->egl_surface = egl_create_surface(&backend->egl, width, height); @@ -138,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_create_global(wlr_output, backend->display); + wlr_output_update_enabled(wlr_output, true); wl_signal_emit(&backend->backend.events.output_add, wlr_output); } |