From 08650b0268c94ccb5db29fc53d9f2204d7919adb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 21 Oct 2020 11:33:54 +1000 Subject: [PATCH] tools/demo-server: set the server keymap in our local struct Where the demo server is run with a --layout, set that in our local struct so the printed messages use the correct keysyms. Signed-off-by: Peter Hutterer --- tools/eis-demo-server.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/eis-demo-server.c b/tools/eis-demo-server.c index 8835bb3..e13ac7a 100644 --- a/tools/eis-demo-server.c +++ b/tools/eis-demo-server.c @@ -116,6 +116,14 @@ setup_keymap(struct eis_demo_server *server, struct eis_device *device) eis_device_keyboard_set_keymap(device, k); memfile_unref(f); + _unref_(xkb_state) *state = xkb_state_new(keymap); + if (!state) + return; + + server->ctx = steal(&ctx); + server->keymap = steal(&keymap); + server->state = steal(&state); + return; }