aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/backend.c157
-rw-r--r--backend/drm/backend.c5
-rw-r--r--backend/drm/renderer.c17
-rw-r--r--backend/headless/backend.c19
-rw-r--r--backend/multi/backend.c20
-rw-r--r--backend/wayland/backend.c19
-rw-r--r--backend/x11/backend.c15
-rw-r--r--docs/env_vars.md15
-rw-r--r--examples/multi-pointer.c2
-rw-r--r--examples/output-layout.c2
-rw-r--r--examples/pointer.c2
-rw-r--r--examples/rotation.c2
-rw-r--r--examples/simple.c2
-rw-r--r--examples/tablet.c2
-rw-r--r--examples/touch.c2
-rw-r--r--include/backend/drm/renderer.h3
-rw-r--r--include/wlr/backend.h10
-rw-r--r--include/wlr/backend/drm.h3
-rw-r--r--include/wlr/backend/headless.h3
-rw-r--r--include/wlr/backend/multi.h2
-rw-r--r--include/wlr/backend/wayland.h3
-rw-r--r--include/wlr/backend/x11.h2
-rw-r--r--include/wlr/render/wlr_renderer.h4
-rw-r--r--render/egl.c4
-rw-r--r--render/wlr_renderer.c17
-rw-r--r--rootston/cursor.c4
-rw-r--r--rootston/main.c2
-rw-r--r--rootston/seat.c1
28 files changed, 244 insertions, 95 deletions
diff --git a/backend/backend.c b/backend/backend.c
index 20bf42b3..07c171bc 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <errno.h>
#include <libinput.h>
@@ -6,6 +7,7 @@
#include <unistd.h>
#include <wayland-server.h>
#include <wlr/backend/drm.h>
+#include <wlr/backend/headless.h>
#include <wlr/backend/interface.h>
#include <wlr/backend/libinput.h>
#include <wlr/backend/multi.h>
@@ -70,8 +72,9 @@ static size_t parse_outputs_env(const char *name) {
return outputs;
}
-static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
- struct wlr_backend *backend = wlr_wl_backend_create(display, NULL);
+static struct wlr_backend *attempt_wl_backend(struct wl_display *display,
+ wlr_renderer_create_func_t create_renderer_func) {
+ struct wlr_backend *backend = wlr_wl_backend_create(display, NULL, create_renderer_func);
if (backend == NULL) {
return NULL;
}
@@ -86,8 +89,8 @@ static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
#ifdef WLR_HAS_X11_BACKEND
static struct wlr_backend *attempt_x11_backend(struct wl_display *display,
- const char *x11_display) {
- struct wlr_backend *backend = wlr_x11_backend_create(display, x11_display);
+ const char *x11_display, wlr_renderer_create_func_t create_renderer_func) {
+ struct wlr_backend *backend = wlr_x11_backend_create(display, x11_display, create_renderer_func);
if (backend == NULL) {
return NULL;
}
@@ -101,16 +104,125 @@ static struct wlr_backend *attempt_x11_backend(struct wl_display *display,
}
#endif
-struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
+static struct wlr_backend *attempt_headless_backend(
+ struct wl_display *display, wlr_renderer_create_func_t create_renderer_func) {
+ struct wlr_backend *backend = wlr_headless_backend_create(display, create_renderer_func);
+ if (backend == NULL) {
+ return NULL;
+ }
+
+ size_t outputs = parse_outputs_env("WLR_HEADLESS_OUTPUTS");
+ for (size_t i = 0; i < outputs; ++i) {
+ wlr_headless_add_output(backend, 1280, 720);
+ }
+
+ return backend;
+}
+
+static struct wlr_backend *attempt_drm_backend(struct wl_display *display,
+ struct wlr_backend *backend, struct wlr_session *session,
+ wlr_renderer_create_func_t create_renderer_func) {
+ int gpus[8];
+ size_t num_gpus = wlr_session_find_gpus(session, 8, gpus);
+ struct wlr_backend *primary_drm = NULL;
+ wlr_log(L_INFO, "Found %zu GPUs", num_gpus);
+
+ for (size_t i = 0; i < num_gpus; ++i) {
+ struct wlr_backend *drm = wlr_drm_backend_create(display, session,
+ gpus[i], primary_drm, create_renderer_func);
+ if (!drm) {
+ wlr_log(L_ERROR, "Failed to open DRM device %d", gpus[i]);
+ continue;
+ }
+
+ if (!primary_drm) {
+ primary_drm = drm;
+ }
+
+ wlr_multi_backend_add(backend, drm);
+ }
+
+ return primary_drm;
+}
+
+static struct wlr_backend *attempt_backend_by_name(struct wl_display *display,
+ struct wlr_backend *backend, struct wlr_session **session,
+ const char *name, wlr_renderer_create_func_t create_renderer_func) {
+ if (strcmp(name, "wayland") == 0) {
+ return attempt_wl_backend(display, create_renderer_func);
+#ifdef WLR_HAS_X11_BACKEND
+ } else if (strcmp(name, "x11") == 0) {
+ return attempt_x11_backend(display, NULL, create_renderer_func);
+#endif
+ } else if (strcmp(name, "headless") == 0) {
+ return attempt_headless_backend(display, create_renderer_func);
+ } else if (strcmp(name, "drm") == 0 || strcmp(name, "libinput") == 0) {
+ // DRM and libinput need a session
+ *session = wlr_session_create(display);
+ if (!*session) {
+ wlr_log(L_ERROR, "failed to start a session");
+ return NULL;
+ }
+
+ if (strcmp(name, "libinput") == 0) {
+ return wlr_libinput_backend_create(display, *session);
+ } else {
+ return attempt_drm_backend(display, backend, *session, create_renderer_func);
+ }
+ }
+
+ wlr_log(L_ERROR, "unrecognized backend '%s'", name);
+ return NULL;
+}
+
+struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
+ wlr_renderer_create_func_t create_renderer_func) {
struct wlr_backend *backend = wlr_multi_backend_create(display);
if (!backend) {
wlr_log(L_ERROR, "could not allocate multibackend");
return NULL;
}
+ struct wlr_session *session = NULL;
+
+ char *names = getenv("WLR_BACKENDS");
+ if (names) {
+ names = strdup(names);
+ if (names == NULL) {
+ wlr_log(L_ERROR, "allocation failed");
+ wlr_backend_destroy(backend);
+ return NULL;
+ }
+
+ char *saveptr;
+ char *name = strtok_r(names, ",", &saveptr);
+ while (name != NULL) {
+ struct wlr_backend *subbackend =
+ attempt_backend_by_name(display, backend, &session, name, create_renderer_func);
+ if (subbackend == NULL) {
+ wlr_log(L_ERROR, "failed to start backend '%s'", name);
+ wlr_backend_destroy(backend);
+ wlr_session_destroy(session);
+ return NULL;
+ }
+
+ if (!wlr_multi_backend_add(backend, subbackend)) {
+ wlr_log(L_ERROR, "failed to add backend '%s'", name);
+ wlr_backend_destroy(backend);
+ wlr_session_destroy(session);
+ return NULL;
+ }
+
+ name = strtok_r(NULL, ",", &saveptr);
+ }
+
+ return backend;
+ }
+
if (getenv("WAYLAND_DISPLAY") || getenv("_WAYLAND_DISPLAY") ||
getenv("WAYLAND_SOCKET")) {
- struct wlr_backend *wl_backend = attempt_wl_backend(display);
+ struct wlr_backend *wl_backend = attempt_wl_backend(display,
+ create_renderer_func);
if (wl_backend) {
wlr_multi_backend_add(backend, wl_backend);
return backend;
@@ -121,7 +233,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
const char *x11_display = getenv("DISPLAY");
if (x11_display) {
struct wlr_backend *x11_backend =
- attempt_x11_backend(display, x11_display);
+ attempt_x11_backend(display, x11_display, create_renderer_func);
if (x11_backend) {
wlr_multi_backend_add(backend, x11_backend);
return backend;
@@ -130,7 +242,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
#endif
// Attempt DRM+libinput
- struct wlr_session *session = wlr_session_create(display);
+ session = wlr_session_create(display);
if (!session) {
wlr_log(L_ERROR, "Failed to start a DRM session");
wlr_backend_destroy(backend);
@@ -138,40 +250,21 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
}
struct wlr_backend *libinput = wlr_libinput_backend_create(display, session);
- if (libinput) {
- wlr_multi_backend_add(backend, libinput);
- } else {
+ if (!libinput) {
wlr_log(L_ERROR, "Failed to start libinput backend");
wlr_backend_destroy(backend);
wlr_session_destroy(session);
return NULL;
}
+ wlr_multi_backend_add(backend, libinput);
- int gpus[8];
- size_t num_gpus = wlr_session_find_gpus(session, 8, gpus);
- struct wlr_backend *primary_drm = NULL;
- wlr_log(L_INFO, "Found %zu GPUs", num_gpus);
-
- for (size_t i = 0; i < num_gpus; ++i) {
- struct wlr_backend *drm = wlr_drm_backend_create(display, session,
- gpus[i], primary_drm);
- if (!drm) {
- wlr_log(L_ERROR, "Failed to open DRM device");
- continue;
- }
-
- if (!primary_drm) {
- primary_drm = drm;
- }
-
- wlr_multi_backend_add(backend, drm);
- }
-
+ struct wlr_backend *primary_drm =
+ attempt_drm_backend(display, backend, session, create_renderer_func);
if (!primary_drm) {
wlr_log(L_ERROR, "Failed to open any DRM device");
wlr_backend_destroy(libinput);
- wlr_session_destroy(session);
wlr_backend_destroy(backend);
+ wlr_session_destroy(session);
return NULL;
}
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index f0306ee3..7bb4dc32 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -114,7 +114,8 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
}
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
- struct wlr_session *session, int gpu_fd, struct wlr_backend *parent) {
+ struct wlr_session *session, int gpu_fd, struct wlr_backend *parent,
+ wlr_renderer_create_func_t create_renderer_func) {
assert(display && session && gpu_fd >= 0);
assert(!parent || wlr_backend_is_drm(parent));
@@ -161,7 +162,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
goto error_event;
}
- if (!init_drm_renderer(drm, &drm->renderer)) {
+ if (!init_drm_renderer(drm, &drm->renderer, create_renderer_func)) {
wlr_log(L_ERROR, "Failed to initialize renderer");
goto error_event;
}
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 7e2b5174..d5bcef2b 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -19,29 +19,28 @@
#endif
bool init_drm_renderer(struct wlr_drm_backend *drm,
- struct wlr_drm_renderer *renderer) {
+ struct wlr_drm_renderer *renderer, wlr_renderer_create_func_t create_renderer_func) {
renderer->gbm = gbm_create_device(drm->fd);
if (!renderer->gbm) {
wlr_log(L_ERROR, "Failed to create GBM device");
return false;
}
- if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA, renderer->gbm,
- NULL, GBM_FORMAT_ARGB8888)) {
- goto error_gbm;
+ if (!create_renderer_func) {
+ create_renderer_func = wlr_renderer_autocreate;
}
- renderer->wlr_rend = wlr_gles2_renderer_create(&renderer->egl);
+ renderer->wlr_rend = create_renderer_func(&renderer->egl,
+ EGL_PLATFORM_GBM_MESA, renderer->gbm, NULL, GBM_FORMAT_ARGB8888);
+
if (!renderer->wlr_rend) {
- wlr_log(L_ERROR, "Failed to create WLR renderer");
- goto error_egl;
+ wlr_log(L_ERROR, "Failed to create EGL/WLR renderer");
+ goto error_gbm;
}
renderer->fd = drm->fd;
return true;
-error_egl:
- wlr_egl_finish(&renderer->egl);
error_gbm:
gbm_device_destroy(renderer->gbm);
return false;
diff --git a/backend/headless/backend.c b/backend/headless/backend.c
index 1d29e12a..7015099e 100644
--- a/backend/headless/backend.c
+++ b/backend/headless/backend.c
@@ -78,7 +78,8 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
backend_destroy(&backend->backend);
}
-struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) {
+struct wlr_backend *wlr_headless_backend_create(struct wl_display *display,
+ wlr_renderer_create_func_t create_renderer_func) {
wlr_log(L_INFO, "Creating headless backend");
struct wlr_headless_backend *backend =
@@ -101,16 +102,18 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) {
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
EGL_NONE,
};
- bool ok = wlr_egl_init(&backend->egl, EGL_PLATFORM_SURFACELESS_MESA, NULL,
- (EGLint *)config_attribs, 0);
- if (!ok) {
- free(backend);
- return NULL;
+
+ if (!create_renderer_func) {
+ create_renderer_func = wlr_renderer_autocreate;
}
- backend->renderer = wlr_gles2_renderer_create(&backend->egl);
- if (backend->renderer == NULL) {
+ backend->renderer = create_renderer_func(&backend->egl, EGL_PLATFORM_SURFACELESS_MESA,
+ NULL, (EGLint*)config_attribs, 0);
+
+ if (!backend->renderer) {
wlr_log(L_ERROR, "Failed to create renderer");
+ free(backend);
+ return NULL;
}
backend->display_destroy.notify = handle_display_destroy;
diff --git a/backend/multi/backend.c b/backend/multi/backend.c
index b70d7003..33dfc6c5 100644
--- a/backend/multi/backend.c
+++ b/backend/multi/backend.c
@@ -130,20 +130,29 @@ static struct subbackend_state *multi_backend_get_subbackend(struct wlr_multi_ba
return NULL;
}
-void wlr_multi_backend_add(struct wlr_backend *_multi,
+bool wlr_multi_backend_add(struct wlr_backend *_multi,
struct wlr_backend *backend) {
assert(wlr_backend_is_multi(_multi));
struct wlr_multi_backend *multi = (struct wlr_multi_backend *)_multi;
if (multi_backend_get_subbackend(multi, backend)) {
// already added
- return;
+ return true;
}
- struct subbackend_state *sub;
- if (!(sub = calloc(1, sizeof(struct subbackend_state)))) {
+ struct wlr_renderer *multi_renderer =
+ multi_backend_get_renderer(&multi->backend);
+ struct wlr_renderer *backend_renderer = wlr_backend_get_renderer(backend);
+ if (multi_renderer != NULL && backend_renderer != NULL) {
+ wlr_log(L_ERROR, "Could not add backend: multiple renderers at the "
+ "same time aren't supported");
+ return false;
+ }
+
+ struct subbackend_state *sub = calloc(1, sizeof(struct subbackend_state));
+ if (sub == NULL) {
wlr_log(L_ERROR, "Could not add backend: allocation failed");
- return;
+ return false;
}
wl_list_insert(&multi->backends, &sub->link);
@@ -160,6 +169,7 @@ void wlr_multi_backend_add(struct wlr_backend *_multi,
sub->new_output.notify = new_output_reemit;
wlr_signal_emit_safe(&multi->events.backend_add, backend);
+ return true;
}
void wlr_multi_backend_remove(struct wlr_backend *_multi,
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index bac0ab73..4f3fa2f3 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -87,7 +87,9 @@ static void backend_destroy(struct wlr_backend *wlr_backend) {
free(backend->seat_name);
- wl_event_source_remove(backend->remote_display_src);
+ if (backend->remote_display_src) {
+ wl_event_source_remove(backend->remote_display_src);
+ }
wlr_renderer_destroy(backend->renderer);
wlr_egl_finish(&backend->egl);
if (backend->pointer) {
@@ -137,7 +139,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
}
struct wlr_backend *wlr_wl_backend_create(struct wl_display *display,
- const char *remote) {
+ const char *remote, wlr_renderer_create_func_t create_renderer_func) {
wlr_log(L_INFO, "Creating wayland backend");
struct wlr_wl_backend *backend = calloc(1, sizeof(struct wlr_wl_backend));
@@ -172,13 +174,14 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display,
EGL_ALPHA_SIZE, 1,
EGL_NONE,
};
- if (!wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT,
- backend->remote_display, config_attribs, WL_SHM_FORMAT_ARGB8888)) {
- wlr_log(L_ERROR, "Could not initialize EGL");
- goto error_egl;
+
+ if (!create_renderer_func) {
+ create_renderer_func = wlr_renderer_autocreate;
}
- backend->renderer = wlr_gles2_renderer_create(&backend->egl);
+ backend->renderer = create_renderer_func(&backend->egl, EGL_PLATFORM_WAYLAND_EXT,
+ backend->remote_display, config_attribs, WL_SHM_FORMAT_ARGB8888);
+
if (backend->renderer == NULL) {
wlr_log(L_ERROR, "Could not create renderer");
goto error_renderer;
@@ -190,8 +193,6 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display,
return &backend->backend;
error_renderer:
- wlr_egl_finish(&backend->egl);
-error_egl:
wl_registry_destroy(backend->registry);
error_registry:
wl_display_disconnect(backend->remote_display);
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 845495e7..d4793b9c 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -232,7 +232,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
}
struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
- const char *x11_display) {
+ const char *x11_display, wlr_renderer_create_func_t create_renderer_func) {
struct wlr_x11_backend *x11 = calloc(1, sizeof(*x11));
if (!x11) {
return NULL;
@@ -267,15 +267,16 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data;
- if (!wlr_egl_init(&x11->egl, EGL_PLATFORM_X11_KHR, x11->xlib_conn, NULL,
- x11->screen->root_visual)) {
- goto error_event;
+ if (!create_renderer_func) {
+ create_renderer_func = wlr_renderer_autocreate;
}
- x11->renderer = wlr_gles2_renderer_create(&x11->egl);
+ x11->renderer = create_renderer_func(&x11->egl, EGL_PLATFORM_X11_KHR,
+ x11->xlib_conn, NULL, x11->screen->root_visual);
+
if (x11->renderer == NULL) {
wlr_log(L_ERROR, "Failed to create renderer");
- goto error_egl;
+ goto error_event;
}
wlr_input_device_init(&x11->keyboard_dev, WLR_INPUT_DEVICE_KEYBOARD,
@@ -288,8 +289,6 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
return &x11->backend;
-error_egl:
- wlr_egl_finish(&x11->egl);
error_event:
wl_event_source_remove(x11->event_source);
error_x11:
diff --git a/docs/env_vars.md b/docs/env_vars.md
index 5744701a..3f1926d3 100644
--- a/docs/env_vars.md
+++ b/docs/env_vars.md
@@ -2,19 +2,26 @@ wlroots reads these environment variables
wlroots specific
----------------
-* *WLR_DRM_DEVICES*: specifies the DRM devices (as a colon separated list) instead of auto probing them. The first existing device in this list is considered the primary DRM device.
-* *WLR_DRM_NO_ATOMIC*: set to 1 to use legacy DRM interface instead of atomic mode setting
+* *WLR_DRM_DEVICES*: specifies the DRM devices (as a colon separated list)
+ instead of auto probing them. The first existing device in this list is
+ considered the primary DRM device.
+* *WLR_DRM_NO_ATOMIC*: set to 1 to use legacy DRM interface instead of atomic
+ mode setting
* *WLR_LIBINPUT_NO_DEVICES*: set to 1 to not fail without any input devices
+* *WLR_BACKENDS*: comma-separated list of backends to use (available backends:
+ wayland, x11, headless)
* *WLR_WL_OUTPUTS*: when using the wayland backend specifies the number of outputs
* *WLR_X11_OUTPUTS*: when using the X11 backend specifies the number of outputs
rootston specific
------------------
-* *XKB_DEFAULT_RULES*, *XKB_DEFAULT_MODEL*, *XKB_DEFAULT_LAYOUT*, *XKB_DEFAULT_VARIANT*, *XKB_DEFAULT_OPTIONS*: xkb setup
+* *XKB_DEFAULT_RULES*, *XKB_DEFAULT_MODEL*, *XKB_DEFAULT_LAYOUT*,
+ *XKB_DEFAULT_VARIANT*, *XKB_DEFAULT_OPTIONS*: xkb setup
generic
-------
* *DISPLAY*: if set probe X11 backend in *wlr_backend_autocreate*
-* *WAYLAND_DISPLAY*, *_WAYLAND_DISPLAY*, *WAYLAND_SOCKET*: if set probe Wayland backend in *wlr_backend_autocreate*
+* *WAYLAND_DISPLAY*, *_WAYLAND_DISPLAY*, *WAYLAND_SOCKET*: if set probe Wayland
+ backend in *wlr_backend_autocreate*
* *XCURSOR_PATH*: directory where xcursors are located
* *XDG_RUNTIME_DIR*: used to store non persistent temporary files
diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c
index 83ee253d..c5b2048f 100644
--- a/examples/multi-pointer.c
+++ b/examples/multi-pointer.c
@@ -284,7 +284,7 @@ int main(int argc, char *argv[]) {
.clear_color = { 0.25f, 0.25f, 0.25f, 1 },
.display = display,
};
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/examples/output-layout.c b/examples/output-layout.c
index d45100b6..7b847a3b 100644
--- a/examples/output-layout.c
+++ b/examples/output-layout.c
@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) {
state.layout = wlr_output_layout_create();
clock_gettime(CLOCK_MONOTONIC, &state.ts_last);
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/examples/pointer.c b/examples/pointer.c
index 8dba99eb..d6b4ed1c 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -324,7 +324,7 @@ int main(int argc, char *argv[]) {
.display = display
};
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/examples/rotation.c b/examples/rotation.c
index 0ee9964c..bd39a21e 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -235,7 +235,7 @@ int main(int argc, char *argv[]) {
};
wl_list_init(&state.outputs);
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/examples/simple.c b/examples/simple.c
index e64289fb..60acd7db 100644
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -152,7 +152,7 @@ int main() {
.last_frame = { 0 },
.display = display
};
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/examples/tablet.c b/examples/tablet.c
index d178f2ef..f5c4bbb5 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -349,7 +349,7 @@ int main(int argc, char *argv[]) {
};
wl_list_init(&state.tablet_pads);
wl_list_init(&state.tablet_tools);
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/examples/touch.c b/examples/touch.c
index 069fda74..68f78a0a 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) {
wl_list_init(&state.touch_points);
wl_list_init(&state.touch);
- struct wlr_backend *wlr = wlr_backend_autocreate(display);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, NULL);
if (!wlr) {
exit(1);
}
diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h
index 5e15f3d5..510abe43 100644
--- a/include/backend/drm/renderer.h
+++ b/include/backend/drm/renderer.h
@@ -5,6 +5,7 @@
#include <gbm.h>
#include <stdbool.h>
#include <stdint.h>
+#include <wlr/backend.h>
#include <wlr/render/wlr_renderer.h>
struct wlr_drm_backend;
@@ -32,7 +33,7 @@ struct wlr_drm_surface {
};
bool init_drm_renderer(struct wlr_drm_backend *drm,
- struct wlr_drm_renderer *renderer);
+ struct wlr_drm_renderer *renderer, wlr_renderer_create_func_t create_render);
void finish_drm_renderer(struct wlr_drm_renderer *renderer);
bool init_drm_surface(struct wlr_drm_surface *surf,
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 2059e3b7..f40f5353 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -20,12 +20,20 @@ struct wlr_backend {
} events;
};
+typedef struct wlr_renderer *(*wlr_renderer_create_func_t)(struct wlr_egl *egl, EGLenum platform,
+ void *remote_display, EGLint *config_attribs, EGLint visual_id);
/**
* Automatically initializes the most suitable backend given the environment.
* Will always return a multibackend. The backend is created but not started.
* Returns NULL on failure.
+ *
+ * The compositor can request to initialize the backend's renderer by setting
+ * the create_render_func. The callback must initialize the given wlr_egl and
+ * return a valid wlr_renderer, or NULL if it has failed to initiaze it.
+ * Pass NULL as create_renderer_func to use the backend's default renderer.
*/
-struct wlr_backend *wlr_backend_autocreate(struct wl_display *display);
+struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
+ wlr_renderer_create_func_t create_renderer_func);
/**
* Start the backend. This may signal new_input or new_output immediately, but
* may also wait until the display's event loop begins. Returns false on
diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index 14fafe10..7f41ca15 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -14,7 +14,8 @@
* a DRM backend, other kinds of backends raise SIGABRT).
*/
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
- struct wlr_session *session, int gpu_fd, struct wlr_backend *parent);
+ struct wlr_session *session, int gpu_fd, struct wlr_backend *parent,
+ wlr_renderer_create_func_t create_renderer_func);
bool wlr_backend_is_drm(struct wlr_backend *backend);
bool wlr_output_is_drm(struct wlr_output *output);
diff --git a/include/wlr/backend/headless.h b/include/wlr/backend/headless.h
index ee784a0d..02c7cd11 100644
--- a/include/wlr/backend/headless.h
+++ b/include/wlr/backend/headless.h
@@ -9,7 +9,8 @@
* Creates a headless backend. A headless backend has no outputs or inputs by
* default.
*/
-struct wlr_backend *wlr_headless_backend_create(struct wl_display *display);
+struct wlr_backend *wlr_headless_backend_create(struct wl_display *display,
+ wlr_renderer_create_func_t create_renderer_func);
/**
* Create a new headless output backed by an in-memory EGL framebuffer. You can
* read pixels from this framebuffer via wlr_renderer_read_pixels but it is
diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h
index 842eed67..1e04dba4 100644
--- a/include/wlr/backend/multi.h
+++ b/include/wlr/backend/multi.h
@@ -13,7 +13,7 @@ struct wlr_backend *wlr_multi_backend_create(struct wl_display *display);
* Adds the given backend to the multi backend. This should be done before the
* new backend is started.
*/
-void wlr_multi_backend_add(struct wlr_backend *multi,
+bool wlr_multi_backend_add(struct wlr_backend *multi,
struct wlr_backend *backend);
void wlr_multi_backend_remove(struct wlr_backend *multi,
diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h
index 31a14c97..119ea247 100644
--- a/include/wlr/backend/wayland.h
+++ b/include/wlr/backend/wayland.h
@@ -16,7 +16,8 @@
* to NULL for the default behaviour (WAYLAND_DISPLAY env variable or wayland-0
* default)
*/
-struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char *remote);
+struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char *remote,
+ wlr_renderer_create_func_t create_renderer_func);
/**
* Adds a new output to this backend. You may remove outputs by destroying them.
diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h
index 7bc1f891..56360bf7 100644
--- a/include/wlr/backend/x11.h
+++ b/include/wlr/backend/x11.h
@@ -8,7 +8,7 @@
#include <wlr/types/wlr_output.h>
struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
- const char *x11_display);
+ const char *x11_display, wlr_renderer_create_func_t create_renderer_func);
struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend);
bool wlr_backend_is_x11(struct wlr_backend *backend);
diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h
index 93b76195..039bb66e 100644
--- a/include/wlr/render/wlr_renderer.h
+++ b/include/wlr/render/wlr_renderer.h
@@ -3,6 +3,7 @@
#include <stdint.h>
#include <wayland-server-protocol.h>
+#include <wlr/render/egl.h>
#include <wlr/render/wlr_texture.h>
#include <wlr/types/wlr_box.h>
@@ -16,6 +17,9 @@ struct wlr_renderer {
} events;
};
+struct wlr_renderer *wlr_renderer_autocreate(struct wlr_egl *egl, EGLenum platform,
+ void *remote_display, EGLint *config_attribs, EGLint visual_id);
+
void wlr_renderer_begin(struct wlr_renderer *r, int width, int height);
void wlr_renderer_end(struct wlr_renderer *r);
void wlr_renderer_clear(struct wlr_renderer *r, const float color[static 4]);
diff --git a/render/egl.c b/render/egl.c
index a1452e9d..579bb5fe 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -198,8 +198,8 @@ void wlr_egl_finish(struct wlr_egl *egl) {
return;
}
- eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- if (egl->wl_display && eglUnbindWaylandDisplayWL) {
+ eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ if (egl->wl_display && egl->egl_exts.bind_wayland_display) {
eglUnbindWaylandDisplayWL(egl->display, egl->wl_display);
}
diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c
index 6407e1ec..aed821c9 100644
--- a/render/wlr_renderer.c
+++ b/render/wlr_renderer.c
@@ -4,6 +4,7 @@
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_matrix.h>
+#include <wlr/render/gles2.h>
#include <wlr/util/log.h>
#include "util/signal.h"
@@ -184,3 +185,19 @@ void wlr_renderer_init_wl_display(struct wlr_renderer *r,
r->impl->init_wl_display(r, wl_display);
}
}
+
+struct wlr_renderer *wlr_renderer_autocreate(struct wlr_egl *egl,
+ EGLenum platform, void *remote_display, EGLint *config_attribs, EGLint visual_id) {
+
+ if (!wlr_egl_init(egl, platform, remote_display, config_attribs, visual_id)) {
+ wlr_log(L_ERROR, "Could not initialize EGL");
+ return NULL;
+ }
+
+ struct wlr_renderer *renderer = wlr_gles2_renderer_create(egl);
+ if (!renderer) {
+ wlr_egl_finish(egl);
+ }
+
+ return renderer;
+}
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 55b145e2..1cf81704 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -273,7 +273,9 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
}
break;
case WLR_BUTTON_PRESSED:
- roots_seat_set_focus(seat, view);
+ if (view) {
+ roots_seat_set_focus(seat, view);
+ }
if (surface && wlr_surface_is_layer_surface(surface)) {
struct wlr_layer_surface *layer =
wlr_layer_surface_from_wlr_surface(surface);
diff --git a/rootston/main.c b/rootston/main.c
index e5fecbe5..cecdb23d 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
server.wl_event_loop = wl_display_get_event_loop(server.wl_display);
assert(server.config && server.wl_display && server.wl_event_loop);
- server.backend = wlr_backend_autocreate(server.wl_display);
+ server.backend = wlr_backend_autocreate(server.wl_display, NULL);
if (server.backend == NULL) {
wlr_log(L_ERROR, "could not start backend");
return 1;
diff --git a/rootston/seat.c b/rootston/seat.c
index cbc7c961..b137ff11 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -798,6 +798,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
if (view == NULL) {
seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
+ wlr_seat_keyboard_clear_focus(seat->seat);
return;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 10:23:06 +0000