Merge presentation protocol setup for lock and greeter hosts

Changed

 src/c/desktop.h | 3 +--
 src/c/host.c    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

Diff

A merge. Shown against its first parent, so this is the effect of merging rather than the work of the branch.

@@ -184,8 +184,7 @@ static void cursor_shape_request(struct wl_listener *listener,void *data) {

184

wlr_cursor_set_xcursor(s->cursor,s->cursor_manager,wlr_cursor_shape_v1_name(event->shape));

185

}

186

static bool desktop_init(struct server *s) {

−187

if(!wlr_presentation_create(s->display,s->backend,1) ||

−188

!wlr_single_pixel_buffer_manager_v1_create(s->display) ||

+187

if(!wlr_single_pixel_buffer_manager_v1_create(s->display) ||

188

!wlr_data_control_manager_v1_create(s->display) ||

189

!wlr_primary_selection_v1_device_manager_create(s->display) ||

190

!wlr_xdg_output_manager_v1_create(s->display,s->layout) ||

@@ -2260,6 +2260,7 @@ static int run_host(void) {

2260

if(!s.compositor || !wlr_subcompositor_create(s.display) ||

2261

!wlr_viewporter_create(s.display) || !wlr_fractional_scale_manager_v1_create(s.display,1)) goto cleanup;

2262

wlr_data_device_manager_create(s.display);

+2263

if(!wlr_presentation_create(s.display,s.backend,1)) goto cleanup;

2264

s.layout=wlr_output_layout_create(s.display);

2265

s.scene=wlr_scene_create();

2266

if(!s.layout || !s.scene) goto cleanup;