diff options
31 files changed, 274 insertions, 234 deletions
diff --git a/backend/backend.c b/backend/backend.c index c5dcdb48..b369a135 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -17,8 +17,7 @@ #include <wlr/util/log.h> #include "backend/multi.h" -/* WLR_HAS_X11_BACKEND needs to be after wlr/config.h */ -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND #include <wlr/backend/x11.h> #endif @@ -102,7 +101,7 @@ static struct wlr_backend *attempt_wl_backend(struct wl_display *display, return backend; } -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND static struct wlr_backend *attempt_x11_backend(struct wl_display *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); @@ -165,7 +164,7 @@ static struct wlr_backend *attempt_backend_by_name(struct wl_display *display, 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 +#if WLR_HAS_X11_BACKEND } else if (strcmp(name, "x11") == 0) { return attempt_x11_backend(display, NULL, create_renderer_func); #endif @@ -248,7 +247,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display, } } -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND const char *x11_display = getenv("DISPLAY"); if (x11_display) { struct wlr_backend *x11_backend = diff --git a/backend/meson.build b/backend/meson.build index dd1f4df3..03f8ea7d 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -23,7 +23,6 @@ backend_files = files( 'session/session.c', 'wayland/backend.c', 'wayland/output.c', - 'wayland/registry.c', 'wayland/wl_seat.c', ) diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c index 3abce46a..2b9634da 100644 --- a/backend/session/direct-ipc.c +++ b/backend/session/direct-ipc.c @@ -24,7 +24,7 @@ enum { DRM_MAJOR = 226 }; -#ifdef WLR_HAS_LIBCAP +#if WLR_HAS_LIBCAP #include <sys/capability.h> static bool have_permissions(void) { diff --git a/backend/session/logind.c b/backend/session/logind.c index b44112e6..bfe12190 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -15,10 +15,10 @@ #include <wlr/util/log.h> #include "util/signal.h" -#ifdef WLR_HAS_SYSTEMD +#if WLR_HAS_SYSTEMD #include <systemd/sd-bus.h> #include <systemd/sd-login.h> -#elif defined(WLR_HAS_ELOGIND) +#elif WLR_HAS_ELOGIND #include <elogind/sd-bus.h> #include <elogind/sd-login.h> #endif diff --git a/backend/session/session.c b/backend/session/session.c index 041d8f83..96cde65c 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -19,7 +19,7 @@ extern const struct session_impl session_logind; extern const struct session_impl session_direct; static const struct session_impl *impls[] = { -#if defined(WLR_HAS_SYSTEMD) || defined(WLR_HAS_ELOGIND) +#if WLR_HAS_SYSTEMD || WLR_HAS_ELOGIND &session_logind, #endif &session_direct, @@ -70,7 +70,7 @@ struct wlr_session *wlr_session_create(struct wl_display *disp) { const char *env_wlr_session = getenv("WLR_SESSION"); if (env_wlr_session) { if (!strcmp(env_wlr_session, "logind") || !strcmp(env_wlr_session, "systemd")) { - #if defined(WLR_HAS_SYSTEMD) || defined(WLR_HAS_ELOGIND) + #if WLR_HAS_SYSTEMD || WLR_HAS_ELOGIND session = session_logind.create(disp); #else wlr_log(WLR_ERROR, "wlroots is not compiled with logind support"); diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 28f61863..df1bf431 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -1,131 +1,168 @@ #include <assert.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> #include <limits.h> #include <stdint.h> #include <stdlib.h> + +#include <wlr/config.h> + +#include <EGL/egl.h> +#include <EGL/eglext.h> #include <wayland-server.h> + #include <wlr/backend/interface.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/egl.h> #include <wlr/render/gles2.h> #include <wlr/util/log.h> + #include "backend/wayland.h" #include "util/signal.h" #include "xdg-shell-unstable-v6-client-protocol.h" -struct wlr_wl_backend *get_wl_backend_from_backend( - struct wlr_backend *wlr_backend) { - assert(wlr_backend_is_wl(wlr_backend)); - return (struct wlr_wl_backend *)wlr_backend; +struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *backend) { + assert(wlr_backend_is_wl(backend)); + return (struct wlr_wl_backend *)backend; } static int dispatch_events(int fd, uint32_t mask, void *data) { - struct wlr_wl_backend *backend = data; - int count = 0; + struct wlr_wl_backend *wl = data; if ((mask & WL_EVENT_HANGUP) || (mask & WL_EVENT_ERROR)) { - wl_display_terminate(backend->local_display); + wl_display_terminate(wl->local_display); return 0; } if (mask & WL_EVENT_READABLE) { - count = wl_display_dispatch(backend->remote_display); + return wl_display_dispatch(wl->remote_display); + } + if (mask & WL_EVENT_WRITABLE) { + wl_display_flush(wl->remote_display); + return 0; } if (mask == 0) { - count = wl_display_dispatch_pending(backend->remote_display); - wl_display_flush(backend->remote_display); + int count = wl_display_dispatch_pending(wl->remote_display); + wl_display_flush(wl->remote_display); + return count; + } + + return 0; +} + +static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell, + uint32_t serial) { + zxdg_shell_v6_pong(shell, serial); +} + +static const struct zxdg_shell_v6_listener xdg_shell_listener = { + xdg_shell_handle_ping, +}; + +static void registry_global(void *data, struct wl_registry *registry, + uint32_t name, const char *iface, uint32_t version) { + struct wlr_wl_backend *wl = data; + + wlr_log(WLR_DEBUG, "Remote wayland global: %s v%d", iface, version); + + if (strcmp(iface, wl_compositor_interface.name) == 0) { + wl->compositor = wl_registry_bind(registry, name, + &wl_compositor_interface, 4); + + } else if (strcmp(iface, wl_seat_interface.name) == 0) { + wl->seat = wl_registry_bind(registry, name, + &wl_seat_interface, 2); + wl_seat_add_listener(wl->seat, &seat_listener, wl); + + } else if (strcmp(iface, wl_shm_interface.name) == 0) { + wl->shm = wl_registry_bind(registry, name, + &wl_shm_interface, 1); + + } else if (strcmp(iface, zxdg_shell_v6_interface.name) == 0) { + wl->shell = wl_registry_bind(registry, name, + &zxdg_shell_v6_interface, 1); + zxdg_shell_v6_add_listener(wl->shell, &xdg_shell_listener, NULL); } - return count; } +static void registry_global_remove(void *data, struct wl_registry *registry, + uint32_t name) { + // TODO +} + +static const struct wl_registry_listener registry_listener = { + .global = registry_global, + .global_remove = registry_global_remove +}; + /* * 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. */ -static bool backend_start(struct wlr_backend *wlr_backend) { - struct wlr_wl_backend *backend = get_wl_backend_from_backend(wlr_backend); +static bool backend_start(struct wlr_backend *backend) { + struct wlr_wl_backend *wl = get_wl_backend_from_backend(backend); wlr_log(WLR_INFO, "Initializating wayland backend"); - poll_wl_registry(backend); - if (!backend->compositor || !backend->shell) { - wlr_log_errno(WLR_ERROR, "Could not obtain retrieve required globals"); - return false; - } - - backend->started = true; + wl->started = true; - for (size_t i = 0; i < backend->requested_outputs; ++i) { - wlr_wl_output_create(&backend->backend); + if (wl->keyboard) { + create_wl_keyboard(wl->keyboard, wl); } - 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; - backend->remote_display_src = wl_event_loop_add_fd(loop, fd, events, - dispatch_events, backend); - wl_event_source_check(backend->remote_display_src); + for (size_t i = 0; i < wl->requested_outputs; ++i) { + wlr_wl_output_create(&wl->backend); + } return true; } -static void backend_destroy(struct wlr_backend *wlr_backend) { - struct wlr_wl_backend *backend = get_wl_backend_from_backend(wlr_backend); - if (backend == NULL) { +static void backend_destroy(struct wlr_backend *backend) { + if (!backend) { return; } + struct wlr_wl_backend *wl = get_wl_backend_from_backend(backend); + struct wlr_wl_output *output, *tmp_output; - wl_list_for_each_safe(output, tmp_output, &backend->outputs, link) { + wl_list_for_each_safe(output, tmp_output, &wl->outputs, link) { wlr_output_destroy(&output->wlr_output); } struct wlr_input_device *input_device, *tmp_input_device; - wl_list_for_each_safe(input_device, tmp_input_device, &backend->devices, link) { + wl_list_for_each_safe(input_device, tmp_input_device, &wl->devices, link) { wlr_input_device_destroy(input_device); } - wlr_signal_emit_safe(&wlr_backend->events.destroy, wlr_backend); + wlr_signal_emit_safe(&wl->backend.events.destroy, &wl->backend); - wl_list_remove(&backend->local_display_destroy.link); + wl_list_remove(&wl->local_display_destroy.link); - free(backend->seat_name); + free(wl->seat_name); - 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) { - wl_pointer_destroy(backend->pointer); - } - if (backend->seat) { - wl_seat_destroy(backend->seat); - } - if (backend->shm) { - wl_shm_destroy(backend->shm); - } - if (backend->shell) { - zxdg_shell_v6_destroy(backend->shell); - } - if (backend->compositor) { - wl_compositor_destroy(backend->compositor); + wl_event_source_remove(wl->remote_display_src); + + wlr_renderer_destroy(wl->renderer); + wlr_egl_finish(&wl->egl); + + if (wl->pointer) { + wl_pointer_destroy(wl->pointer); } - if (backend->registry) { - wl_registry_destroy(backend->registry); + if (wl->seat) { + wl_seat_destroy(wl->seat); } - if (backend->remote_display) { - wl_display_disconnect(backend->remote_display); + if (wl->shm) { + wl_shm_destroy(wl->shm); } - free(backend); + zxdg_shell_v6_destroy(wl->shell); + wl_compositor_destroy(wl->compositor); + wl_registry_destroy(wl->registry); + wl_display_disconnect(wl->remote_display); + free(wl); } -static struct wlr_renderer *backend_get_renderer( - struct wlr_backend *wlr_backend) { - struct wlr_wl_backend *backend = get_wl_backend_from_backend(wlr_backend); - return backend->renderer; +static struct wlr_renderer *backend_get_renderer(struct wlr_backend *backend) { + struct wlr_wl_backend *wl = get_wl_backend_from_backend(backend); + return wl->renderer; } static struct wlr_backend_impl backend_impl = { @@ -139,39 +176,65 @@ bool wlr_backend_is_wl(struct wlr_backend *b) { } static void handle_display_destroy(struct wl_listener *listener, void *data) { - struct wlr_wl_backend *backend = - wl_container_of(listener, backend, local_display_destroy); - backend_destroy(&backend->backend); + struct wlr_wl_backend *wl = + wl_container_of(listener, wl, local_display_destroy); + backend_destroy(&wl->backend); } struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char *remote, wlr_renderer_create_func_t create_renderer_func) { wlr_log(WLR_INFO, "Creating wayland backend"); - struct wlr_wl_backend *backend = calloc(1, sizeof(struct wlr_wl_backend)); - if (!backend) { - wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno)); + struct wlr_wl_backend *wl = calloc(1, sizeof(*wl)); + if (!wl) { + wlr_log_errno(WLR_ERROR, "Allocation failed"); return NULL; } - wlr_backend_init(&backend->backend, &backend_impl); - wl_list_init(&backend->devices); - wl_list_init(&backend->outputs); + wlr_backend_init(&wl->backend, &backend_impl); - backend->local_display = display; + wl->local_display = display; + wl_list_init(&wl->devices); + wl_list_init(&wl->outputs); - backend->remote_display = wl_display_connect(remote); - if (!backend->remote_display) { + wl->remote_display = wl_display_connect(remote); + if (!wl->remote_display) { wlr_log_errno(WLR_ERROR, "Could not connect to remote display"); - goto error_connect; + goto error_wl; } - backend->registry = wl_display_get_registry(backend->remote_display); - if (backend->registry == NULL) { + wl->registry = wl_display_get_registry(wl->remote_display); + if (!wl->registry) { wlr_log_errno(WLR_ERROR, "Could not obtain reference to remote registry"); + goto error_display; + } + + wl_registry_add_listener(wl->registry, ®istry_listener, wl); + wl_display_dispatch(wl->remote_display); + wl_display_roundtrip(wl->remote_display); + + if (!wl->compositor) { + wlr_log(WLR_ERROR, + "Remote Wayland compositor does not support wl_compositor"); + goto error_registry; + } + if (!wl->shell) { + wlr_log(WLR_ERROR, + "Remote Wayland compositor does not support zxdg_shell_v6"); goto error_registry; } + struct wl_event_loop *loop = wl_display_get_event_loop(wl->local_display); + int fd = wl_display_get_fd(wl->remote_display); + int events = WL_EVENT_READABLE | WL_EVENT_ERROR | WL_EVENT_HANGUP; + wl->remote_display_src = wl_event_loop_add_fd(loop, fd, events, + dispatch_events, wl); + if (!wl->remote_display_src) { + wlr_log(WLR_ERROR, "Failed to create event source"); + goto error_registry; + } + wl_event_source_check(wl->remote_display_src); + static EGLint config_attribs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_RED_SIZE, 1, @@ -185,24 +248,32 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, create_renderer_func = wlr_renderer_autocreate; } - backend->renderer = create_renderer_func(&backend->egl, EGL_PLATFORM_WAYLAND_EXT, - backend->remote_display, config_attribs, WL_SHM_FORMAT_ARGB8888); + wl->renderer = create_renderer_func(&wl->egl, EGL_PLATFORM_WAYLAND_EXT, + wl->remote_display, config_attribs, WL_SHM_FORMAT_ARGB8888); - if (backend->renderer == NULL) { + if (!wl->renderer) { wlr_log(WLR_ERROR, "Could not create renderer"); - goto error_renderer; + goto error_event; } - backend->local_display_destroy.notify = handle_display_destroy; - wl_display_add_destroy_listener(display, &backend->local_display_destroy); + wl->local_display_destroy.notify = handle_display_destroy; + wl_display_add_destroy_listener(display, &wl->local_display_destroy); - return &backend->backend; + return &wl->backend; -error_renderer: - wl_registry_destroy(backend->registry); +error_event: + wl_event_source_remove(wl->remote_display_src); error_registry: - wl_display_disconnect(backend->remote_display); -error_connect: - free(backend); + if (wl->compositor) { + wl_compositor_destroy(wl->compositor); + } + if (wl->shell) { + zxdg_shell_v6_destroy(wl->shell); + } + wl_registry_destroy(wl->registry); +error_display: + wl_display_disconnect(wl->remote_display); +error_wl: + free(wl); return NULL; } diff --git a/backend/wayland/output.c b/backend/wayland/output.c index f90c6009..03322678 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -6,11 +6,14 @@ #include <sys/mman.h> #include <sys/types.h> #include <unistd.h> + #include <wayland-client.h> + #include <wlr/interfaces/wlr_output.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_matrix.h> #include <wlr/util/log.h> + #include "backend/wayland.h" #include "util/signal.h" #include "xdg-shell-unstable-v6-client-protocol.h" diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c deleted file mode 100644 index 8b154750..00000000 --- a/backend/wayland/registry.c +++ /dev/null @@ -1,55 +0,0 @@ -#include <stdint.h> -#include <stdlib.h> -#include <string.h> -#include <wayland-client.h> -#include <wlr/util/log.h> -#include "backend/wayland.h" -#include "xdg-shell-unstable-v6-client-protocol.h" - -static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell, - uint32_t serial) { - zxdg_shell_v6_pong(shell, serial); -} - -static const struct zxdg_shell_v6_listener xdg_shell_listener = { - xdg_shell_handle_ping, -}; - - -static void registry_global(void *data, struct wl_registry *registry, - uint32_t name, const char *interface, uint32_t version) { - struct wlr_wl_backend *backend = data; - wlr_log(WLR_DEBUG, "Remote wayland global: %s v%d", interface, version); - - if (strcmp(interface, wl_compositor_interface.name) == 0) { - backend->compositor = wl_registry_bind(registry, name, - &wl_compositor_interface, version); - } else if (strcmp(interface, zxdg_shell_v6_interface.name) == 0) { - backend->shell = wl_registry_bind(registry, name, - &zxdg_shell_v6_interface, version); - zxdg_shell_v6_add_listener(backend->shell, &xdg_shell_listener, NULL); - } else if (strcmp(interface, wl_shm_interface.name) == 0) { - backend->shm = wl_registry_bind(registry, name, - &wl_shm_interface, version); - } else if (strcmp(interface, wl_seat_interface.name) == 0) { - backend->seat = wl_registry_bind(registry, name, - &wl_seat_interface, version); - wl_seat_add_listener(backend->seat, &seat_listener, backend); - } -} - -static void registry_global_remove(void *data, struct wl_registry *registry, - uint32_t name) { - // TODO -} - -static const struct wl_registry_listener registry_listener = { - .global = registry_global, - .global_remove = registry_global_remove -}; - -void poll_wl_registry(struct wlr_wl_backend *backend) { - wl_registry_add_listener(backend->registry, ®istry_listener, backend); - wl_display_dispatch(backend->remote_display); - wl_display_roundtrip(backend->remote_display); -} diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index 562d9431..c4098987 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -1,16 +1,20 @@ #define _POSIX_C_SOURCE 200809L + #include <assert.h> #include <stdint.h> #include <stdlib.h> #include <string.h> #include <time.h> + #include <wayland-client.h> + #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_pointer.h> #include <wlr/interfaces/wlr_touch.h> #include <wlr/util/log.h> + #include "backend/wayland.h" #include "util/signal.h" @@ -321,8 +325,7 @@ static void pointer_handle_output_destroy(struct wl_listener *listener, wlr_input_device_destroy(&pointer->input_device->wlr_input_device); } -void create_wl_pointer(struct wl_pointer *wl_pointer, - struct wlr_wl_output *output) { +void create_wl_pointer(struct wl_pointer *wl_pointer, struct wlr_wl_output *output) { struct wlr_wl_backend *backend = output->backend; struct wlr_input_device *wlr_dev; @@ -364,6 +367,28 @@ void create_wl_pointer(struct wl_pointer *wl_pointer, wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_dev); } +void create_wl_keyboard(struct wl_keyboard *wl_keyboard, struct wlr_wl_backend *wl) { + struct wlr_wl_input_device *dev = + create_wl_input_device(wl, WLR_INPUT_DEVICE_KEYBOARD); + if (!dev) { + return; + } + + struct wlr_input_device *wlr_dev = &dev->wlr_input_device; + + wlr_dev->keyboard = calloc(1, sizeof(*wlr_dev->keyboard)); + if (!wlr_dev->keyboard) { + wlr_log_errno(WLR_ERROR, "Allocation failed"); + free(dev); + return; + } + wlr_keyboard_init(wlr_dev->keyboard, NULL); + + wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_dev); + dev->resource = wl_keyboard; + wlr_signal_emit_safe(&wl->backend.events.new_input, wlr_dev); +} + static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, enum wl_seat_capability caps) { struct wlr_wl_backend *backend = data; @@ -384,25 +409,13 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, } if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { wlr_log(WLR_DEBUG, "seat %p offered keyboard", (void*) wl_seat); - struct wlr_wl_input_device *dev = create_wl_input_device(backend, - WLR_INPUT_DEVICE_KEYBOARD); - if (dev == NULL) { - wlr_log(WLR_ERROR, "Allocation failed"); - return; - } - struct wlr_input_device *wlr_dev = &dev->wlr_input_device; - wlr_dev->keyboard = calloc(1, sizeof(struct wlr_keyboard)); - if (!wlr_dev->keyboard) { - free(dev); - wlr_log(WLR_ERROR, "Allocation failed"); - return; - } - wlr_keyboard_init(wlr_dev->keyboard, NULL); struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat); - wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_dev); - dev->resource = wl_keyboard; - wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_dev); + backend->keyboard = wl_keyboard; + + if (backend->started) { + create_wl_keyboard(wl_keyboard, backend); + } } } diff --git a/backend/x11/backend.c b/backend/x11/backend.c index c0a11fbb..cd7986a0 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -17,7 +17,7 @@ #include <wlr/util/log.h> #include <X11/Xlib-xcb.h> #include <xcb/xcb.h> -#ifdef WLR_HAS_XCB_XKB +#if WLR_HAS_XCB_XKB #include <xcb/xkb.h> #endif #include "backend/x11.h" @@ -148,7 +148,7 @@ static bool backend_start(struct wlr_backend *backend) { 0, 0); xcb_free_pixmap(x11->xcb_conn, pix); -#ifdef WLR_HAS_XCB_XKB +#if WLR_HAS_XCB_XKB const xcb_query_extension_reply_t *reply = xcb_get_extension_data(x11->xcb_conn, &xcb_xkb_id); if (reply != NULL && reply->present) { diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index a16da1c9..5b108ffb 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -10,7 +10,7 @@ #elif __FreeBSD__ #include <dev/evdev/input-event-codes.h> #endif -#ifdef WLR_HAS_XCB_XKB +#if WLR_HAS_XCB_XKB #include <xcb/xkb.h> #endif #include "backend/x11.h" @@ -124,7 +124,7 @@ void handle_x11_input_event(struct wlr_x11_backend *x11, return; } default: -#ifdef WLR_HAS_XCB_XKB +#if WLR_HAS_XCB_XKB if (x11->xkb_supported && event->response_type == x11->xkb_base_event) { xcb_xkb_state_notify_event_t *ev = (xcb_xkb_state_notify_event_t *)event; diff --git a/backend/x11/meson.build b/backend/x11/meson.build index 1164df1e..fa51e3d7 100644 --- a/backend/x11/meson.build +++ b/backend/x11/meson.build @@ -20,7 +20,7 @@ foreach lib : x11_optional dep = dependency(lib, required: get_option(lib)) if dep.found() x11_libs += dep - conf_data.set('WLR_HAS_' + lib.underscorify().to_upper(), true) + conf_data.set10('WLR_HAS_' + lib.underscorify().to_upper(), true) endif endforeach @@ -41,4 +41,4 @@ lib_wlr_backend_x11 = static_library( ) backend_parts += lib_wlr_backend_x11 -conf_data.set('WLR_HAS_X11_BACKEND', true) +conf_data.set10('WLR_HAS_X11_BACKEND', true) diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 47585d9e..dbc309ca 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -2,10 +2,12 @@ #define BACKEND_WAYLAND_H #include <stdbool.h> + #include <wayland-client.h> #include <wayland-egl.h> #include <wayland-server.h> #include <wayland-util.h> + #include <wlr/backend/wayland.h> #include <wlr/render/egl.h> #include <wlr/render/wlr_renderer.h> @@ -32,6 +34,7 @@ struct wlr_wl_backend { struct wl_shm *shm; struct wl_seat *seat; struct wl_pointer *pointer; + struct wl_keyboard *keyboard; struct wlr_wl_pointer *current_pointer; char *seat_name; }; @@ -78,13 +81,11 @@ struct wlr_wl_pointer { struct wl_listener output_destroy; }; -struct wlr_wl_backend *get_wl_backend_from_backend( - struct wlr_backend *wlr_backend); -void poll_wl_registry(struct wlr_wl_backend *backend); +struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *backend); void update_wl_output_cursor(struct wlr_wl_output *output); struct wlr_wl_pointer *pointer_get_wl(struct wlr_pointer *wlr_pointer); -void create_wl_pointer(struct wl_pointer *wl_pointer, - struct wlr_wl_output *output); +void create_wl_pointer(struct wl_pointer *wl_pointer, struct wlr_wl_output *output); +void create_wl_keyboard(struct wl_keyboard *wl_keyboard, struct wlr_wl_backend *wl); extern const struct wl_seat_listener seat_listener; diff --git a/include/backend/x11.h b/include/backend/x11.h index 37e3e4b6..06803768 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -64,7 +64,7 @@ struct wlr_x11_backend { // A blank cursor xcb_cursor_t cursor; -#ifdef WLR_HAS_XCB_XKB +#if WLR_HAS_XCB_XKB bool xkb_supported; uint8_t xkb_base_event; uint8_t xkb_base_error; diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 345c9c09..4ce92e2b 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -76,7 +76,7 @@ struct roots_desktop { struct wl_listener virtual_keyboard_new; struct wl_listener pointer_constraint; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND struct wlr_xwayland *xwayland; struct wl_listener xwayland_surface; #endif diff --git a/include/rootston/server.h b/include/rootston/server.h index 7ab15682..1836a374 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -7,7 +7,7 @@ #include <wlr/config.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_data_device.h> -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND #include <wlr/xwayland.h> #endif #include "rootston/config.h" diff --git a/include/rootston/view.h b/include/rootston/view.h index 14448fc6..0c75737b 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -79,7 +79,7 @@ enum roots_view_type { ROOTS_WL_SHELL_VIEW, ROOTS_XDG_SHELL_V6_VIEW, ROOTS_XDG_SHELL_VIEW, -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND ROOTS_XWAYLAND_VIEW, #endif }; @@ -117,7 +117,7 @@ struct roots_view { struct wlr_wl_shell_surface *wl_shell_surface; struct wlr_xdg_surface_v6 *xdg_surface_v6; struct wlr_xdg_surface *xdg_surface; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND struct wlr_xwayland_surface *xwayland_surface; #endif }; @@ -125,7 +125,7 @@ struct roots_view { struct roots_wl_shell_surface *roots_wl_shell_surface; struct roots_xdg_surface_v6 *roots_xdg_surface_v6; struct roots_xdg_surface *roots_xdg_surface; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND struct roots_xwayland_surface *roots_xwayland_surface; #endif }; diff --git a/include/wlr/backend/meson.build b/include/wlr/backend/meson.build index e005b854..3d6f0e40 100644 --- a/include/wlr/backend/meson.build +++ b/include/wlr/backend/meson.build @@ -9,7 +9,7 @@ install_headers( subdir: 'wlr/backend', ) -if conf_data.get('WLR_HAS_X11_BACKEND', false) +if conf_data.get('WLR_HAS_X11_BACKEND', 0) == 1 install_headers('x11.h', subdir: 'wlr/backend') endif diff --git a/include/wlr/meson.build b/include/wlr/meson.build index 43b5aec9..8874dbc7 100644 --- a/include/wlr/meson.build +++ b/include/wlr/meson.build @@ -15,7 +15,7 @@ install_headers( 'xcursor.h', subdir: 'wlr' ) -if conf_data.get('WLR_HAS_XWAYLAND', false) +if conf_data.get('WLR_HAS_XWAYLAND', 0) == 1 install_headers('xwayland.h', subdir: 'wlr') endif diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index 9ba2996a..fedb6fdd 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -11,7 +11,7 @@ #include <wlr/config.h> -#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND)) +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND #define MESA_EGL_NO_X11_HEADERS #endif diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 9500bced..a7f97a89 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -11,7 +11,7 @@ #include <wlr/config.h> -#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND)) +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND #define MESA_EGL_NO_X11_HEADERS #endif diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h index dc40cc3e..c1be572b 100644 --- a/include/xwayland/xwm.h +++ b/include/xwayland/xwm.h @@ -5,10 +5,10 @@ #include <wlr/config.h> #include <wlr/xwayland.h> #include <xcb/render.h> -#ifdef WLR_HAS_XCB_ICCCM +#if WLR_HAS_XCB_ICCCM #include <xcb/xcb_icccm.h> #endif -#ifdef WLR_HAS_XCB_ERRORS +#if WLR_HAS_XCB_ERRORS #include <xcb/xcb_errors.h> #endif #include "xwayland/selection.h" @@ -122,7 +122,7 @@ struct wlr_xwm { struct wlr_xwayland_surface *drag_focus; const xcb_query_extension_reply_t *xfixes; -#ifdef WLR_HAS_XCB_ERRORS +#if WLR_HAS_XCB_ERRORS xcb_errors_context_t *errors_context; #endif diff --git a/meson.build b/meson.build index 1ed93c04..7017e4b5 100644 --- a/meson.build +++ b/meson.build @@ -16,17 +16,26 @@ project( # for a reference about clean library versioning. so_version = ['0', '0', '0'] -add_project_arguments('-Wno-unused-parameter', language: 'c') add_project_arguments( - '-DWLR_SRC_DIR="@0@"'.format(meson.current_source_dir()), - language: 'c', -) -add_project_arguments( - '-DWLR_USE_UNSTABLE', + [ + '-DWLR_SRC_DIR="@0@"'.format(meson.current_source_dir()), + '-DWLR_USE_UNSTABLE', + + '-Wno-unused-parameter', + '-Wundef', + ], language: 'c', ) conf_data = configuration_data() +conf_data.set10('WLR_HAS_LIBCAP', false) +conf_data.set10('WLR_HAS_SYSTEMD', false) +conf_data.set10('WLR_HAS_ELOGIND', false) +conf_data.set10('WLR_HAS_X11_BACKEND', false) +conf_data.set10('WLR_HAS_XWAYLAND', false) +conf_data.set10('WLR_HAS_XCB_ERRORS', false) +conf_data.set10('WLR_HAS_XCB_ICCCM', false) +conf_data.set10('WLR_HAS_XCB_XKB', false) wlr_inc = include_directories('.', 'include') @@ -63,12 +72,12 @@ wlr_parts = [] wlr_deps = [] if libcap.found() - conf_data.set('WLR_HAS_LIBCAP', true) + conf_data.set10('WLR_HAS_LIBCAP', true) wlr_deps += libcap endif if logind.found() - conf_data.set('WLR_HAS_' + get_option('logind-provider').to_upper(), true) + conf_data.set10('WLR_HAS_' + get_option('logind-provider').to_upper(), true) wlr_deps += logind endif diff --git a/rootston/desktop.c b/rootston/desktop.c index 7da64ef8..e49d61a1 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -619,7 +619,7 @@ static bool view_at(struct roots_view *view, double lx, double ly, _surface = wlr_wl_shell_surface_surface_at(view->wl_shell_surface, view_sx, view_sy, &_sx, &_sy); break; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND case ROOTS_XWAYLAND_VIEW: _surface = wlr_surface_surface_at(view->wlr_surface, view_sx, view_sy, &_sx, &_sy); @@ -890,14 +890,14 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->tablet_v2 = wlr_tablet_v2_create(server->wl_display); const char *cursor_theme = NULL; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND const char *cursor_default = ROOTS_XCURSOR_DEFAULT; #endif struct roots_cursor_config *cc = roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME); if (cc != NULL) { cursor_theme = cc->theme; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (cc->default_image != NULL) { cursor_default = cc->default_image; } @@ -912,7 +912,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, setenv("XCURSOR_THEME", cursor_theme, 1); } -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE); if (desktop->xcursor_manager == NULL) { diff --git a/rootston/input.c b/rootston/input.c index b7a5f1ba..7b4001b3 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -8,7 +8,7 @@ #include <wlr/types/wlr_cursor.h> #include <wlr/util/log.h> #include <wlr/xcursor.h> -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND #include <wlr/xwayland.h> #endif #include "rootston/config.h" diff --git a/rootston/main.c b/rootston/main.c index cc3ffd3e..7e25dab1 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) { } setenv("WAYLAND_DISPLAY", socket, true); -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (server.desktop->xwayland != NULL) { struct roots_seat *xwayland_seat = input_get_seat(server.input, ROOTS_CONFIG_DEFAULT_SEAT_NAME); @@ -72,7 +72,7 @@ int main(int argc, char **argv) { } wl_display_run(server.wl_display); -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND wlr_xwayland_destroy(server.desktop->xwayland); #endif wl_display_destroy_clients(server.wl_display); diff --git a/rootston/meson.build b/rootston/meson.build index d650dc51..d41e00b0 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -16,7 +16,7 @@ sources = [ 'xdg_shell_v6.c', ] -if conf_data.get('WLR_HAS_XWAYLAND', false) +if conf_data.get('WLR_HAS_XWAYLAND', 0) == 1 sources += 'xwayland.c' endif diff --git a/rootston/output.c b/rootston/output.c index 9aa7de65..01fcae98 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -86,7 +86,7 @@ static void view_for_each_surface(struct roots_view *view, wlr_wl_shell_surface_for_each_surface(view->wl_shell_surface, iterator, user_data); break; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND case ROOTS_XWAYLAND_VIEW: wlr_surface_for_each_surface(view->wlr_surface, iterator, user_data); break; @@ -94,7 +94,7 @@ static void view_for_each_surface(struct roots_view *view, } } -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND static void xwayland_children_for_each_surface( struct wlr_xwayland_surface *surface, wlr_surface_iterator_func_t iterator, struct layout_data *layout_data, @@ -164,7 +164,7 @@ static void output_for_each_surface(struct roots_output *output, view_for_each_surface(view, layout_data, iterator, user_data); -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (view->type == ROOTS_XWAYLAND_VIEW) { xwayland_children_for_each_surface(view->xwayland_surface, iterator, layout_data, user_data); @@ -400,7 +400,7 @@ static bool has_standalone_surface(struct roots_view *view) { return wl_list_empty(&view->xdg_surface->popups); case ROOTS_WL_SHELL_VIEW: return wl_list_empty(&view->wl_shell_surface->popups); -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND case ROOTS_XWAYLAND_VIEW: return wl_list_empty(&view->xwayland_surface->children); #endif @@ -530,7 +530,7 @@ static void render_output(struct roots_output *output) { // During normal rendering the xwayland window tree isn't traversed // because all windows are rendered. Here we only want to render // the fullscreen window's children so we have to traverse the tree. -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (view->type == ROOTS_XWAYLAND_VIEW) { xwayland_children_for_each_surface(view->xwayland_surface, render_surface, &data.layout, &data); @@ -593,7 +593,7 @@ static bool view_accept_damage(struct roots_output *output, if (output->fullscreen_view == view) { return true; } -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (output->fullscreen_view->type == ROOTS_XWAYLAND_VIEW && view->type == ROOTS_XWAYLAND_VIEW) { // Special case: accept damage from children diff --git a/rootston/seat.c b/rootston/seat.c index 82444dcb..95e7d6c9 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -1131,7 +1131,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { bool unfullscreen = true; -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (view && view->type == ROOTS_XWAYLAND_VIEW && view->xwayland_surface->override_redirect) { unfullscreen = false; @@ -1160,7 +1160,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { return; } -#ifdef WLR_HAS_XWAYLAND +#if WLR_HAS_XWAYLAND if (view && view->type == ROOTS_XWAYLAND_VIEW && !wlr_xwayland_or_surface_wants_focus( view->xwayland_surface)) { diff --git a/xwayland/meson.build b/xwayland/meson.build index 0bd88924..e5f9b9be 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -23,7 +23,7 @@ foreach lib : xwayland_optional dep = dependency(lib, required: get_option(lib)) if dep.found() xwayland_libs += dep - conf_data.set('WLR_HAS_' + lib.underscorify().to_upper(), true) + conf_data.set10('WLR_HAS_' + lib.underscorify().to_upper(), true) endif endforeach @@ -48,4 +48,4 @@ lib_wlr_xwayland = static_library( ) wlr_parts += lib_wlr_xwayland -conf_data.set('WLR_HAS_XWAYLAND', true) +conf_data.set10('WLR_HAS_XWAYLAND', true) diff --git a/xwayland/xwm.c b/xwayland/xwm.c index c61c3ced..91fa7e3d 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -502,7 +502,7 @@ static void read_surface_protocols(struct wlr_xwm *xwm, wlr_log(WLR_DEBUG, "WM_PROTOCOLS (%zu)", atoms_len); } -#ifdef WLR_HAS_XCB_ICCCM +#if WLR_HAS_XCB_ICCCM static void read_surface_hints(struct wlr_xwm *xwm, struct wlr_xwayland_surface *xsurface, xcb_get_property_reply_t *reply) { @@ -540,7 +540,7 @@ static void read_surface_hints(struct wlr_xwm *xwm, } #endif -#ifdef WLR_HAS_XCB_ICCCM +#if WLR_HAS_XCB_ICCCM static void read_surface_normal_hints(struct wlr_xwm *xwm, struct wlr_xwayland_surface *xsurface, xcb_get_property_reply_t *reply) { @@ -1195,7 +1195,7 @@ static void xwm_handle_focus_in(struct wlr_xwm *xwm, } static void xwm_handle_xcb_error(struct wlr_xwm *xwm, xcb_value_error_t *ev) { -#ifdef WLR_HAS_XCB_ERRORS +#if WLR_HAS_XCB_ERRORS const char *major_name = xcb_errors_get_name_for_major_code(xwm->errors_context, ev->major_opcode); @@ -1233,7 +1233,7 @@ log_raw: } static void xwm_handle_unhandled_event(struct wlr_xwm *xwm, xcb_generic_event_t *ev) { -#ifdef WLR_HAS_XCB_ERRORS +#if WLR_HAS_XCB_ERRORS const char *extension; const char *event_name = xcb_errors_get_name_for_xcb_event(xwm->errors_context, @@ -1418,7 +1418,7 @@ void xwm_destroy(struct wlr_xwm *xwm) { if (xwm->event_source) { wl_event_source_remove(xwm->event_source); } -#ifdef WLR_HAS_XCB_ERRORS +#if WLR_HAS_XCB_ERRORS if (xwm->errors_context) { xcb_errors_context_free(xwm->errors_context); } @@ -1659,7 +1659,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { return NULL; } -#ifdef WLR_HAS_XCB_ERRORS +#if WLR_HAS_XCB_ERRORS if (xcb_errors_context_new(xwm->xcb_conn, &xwm->errors_context)) { wlr_log(WLR_ERROR, "Could not allocate error context"); xwm_destroy(xwm); |