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

Refactor out wlr_backend_state from wl/multi

Browse source
This commit is contained in:
Drew DeVault 2017-08-12 11:43:36 -04:00
parent e2386043f6
commit 81cd90297d
13 changed files with 233 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

114
backend/wayland/backend.c
View file

@ -12,17 +12,17 @@
#include "backend/wayland.h"
static int dispatch_events(int fd, uint32_t mask, void *data) {
struct wlr_backend_state *state = data;
struct wlr_wl_backend *backend = data;
int count = 0;
if (mask & WL_EVENT_READABLE) {
count = wl_display_dispatch(state->remote_display);
count = wl_display_dispatch(backend->remote_display);
}
if (mask & WL_EVENT_WRITABLE) {
count = wl_display_flush(state->remote_display);
count = wl_display_flush(backend->remote_display);
}
if (mask == 0) {
count = wl_display_dispatch_pending(state->remote_display);
wl_display_flush(state->remote_display);
count = wl_display_dispatch_pending(backend->remote_display);
wl_display_flush(backend->remote_display);
}
return count;
}
@ -32,73 +32,76 @@ static int dispatch_events(int fd, uint32_t mask, void *data) {
* compositor and creates surfaces for each output, then registers globals on
* the specified display.
*/
static bool wlr_wl_backend_init(struct wlr_backend_state* state) {
static bool wlr_wl_backend_init(struct wlr_backend *_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
wlr_log(L_INFO, "Initializating wayland backend");
state->remote_display = wl_display_connect(NULL);
if (!state->remote_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 (!(state->registry = wl_display_get_registry(state->remote_display))) {
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(state);
if (!(state->compositor) || (!(state->shell))) {
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(&state->egl, EGL_PLATFORM_WAYLAND_EXT, state->remote_display);
wlr_egl_bind_display(&state->egl, state->local_display);
wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT, backend->remote_display);
wlr_egl_bind_display(&backend->egl, backend->local_display);
for (size_t i = 0; i < state->requested_outputs; ++i) {
wlr_wl_output_create(state->backend);
for (size_t i = 0; i < backend->requested_outputs; ++i) {
wlr_wl_output_create(&backend->backend);
}
struct wl_event_loop *loop = wl_display_get_event_loop(state->local_display);
int fd = wl_display_get_fd(state->remote_display);
struct wl_event_loop *loop = wl_display_get_event_loop(backend->local_display);
int fd = wl_display_get_fd(backend->remote_display);
int events = WL_EVENT_READABLE | WL_EVENT_ERROR |
WL_EVENT_HANGUP | WL_EVENT_WRITABLE;
state->remote_display_src = wl_event_loop_add_fd(loop, fd, events,
dispatch_events, state);
wl_event_source_check(state->remote_display_src);
backend->remote_display_src = wl_event_loop_add_fd(loop, fd, events,
dispatch_events, backend);
wl_event_source_check(backend->remote_display_src);
return true;
}
static void wlr_wl_backend_destroy(struct wlr_backend_state *state) {
if (!state) {
static void wlr_wl_backend_destroy(struct wlr_backend *_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
if (!_backend) {
return;
}
for (size_t i = 0; i < state->outputs->length; ++i) {
wlr_output_destroy(state->outputs->items[i]);
for (size_t i = 0; i < backend->outputs->length; ++i) {
wlr_output_destroy(backend->outputs->items[i]);
}
for (size_t i = 0; i < state->devices->length; ++i) {
wlr_input_device_destroy(state->devices->items[i]);
for (size_t i = 0; i < backend->devices->length; ++i) {
wlr_input_device_destroy(backend->devices->items[i]);
}
list_free(state->devices);
list_free(state->outputs);
free(state->seatName);
list_free(backend->devices);
list_free(backend->outputs);
free(backend->seat_name);
wlr_egl_free(&state->egl);
if (state->seat) wl_seat_destroy(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);
wlr_egl_free(&backend->egl);
if (backend->seat) wl_seat_destroy(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);
}
static struct wlr_egl *wlr_wl_backend_get_egl(struct wlr_backend_state *state) {
return &state->egl;
static struct wlr_egl *wlr_wl_backend_get_egl(struct wlr_backend *_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
return &backend->egl;
}
static struct wlr_backend_impl backend_impl = {
@ -111,52 +114,45 @@ bool wlr_backend_is_wl(struct wlr_backend *b) {
return b->impl == &backend_impl;
}
struct wlr_output *wlr_wl_output_for_surface(struct wlr_backend_state *backend,
struct wl_surface *surface) {
struct wlr_output *wlr_wl_output_for_surface(struct wlr_wl_backend *backend,
struct wl_surface *surface) {
for (size_t i = 0; i < backend->outputs->length; ++i) {
struct wlr_output *output = backend->outputs->items[i];
if(output->state->surface == surface)
if (output->state->surface == surface) {
return output;
}
}
return NULL;
}
struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
wlr_log(L_INFO, "Creating 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);
struct wlr_wl_backend *backend = calloc(1, sizeof(struct wlr_wl_backend));
if (!backend) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL;
}
wlr_backend_create(&backend->backend, &backend_impl);
if (!(state->devices = list_create())) {
if (!(backend->devices = list_create())) {
wlr_log(L_ERROR, "Could not allocate devices list");
goto error;
}
if (!(state->outputs = list_create())) {
if (!(backend->outputs = list_create())) {
wlr_log(L_ERROR, "Could not allocate outputs list");
goto error;
}
state->local_display = display;
state->backend = backend;
return backend;
backend->local_display = display;
return &backend->backend;
error:
if (state) {
list_free(state->devices);
list_free(state->outputs);
if (backend) {
list_free(backend->devices);
list_free(backend->outputs);
}
free(state);
free(backend);
return NULL;
}