aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/backend.c9
-rw-r--r--backend/drm/drm.c6
-rw-r--r--backend/meson.build1
-rw-r--r--backend/session/direct-ipc.c2
-rw-r--r--backend/session/logind.c4
-rw-r--r--backend/session/session.c4
-rw-r--r--backend/wayland/backend.c257
-rw-r--r--backend/wayland/output.c3
-rw-r--r--backend/wayland/registry.c55
-rw-r--r--backend/wayland/wl_seat.c51
-rw-r--r--backend/x11/backend.c183
-rw-r--r--backend/x11/input_device.c261
-rw-r--r--backend/x11/meson.build17
-rw-r--r--backend/x11/output.c57
14 files changed, 503 insertions, 407 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/drm/drm.c b/backend/drm/drm.c
index 9fd5c6a3..c2186932 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -1133,6 +1133,12 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
continue;
}
+
+ if (drm_conn->modes[i].flags & DRM_MODE_FLAG_INTERLACE) {
+ free(mode);
+ continue;
+ }
+
mode->drm_mode = drm_conn->modes[i];
mode->wlr_mode.width = mode->drm_mode.hdisplay;
mode->wlr_mode.height = mode->drm_mode.vdisplay;
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, &registry_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, &registry_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..38715631 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -1,25 +1,29 @@
#define _POSIX_C_SOURCE 200112L
+
#include <assert.h>
#include <limits.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
+
+#include <wlr/config.h>
+
+#include <X11/Xlib-xcb.h>
#include <wayland-server.h>
+#include <xcb/xcb.h>
+#include <xcb/xfixes.h>
+#include <xcb/xinput.h>
+
#include <wlr/backend/interface.h>
#include <wlr/backend/x11.h>
-#include <wlr/config.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/render/egl.h>
-#include <wlr/render/gles2.h>
+#include <wlr/render/wlr_renderer.h>
#include <wlr/util/log.h>
-#include <X11/Xlib-xcb.h>
-#include <xcb/xcb.h>
-#ifdef WLR_HAS_XCB_XKB
-#include <xcb/xkb.h>
-#endif
+
#include "backend/x11.h"
#include "util/signal.h"
@@ -36,8 +40,6 @@ struct wlr_x11_output *get_x11_output_from_window_id(
static void handle_x11_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event) {
- handle_x11_input_event(x11, event);
-
switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) {
case XCB_EXPOSE: {
xcb_expose_event_t *ev = (xcb_expose_event_t *)event;
@@ -69,6 +71,12 @@ static void handle_x11_event(struct wlr_x11_backend *x11,
}
break;
}
+ case XCB_GE_GENERIC: {
+ xcb_ge_generic_event_t *ev = (xcb_ge_generic_event_t *)event;
+ if (ev->extension == x11->xinput_opcode) {
+ handle_x11_xinput_event(x11, ev);
+ }
+ }
}
}
@@ -81,7 +89,7 @@ static int x11_event(int fd, uint32_t mask, void *data) {
}
xcb_generic_event_t *e;
- while ((e = xcb_poll_for_event(x11->xcb_conn))) {
+ while ((e = xcb_poll_for_event(x11->xcb))) {
handle_x11_event(x11, e);
free(e);
}
@@ -99,83 +107,6 @@ static bool backend_start(struct wlr_backend *backend) {
struct wlr_x11_backend *x11 = get_x11_backend_from_backend(backend);
x11->started = true;
- struct {
- const char *name;
- xcb_intern_atom_cookie_t cookie;
- xcb_atom_t *atom;
- } atom[] = {
- {
- .name = "WM_PROTOCOLS",
- .atom = &x11->atoms.wm_protocols,
- },
- {
- .name = "WM_DELETE_WINDOW",
- .atom = &x11->atoms.wm_delete_window,
- },
- {
- .name = "_NET_WM_NAME",
- .atom = &x11->atoms.net_wm_name,
- },
- {
- .name = "UTF8_STRING",
- .atom = &x11->atoms.utf8_string,
- },
- };
-
- for (size_t i = 0; i < sizeof(atom) / sizeof(atom[0]); ++i) {
- atom[i].cookie = xcb_intern_atom(x11->xcb_conn,
- true, strlen(atom[i].name), atom[i].name);
- }
-
- for (size_t i = 0; i < sizeof(atom) / sizeof(atom[0]); ++i) {
- xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(
- x11->xcb_conn, atom[i].cookie, NULL);
-
- if (reply) {
- *atom[i].atom = reply->atom;
- free(reply);
- } else {
- *atom[i].atom = XCB_ATOM_NONE;
- }
- }
-
- // create a blank cursor
- xcb_pixmap_t pix = xcb_generate_id(x11->xcb_conn);
- xcb_create_pixmap(x11->xcb_conn, 1, pix, x11->screen->root, 1, 1);
-
- x11->cursor = xcb_generate_id(x11->xcb_conn);
- xcb_create_cursor(x11->xcb_conn, x11->cursor, pix, pix, 0, 0, 0, 0, 0, 0,
- 0, 0);
- xcb_free_pixmap(x11->xcb_conn, pix);
-
-#ifdef 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) {
- x11->xkb_base_event = reply->first_event;
- x11->xkb_base_error = reply->first_error;
-
- xcb_xkb_use_extension_cookie_t cookie = xcb_xkb_use_extension(
- x11->xcb_conn, XCB_XKB_MAJOR_VERSION, XCB_XKB_MINOR_VERSION);
- xcb_xkb_use_extension_reply_t *reply =
- xcb_xkb_use_extension_reply(x11->xcb_conn, cookie, NULL);
- if (reply != NULL && reply->supported) {
- x11->xkb_supported = true;
-
- xcb_xkb_select_events(x11->xcb_conn,
- XCB_XKB_ID_USE_CORE_KBD,
- XCB_XKB_EVENT_TYPE_STATE_NOTIFY,
- 0,
- XCB_XKB_EVENT_TYPE_STATE_NOTIFY,
- 0,
- 0,
- 0);
-
- free(reply);
- }
- }
-#endif
-
wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->keyboard_dev);
for (size_t i = 0; i < x11->requested_outputs; ++i) {
@@ -209,9 +140,6 @@ static void backend_destroy(struct wlr_backend *backend) {
wlr_renderer_destroy(x11->renderer);
wlr_egl_finish(&x11->egl);
- if (x11->cursor) {
- xcb_free_cursor(x11->xcb_conn, x11->cursor);
- }
if (x11->xlib_conn) {
XCloseDisplay(x11->xlib_conn);
}
@@ -258,15 +186,82 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
goto error_x11;
}
- x11->xcb_conn = XGetXCBConnection(x11->xlib_conn);
- if (!x11->xcb_conn || xcb_connection_has_error(x11->xcb_conn)) {
+ x11->xcb = XGetXCBConnection(x11->xlib_conn);
+ if (!x11->xcb || xcb_connection_has_error(x11->xcb)) {
wlr_log(WLR_ERROR, "Failed to open xcb connection");
goto error_display;
}
XSetEventQueueOwner(x11->xlib_conn, XCBOwnsEventQueue);
- int fd = xcb_get_file_descriptor(x11->xcb_conn);
+ struct {
+ const char *name;
+ xcb_intern_atom_cookie_t cookie;
+ xcb_atom_t *atom;
+ } atom[] = {
+ { .name = "WM_PROTOCOLS", .atom = &x11->atoms.wm_protocols },
+ { .name = "WM_DELETE_WINDOW", .atom = &x11->atoms.wm_delete_window },
+ { .name = "_NET_WM_NAME", .atom = &x11->atoms.net_wm_name },
+ { .name = "UTF8_STRING", .atom = &x11->atoms.utf8_string },
+ };
+
+ for (size_t i = 0; i < sizeof(atom) / sizeof(atom[0]); ++i) {
+ atom[i].cookie = xcb_intern_atom(x11->xcb,
+ true, strlen(atom[i].name), atom[i].name);
+ }
+
+ for (size_t i = 0; i < sizeof(atom) / sizeof(atom[0]); ++i) {
+ xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(
+ x11->xcb, atom[i].cookie, NULL);
+
+ if (reply) {
+ *atom[i].atom = reply->atom;
+ free(reply);
+ } else {
+ *atom[i].atom = XCB_ATOM_NONE;
+ }
+ }
+
+ const xcb_query_extension_reply_t *ext;
+
+ ext = xcb_get_extension_data(x11->xcb, &xcb_xfixes_id);
+ if (!ext || !ext->present) {
+ wlr_log(WLR_ERROR, "X11 does not support Xfixes extension");
+ goto error_display;
+ }
+
+ xcb_xfixes_query_version_cookie_t fixes_cookie =
+ xcb_xfixes_query_version(x11->xcb, 4, 0);
+ xcb_xfixes_query_version_reply_t *fixes_reply =
+ xcb_xfixes_query_version_reply(x11->xcb, fixes_cookie, NULL);
+
+ if (!fixes_reply || fixes_reply->major_version < 4) {
+ wlr_log(WLR_ERROR, "X11 does not support required Xfixes version");
+ free(fixes_reply);
+ goto error_display;
+ }
+ free(fixes_reply);
+
+ ext = xcb_get_extension_data(x11->xcb, &xcb_input_id);
+ if (!ext || !ext->present) {
+ wlr_log(WLR_ERROR, "X11 does not support Xinput extension");
+ goto error_display;
+ }
+ x11->xinput_opcode = ext->major_opcode;
+
+ xcb_input_xi_query_version_cookie_t xi_cookie =
+ xcb_input_xi_query_version(x11->xcb, 2, 0);
+ xcb_input_xi_query_version_reply_t *xi_reply =
+ xcb_input_xi_query_version_reply(x11->xcb, xi_cookie, NULL);
+
+ if (!xi_reply || xi_reply->major_version < 2) {
+ wlr_log(WLR_ERROR, "X11 does not support required Xinput version");
+ free(xi_reply);
+ goto error_display;
+ }
+ free(xi_reply);
+
+ int fd = xcb_get_file_descriptor(x11->xcb);
struct wl_event_loop *ev = wl_display_get_event_loop(display);
uint32_t events = WL_EVENT_READABLE | WL_EVENT_ERROR | WL_EVENT_HANGUP;
x11->event_source = wl_event_loop_add_fd(ev, fd, events, x11_event, x11);
@@ -276,7 +271,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
}
wl_event_source_check(x11->event_source);
- x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data;
+ x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb)).data;
if (!create_renderer_func) {
create_renderer_func = wlr_renderer_autocreate;
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index a16da1c9..a50f478a 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -1,140 +1,201 @@
#include <stdlib.h>
+
#include <wlr/config.h>
-#include <wlr/interfaces/wlr_input_device.h>
-#include <wlr/interfaces/wlr_keyboard.h>
-#include <wlr/interfaces/wlr_pointer.h>
-#include <wlr/util/log.h>
-#include <xcb/xcb.h>
+
#ifdef __linux__
#include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
-#ifdef WLR_HAS_XCB_XKB
-#include <xcb/xkb.h>
-#endif
+
+#include <xcb/xcb.h>
+#include <xcb/xfixes.h>
+#include <xcb/xinput.h>
+
+#include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/interfaces/wlr_pointer.h>
+#include <wlr/util/log.h>
+
#include "backend/x11.h"
#include "util/signal.h"
-static uint32_t xcb_button_to_wl(uint32_t button) {
- switch (button) {
- case XCB_BUTTON_INDEX_1: return BTN_LEFT;
- case XCB_BUTTON_INDEX_2: return BTN_MIDDLE;
- case XCB_BUTTON_INDEX_3: return BTN_RIGHT;
- // XXX: I'm not sure the scroll-wheel direction is right
- case XCB_BUTTON_INDEX_4: return BTN_GEAR_UP;
- case XCB_BUTTON_INDEX_5: return BTN_GEAR_DOWN;
- default: return 0;
- }
+static void send_key_event(struct wlr_x11_backend *x11, uint32_t key,
+ enum wlr_key_state st, xcb_timestamp_t time) {
+ struct wlr_event_keyboard_key ev = {
+ .time_msec = time,
+ .keycode = key,
+ .state = st,
+ .update_state = true,
+ };
+ wlr_keyboard_notify_key(&x11->keyboard, &ev);
}
-static void x11_handle_pointer_position(struct wlr_x11_output *output,
- int16_t x, int16_t y, xcb_timestamp_t time) {
- struct wlr_x11_backend *x11 = output->x11;
- struct wlr_output *wlr_output = &output->wlr_output;
- struct wlr_event_pointer_motion_absolute event = {
+static void send_button_event(struct wlr_x11_output *output, uint32_t key,
+ enum wlr_button_state st, xcb_timestamp_t time) {
+ struct wlr_event_pointer_button ev = {
+ .device = &output->pointer_dev,
+ .time_msec = time,
+ .button = key,
+ .state = st,
+ };
+ wlr_signal_emit_safe(&output->pointer.events.button, &ev);
+}
+
+static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
+ xcb_timestamp_t time) {
+ struct wlr_event_pointer_axis ev = {
.device = &output->pointer_dev,
.time_msec = time,
- .x = (double)x / wlr_output->width,
- .y = (double)y / wlr_output->height,
+ .source = WLR_AXIS_SOURCE_WHEEL,
+ .orientation = WLR_AXIS_ORIENTATION_VERTICAL,
+ // 15 is a typical value libinput sends for one scroll
+ .delta = delta * 15,
+ .delta_discrete = delta,
};
- wlr_signal_emit_safe(&output->pointer.events.motion_absolute, &event);
+ wlr_signal_emit_safe(&output->pointer.events.axis, &ev);
+}
- x11->time = time;
+static void send_pointer_position_event(struct wlr_x11_output *output,
+ int16_t x, int16_t y, xcb_timestamp_t time) {
+ struct wlr_event_pointer_motion_absolute ev = {
+ .device = &output->pointer_dev,
+ .time_msec = time,
+ .x = (double)x / output->wlr_output.width,
+ .y = (double)y / output->wlr_output.height,
+ };
+ wlr_signal_emit_safe(&output->pointer.events.motion_absolute, &ev);
}
-void handle_x11_input_event(struct wlr_x11_backend *x11,
- xcb_generic_event_t *event) {
- switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) {
- case XCB_KEY_PRESS:
- case XCB_KEY_RELEASE: {
- xcb_key_press_event_t *ev = (xcb_key_press_event_t *)event;
- struct wlr_event_keyboard_key key = {
- .time_msec = ev->time,
- .keycode = ev->detail - 8,
- .state = event->response_type == XCB_KEY_PRESS ?
- WLR_KEY_PRESSED : WLR_KEY_RELEASED,
- .update_state = true,
- };
-
- // TODO use xcb-xkb for more precise modifiers state?
- wlr_keyboard_notify_key(&x11->keyboard, &key);
+void handle_x11_xinput_event(struct wlr_x11_backend *x11,
+ xcb_ge_generic_event_t *event) {
+ struct wlr_x11_output *output;
+
+ switch (event->event_type) {
+ case XCB_INPUT_KEY_PRESS: {
+ xcb_input_key_press_event_t *ev =
+ (xcb_input_key_press_event_t *)event;
+
+ wlr_keyboard_notify_modifiers(&x11->keyboard, ev->mods.base,
+ ev->mods.latched, ev->mods.locked, ev->mods.effective);
+ send_key_event(x11, ev->detail - 8, WLR_KEY_PRESSED, ev->time);
x11->time = ev->time;
- return;
+ break;
}
- case XCB_BUTTON_PRESS: {
- xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
+ case XCB_INPUT_KEY_RELEASE: {
+ xcb_input_key_release_event_t *ev =
+ (xcb_input_key_release_event_t *)event;
- struct wlr_x11_output *output =
- get_x11_output_from_window_id(x11, ev->event);
- if (output == NULL) {
- break;
+ wlr_keyboard_notify_modifiers(&x11->keyboard, ev->mods.base,
+ ev->mods.latched, ev->mods.locked, ev->mods.effective);
+ send_key_event(x11, ev->detail - 8, WLR_KEY_RELEASED, ev->time);
+ x11->time = ev->time;
+ break;
+ }
+ case XCB_INPUT_BUTTON_PRESS: {
+ xcb_input_button_press_event_t *ev =
+ (xcb_input_button_press_event_t *)event;
+
+ output = get_x11_output_from_window_id(x11, ev->event);
+ if (!output) {
+ return;
}
- if (ev->detail == XCB_BUTTON_INDEX_4 ||
- ev->detail == XCB_BUTTON_INDEX_5) {
- int32_t delta_discrete = ev->detail == XCB_BUTTON_INDEX_4 ? -1 : 1;
- struct wlr_event_pointer_axis axis = {
- .device = &output->pointer_dev,
- .time_msec = ev->time,
- .source = WLR_AXIS_SOURCE_WHEEL,
- .orientation = WLR_AXIS_ORIENTATION_VERTICAL,
- // 15 is a typical value libinput sends for one scroll
- .delta = delta_discrete * 15,
- .delta_discrete = delta_discrete,
- };
- wlr_signal_emit_safe(&output->pointer.events.axis, &axis);
- x11->time = ev->time;
+ switch (ev->detail) {
+ case XCB_BUTTON_INDEX_1:
+ send_button_event(output, BTN_LEFT, WLR_BUTTON_PRESSED,
+ ev->time);
+ break;
+ case XCB_BUTTON_INDEX_2:
+ send_button_event(output, BTN_MIDDLE, WLR_BUTTON_PRESSED,
+ ev->time);
+ break;
+ case XCB_BUTTON_INDEX_3:
+ send_button_event(output, BTN_RIGHT, WLR_BUTTON_PRESSED,
+ ev->time);
+ break;
+ case XCB_BUTTON_INDEX_4:
+ send_axis_event(output, -1, ev->time);
+ break;
+ case XCB_BUTTON_INDEX_5:
+ send_axis_event(output, 1, ev->time);
break;
}
+
+ x11->time = ev->time;
+ break;
}
- /* fallthrough */
- case XCB_BUTTON_RELEASE: {
- xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
+ case XCB_INPUT_BUTTON_RELEASE: {
+ xcb_input_button_release_event_t *ev =
+ (xcb_input_button_release_event_t *)event;
- struct wlr_x11_output *output =
- get_x11_output_from_window_id(x11, ev->event);
- if (output == NULL) {
+ output = get_x11_output_from_window_id(x11, ev->event);
+ if (!output) {
+ return;
+ }
+
+ switch (ev->detail) {
+ case XCB_BUTTON_INDEX_1:
+ send_button_event(output, BTN_LEFT, WLR_BUTTON_RELEASED,
+ ev->time);
+ break;
+ case XCB_BUTTON_INDEX_2:
+ send_button_event(output, BTN_MIDDLE, WLR_BUTTON_RELEASED,
+ ev->time);
+ break;
+ case XCB_BUTTON_INDEX_3:
+ send_button_event(output, BTN_RIGHT, WLR_BUTTON_RELEASED,
+ ev->time);
break;
}
- if (ev->detail != XCB_BUTTON_INDEX_4 &&
- ev->detail != XCB_BUTTON_INDEX_5) {
- struct wlr_event_pointer_button button = {
- .device = &output->pointer_dev,
- .time_msec = ev->time,
- .button = xcb_button_to_wl(ev->detail),
- .state = event->response_type == XCB_BUTTON_PRESS ?
- WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED,
- };
-
- wlr_signal_emit_safe(&output->pointer.events.button, &button);
+ x11->time = ev->time;
+ break;
+ }
+ case XCB_INPUT_MOTION: {
+ xcb_input_motion_event_t *ev = (xcb_input_motion_event_t *)event;
+
+ output = get_x11_output_from_window_id(x11, ev->event);
+ if (!output) {
+ return;
}
+
+ send_pointer_position_event(output, ev->event_x >> 16,
+ ev->event_y >> 16, ev->time);
x11->time = ev->time;
- return;
+ break;
}
- case XCB_MOTION_NOTIFY: {
- xcb_motion_notify_event_t *ev = (xcb_motion_notify_event_t *)event;
+ case XCB_INPUT_ENTER: {
+ xcb_input_enter_event_t *ev = (xcb_input_enter_event_t *)event;
+
+ output = get_x11_output_from_window_id(x11, ev->event);
+ if (!output) {
+ return;
+ }
- struct wlr_x11_output *output =
- get_x11_output_from_window_id(x11, ev->event);
- if (output != NULL) {
- x11_handle_pointer_position(output, ev->event_x, ev->event_y, ev->time);
+ if (!output->cursor_hidden) {
+ xcb_xfixes_hide_cursor(x11->xcb, output->win);
+ xcb_flush(x11->xcb);
+ output->cursor_hidden = true;
}
- return;
+ break;
}
- default:
-#ifdef 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;
- wlr_keyboard_notify_modifiers(&x11->keyboard, ev->baseMods,
- ev->latchedMods, ev->lockedMods, ev->lockedGroup);
+ case XCB_INPUT_LEAVE: {
+ xcb_input_leave_event_t *ev = (xcb_input_leave_event_t *)event;
+
+ output = get_x11_output_from_window_id(x11, ev->event);
+ if (!output) {
return;
}
-#endif
+
+ if (output->cursor_hidden) {
+ xcb_xfixes_show_cursor(x11->xcb, output->win);
+ xcb_flush(x11->xcb);
+ output->cursor_hidden = false;
+ }
break;
}
+ }
}
static void input_device_destroy(struct wlr_input_device *wlr_device) {
@@ -166,14 +227,14 @@ void update_x11_pointer_position(struct wlr_x11_output *output,
struct wlr_x11_backend *x11 = output->x11;
xcb_query_pointer_cookie_t cookie =
- xcb_query_pointer(x11->xcb_conn, output->win);
+ xcb_query_pointer(x11->xcb, output->win);
xcb_query_pointer_reply_t *reply =
- xcb_query_pointer_reply(x11->xcb_conn, cookie, NULL);
+ xcb_query_pointer_reply(x11->xcb, cookie, NULL);
if (!reply) {
return;
}
- x11_handle_pointer_position(output, reply->win_x, reply->win_y, time);
+ send_pointer_position_event(output, reply->win_x, reply->win_y, time);
free(reply);
}
diff --git a/backend/x11/meson.build b/backend/x11/meson.build
index 1164df1e..19e873ab 100644
--- a/backend/x11/meson.build
+++ b/backend/x11/meson.build
@@ -1,10 +1,9 @@
x11_libs = []
x11_required = [
- 'xcb',
'x11-xcb',
-]
-x11_optional = [
- 'xcb-xkb',
+ 'xcb',
+ 'xcb-xinput',
+ 'xcb-xfixes',
]
foreach lib : x11_required
@@ -16,14 +15,6 @@ foreach lib : x11_required
x11_libs += dep
endforeach
-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)
- endif
-endforeach
-
lib_wlr_backend_x11 = static_library(
'wlr_backend_x11',
files(
@@ -41,4 +32,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/backend/x11/output.c b/backend/x11/output.c
index 1ac12a8d..6f98c590 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -1,10 +1,16 @@
#define _POSIX_C_SOURCE 200809L
+
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+
+#include <xcb/xcb.h>
+#include <xcb/xinput.h>
+
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/util/log.h>
+
#include "backend/x11.h"
#include "util/signal.h"
@@ -16,8 +22,8 @@ static int signal_frame(void *data) {
}
static void parse_xcb_setup(struct wlr_output *output,
- xcb_connection_t *xcb_conn) {
- const xcb_setup_t *xcb_setup = xcb_get_setup(xcb_conn);
+ xcb_connection_t *xcb) {
+ const xcb_setup_t *xcb_setup = xcb_get_setup(xcb);
snprintf(output->make, sizeof(output->make), "%.*s",
xcb_setup_vendor_length(xcb_setup),
@@ -55,11 +61,11 @@ static bool output_set_custom_mode(struct wlr_output *wlr_output,
const uint32_t values[] = { width, height };
xcb_void_cookie_t cookie = xcb_configure_window_checked(
- x11->xcb_conn, output->win,
+ x11->xcb, output->win,
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, values);
xcb_generic_error_t *error;
- if ((error = xcb_request_check(x11->xcb_conn, cookie))) {
+ if ((error = xcb_request_check(x11->xcb, cookie))) {
wlr_log(WLR_ERROR, "Could not set window size to %dx%d\n",
width, height);
free(error);
@@ -84,8 +90,8 @@ static void output_destroy(struct wlr_output *wlr_output) {
wl_list_remove(&output->link);
wl_event_source_remove(output->frame_timer);
wlr_egl_destroy_surface(&x11->egl, output->surf);
- xcb_destroy_window(x11->xcb_conn, output->win);
- xcb_flush(x11->xcb_conn);
+ xcb_destroy_window(x11->xcb, output->win);
+ xcb_flush(x11->xcb);
free(output);
}
@@ -142,21 +148,32 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
snprintf(wlr_output->name, sizeof(wlr_output->name), "X11-%d",
wl_list_length(&x11->outputs) + 1);
- parse_xcb_setup(wlr_output, x11->xcb_conn);
+ parse_xcb_setup(wlr_output, x11->xcb);
uint32_t mask = XCB_CW_EVENT_MASK;
uint32_t values[] = {
- XCB_EVENT_MASK_EXPOSURE |
- XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
- XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
- XCB_EVENT_MASK_POINTER_MOTION |
- XCB_EVENT_MASK_STRUCTURE_NOTIFY
+ XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY
};
- output->win = xcb_generate_id(x11->xcb_conn);
- xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, output->win,
+ output->win = xcb_generate_id(x11->xcb);
+ xcb_create_window(x11->xcb, XCB_COPY_FROM_PARENT, output->win,
x11->screen->root, 0, 0, wlr_output->width, wlr_output->height, 1,
XCB_WINDOW_CLASS_INPUT_OUTPUT, x11->screen->root_visual, mask, values);
+ struct {
+ xcb_input_event_mask_t head;
+ xcb_input_xi_event_mask_t mask;
+ } xinput_mask = {
+ .head = { .deviceid = XCB_INPUT_DEVICE_ALL_MASTER, .mask_len = 1 },
+ .mask = XCB_INPUT_XI_EVENT_MASK_KEY_PRESS |
+ XCB_INPUT_XI_EVENT_MASK_KEY_RELEASE |
+ XCB_INPUT_XI_EVENT_MASK_BUTTON_PRESS |
+ XCB_INPUT_XI_EVENT_MASK_BUTTON_RELEASE |
+ XCB_INPUT_XI_EVENT_MASK_MOTION |
+ XCB_INPUT_XI_EVENT_MASK_ENTER |
+ XCB_INPUT_XI_EVENT_MASK_LEAVE,
+ };
+ xcb_input_xi_select_events(x11->xcb, output->win, 1, &xinput_mask.head);
+
output->surf = wlr_egl_create_surface(&x11->egl, &output->win);
if (!output->surf) {
wlr_log(WLR_ERROR, "Failed to create EGL surface");
@@ -164,23 +181,19 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
return NULL;
}
- xcb_change_property(x11->xcb_conn, XCB_PROP_MODE_REPLACE, output->win,
+ xcb_change_property(x11->xcb, XCB_PROP_MODE_REPLACE, output->win,
x11->atoms.wm_protocols, XCB_ATOM_ATOM, 32, 1,
&x11->atoms.wm_delete_window);
char title[32];
if (snprintf(title, sizeof(title), "wlroots - %s", wlr_output->name)) {
- xcb_change_property(x11->xcb_conn, XCB_PROP_MODE_REPLACE, output->win,
+ xcb_change_property(x11->xcb, XCB_PROP_MODE_REPLACE, output->win,
x11->atoms.net_wm_name, x11->atoms.utf8_string, 8,
strlen(title), title);
}
- uint32_t cursor_values[] = { x11->cursor };
- xcb_change_window_attributes(x11->xcb_conn, output->win, XCB_CW_CURSOR,
- cursor_values);
-
- xcb_map_window(x11->xcb_conn, output->win);
- xcb_flush(x11->xcb_conn);
+ xcb_map_window(x11->xcb, output->win);
+ xcb_flush(x11->xcb);
struct wl_event_loop *ev = wl_display_get_event_loop(x11->wl_display);
output->frame_timer = wl_event_loop_add_timer(ev, signal_frame, output);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 23:13:06 +0000