Add support for wl_keyboard::keymap events
These keymap events communicate the keymap from the compositor to the
clients via fd passing, rather than having the clients separately
compile a map.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 870c208..9e1f8a3 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -31,6 +31,7 @@
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
+#include <sys/mman.h>
#include <wayland-client.h>
#include <wayland-egl.h>
@@ -576,6 +577,46 @@
};
static void
+input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format,
+ int fd, uint32_t size)
+{
+ struct wayland_input *input = data;
+ struct xkb_keymap *keymap;
+ char *map_str;
+
+ if (!data) {
+ close(fd);
+ return;
+ }
+
+ if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
+ close(fd);
+ return;
+ }
+
+ map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+ if (map_str == MAP_FAILED) {
+ close(fd);
+ return;
+ }
+
+ keymap = xkb_map_new_from_string(input->compositor->base.xkb_context,
+ map_str,
+ XKB_KEYMAP_FORMAT_TEXT_V1,
+ 0);
+ munmap(map_str, size);
+ close(fd);
+
+ if (!keymap) {
+ fprintf(stderr, "failed to compile keymap\n");
+ return;
+ }
+
+ weston_seat_init_keyboard(input->compositor->base.seat, keymap);
+ xkb_map_unref(keymap);
+}
+
+static void
input_handle_keyboard_enter(void *data,
struct wl_keyboard *keyboard,
uint32_t serial,
@@ -622,6 +663,7 @@
}
static const struct wl_keyboard_listener keyboard_listener = {
+ input_handle_keymap,
input_handle_keyboard_enter,
input_handle_keyboard_leave,
input_handle_key,
@@ -650,7 +692,6 @@
wl_keyboard_set_user_data(input->keyboard, input);
wl_keyboard_add_listener(input->keyboard, &keyboard_listener,
input);
- weston_seat_init_keyboard(input->compositor->base.seat, NULL);
} else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) {
wl_keyboard_destroy(input->keyboard);
input->keyboard = NULL;
diff --git a/src/compositor.c b/src/compositor.c
index 676eebb..b299e03 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -26,6 +26,7 @@
#include "config.h"
+#include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -34,6 +35,7 @@
#include <stdarg.h>
#include <assert.h>
#include <sys/ioctl.h>
+#include <sys/mman.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <unistd.h>
@@ -2163,6 +2165,10 @@
wl_list_insert(&seat->seat.keyboard->resource_list, &cr->link);
cr->destroy = unbind_resource;
+ wl_keyboard_send_keymap(cr, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
+ seat->xkb_info.keymap_fd,
+ seat->xkb_info.keymap_size);
+
if (seat->seat.keyboard->focus &&
seat->seat.keyboard->focus->resource.client == client) {
wl_keyboard_set_focus(seat->seat.keyboard,
@@ -2247,8 +2253,13 @@
static void xkb_info_destroy(struct weston_xkb_info *xkb_info)
{
- if (xkb_info->keymap)
- xkb_map_unref(xkb_info->keymap);
+ if (xkb_info->keymap)
+ xkb_map_unref(xkb_info->keymap);
+
+ if (xkb_info->keymap_area)
+ munmap(xkb_info->keymap_area, xkb_info->keymap_size);
+ if (xkb_info->keymap_fd >= 0)
+ close(xkb_info->keymap_fd);
}
static void weston_compositor_xkb_destroy(struct weston_compositor *ec)
@@ -2264,8 +2275,11 @@
}
static void
-weston_xkb_info_get_mods(struct weston_xkb_info *xkb_info)
+weston_xkb_info_new_keymap(struct weston_xkb_info *xkb_info)
{
+ char *keymap_str;
+ char *path;
+
xkb_info->ctrl_mod = xkb_map_mod_get_index(xkb_info->keymap,
XKB_MOD_NAME_CTRL);
xkb_info->alt_mod = xkb_map_mod_get_index(xkb_info->keymap,
@@ -2279,6 +2293,57 @@
XKB_LED_NAME_CAPS);
xkb_info->scroll_led = xkb_map_led_get_index(xkb_info->keymap,
XKB_LED_NAME_SCROLL);
+
+ keymap_str = xkb_map_get_as_string(xkb_info->keymap);
+ if (keymap_str == NULL) {
+ fprintf(stderr, "failed to get string version of keymap\n");
+ exit(EXIT_FAILURE);
+ }
+ xkb_info->keymap_size = strlen(keymap_str) + 1;
+
+ /* Create a temporary file in /dev/shm to use for mapping the keymap,
+ * and then unlink it as soon as we can. */
+ path = strdup("/dev/shm/weston-keymap-XXXXXX");
+ if (path == NULL) {
+ fprintf(stderr, "failed to allocate keymap path\n");
+ goto err_keymap_str;
+ }
+
+ xkb_info->keymap_fd = mkostemp(path, O_CLOEXEC);
+ if (xkb_info->keymap_fd < 0) {
+ fprintf(stderr, "failed to create temporary keymap file\n");
+ goto err_path;
+ }
+ unlink(path);
+
+ if (ftruncate(xkb_info->keymap_fd, xkb_info->keymap_size) != 0) {
+ fprintf(stderr, "failed to enlarage temporary keymap file\n");
+ goto err_path;
+ }
+
+ xkb_info->keymap_area = mmap(NULL, xkb_info->keymap_size,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED, xkb_info->keymap_fd, 0);
+ if (xkb_info->keymap_area == MAP_FAILED) {
+ fprintf(stderr, "failed to mmap() %lu bytes on %s\n",
+ (unsigned long) xkb_info->keymap_size,
+ path);
+ goto err_dev_zero;
+ }
+ strcpy(xkb_info->keymap_area, keymap_str);
+ free(keymap_str);
+ free(path);
+
+ return;
+
+err_dev_zero:
+ close(xkb_info->keymap_fd);
+ xkb_info->keymap_fd = -1;
+err_path:
+ free(path);
+err_keymap_str:
+ free(keymap_str);
+ exit(EXIT_FAILURE);
}
static void
@@ -2301,7 +2366,7 @@
exit(1);
}
- weston_xkb_info_get_mods(&ec->xkb_info);
+ weston_xkb_info_new_keymap(&ec->xkb_info);
}
WL_EXPORT void
@@ -2312,7 +2377,7 @@
if (keymap != NULL) {
seat->xkb_info.keymap = xkb_map_ref(keymap);
- weston_xkb_info_get_mods(&seat->xkb_info);
+ weston_xkb_info_new_keymap(&seat->xkb_info);
}
else {
weston_compositor_build_global_keymap(seat->compositor);
diff --git a/src/compositor.h b/src/compositor.h
index 23beb5f..d070471 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -164,6 +164,9 @@
struct weston_xkb_info {
struct xkb_keymap *keymap;
+ int keymap_fd;
+ size_t keymap_size;
+ char *keymap_area;
xkb_mod_index_t ctrl_mod;
xkb_mod_index_t alt_mod;
xkb_mod_index_t super_mod;