From 5dbb5b76597f434ec91cfcde0750de8157c0bbf5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 18 Jan 2021 11:37:39 +1000 Subject: XF86keysym.h: reserve a range for Linux kernel keysyms The Linux kernel adds a few evdev keycodes roughly every other release. These aren't available as keysyms through XKB until they have been added as keycode in xkeyboard-config and mapped there to a newly defined keysym in the X11 proto headers. In the past, this was done manually, a suitable keysym was picked at random and the mapping updated accordingly. This doesn't scale very well and, given we have a large reserved range for XF86 keysyms anyway, can be done easier. Let's reserve the range 0x10081XXX range for a 1:1 mapping of Linux kernel codes. That's 4095 values, the kernel currently uses only 767 anyway. The lower 3 bytes of keysyms within that range have to match the kernel value to make them easy to add and search for. Nothing in X must care about the actual keysym value anyway. Since we expect this to be parsed by other scripts for automatic updating, the format of those #defines is quite strict. Add a script to generate keycodes as well as verify that the existing ones match the current expected format. The script is integrated into the CI and meson test, so we will fail if an update breaks the expectations. Signed-off-by: Peter Hutterer --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 8da8337..fa44c38 100644 --- a/meson.build +++ b/meson.build @@ -95,3 +95,8 @@ ext_xorgproto = declare_dependency( ) subdir('include') + +keysymfile = join_paths(meson.source_root(), 'include', 'X11', 'XF86keysym.h') +test('evdev-keysym-check', + find_program('scripts/keysym-generator.py'), + args: ['-v', '--header', keysymfile, 'verify']) -- cgit v1.2.3