input: add keyboard group implementation

input/keyboard_group.c

@@ -0,0 +1,104 @@
+/*
+ * Cage: A Wayland kiosk.
+ *
+ * Copyright (C) 2018-2020 Jente Hidskes
+ *
+ * See the LICENSE file accompanying this file.
+ */
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wayland-server-core.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_keyboard_group.h>
+#include <wlr/types/wlr_seat.h>
+#include <wlr/util/log.h>
+
+#include "keyboard_group.h"
+
+static void
+handle_keyboard_group_key(struct wl_listener *listener, void *user_data)
+{
+	struct cg_keyboard_group *group = wl_container_of(listener, group, key);
+	struct wlr_input_device *wlr_input_device = group->wlr_keyboard_group->input_device;
+	struct wlr_event_keyboard_key *event = user_data;
+
+	wlr_seat_set_keyboard(group->wlr_seat, wlr_input_device);
+	wlr_seat_keyboard_notify_key(group->wlr_seat, event->time_msec, event->keycode, event->state);
+
+	wlr_seat_set_keyboard(group->wlr_seat, wlr_input_device);
+	wlr_seat_keyboard_notify_key(group->wlr_seat, event->time_msec, event->keycode, event->state);
+}
+
+static void
+handle_keyboard_group_modifiers(struct wl_listener *listener, void *user_data)
+{
+	struct cg_keyboard_group *group = wl_container_of(listener, group, modifiers);
+	struct wlr_input_device *wlr_input_device = group->wlr_keyboard_group->input_device;
+
+	wlr_seat_set_keyboard(group->wlr_seat, wlr_input_device);
+	wlr_seat_keyboard_notify_modifiers(group->wlr_seat, &wlr_input_device->keyboard->modifiers);
+
+	// wlr_idle_notify_activity(seat->server->idle, seat->seat);
+}
+
+bool
+cage_keyboard_group_add(struct cg_keyboard_group *group, struct wlr_input_device *wlr_input_device)
+{
+	struct wlr_keyboard_group *wlr_group = group->wlr_keyboard_group;
+	bool added = wlr_keyboard_group_add_keyboard(wlr_group, wlr_input_device->keyboard);
+	if (added) {
+		wlr_seat_set_keyboard(group->wlr_seat, wlr_input_device);
+	}
+	return added;
+}
+
+bool
+cage_keyboard_group_init(struct cg_keyboard_group *group, struct wlr_input_device *device, struct wlr_seat *wlr_seat)
+{
+	assert(group != NULL);
+	assert(device != NULL);
+	assert(wlr_seat != NULL);
+
+	struct wlr_keyboard_group *wlr_keyboard_group = NULL;
+	struct wlr_keyboard *wlr_keyboard = device->keyboard;
+
+	wlr_keyboard_group = wlr_keyboard_group_create();
+	if (!wlr_keyboard_group) {
+		wlr_log(WLR_ERROR, "Failed to create wlr keyboard group.");
+		return false;
+	}
+	wlr_keyboard_group->data = group;
+	group->wlr_keyboard_group = wlr_keyboard_group;
+	group->wlr_seat = wlr_seat;
+
+	wlr_keyboard_set_keymap(&wlr_keyboard_group->keyboard, device->keyboard->keymap);
+	wlr_keyboard_set_repeat_info(&wlr_keyboard_group->keyboard, wlr_keyboard->repeat_info.rate,
+				     wlr_keyboard->repeat_info.delay);
+	wlr_keyboard_group_add_keyboard(wlr_keyboard_group, wlr_keyboard);
+
+	wl_signal_add(&wlr_keyboard_group->keyboard.events.key, &group->key);
+	group->key.notify = handle_keyboard_group_key;
+	wl_signal_add(&wlr_keyboard_group->keyboard.events.modifiers, &group->modifiers);
+	group->modifiers.notify = handle_keyboard_group_modifiers;
+
+	wlr_seat_set_keyboard(wlr_seat, device);
+	return true;
+}
+
+void
+cage_keyboard_group_fini(struct cg_keyboard_group *group)
+{
+	assert(group != NULL);
+
+	group->wlr_seat = NULL;
+	if (group->wlr_keyboard_group) {
+		wlr_keyboard_group_destroy(group->wlr_keyboard_group);
+	}
+
+	wl_list_remove(&group->key.link);
+	wl_list_remove(&group->modifiers.link);
+
+	free(group);
+}

input/keyboard_group.h

@@ -0,0 +1,24 @@
+#ifndef CG_KEYBOARD_GROUP_H
+#define CG_KEYBOARD_GROUP_H
+
+#include <stdbool.h>
+#include <wayland-server-core.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_keyboard_group.h>
+#include <wlr/types/wlr_seat.h>
+
+struct cg_keyboard_group {
+	struct wlr_keyboard_group *wlr_keyboard_group;
+	struct wlr_seat *wlr_seat;
+
+	struct wl_listener key;
+	struct wl_listener modifiers;
+	struct wl_list link; // seat::keyboard_groups
+};
+
+bool cage_keyboard_group_add(struct cg_keyboard_group *group, struct wlr_input_device *wlr_input_device);
+bool cage_keyboard_group_init(struct cg_keyboard_group *group, struct wlr_input_device *wlr_input_device,
+			      struct wlr_seat *wlr_seat);
+void cage_keyboard_group_fini(struct cg_keyboard_group *group);
+
+#endif

input/seat.c

@@ -14,9 +14,68 @@
 #include <wlr/util/log.h>
 
 #include "cursor.h"
+#include "keyboard_group.h"
 #include "pointer.h"
 #include "seat.h"
 
+void
+cage_seat_add_new_keyboard(struct cg_seat *seat, struct wlr_input_device *device)
+{
+	assert(seat != NULL);
+	assert(device != NULL);
+
+	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+	if (!context) {
+		wlr_log(WLR_ERROR, "Unable to create XBK context");
+		return;
+	}
+
+	struct xkb_rule_names rules = {0};
+	rules.rules = getenv("XKB_DEFAULT_RULES");
+	rules.model = getenv("XKB_DEFAULT_MODEL");
+	rules.layout = getenv("XKB_DEFAULT_LAYOUT");
+	rules.variant = getenv("XKB_DEFAULT_VARIANT");
+	rules.options = getenv("XKB_DEFAULT_OPTIONS");
+	struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+	if (!keymap) {
+		wlr_log(WLR_ERROR, "Unable to configure keyboard: keymap does not exist");
+		xkb_context_unref(context);
+		return;
+	}
+
+	wlr_keyboard_set_keymap(device->keyboard, keymap);
+
+	xkb_keymap_unref(keymap);
+	xkb_context_unref(context);
+	wlr_keyboard_set_repeat_info(device->keyboard, 25, 600);
+
+	struct cg_keyboard_group *group;
+	wl_list_for_each (group, &seat->keyboard_groups, link) {
+		if (cage_keyboard_group_add(group, device)) {
+			wlr_log(WLR_DEBUG, "Added new keyboard to existing group");
+			return;
+		}
+	}
+
+	wlr_log(WLR_DEBUG, "Created new keyboard group");
+
+	/* This is reached if and only if the keyboard could not be inserted into
+	 * any group. */
+	struct cg_keyboard_group *keyboard_group = calloc(1, sizeof(struct cg_keyboard_group));
+	if (!keyboard_group) {
+		wlr_log(WLR_ERROR, "Cannot allocate keyboard group");
+		return;
+	}
+
+	if (!cage_keyboard_group_init(keyboard_group, device, seat->wlr_seat)) {
+		wlr_log(WLR_ERROR, "Failed setting up keyboard group");
+		cage_keyboard_group_fini(keyboard_group);
+		return;
+	}
+
+	wl_list_insert(&seat->keyboard_groups, &keyboard_group->link);
+}
+
 void
 cage_seat_add_new_pointer(struct cg_seat *seat, struct wlr_input_device *device)
 {
@@ -39,6 +98,9 @@ cage_seat_update_capabilities(struct cg_seat *seat)
 	if (!wl_list_empty(&seat->pointers)) {
 		caps |= WL_SEAT_CAPABILITY_POINTER;
 	}
+	if (!wl_list_empty(&seat->keyboard_groups)) {
+		caps |= WL_SEAT_CAPABILITY_KEYBOARD;
+	}
 	wlr_seat_set_capabilities(seat->wlr_seat, caps);
 
 	/* Hide cursor if the seat doesn't have pointer capability. */
@@ -70,6 +132,7 @@ cage_seat_init(struct cg_seat *seat, struct wlr_seat *wlr_seat, struct cg_cursor
 	wl_signal_add(&seat->wlr_seat->events.destroy, &seat->seat_destroy);
 
 	wl_list_init(&seat->pointers);
+	wl_list_init(&seat->keyboard_groups);
 }
 
 void
@@ -89,5 +152,10 @@ cage_seat_fini(struct cg_seat *seat)
 		cage_pointer_fini(pointer);
 	}
 
+	struct cg_keyboard_group *keyboard_group, *keyboard_group_tmp;
+	wl_list_for_each_safe (keyboard_group, keyboard_group_tmp, &seat->keyboard_groups, link) {
+		cage_keyboard_group_fini(keyboard_group);
+	}
+
 	free(seat);
 }

input/seat.h

@@ -14,8 +14,10 @@ struct cg_seat {
 	struct cg_cursor *cursor;
 
 	struct wl_list pointers; // cg_pointer::link
+	struct wl_list keyboard_groups; // cg_keyboard_group::link
 };
 
+void cage_seat_add_new_keyboard(struct cg_seat *seat, struct wlr_input_device *device);
 void cage_seat_add_new_pointer(struct cg_seat *seat, struct wlr_input_device *device);
 void cage_seat_update_capabilities(struct cg_seat *seat);
 void cage_seat_init(struct cg_seat *seat, struct wlr_seat *wlr_seat, struct cg_cursor *cursor);

meson.build

@@ -130,6 +130,7 @@ cageng_sources = [
   'desktop/view.c',
   'desktop/xdg_shell.c',
   'input/cursor.c',
+  'input/keyboard_group.c',
   'input/pointer.c',
   'input/seat.c',
   'cageng.c',
@@ -145,6 +146,7 @@ cageng_headers = [
   'desktop/view.h',
   'desktop/xdg_shell.h',
   'input/cursor.h',
+  'input/keyboard_group.h',
   'input/pointer.h',
   'input/seat.h',
   'serverng.h',