mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-16 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initialize display, backend; add frame handling

Browse source
This commit is contained in:
Drew DeVault 2017-09-23 00:29:53 -04:00
parent 550748681d
commit b6d7c3ed8e
9 changed files with 253 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

42
backend/wayland/backend.c
View file

@ -35,26 +35,7 @@ static bool wlr_wl_backend_start(struct wlr_backend *_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
wlr_log(L_INFO, "Initializating wayland backend");
backend->remote_display = wl_display_connect(NULL);
if (!backend->remote_display) {
wlr_log_errno(L_ERROR, "Could not connect to remote display");
return false;
}
if (!(backend->registry = wl_display_get_registry(backend->remote_display))) {
wlr_log_errno(L_ERROR, "Could not obtain reference to remote registry");
return false;
}
wlr_wl_registry_poll(backend);
if (!(backend->compositor) || (!(backend->shell))) {
wlr_log_errno(L_ERROR, "Could not obtain retrieve required globals");
return false;
}
wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT, backend->remote_display);
wlr_egl_bind_display(&backend->egl, backend->local_display);
backend->started = true;
for (size_t i = 0; i < backend->requested_outputs; ++i) {
wlr_wl_output_create(&backend->backend);
}
@ -146,6 +127,27 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
}
backend->local_display = display;
backend->remote_display = wl_display_connect(NULL);
if (!backend->remote_display) {
wlr_log_errno(L_ERROR, "Could not connect to remote display");
return false;
}
if (!(backend->registry = wl_display_get_registry(backend->remote_display))) {
wlr_log_errno(L_ERROR, "Could not obtain reference to remote registry");
return false;
}
wlr_wl_registry_poll(backend);
if (!(backend->compositor) || (!(backend->shell))) {
wlr_log_errno(L_ERROR, "Could not obtain retrieve required globals");
return false;
}
wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT, backend->remote_display);
wlr_egl_bind_display(&backend->egl, backend->local_display);
return &backend->backend;
error:

2
backend/wayland/output.c
View file

@ -209,7 +209,7 @@ static struct zxdg_toplevel_v6_listener xdg_toplevel_listener = {
struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
assert(wlr_backend_is_wl(_backend));
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
if (!backend->remote_display) {
if (!backend->started) {
++backend->requested_outputs;
return NULL;
}