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

Start to fix wayland backend

Browse source 
Starts to update the wayland backend to the new backend api.
Not yet updated to libinput branch (not yet compiling).
This commit is contained in:
nyorain 2017-06-19 17:46:50 +02:00
parent 325a331425
commit 904739c405
4 changed files with 76 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

104
backend/wayland/backend.c
View file

@ -2,58 +2,84 @@
#include <stdint.h>
#include <wayland-server.h>
#include <assert.h>
#include <wlr/backend/interface.h>
#include "backend/wayland.h"
#include "common/log.h"
void wlr_wl_backend_free(struct wlr_wl_backend *backend) {
if (!backend) {
return;
}
// TODO: Free surfaces
for (size_t i = 0; backend->outputs && i < backend->outputs->length; ++i) {
struct wlr_wl_output *output = backend->outputs->items[i];
wlr_wl_output_free(output);
}
list_free(backend->outputs);
if (backend->seat) wlr_wl_seat_free(backend->seat);
if (backend->shm) wl_shm_destroy(backend->shm);
if (backend->shell) wl_shell_destroy(backend->shell);
if (backend->compositor) wl_compositor_destroy(backend->compositor);
if (backend->registry) wl_registry_destroy(backend->registry);
if (backend->remote_display) wl_display_disconnect(backend->remote_display);
free(backend);
}
/*
* Initializes the wayland backend. Opens a connection to a remote wayland
* compositor and creates surfaces for each output, then registers globals on
* the specified display.
*/
struct wlr_wl_backend *wlr_wl_backend_init(
struct wl_display *display, size_t outputs) {
assert(display);
struct wlr_wl_backend *backend;
if (!(backend = calloc(sizeof(struct wlr_wl_backend), 1))) {
wlr_log(L_ERROR, "Could not allocate backend");
goto error;
static bool wlr_wl_backend_init(struct wlr_backend_state* state) {
state->remote_display = wl_display_connect(getenv("_WAYLAND_DISPLAY"));
if (!state->remote_display) {
wlr_log(L_ERROR, "Could not connect to remote display");
return false;
}
if (!(backend->outputs = list_create())) {
if (!(state->registry = wl_display_get_registry(state->remote_display))) {
wlr_log(L_ERROR, "Could not obtain reference to remote registry");
return false;
}
wlr_wlb_registry_poll(state);
return true;
}
static void wlr_wl_backend_destroy(struct wlr_backend_state *state) {
if (!state) {
return;
}
// TODO: Free surfaces
for (size_t i = 0; state->outputs && i < state->outputs->length; ++i) {
struct wlr_wl_output *output = state->outputs->items[i];
wlr_wl_output_free(output);
}
list_free(state->outputs);
if (state->seat) wlr_wl_seat_free(state->seat);
if (state->shm) wl_shm_destroy(state->shm);
if (state->shell) wl_shell_destroy(state->shell);
if (state->compositor) wl_compositor_destroy(state->compositor);
if (state->registry) wl_registry_destroy(state->registry);
if (state->remote_display) wl_display_disconnect(state->remote_display);
free(state);
}
static struct wlr_backend_impl backend_impl = {
.init = wlr_wl_backend_init,
.destroy = wlr_wl_backend_destroy
};
struct wlr_backend *wlr_wl_backend_create(struct wl_display *display,
size_t outputs) {
wlr_log(L_INFO, "Initalizing wayland backend");
struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state));
if (!state) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL;
}
struct wlr_backend *backend = wlr_backend_create(&backend_impl, state);
if (!backend) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL;
}
if (!(state->outputs = list_create())) {
wlr_log(L_ERROR, "Could not allocate output list");
goto error;
}
backend->local_display = display;
backend->remote_display = wl_display_connect(getenv("_WAYLAND_DISPLAY"));
if (!backend->remote_display) {
wlr_log(L_ERROR, "Could not connect to remote display");
goto error;
}
if (!(backend->registry = wl_display_get_registry(backend->remote_display))) {
wlr_log(L_ERROR, "Could not obtain reference to remote registry");
goto error;
}
wlr_wlb_registry_poll(backend);
state->local_display = display;
return backend;
error:
wlr_wl_backend_free(backend);
free(state);
free(backend);
return NULL;
}