kmx git

Commit de1b6943d2b0ddcbcc757cee7446bf8b297fa9fd

2021-04-27T10:10:26
Move include files to include/ subdirectory This way we don't specify `include_directorories('.')` which brings in more than needed. Signed-off-by: Ran Benita <ran@unusedvar.com>
diff --git a/include/xkbcommon/xkbcommon-compat.h b/include/xkbcommon/xkbcommon-compat.h
new file mode 100644
index 0000000..299732f
--- /dev/null
+++ b/include/xkbcommon/xkbcommon-compat.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2012 Daniel Stone
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Daniel Stone <daniel@fooishbar.org>
+ */
+
+#ifndef _XKBCOMMON_COMPAT_H
+#define _XKBCOMMON_COMPAT_H
+
+/**
+ * Renamed keymap API.
+ */
+#define xkb_group_index_t xkb_layout_index_t
+#define xkb_group_mask_t xkb_layout_mask_t
+#define xkb_map_compile_flags xkb_keymap_compile_flags
+#define XKB_GROUP_INVALID XKB_LAYOUT_INVALID
+
+#define XKB_STATE_DEPRESSED \
+    (XKB_STATE_MODS_DEPRESSED | XKB_STATE_LAYOUT_DEPRESSED)
+#define XKB_STATE_LATCHED \
+    (XKB_STATE_MODS_LATCHED | XKB_STATE_LAYOUT_LATCHED)
+#define XKB_STATE_LOCKED \
+    (XKB_STATE_MODS_LOCKED | XKB_STATE_LAYOUT_LOCKED)
+#define XKB_STATE_EFFECTIVE \
+    (XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED | \
+     XKB_STATE_MODS_EFFECTIVE | XKB_STATE_LAYOUT_EFFECTIVE)
+
+#define xkb_map_new_from_names(context, names, flags) \
+        xkb_keymap_new_from_names(context, names, flags)
+#define xkb_map_new_from_file(context, file, format, flags) \
+        xkb_keymap_new_from_file(context, file, format, flags)
+#define xkb_map_new_from_string(context, string, format, flags) \
+        xkb_keymap_new_from_string(context, string, format, flags)
+#define xkb_map_get_as_string(keymap) \
+        xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1)
+#define xkb_map_ref(keymap) xkb_keymap_ref(keymap)
+#define xkb_map_unref(keymap) xkb_keymap_unref(keymap)
+
+#define xkb_map_num_mods(keymap) xkb_keymap_num_mods(keymap)
+#define xkb_map_mod_get_name(keymap, idx) xkb_keymap_mod_get_name(keymap, idx)
+#define xkb_map_mod_get_index(keymap, str) xkb_keymap_mod_get_index(keymap, str)
+#define xkb_key_mod_index_is_consumed(state, key, mod) \
+        xkb_state_mod_index_is_consumed(state, key, mod)
+#define xkb_key_mod_mask_remove_consumed(state, key, modmask) \
+        xkb_state_mod_mask_remove_consumed(state, key, modmask)
+
+#define xkb_map_num_groups(keymap) xkb_keymap_num_layouts(keymap)
+#define xkb_key_num_groups(keymap, key) \
+        xkb_keymap_num_layouts_for_key(keymap, key)
+#define xkb_map_group_get_name(keymap, idx) \
+        xkb_keymap_layout_get_name(keymap, idx)
+#define xkb_map_group_get_index(keymap, str) \
+        xkb_keymap_layout_get_index(keymap, str)
+
+#define xkb_map_num_leds(keymap) xkb_keymap_num_leds(keymap)
+#define xkb_map_led_get_name(keymap, idx) xkb_keymap_led_get_name(keymap, idx)
+#define xkb_map_led_get_index(keymap, str) \
+        xkb_keymap_led_get_index(keymap, str)
+
+#define xkb_key_repeats(keymap, key) xkb_keymap_key_repeats(keymap, key)
+
+#define xkb_key_get_syms(state, key, syms_out) \
+        xkb_state_key_get_syms(state, key, syms_out)
+
+#define xkb_state_group_name_is_active(state, name, type) \
+        xkb_state_layout_name_is_active(state, name, type)
+#define xkb_state_group_index_is_active(state, idx, type) \
+        xkb_state_layout_index_is_active(state, idx, type)
+
+#define xkb_state_serialize_group(state, component) \
+        xkb_state_serialize_layout(state, component)
+
+#define xkb_state_get_map(state) xkb_state_get_keymap(state)
+
+/* Not needed anymore, since there's NO_FLAGS. */
+#define XKB_MAP_COMPILE_PLACEHOLDER XKB_KEYMAP_COMPILE_NO_FLAGS
+#define XKB_MAP_COMPILE_NO_FLAGS XKB_KEYMAP_COMPILE_NO_FLAGS
+
+#endif
diff --git a/include/xkbcommon/xkbcommon-compose.h b/include/xkbcommon/xkbcommon-compose.h
new file mode 100644
index 0000000..8b41b98
--- /dev/null
+++ b/include/xkbcommon/xkbcommon-compose.h
@@ -0,0 +1,500 @@
+/*
+ * Copyright © 2013 Ran Benita
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _XKBCOMMON_COMPOSE_H
+#define _XKBCOMMON_COMPOSE_H
+
+#include <xkbcommon/xkbcommon.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file
+ * libxkbcommon Compose API - support for Compose and dead-keys.
+ */
+
+/**
+ * @defgroup compose Compose and dead-keys support
+ * Support for Compose and dead-keys.
+ * @since 0.5.0
+ *
+ * @{
+ */
+
+/**
+ * @page compose-overview Overview
+ * @parblock
+ *
+ * Compose and dead-keys are a common feature of many keyboard input
+ * systems.  They extend the range of the keysysm that can be produced
+ * directly from a keyboard by using a sequence of key strokes, instead
+ * of just one.
+ *
+ * Here are some example sequences, in the libX11 Compose file format:
+ *
+ *     <dead_acute> <a>         : "á"   aacute # LATIN SMALL LETTER A WITH ACUTE
+ *     <Multi_key> <A> <T>      : "@"   at     # COMMERCIAL AT
+ *
+ * When the user presses a key which produces the `<dead_acute>` keysym,
+ * nothing initially happens (thus the key is dubbed a "dead-key").  But
+ * when the user enters `<a>`, "á" is "composed", in place of "a".  If
+ * instead the user had entered a keysym which does not follow
+ * `<dead_acute>` in any compose sequence, the sequence is said to be
+ * "cancelled".
+ *
+ * Compose files define many such sequences.  For a description of the
+ * common file format for Compose files, see the Compose(5) man page.
+ *
+ * A successfuly-composed sequence has two results: a keysym and a UTF-8
+ * string.  At least one of the two is defined for each sequence.  If only
+ * a keysym is given, the keysym's string representation is used for the
+ * result string (using xkb_keysym_to_utf8()).
+ *
+ * This library provides low-level support for Compose file parsing and
+ * processing.  Higher-level APIs (such as libX11's `Xutf8LookupString`(3))
+ * may be built upon it, or it can be used directly.
+ *
+ * @endparblock
+ */
+
+/**
+ * @page compose-conflicting Conflicting Sequences
+ * @parblock
+ *
+ * To avoid ambiguity, a sequence is not allowed to be a prefix of another.
+ * In such a case, the conflict is resolved thus:
+ *
+ * 1. A longer sequence overrides a shorter one.
+ * 2. An equal sequence overrides an existing one.
+ * 3. A shorter sequence does not override a longer one.
+ *
+ * Sequences of length 1 are allowed.
+ *
+ * @endparblock
+ */
+
+/**
+ * @page compose-cancellation Cancellation Behavior
+ * @parblock
+ *
+ * What should happen when a sequence is cancelled?  For example, consider
+ * there are only the above sequences, and the input keysyms are
+ * `<dead_acute> <b>`.  There are a few approaches:
+ *
+ * 1. Swallow the cancelling keysym; that is, no keysym is produced.
+ *    This is the approach taken by libX11.
+ * 2. Let the cancelling keysym through; that is, `<b>` is produced.
+ * 3. Replay the entire sequence; that is, `<dead_acute> <b>` is produced.
+ *    This is the approach taken by Microsoft Windows (approximately;
+ *    instead of `<dead_acute>`, the underlying key is used.  This is
+ *    difficult to simulate with XKB keymaps).
+ *
+ * You can program whichever approach best fits users' expectations.
+ *
+ * @endparblock
+ */
+
+/**
+ * @struct xkb_compose_table
+ * Opaque Compose table object.
+ *
+ * The compose table holds the definitions of the Compose sequences, as
+ * gathered from Compose files.  It is immutable.
+ */
+struct xkb_compose_table;
+
+/**
+ * @struct xkb_compose_state
+ * Opaque Compose state object.
+ *
+ * The compose state maintains state for compose sequence matching, such
+ * as which possible sequences are being matched, and the position within
+ * these sequences.  It acts as a simple state machine wherein keysyms are
+ * the input, and composed keysyms and strings are the output.
+ *
+ * The compose state is usually associated with a keyboard device.
+ */
+struct xkb_compose_state;
+
+/** Flags affecting Compose file compilation. */
+enum xkb_compose_compile_flags {
+    /** Do not apply any flags. */
+    XKB_COMPOSE_COMPILE_NO_FLAGS = 0
+};
+
+/** The recognized Compose file formats. */
+enum xkb_compose_format {
+    /** The classic libX11 Compose text format, described in Compose(5). */
+    XKB_COMPOSE_FORMAT_TEXT_V1 = 1
+};
+
+/**
+ * @page compose-locale Compose Locale
+ * @parblock
+ *
+ * Compose files are locale dependent:
+ * - Compose files are written for a locale, and the locale is used when
+ *   searching for the appropriate file to use.
+ * - Compose files may reference the locale internally, with directives
+ *   such as \%L.
+ *
+ * As such, functions like xkb_compose_table_new_from_locale() require
+ * a `locale` parameter.  This will usually be the current locale (see
+ * locale(7) for more details).  You may also want to allow the user to
+ * explicitly configure it, so he can use the Compose file of a given
+ * locale, but not use that locale for other things.
+ *
+ * You may query the current locale as follows:
+ * @code
+ *     const char *locale;
+ *     locale = setlocale(LC_CTYPE, NULL);
+ * @endcode
+ *
+ * This will only give useful results if the program had previously set
+ * the current locale using setlocale(3), with `LC_CTYPE` or `LC_ALL`
+ * and a non-NULL argument.
+ *
+ * If you prefer not to use the locale system of the C runtime library,
+ * you may nevertheless obtain the user's locale directly using
+ * environment variables, as described in locale(7).  For example,
+ * @code
+ *     const char *locale;
+ *     locale = getenv("LC_ALL");
+ *     if (!locale || !*locale)
+ *         locale = getenv("LC_CTYPE");
+ *     if (!locale || !*locale)
+ *         locale = getenv("LANG");
+ *     if (!locale || !*locale)
+ *         locale = "C";
+ * @endcode
+ *
+ * Note that some locales supported by the C standard library may not
+ * have a Compose file assigned.
+ *
+ * @endparblock
+ */
+
+/**
+ * Create a compose table for a given locale.
+ *
+ * The locale is used for searching the file-system for an appropriate
+ * Compose file.  The search order is described in Compose(5).  It is
+ * affected by the following environment variables:
+ *
+ * 1. `XCOMPOSEFILE` - see Compose(5).
+ * 2. `XDG_CONFIG_HOME` - before `$HOME/.XCompose` is checked,
+ *    `$XDG_CONFIG_HOME/XCompose` is checked (with a fall back to
+ *    `$HOME/.config/XCompose` if `XDG_CONFIG_HOME` is not defined).
+ *    This is a libxkbcommon extension to the search procedure in
+ *    Compose(5) (since libxkbcommon 1.0.0). Note that other
+ *    implementations, such as libX11, might not find a Compose file in
+ *    this path.
+ * 3. `HOME` - see Compose(5).
+ * 4. `XLOCALEDIR` - if set, used as the base directory for the system's
+ *    X locale files, e.g. `/usr/share/X11/locale`, instead of the
+ *    preconfigured directory.
+ *
+ * @param context
+ *     The library context in which to create the compose table.
+ * @param locale
+ *     The current locale.  See @ref compose-locale.
+ *     \n
+ *     The value is copied, so it is safe to pass the result of getenv(3)
+ *     (or similar) without fear of it being invalidated by a subsequent
+ *     setenv(3) (or similar).
+ * @param flags
+ *     Optional flags for the compose table, or 0.
+ *
+ * @returns A compose table for the given locale, or NULL if the
+ * compilation failed or a Compose file was not found.
+ *
+ * @memberof xkb_compose_table
+ */
+struct xkb_compose_table *
+xkb_compose_table_new_from_locale(struct xkb_context *context,
+                                  const char *locale,
+                                  enum xkb_compose_compile_flags flags);
+
+/**
+ * Create a new compose table from a Compose file.
+ *
+ * @param context
+ *     The library context in which to create the compose table.
+ * @param file
+ *     The Compose file to compile.
+ * @param locale
+ *     The current locale.  See @ref compose-locale.
+ * @param format
+ *     The text format of the Compose file to compile.
+ * @param flags
+ *     Optional flags for the compose table, or 0.
+ *
+ * @returns A compose table compiled from the given file, or NULL if
+ * the compilation failed.
+ *
+ * @memberof xkb_compose_table
+ */
+struct xkb_compose_table *
+xkb_compose_table_new_from_file(struct xkb_context *context,
+                                FILE *file,
+                                const char *locale,
+                                enum xkb_compose_format format,
+                                enum xkb_compose_compile_flags flags);
+
+/**
+ * Create a new compose table from a memory buffer.
+ *
+ * This is just like xkb_compose_table_new_from_file(), but instead of
+ * a file, gets the table as one enormous string.
+ *
+ * @see xkb_compose_table_new_from_file()
+ * @memberof xkb_compose_table
+ */
+struct xkb_compose_table *
+xkb_compose_table_new_from_buffer(struct xkb_context *context,
+                                  const char *buffer, size_t length,
+                                  const char *locale,
+                                  enum xkb_compose_format format,
+                                  enum xkb_compose_compile_flags flags);
+
+/**
+ * Take a new reference on a compose table.
+ *
+ * @returns The passed in object.
+ *
+ * @memberof xkb_compose_table
+ */
+struct xkb_compose_table *
+xkb_compose_table_ref(struct xkb_compose_table *table);
+
+/**
+ * Release a reference on a compose table, and possibly free it.
+ *
+ * @param table The object.  If it is NULL, this function does nothing.
+ *
+ * @memberof xkb_compose_table
+ */
+void
+xkb_compose_table_unref(struct xkb_compose_table *table);
+
+/** Flags for compose state creation. */
+enum xkb_compose_state_flags {
+    /** Do not apply any flags. */
+    XKB_COMPOSE_STATE_NO_FLAGS = 0
+};
+
+/**
+ * Create a new compose state object.
+ *
+ * @param table
+ *     The compose table the state will use.
+ * @param flags
+ *     Optional flags for the compose state, or 0.
+ *
+ * @returns A new compose state, or NULL on failure.
+ *
+ * @memberof xkb_compose_state
+ */
+struct xkb_compose_state *
+xkb_compose_state_new(struct xkb_compose_table *table,
+                      enum xkb_compose_state_flags flags);
+
+/**
+ * Take a new reference on a compose state object.
+ *
+ * @returns The passed in object.
+ *
+ * @memberof xkb_compose_state
+ */
+struct xkb_compose_state *
+xkb_compose_state_ref(struct xkb_compose_state *state);
+
+/**
+ * Release a reference on a compose state object, and possibly free it.
+ *
+ * @param state The object.  If NULL, do nothing.
+ *
+ * @memberof xkb_compose_state
+ */
+void
+xkb_compose_state_unref(struct xkb_compose_state *state);
+
+/**
+ * Get the compose table which a compose state object is using.
+ *
+ * @returns The compose table which was passed to xkb_compose_state_new()
+ * when creating this state object.
+ *
+ * This function does not take a new reference on the compose table; you
+ * must explicitly reference it yourself if you plan to use it beyond the
+ * lifetime of the state.
+ *
+ * @memberof xkb_compose_state
+ */
+struct xkb_compose_table *
+xkb_compose_state_get_compose_table(struct xkb_compose_state *state);
+
+/** Status of the Compose sequence state machine. */
+enum xkb_compose_status {
+    /** The initial state; no sequence has started yet. */
+    XKB_COMPOSE_NOTHING,
+    /** In the middle of a sequence. */
+    XKB_COMPOSE_COMPOSING,
+    /** A complete sequence has been matched. */
+    XKB_COMPOSE_COMPOSED,
+    /** The last sequence was cancelled due to an unmatched keysym. */
+    XKB_COMPOSE_CANCELLED
+};
+
+/** The effect of a keysym fed to xkb_compose_state_feed(). */
+enum xkb_compose_feed_result {
+    /** The keysym had no effect - it did not affect the status. */
+    XKB_COMPOSE_FEED_IGNORED,
+    /** The keysym started, advanced or cancelled a sequence. */
+    XKB_COMPOSE_FEED_ACCEPTED
+};
+
+/**
+ * Feed one keysym to the Compose sequence state machine.
+ *
+ * This function can advance into a compose sequence, cancel a sequence,
+ * start a new sequence, or do nothing in particular.  The resulting
+ * status may be observed with xkb_compose_state_get_status().
+ *
+ * Some keysyms, such as keysyms for modifier keys, are ignored - they
+ * have no effect on the status or otherwise.
+ *
+ * The following is a description of the possible status transitions, in
+ * the format CURRENT STATUS => NEXT STATUS, given a non-ignored input
+ * keysym `keysym`:
+ *
+   @verbatim
+   NOTHING or CANCELLED or COMPOSED =>
+      NOTHING   if keysym does not start a sequence.
+      COMPOSING if keysym starts a sequence.
+      COMPOSED  if keysym starts and terminates a single-keysym sequence.
+
+   COMPOSING =>
+      COMPOSING if keysym advances any of the currently possible
+                sequences but does not terminate any of them.
+      COMPOSED  if keysym terminates one of the currently possible
+                sequences.
+      CANCELLED if keysym does not advance any of the currently
+                possible sequences.
+   @endverbatim
+ *
+ * The current Compose formats do not support multiple-keysyms.
+ * Therefore, if you are using a function such as xkb_state_key_get_syms()
+ * and it returns more than one keysym, consider feeding XKB_KEY_NoSymbol
+ * instead.
+ *
+ * @param state
+ *     The compose state object.
+ * @param keysym
+ *     A keysym, usually obtained after a key-press event, with a
+ *     function such as xkb_state_key_get_one_sym().
+ *
+ * @returns Whether the keysym was ignored.  This is useful, for example,
+ * if you want to keep a record of the sequence matched thus far.
+ *
+ * @memberof xkb_compose_state
+ */
+enum xkb_compose_feed_result
+xkb_compose_state_feed(struct xkb_compose_state *state,
+                       xkb_keysym_t keysym);
+
+/**
+ * Reset the Compose sequence state machine.
+ *
+ * The status is set to XKB_COMPOSE_NOTHING, and the current sequence
+ * is discarded.
+ *
+ * @memberof xkb_compose_state
+ */
+void
+xkb_compose_state_reset(struct xkb_compose_state *state);
+
+/**
+ * Get the current status of the compose state machine.
+ *
+ * @see xkb_compose_status
+ * @memberof xkb_compose_state
+ **/
+enum xkb_compose_status
+xkb_compose_state_get_status(struct xkb_compose_state *state);
+
+/**
+ * Get the result Unicode/UTF-8 string for a composed sequence.
+ *
+ * See @ref compose-overview for more details.  This function is only
+ * useful when the status is XKB_COMPOSE_COMPOSED.
+ *
+ * @param[in] state
+ *     The compose state.
+ * @param[out] buffer
+ *     A buffer to write the string into.
+ * @param[in] size
+ *     Size of the buffer.
+ *
+ * @warning If the buffer passed is too small, the string is truncated
+ * (though still NUL-terminated).
+ *
+ * @returns
+ *   The number of bytes required for the string, excluding the NUL byte.
+ *   If the sequence is not complete, or does not have a viable result
+ *   string, returns 0, and sets `buffer` to the empty string (if possible).
+ * @returns
+ *   You may check if truncation has occurred by comparing the return value
+ *   with the size of `buffer`, similarly to the `snprintf`(3) function.
+ *   You may safely pass NULL and 0 to `buffer` and `size` to find the
+ *   required size (without the NUL-byte).
+ *
+ * @memberof xkb_compose_state
+ **/
+int
+xkb_compose_state_get_utf8(struct xkb_compose_state *state,
+                           char *buffer, size_t size);
+
+/**
+ * Get the result keysym for a composed sequence.
+ *
+ * See @ref compose-overview for more details.  This function is only
+ * useful when the status is XKB_COMPOSE_COMPOSED.
+ *
+ * @returns The result keysym.  If the sequence is not complete, or does
+ * not specify a result keysym, returns XKB_KEY_NoSymbol.
+ *
+ * @memberof xkb_compose_state
+ **/
+xkb_keysym_t
+xkb_compose_state_get_one_sym(struct xkb_compose_state *state);
+
+/** @} */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _XKBCOMMON_COMPOSE_H */
diff --git a/include/xkbcommon/xkbcommon-keysyms.h b/include/xkbcommon/xkbcommon-keysyms.h
new file mode 100644
index 0000000..bb96efc
--- /dev/null
+++ b/include/xkbcommon/xkbcommon-keysyms.h
@@ -0,0 +1,3248 @@
+#ifndef _XKBCOMMON_KEYSYMS_H
+#define _XKBCOMMON_KEYSYMS_H
+
+/* This file is autogenerated; please do not commit directly. */
+
+#define XKB_KEY_NoSymbol                    0x000000  /* Special KeySym */
+
+/***********************************************************
+Copyright 1987, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+/*
+ * The "X11 Window System Protocol" standard defines in Appendix A the
+ * keysym codes. These 29-bit integer values identify characters or
+ * functions associated with each key (e.g., via the visible
+ * engraving) of a keyboard layout. This file assigns mnemonic macro
+ * names for these keysyms.
+ *
+ * This file is also compiled (by src/util/makekeys.c in libX11) into
+ * hash tables that can be accessed with X11 library functions such as
+ * XStringToKeysym() and XKeysymToString().
+ *
+ * Where a keysym corresponds one-to-one to an ISO 10646 / Unicode
+ * character, this is noted in a comment that provides both the U+xxxx
+ * Unicode position, as well as the official Unicode name of the
+ * character.
+ *
+ * Where the correspondence is either not one-to-one or semantically
+ * unclear, the Unicode position and name are enclosed in
+ * parentheses. Such legacy keysyms should be considered deprecated
+ * and are not recommended for use in future keyboard mappings.
+ *
+ * For any future extension of the keysyms with characters already
+ * found in ISO 10646 / Unicode, the following algorithm shall be
+ * used. The new keysym code position will simply be the character's
+ * Unicode number plus 0x01000000. The keysym values in the range
+ * 0x01000100 to 0x0110ffff are reserved to represent Unicode
+ * characters in the range U+0100 to U+10FFFF.
+ *
+ * While most newer Unicode-based X11 clients do already accept
+ * Unicode-mapped keysyms in the range 0x01000100 to 0x0110ffff, it
+ * will remain necessary for clients -- in the interest of
+ * compatibility with existing servers -- to also understand the
+ * existing legacy keysym values in the range 0x0100 to 0x20ff.
+ *
+ * Where several mnemonic names are defined for the same keysym in this
+ * file, all but the first one listed should be considered deprecated.
+ *
+ * Mnemonic names for keysyms are defined in this file with lines
+ * that match one of these Perl regular expressions:
+ *
+ *    /^\#define XKB_KEY_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\* U\+([0-9A-F]{4,6}) (.*) \*\/\s*$/
+ *    /^\#define XKB_KEY_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U\+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/
+ *    /^\#define XKB_KEY_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/
+ *
+ * Before adding new keysyms, please do consider the following: In
+ * addition to the keysym names defined in this file, the
+ * XStringToKeysym() and XKeysymToString() functions will also handle
+ * any keysym string of the form "U0020" to "U007E" and "U00A0" to
+ * "U10FFFF" for all possible Unicode characters. In other words,
+ * every possible Unicode character has already a keysym string
+ * defined algorithmically, even if it is not listed here. Therefore,
+ * defining an additional keysym macro is only necessary where a
+ * non-hexadecimal mnemonic name is needed, or where the new keysym
+ * does not represent any existing Unicode character.
+ *
+ * When adding new keysyms to this file, do not forget to also update the
+ * following as needed:
+ *
+ *   - the mappings in src/KeyBind.c in the libX11 repo
+ *     https://gitlab.freedesktop.org/xorg/lib/libx11
+ *
+ *   - the protocol specification in specs/keysyms.xml in this repo
+ *     https://gitlab.freedesktop.org/xorg/proto/xorgproto
+ *
+ */
+
+#define XKB_KEY_VoidSymbol                  0xffffff  /* Void symbol */
+
+/*
+ * TTY function keys, cleverly chosen to map to ASCII, for convenience of
+ * programming, but could have been arbitrary (at the cost of lookup
+ * tables in client code).
+ */
+
+#define XKB_KEY_BackSpace                     0xff08  /* Back space, back char */
+#define XKB_KEY_Tab                           0xff09
+#define XKB_KEY_Linefeed                      0xff0a  /* Linefeed, LF */
+#define XKB_KEY_Clear                         0xff0b
+#define XKB_KEY_Return                        0xff0d  /* Return, enter */
+#define XKB_KEY_Pause                         0xff13  /* Pause, hold */
+#define XKB_KEY_Scroll_Lock                   0xff14
+#define XKB_KEY_Sys_Req                       0xff15
+#define XKB_KEY_Escape                        0xff1b
+#define XKB_KEY_Delete                        0xffff  /* Delete, rubout */
+
+
+
+/* International & multi-key character composition */
+
+#define XKB_KEY_Multi_key                     0xff20  /* Multi-key character compose */
+#define XKB_KEY_Codeinput                     0xff37
+#define XKB_KEY_SingleCandidate               0xff3c
+#define XKB_KEY_MultipleCandidate             0xff3d
+#define XKB_KEY_PreviousCandidate             0xff3e
+
+/* Japanese keyboard support */
+
+#define XKB_KEY_Kanji                         0xff21  /* Kanji, Kanji convert */
+#define XKB_KEY_Muhenkan                      0xff22  /* Cancel Conversion */
+#define XKB_KEY_Henkan_Mode                   0xff23  /* Start/Stop Conversion */
+#define XKB_KEY_Henkan                        0xff23  /* Alias for Henkan_Mode */
+#define XKB_KEY_Romaji                        0xff24  /* to Romaji */
+#define XKB_KEY_Hiragana                      0xff25  /* to Hiragana */
+#define XKB_KEY_Katakana                      0xff26  /* to Katakana */
+#define XKB_KEY_Hiragana_Katakana             0xff27  /* Hiragana/Katakana toggle */
+#define XKB_KEY_Zenkaku                       0xff28  /* to Zenkaku */
+#define XKB_KEY_Hankaku                       0xff29  /* to Hankaku */
+#define XKB_KEY_Zenkaku_Hankaku               0xff2a  /* Zenkaku/Hankaku toggle */
+#define XKB_KEY_Touroku                       0xff2b  /* Add to Dictionary */
+#define XKB_KEY_Massyo                        0xff2c  /* Delete from Dictionary */
+#define XKB_KEY_Kana_Lock                     0xff2d  /* Kana Lock */
+#define XKB_KEY_Kana_Shift                    0xff2e  /* Kana Shift */
+#define XKB_KEY_Eisu_Shift                    0xff2f  /* Alphanumeric Shift */
+#define XKB_KEY_Eisu_toggle                   0xff30  /* Alphanumeric toggle */
+#define XKB_KEY_Kanji_Bangou                  0xff37  /* Codeinput */
+#define XKB_KEY_Zen_Koho                      0xff3d  /* Multiple/All Candidate(s) */
+#define XKB_KEY_Mae_Koho                      0xff3e  /* Previous Candidate */
+
+/* 0xff31 thru 0xff3f are under XK_KOREAN */
+
+/* Cursor control & motion */
+
+#define XKB_KEY_Home                          0xff50
+#define XKB_KEY_Left                          0xff51  /* Move left, left arrow */
+#define XKB_KEY_Up                            0xff52  /* Move up, up arrow */
+#define XKB_KEY_Right                         0xff53  /* Move right, right arrow */
+#define XKB_KEY_Down                          0xff54  /* Move down, down arrow */
+#define XKB_KEY_Prior                         0xff55  /* Prior, previous */
+#define XKB_KEY_Page_Up                       0xff55
+#define XKB_KEY_Next                          0xff56  /* Next */
+#define XKB_KEY_Page_Down                     0xff56
+#define XKB_KEY_End                           0xff57  /* EOL */
+#define XKB_KEY_Begin                         0xff58  /* BOL */
+
+
+/* Misc functions */
+
+#define XKB_KEY_Select                        0xff60  /* Select, mark */
+#define XKB_KEY_Print                         0xff61
+#define XKB_KEY_Execute                       0xff62  /* Execute, run, do */
+#define XKB_KEY_Insert                        0xff63  /* Insert, insert here */
+#define XKB_KEY_Undo                          0xff65
+#define XKB_KEY_Redo                          0xff66  /* Redo, again */
+#define XKB_KEY_Menu                          0xff67
+#define XKB_KEY_Find                          0xff68  /* Find, search */
+#define XKB_KEY_Cancel                        0xff69  /* Cancel, stop, abort, exit */
+#define XKB_KEY_Help                          0xff6a  /* Help */
+#define XKB_KEY_Break                         0xff6b
+#define XKB_KEY_Mode_switch                   0xff7e  /* Character set switch */
+#define XKB_KEY_script_switch                 0xff7e  /* Alias for mode_switch */
+#define XKB_KEY_Num_Lock                      0xff7f
+
+/* Keypad functions, keypad numbers cleverly chosen to map to ASCII */
+
+#define XKB_KEY_KP_Space                      0xff80  /* Space */
+#define XKB_KEY_KP_Tab                        0xff89
+#define XKB_KEY_KP_Enter                      0xff8d  /* Enter */
+#define XKB_KEY_KP_F1                         0xff91  /* PF1, KP_A, ... */
+#define XKB_KEY_KP_F2                         0xff92
+#define XKB_KEY_KP_F3                         0xff93
+#define XKB_KEY_KP_F4                         0xff94
+#define XKB_KEY_KP_Home                       0xff95
+#define XKB_KEY_KP_Left                       0xff96
+#define XKB_KEY_KP_Up                         0xff97
+#define XKB_KEY_KP_Right                      0xff98
+#define XKB_KEY_KP_Down                       0xff99
+#define XKB_KEY_KP_Prior                      0xff9a
+#define XKB_KEY_KP_Page_Up                    0xff9a
+#define XKB_KEY_KP_Next                       0xff9b
+#define XKB_KEY_KP_Page_Down                  0xff9b
+#define XKB_KEY_KP_End                        0xff9c
+#define XKB_KEY_KP_Begin                      0xff9d
+#define XKB_KEY_KP_Insert                     0xff9e
+#define XKB_KEY_KP_Delete                     0xff9f
+#define XKB_KEY_KP_Equal                      0xffbd  /* Equals */
+#define XKB_KEY_KP_Multiply                   0xffaa
+#define XKB_KEY_KP_Add                        0xffab
+#define XKB_KEY_KP_Separator                  0xffac  /* Separator, often comma */
+#define XKB_KEY_KP_Subtract                   0xffad
+#define XKB_KEY_KP_Decimal                    0xffae
+#define XKB_KEY_KP_Divide                     0xffaf
+
+#define XKB_KEY_KP_0                          0xffb0
+#define XKB_KEY_KP_1                          0xffb1
+#define XKB_KEY_KP_2                          0xffb2
+#define XKB_KEY_KP_3                          0xffb3
+#define XKB_KEY_KP_4                          0xffb4
+#define XKB_KEY_KP_5                          0xffb5
+#define XKB_KEY_KP_6                          0xffb6
+#define XKB_KEY_KP_7                          0xffb7
+#define XKB_KEY_KP_8                          0xffb8
+#define XKB_KEY_KP_9                          0xffb9
+
+
+
+/*
+ * Auxiliary functions; note the duplicate definitions for left and right
+ * function keys;  Sun keyboards and a few other manufacturers have such
+ * function key groups on the left and/or right sides of the keyboard.
+ * We've not found a keyboard with more than 35 function keys total.
+ */
+
+#define XKB_KEY_F1                            0xffbe
+#define XKB_KEY_F2                            0xffbf
+#define XKB_KEY_F3                            0xffc0
+#define XKB_KEY_F4                            0xffc1
+#define XKB_KEY_F5                            0xffc2
+#define XKB_KEY_F6                            0xffc3
+#define XKB_KEY_F7                            0xffc4
+#define XKB_KEY_F8                            0xffc5
+#define XKB_KEY_F9                            0xffc6
+#define XKB_KEY_F10                           0xffc7
+#define XKB_KEY_F11                           0xffc8
+#define XKB_KEY_L1                            0xffc8
+#define XKB_KEY_F12                           0xffc9
+#define XKB_KEY_L2                            0xffc9
+#define XKB_KEY_F13                           0xffca
+#define XKB_KEY_L3                            0xffca
+#define XKB_KEY_F14                           0xffcb
+#define XKB_KEY_L4                            0xffcb
+#define XKB_KEY_F15                           0xffcc
+#define XKB_KEY_L5                            0xffcc
+#define XKB_KEY_F16                           0xffcd
+#define XKB_KEY_L6                            0xffcd
+#define XKB_KEY_F17                           0xffce
+#define XKB_KEY_L7                            0xffce
+#define XKB_KEY_F18                           0xffcf
+#define XKB_KEY_L8                            0xffcf
+#define XKB_KEY_F19                           0xffd0
+#define XKB_KEY_L9                            0xffd0
+#define XKB_KEY_F20                           0xffd1
+#define XKB_KEY_L10                           0xffd1
+#define XKB_KEY_F21                           0xffd2
+#define XKB_KEY_R1                            0xffd2
+#define XKB_KEY_F22                           0xffd3
+#define XKB_KEY_R2                            0xffd3
+#define XKB_KEY_F23                           0xffd4
+#define XKB_KEY_R3                            0xffd4
+#define XKB_KEY_F24                           0xffd5
+#define XKB_KEY_R4                            0xffd5
+#define XKB_KEY_F25                           0xffd6
+#define XKB_KEY_R5                            0xffd6
+#define XKB_KEY_F26                           0xffd7
+#define XKB_KEY_R6                            0xffd7
+#define XKB_KEY_F27                           0xffd8
+#define XKB_KEY_R7                            0xffd8
+#define XKB_KEY_F28                           0xffd9
+#define XKB_KEY_R8                            0xffd9
+#define XKB_KEY_F29                           0xffda
+#define XKB_KEY_R9                            0xffda
+#define XKB_KEY_F30                           0xffdb
+#define XKB_KEY_R10                           0xffdb
+#define XKB_KEY_F31                           0xffdc
+#define XKB_KEY_R11                           0xffdc
+#define XKB_KEY_F32                           0xffdd
+#define XKB_KEY_R12                           0xffdd
+#define XKB_KEY_F33                           0xffde
+#define XKB_KEY_R13                           0xffde
+#define XKB_KEY_F34                           0xffdf
+#define XKB_KEY_R14                           0xffdf
+#define XKB_KEY_F35                           0xffe0
+#define XKB_KEY_R15                           0xffe0
+
+/* Modifiers */
+
+#define XKB_KEY_Shift_L                       0xffe1  /* Left shift */
+#define XKB_KEY_Shift_R                       0xffe2  /* Right shift */
+#define XKB_KEY_Control_L                     0xffe3  /* Left control */
+#define XKB_KEY_Control_R                     0xffe4  /* Right control */
+#define XKB_KEY_Caps_Lock                     0xffe5  /* Caps lock */
+#define XKB_KEY_Shift_Lock                    0xffe6  /* Shift lock */
+
+#define XKB_KEY_Meta_L                        0xffe7  /* Left meta */
+#define XKB_KEY_Meta_R                        0xffe8  /* Right meta */
+#define XKB_KEY_Alt_L                         0xffe9  /* Left alt */
+#define XKB_KEY_Alt_R                         0xffea  /* Right alt */
+#define XKB_KEY_Super_L                       0xffeb  /* Left super */
+#define XKB_KEY_Super_R                       0xffec  /* Right super */
+#define XKB_KEY_Hyper_L                       0xffed  /* Left hyper */
+#define XKB_KEY_Hyper_R                       0xffee  /* Right hyper */
+
+/*
+ * Keyboard (XKB) Extension function and modifier keys
+ * (from Appendix C of "The X Keyboard Extension: Protocol Specification")
+ * Byte 3 = 0xfe
+ */
+
+#define XKB_KEY_ISO_Lock                      0xfe01
+#define XKB_KEY_ISO_Level2_Latch              0xfe02
+#define XKB_KEY_ISO_Level3_Shift              0xfe03
+#define XKB_KEY_ISO_Level3_Latch              0xfe04
+#define XKB_KEY_ISO_Level3_Lock               0xfe05
+#define XKB_KEY_ISO_Level5_Shift              0xfe11
+#define XKB_KEY_ISO_Level5_Latch              0xfe12
+#define XKB_KEY_ISO_Level5_Lock               0xfe13
+#define XKB_KEY_ISO_Group_Shift               0xff7e  /* Alias for mode_switch */
+#define XKB_KEY_ISO_Group_Latch               0xfe06
+#define XKB_KEY_ISO_Group_Lock                0xfe07
+#define XKB_KEY_ISO_Next_Group                0xfe08
+#define XKB_KEY_ISO_Next_Group_Lock           0xfe09
+#define XKB_KEY_ISO_Prev_Group                0xfe0a
+#define XKB_KEY_ISO_Prev_Group_Lock           0xfe0b
+#define XKB_KEY_ISO_First_Group               0xfe0c
+#define XKB_KEY_ISO_First_Group_Lock          0xfe0d
+#define XKB_KEY_ISO_Last_Group                0xfe0e
+#define XKB_KEY_ISO_Last_Group_Lock           0xfe0f
+
+#define XKB_KEY_ISO_Left_Tab                  0xfe20
+#define XKB_KEY_ISO_Move_Line_Up              0xfe21
+#define XKB_KEY_ISO_Move_Line_Down            0xfe22
+#define XKB_KEY_ISO_Partial_Line_Up           0xfe23
+#define XKB_KEY_ISO_Partial_Line_Down         0xfe24
+#define XKB_KEY_ISO_Partial_Space_Left        0xfe25
+#define XKB_KEY_ISO_Partial_Space_Right       0xfe26
+#define XKB_KEY_ISO_Set_Margin_Left           0xfe27
+#define XKB_KEY_ISO_Set_Margin_Right          0xfe28
+#define XKB_KEY_ISO_Release_Margin_Left       0xfe29
+#define XKB_KEY_ISO_Release_Margin_Right      0xfe2a
+#define XKB_KEY_ISO_Release_Both_Margins      0xfe2b
+#define XKB_KEY_ISO_Fast_Cursor_Left          0xfe2c
+#define XKB_KEY_ISO_Fast_Cursor_Right         0xfe2d
+#define XKB_KEY_ISO_Fast_Cursor_Up            0xfe2e
+#define XKB_KEY_ISO_Fast_Cursor_Down          0xfe2f
+#define XKB_KEY_ISO_Continuous_Underline      0xfe30
+#define XKB_KEY_ISO_Discontinuous_Underline   0xfe31
+#define XKB_KEY_ISO_Emphasize                 0xfe32
+#define XKB_KEY_ISO_Center_Object             0xfe33
+#define XKB_KEY_ISO_Enter                     0xfe34
+
+#define XKB_KEY_dead_grave                    0xfe50
+#define XKB_KEY_dead_acute                    0xfe51
+#define XKB_KEY_dead_circumflex               0xfe52
+#define XKB_KEY_dead_tilde                    0xfe53
+#define XKB_KEY_dead_perispomeni              0xfe53  /* alias for dead_tilde */
+#define XKB_KEY_dead_macron                   0xfe54
+#define XKB_KEY_dead_breve                    0xfe55
+#define XKB_KEY_dead_abovedot                 0xfe56
+#define XKB_KEY_dead_diaeresis                0xfe57
+#define XKB_KEY_dead_abovering                0xfe58
+#define XKB_KEY_dead_doubleacute              0xfe59
+#define XKB_KEY_dead_caron                    0xfe5a
+#define XKB_KEY_dead_cedilla                  0xfe5b
+#define XKB_KEY_dead_ogonek                   0xfe5c
+#define XKB_KEY_dead_iota                     0xfe5d
+#define XKB_KEY_dead_voiced_sound             0xfe5e
+#define XKB_KEY_dead_semivoiced_sound         0xfe5f
+#define XKB_KEY_dead_belowdot                 0xfe60
+#define XKB_KEY_dead_hook                     0xfe61
+#define XKB_KEY_dead_horn                     0xfe62
+#define XKB_KEY_dead_stroke                   0xfe63
+#define XKB_KEY_dead_abovecomma               0xfe64
+#define XKB_KEY_dead_psili                    0xfe64  /* alias for dead_abovecomma */
+#define XKB_KEY_dead_abovereversedcomma       0xfe65
+#define XKB_KEY_dead_dasia                    0xfe65  /* alias for dead_abovereversedcomma */
+#define XKB_KEY_dead_doublegrave              0xfe66
+#define XKB_KEY_dead_belowring                0xfe67
+#define XKB_KEY_dead_belowmacron              0xfe68
+#define XKB_KEY_dead_belowcircumflex          0xfe69
+#define XKB_KEY_dead_belowtilde               0xfe6a
+#define XKB_KEY_dead_belowbreve               0xfe6b
+#define XKB_KEY_dead_belowdiaeresis           0xfe6c
+#define XKB_KEY_dead_invertedbreve            0xfe6d
+#define XKB_KEY_dead_belowcomma               0xfe6e
+#define XKB_KEY_dead_currency                 0xfe6f
+
+/* extra dead elements for German T3 layout */
+#define XKB_KEY_dead_lowline                  0xfe90
+#define XKB_KEY_dead_aboveverticalline        0xfe91
+#define XKB_KEY_dead_belowverticalline        0xfe92
+#define XKB_KEY_dead_longsolidusoverlay       0xfe93
+
+/* dead vowels for universal syllable entry */
+#define XKB_KEY_dead_a                        0xfe80
+#define XKB_KEY_dead_A                        0xfe81
+#define XKB_KEY_dead_e                        0xfe82
+#define XKB_KEY_dead_E                        0xfe83
+#define XKB_KEY_dead_i                        0xfe84
+#define XKB_KEY_dead_I                        0xfe85
+#define XKB_KEY_dead_o                        0xfe86
+#define XKB_KEY_dead_O                        0xfe87
+#define XKB_KEY_dead_u                        0xfe88
+#define XKB_KEY_dead_U                        0xfe89
+#define XKB_KEY_dead_small_schwa              0xfe8a
+#define XKB_KEY_dead_capital_schwa            0xfe8b
+
+#define XKB_KEY_dead_greek                    0xfe8c
+
+#define XKB_KEY_First_Virtual_Screen          0xfed0
+#define XKB_KEY_Prev_Virtual_Screen           0xfed1
+#define XKB_KEY_Next_Virtual_Screen           0xfed2
+#define XKB_KEY_Last_Virtual_Screen           0xfed4
+#define XKB_KEY_Terminate_Server              0xfed5
+
+#define XKB_KEY_AccessX_Enable                0xfe70
+#define XKB_KEY_AccessX_Feedback_Enable       0xfe71
+#define XKB_KEY_RepeatKeys_Enable             0xfe72
+#define XKB_KEY_SlowKeys_Enable               0xfe73
+#define XKB_KEY_BounceKeys_Enable             0xfe74
+#define XKB_KEY_StickyKeys_Enable             0xfe75
+#define XKB_KEY_MouseKeys_Enable              0xfe76
+#define XKB_KEY_MouseKeys_Accel_Enable        0xfe77
+#define XKB_KEY_Overlay1_Enable               0xfe78
+#define XKB_KEY_Overlay2_Enable               0xfe79
+#define XKB_KEY_AudibleBell_Enable            0xfe7a
+
+#define XKB_KEY_Pointer_Left                  0xfee0
+#define XKB_KEY_Pointer_Right                 0xfee1
+#define XKB_KEY_Pointer_Up                    0xfee2
+#define XKB_KEY_Pointer_Down                  0xfee3
+#define XKB_KEY_Pointer_UpLeft                0xfee4
+#define XKB_KEY_Pointer_UpRight               0xfee5
+#define XKB_KEY_Pointer_DownLeft              0xfee6
+#define XKB_KEY_Pointer_DownRight             0xfee7
+#define XKB_KEY_Pointer_Button_Dflt           0xfee8
+#define XKB_KEY_Pointer_Button1               0xfee9
+#define XKB_KEY_Pointer_Button2               0xfeea
+#define XKB_KEY_Pointer_Button3               0xfeeb
+#define XKB_KEY_Pointer_Button4               0xfeec
+#define XKB_KEY_Pointer_Button5               0xfeed
+#define XKB_KEY_Pointer_DblClick_Dflt         0xfeee
+#define XKB_KEY_Pointer_DblClick1             0xfeef
+#define XKB_KEY_Pointer_DblClick2             0xfef0
+#define XKB_KEY_Pointer_DblClick3             0xfef1
+#define XKB_KEY_Pointer_DblClick4             0xfef2
+#define XKB_KEY_Pointer_DblClick5             0xfef3
+#define XKB_KEY_Pointer_Drag_Dflt             0xfef4
+#define XKB_KEY_Pointer_Drag1                 0xfef5
+#define XKB_KEY_Pointer_Drag2                 0xfef6
+#define XKB_KEY_Pointer_Drag3                 0xfef7
+#define XKB_KEY_Pointer_Drag4                 0xfef8
+#define XKB_KEY_Pointer_Drag5                 0xfefd
+
+#define XKB_KEY_Pointer_EnableKeys            0xfef9
+#define XKB_KEY_Pointer_Accelerate            0xfefa
+#define XKB_KEY_Pointer_DfltBtnNext           0xfefb
+#define XKB_KEY_Pointer_DfltBtnPrev           0xfefc
+
+/* Single-Stroke Multiple-Character N-Graph Keysyms For The X Input Method */
+
+#define XKB_KEY_ch                            0xfea0
+#define XKB_KEY_Ch                            0xfea1
+#define XKB_KEY_CH                            0xfea2
+#define XKB_KEY_c_h                           0xfea3
+#define XKB_KEY_C_h                           0xfea4
+#define XKB_KEY_C_H                           0xfea5
+
+
+/*
+ * 3270 Terminal Keys
+ * Byte 3 = 0xfd
+ */
+
+#define XKB_KEY_3270_Duplicate                0xfd01
+#define XKB_KEY_3270_FieldMark                0xfd02
+#define XKB_KEY_3270_Right2                   0xfd03
+#define XKB_KEY_3270_Left2                    0xfd04
+#define XKB_KEY_3270_BackTab                  0xfd05
+#define XKB_KEY_3270_EraseEOF                 0xfd06
+#define XKB_KEY_3270_EraseInput               0xfd07
+#define XKB_KEY_3270_Reset                    0xfd08
+#define XKB_KEY_3270_Quit                     0xfd09
+#define XKB_KEY_3270_PA1                      0xfd0a
+#define XKB_KEY_3270_PA2                      0xfd0b
+#define XKB_KEY_3270_PA3                      0xfd0c
+#define XKB_KEY_3270_Test                     0xfd0d
+#define XKB_KEY_3270_Attn                     0xfd0e
+#define XKB_KEY_3270_CursorBlink              0xfd0f
+#define XKB_KEY_3270_AltCursor                0xfd10
+#define XKB_KEY_3270_KeyClick                 0xfd11
+#define XKB_KEY_3270_Jump                     0xfd12
+#define XKB_KEY_3270_Ident                    0xfd13
+#define XKB_KEY_3270_Rule                     0xfd14
+#define XKB_KEY_3270_Copy                     0xfd15
+#define XKB_KEY_3270_Play                     0xfd16
+#define XKB_KEY_3270_Setup                    0xfd17
+#define XKB_KEY_3270_Record                   0xfd18
+#define XKB_KEY_3270_ChangeScreen             0xfd19
+#define XKB_KEY_3270_DeleteWord               0xfd1a
+#define XKB_KEY_3270_ExSelect                 0xfd1b
+#define XKB_KEY_3270_CursorSelect             0xfd1c
+#define XKB_KEY_3270_PrintScreen              0xfd1d
+#define XKB_KEY_3270_Enter                    0xfd1e
+
+/*
+ * Latin 1
+ * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF)
+ * Byte 3 = 0
+ */
+#define XKB_KEY_space                         0x0020  /* U+0020 SPACE */
+#define XKB_KEY_exclam                        0x0021  /* U+0021 EXCLAMATION MARK */
+#define XKB_KEY_quotedbl                      0x0022  /* U+0022 QUOTATION MARK */
+#define XKB_KEY_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
+#define XKB_KEY_dollar                        0x0024  /* U+0024 DOLLAR SIGN */
+#define XKB_KEY_percent                       0x0025  /* U+0025 PERCENT SIGN */
+#define XKB_KEY_ampersand                     0x0026  /* U+0026 AMPERSAND */
+#define XKB_KEY_apostrophe                    0x0027  /* U+0027 APOSTROPHE */
+#define XKB_KEY_quoteright                    0x0027  /* deprecated */
+#define XKB_KEY_parenleft                     0x0028  /* U+0028 LEFT PARENTHESIS */
+#define XKB_KEY_parenright                    0x0029  /* U+0029 RIGHT PARENTHESIS */
+#define XKB_KEY_asterisk                      0x002a  /* U+002A ASTERISK */
+#define XKB_KEY_plus                          0x002b  /* U+002B PLUS SIGN */
+#define XKB_KEY_comma                         0x002c  /* U+002C COMMA */
+#define XKB_KEY_minus                         0x002d  /* U+002D HYPHEN-MINUS */
+#define XKB_KEY_period                        0x002e  /* U+002E FULL STOP */
+#define XKB_KEY_slash                         0x002f  /* U+002F SOLIDUS */
+#define XKB_KEY_0                             0x0030  /* U+0030 DIGIT ZERO */
+#define XKB_KEY_1                             0x0031  /* U+0031 DIGIT ONE */
+#define XKB_KEY_2                             0x0032  /* U+0032 DIGIT TWO */
+#define XKB_KEY_3                             0x0033  /* U+0033 DIGIT THREE */
+#define XKB_KEY_4                             0x0034  /* U+0034 DIGIT FOUR */
+#define XKB_KEY_5                             0x0035  /* U+0035 DIGIT FIVE */
+#define XKB_KEY_6                             0x0036  /* U+0036 DIGIT SIX */
+#define XKB_KEY_7                             0x0037  /* U+0037 DIGIT SEVEN */
+#define XKB_KEY_8                             0x0038  /* U+0038 DIGIT EIGHT */
+#define XKB_KEY_9                             0x0039  /* U+0039 DIGIT NINE */
+#define XKB_KEY_colon                         0x003a  /* U+003A COLON */
+#define XKB_KEY_semicolon                     0x003b  /* U+003B SEMICOLON */
+#define XKB_KEY_less                          0x003c  /* U+003C LESS-THAN SIGN */
+#define XKB_KEY_equal                         0x003d  /* U+003D EQUALS SIGN */
+#define XKB_KEY_greater                       0x003e  /* U+003E GREATER-THAN SIGN */
+#define XKB_KEY_question                      0x003f  /* U+003F QUESTION MARK */
+#define XKB_KEY_at                            0x0040  /* U+0040 COMMERCIAL AT */
+#define XKB_KEY_A                             0x0041  /* U+0041 LATIN CAPITAL LETTER A */
+#define XKB_KEY_B                             0x0042  /* U+0042 LATIN CAPITAL LETTER B */
+#define XKB_KEY_C                             0x0043  /* U+0043 LATIN CAPITAL LETTER C */
+#define XKB_KEY_D                             0x0044  /* U+0044 LATIN CAPITAL LETTER D */
+#define XKB_KEY_E                             0x0045  /* U+0045 LATIN CAPITAL LETTER E */
+#define XKB_KEY_F                             0x0046  /* U+0046 LATIN CAPITAL LETTER F */
+#define XKB_KEY_G                             0x0047  /* U+0047 LATIN CAPITAL LETTER G */
+#define XKB_KEY_H                             0x0048  /* U+0048 LATIN CAPITAL LETTER H */
+#define XKB_KEY_I                             0x0049  /* U+0049 LATIN CAPITAL LETTER I */
+#define XKB_KEY_J                             0x004a  /* U+004A LATIN CAPITAL LETTER J */
+#define XKB_KEY_K                             0x004b  /* U+004B LATIN CAPITAL LETTER K */
+#define XKB_KEY_L                             0x004c  /* U+004C LATIN CAPITAL LETTER L */
+#define XKB_KEY_M                             0x004d  /* U+004D LATIN CAPITAL LETTER M */
+#define XKB_KEY_N                             0x004e  /* U+004E LATIN CAPITAL LETTER N */
+#define XKB_KEY_O                             0x004f  /* U+004F LATIN CAPITAL LETTER O */
+#define XKB_KEY_P                             0x0050  /* U+0050 LATIN CAPITAL LETTER P */
+#define XKB_KEY_Q                             0x0051  /* U+0051 LATIN CAPITAL LETTER Q */
+#define XKB_KEY_R                             0x0052  /* U+0052 LATIN CAPITAL LETTER R */
+#define XKB_KEY_S                             0x0053  /* U+0053 LATIN CAPITAL LETTER S */
+#define XKB_KEY_T                             0x0054  /* U+0054 LATIN CAPITAL LETTER T */
+#define XKB_KEY_U                             0x0055  /* U+0055 LATIN CAPITAL LETTER U */
+#define XKB_KEY_V                             0x0056  /* U+0056 LATIN CAPITAL LETTER V */
+#define XKB_KEY_W                             0x0057  /* U+0057 LATIN CAPITAL LETTER W */
+#define XKB_KEY_X                             0x0058  /* U+0058 LATIN CAPITAL LETTER X */
+#define XKB_KEY_Y                             0x0059  /* U+0059 LATIN CAPITAL LETTER Y */
+#define XKB_KEY_Z                             0x005a  /* U+005A LATIN CAPITAL LETTER Z */
+#define XKB_KEY_bracketleft                   0x005b  /* U+005B LEFT SQUARE BRACKET */
+#define XKB_KEY_backslash                     0x005c  /* U+005C REVERSE SOLIDUS */
+#define XKB_KEY_bracketright                  0x005d  /* U+005D RIGHT SQUARE BRACKET */
+#define XKB_KEY_asciicircum                   0x005e  /* U+005E CIRCUMFLEX ACCENT */
+#define XKB_KEY_underscore                    0x005f  /* U+005F LOW LINE */
+#define XKB_KEY_grave                         0x0060  /* U+0060 GRAVE ACCENT */
+#define XKB_KEY_quoteleft                     0x0060  /* deprecated */
+#define XKB_KEY_a                             0x0061  /* U+0061 LATIN SMALL LETTER A */
+#define XKB_KEY_b                             0x0062  /* U+0062 LATIN SMALL LETTER B */
+#define XKB_KEY_c                             0x0063  /* U+0063 LATIN SMALL LETTER C */
+#define XKB_KEY_d                             0x0064  /* U+0064 LATIN SMALL LETTER D */
+#define XKB_KEY_e                             0x0065  /* U+0065 LATIN SMALL LETTER E */
+#define XKB_KEY_f                             0x0066  /* U+0066 LATIN SMALL LETTER F */
+#define XKB_KEY_g                             0x0067  /* U+0067 LATIN SMALL LETTER G */
+#define XKB_KEY_h                             0x0068  /* U+0068 LATIN SMALL LETTER H */
+#define XKB_KEY_i                             0x0069  /* U+0069 LATIN SMALL LETTER I */
+#define XKB_KEY_j                             0x006a  /* U+006A LATIN SMALL LETTER J */
+#define XKB_KEY_k                             0x006b  /* U+006B LATIN SMALL LETTER K */
+#define XKB_KEY_l                             0x006c  /* U+006C LATIN SMALL LETTER L */
+#define XKB_KEY_m                             0x006d  /* U+006D LATIN SMALL LETTER M */
+#define XKB_KEY_n                             0x006e  /* U+006E LATIN SMALL LETTER N */
+#define XKB_KEY_o                             0x006f  /* U+006F LATIN SMALL LETTER O */
+#define XKB_KEY_p                             0x0070  /* U+0070 LATIN SMALL LETTER P */
+#define XKB_KEY_q                             0x0071  /* U+0071 LATIN SMALL LETTER Q */
+#define XKB_KEY_r                             0x0072  /* U+0072 LATIN SMALL LETTER R */
+#define XKB_KEY_s                             0x0073  /* U+0073 LATIN SMALL LETTER S */
+#define XKB_KEY_t                             0x0074  /* U+0074 LATIN SMALL LETTER T */
+#define XKB_KEY_u                             0x0075  /* U+0075 LATIN SMALL LETTER U */
+#define XKB_KEY_v                             0x0076  /* U+0076 LATIN SMALL LETTER V */
+#define XKB_KEY_w                             0x0077  /* U+0077 LATIN SMALL LETTER W */
+#define XKB_KEY_x                             0x0078  /* U+0078 LATIN SMALL LETTER X */
+#define XKB_KEY_y                             0x0079  /* U+0079 LATIN SMALL LETTER Y */
+#define XKB_KEY_z                             0x007a  /* U+007A LATIN SMALL LETTER Z */
+#define XKB_KEY_braceleft                     0x007b  /* U+007B LEFT CURLY BRACKET */
+#define XKB_KEY_bar                           0x007c  /* U+007C VERTICAL LINE */
+#define XKB_KEY_braceright                    0x007d  /* U+007D RIGHT CURLY BRACKET */
+#define XKB_KEY_asciitilde                    0x007e  /* U+007E TILDE */
+
+#define XKB_KEY_nobreakspace                  0x00a0  /* U+00A0 NO-BREAK SPACE */
+#define XKB_KEY_exclamdown                    0x00a1  /* U+00A1 INVERTED EXCLAMATION MARK */
+#define XKB_KEY_cent                          0x00a2  /* U+00A2 CENT SIGN */
+#define XKB_KEY_sterling                      0x00a3  /* U+00A3 POUND SIGN */
+#define XKB_KEY_currency                      0x00a4  /* U+00A4 CURRENCY SIGN */
+#define XKB_KEY_yen                           0x00a5  /* U+00A5 YEN SIGN */
+#define XKB_KEY_brokenbar                     0x00a6  /* U+00A6 BROKEN BAR */
+#define XKB_KEY_section                       0x00a7  /* U+00A7 SECTION SIGN */
+#define XKB_KEY_diaeresis                     0x00a8  /* U+00A8 DIAERESIS */
+#define XKB_KEY_copyright                     0x00a9  /* U+00A9 COPYRIGHT SIGN */
+#define XKB_KEY_ordfeminine                   0x00aa  /* U+00AA FEMININE ORDINAL INDICATOR */
+#define XKB_KEY_guillemotleft                 0x00ab  /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+#define XKB_KEY_notsign                       0x00ac  /* U+00AC NOT SIGN */
+#define XKB_KEY_hyphen                        0x00ad  /* U+00AD SOFT HYPHEN */
+#define XKB_KEY_registered                    0x00ae  /* U+00AE REGISTERED SIGN */
+#define XKB_KEY_macron                        0x00af  /* U+00AF MACRON */
+#define XKB_KEY_degree                        0x00b0  /* U+00B0 DEGREE SIGN */
+#define XKB_KEY_plusminus                     0x00b1  /* U+00B1 PLUS-MINUS SIGN */
+#define XKB_KEY_twosuperior                   0x00b2  /* U+00B2 SUPERSCRIPT TWO */
+#define XKB_KEY_threesuperior                 0x00b3  /* U+00B3 SUPERSCRIPT THREE */
+#define XKB_KEY_acute                         0x00b4  /* U+00B4 ACUTE ACCENT */
+#define XKB_KEY_mu                            0x00b5  /* U+00B5 MICRO SIGN */
+#define XKB_KEY_paragraph                     0x00b6  /* U+00B6 PILCROW SIGN */
+#define XKB_KEY_periodcentered                0x00b7  /* U+00B7 MIDDLE DOT */
+#define XKB_KEY_cedilla                       0x00b8  /* U+00B8 CEDILLA */
+#define XKB_KEY_onesuperior                   0x00b9  /* U+00B9 SUPERSCRIPT ONE */
+#define XKB_KEY_masculine                     0x00ba  /* U+00BA MASCULINE ORDINAL INDICATOR */
+#define XKB_KEY_guillemotright                0x00bb  /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+#define XKB_KEY_onequarter                    0x00bc  /* U+00BC VULGAR FRACTION ONE QUARTER */
+#define XKB_KEY_onehalf                       0x00bd  /* U+00BD VULGAR FRACTION ONE HALF */
+#define XKB_KEY_threequarters                 0x00be  /* U+00BE VULGAR FRACTION THREE QUARTERS */
+#define XKB_KEY_questiondown                  0x00bf  /* U+00BF INVERTED QUESTION MARK */
+#define XKB_KEY_Agrave                        0x00c0  /* U+00C0 LATIN CAPITAL LETTER A WITH GRAVE */
+#define XKB_KEY_Aacute                        0x00c1  /* U+00C1 LATIN CAPITAL LETTER A WITH ACUTE */
+#define XKB_KEY_Acircumflex                   0x00c2  /* U+00C2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+#define XKB_KEY_Atilde                        0x00c3  /* U+00C3 LATIN CAPITAL LETTER A WITH TILDE */
+#define XKB_KEY_Adiaeresis                    0x00c4  /* U+00C4 LATIN CAPITAL LETTER A WITH DIAERESIS */
+#define XKB_KEY_Aring                         0x00c5  /* U+00C5 LATIN CAPITAL LETTER A WITH RING ABOVE */
+#define XKB_KEY_AE                            0x00c6  /* U+00C6 LATIN CAPITAL LETTER AE */
+#define XKB_KEY_Ccedilla                      0x00c7  /* U+00C7 LATIN CAPITAL LETTER C WITH CEDILLA */
+#define XKB_KEY_Egrave                        0x00c8  /* U+00C8 LATIN CAPITAL LETTER E WITH GRAVE */
+#define XKB_KEY_Eacute                        0x00c9  /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */
+#define XKB_KEY_Ecircumflex                   0x00ca  /* U+00CA LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+#define XKB_KEY_Ediaeresis                    0x00cb  /* U+00CB LATIN CAPITAL LETTER E WITH DIAERESIS */
+#define XKB_KEY_Igrave                        0x00cc  /* U+00CC LATIN CAPITAL LETTER I WITH GRAVE */
+#define XKB_KEY_Iacute                        0x00cd  /* U+00CD LATIN CAPITAL LETTER I WITH ACUTE */
+#define XKB_KEY_Icircumflex                   0x00ce  /* U+00CE LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+#define XKB_KEY_Idiaeresis                    0x00cf  /* U+00CF LATIN CAPITAL LETTER I WITH DIAERESIS */
+#define XKB_KEY_ETH                           0x00d0  /* U+00D0 LATIN CAPITAL LETTER ETH */
+#define XKB_KEY_Eth                           0x00d0  /* deprecated */
+#define XKB_KEY_Ntilde                        0x00d1  /* U+00D1 LATIN CAPITAL LETTER N WITH TILDE */
+#define XKB_KEY_Ograve                        0x00d2  /* U+00D2 LATIN CAPITAL LETTER O WITH GRAVE */
+#define XKB_KEY_Oacute                        0x00d3  /* U+00D3 LATIN CAPITAL LETTER O WITH ACUTE */
+#define XKB_KEY_Ocircumflex                   0x00d4  /* U+00D4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+#define XKB_KEY_Otilde                        0x00d5  /* U+00D5 LATIN CAPITAL LETTER O WITH TILDE */
+#define XKB_KEY_Odiaeresis                    0x00d6  /* U+00D6 LATIN CAPITAL LETTER O WITH DIAERESIS */
+#define XKB_KEY_multiply                      0x00d7  /* U+00D7 MULTIPLICATION SIGN */
+#define XKB_KEY_Oslash                        0x00d8  /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
+#define XKB_KEY_Ooblique                      0x00d8  /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
+#define XKB_KEY_Ugrave                        0x00d9  /* U+00D9 LATIN CAPITAL LETTER U WITH GRAVE */
+#define XKB_KEY_Uacute                        0x00da  /* U+00DA LATIN CAPITAL LETTER U WITH ACUTE */
+#define XKB_KEY_Ucircumflex                   0x00db  /* U+00DB LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+#define XKB_KEY_Udiaeresis                    0x00dc  /* U+00DC LATIN CAPITAL LETTER U WITH DIAERESIS */
+#define XKB_KEY_Yacute                        0x00dd  /* U+00DD LATIN CAPITAL LETTER Y WITH ACUTE */
+#define XKB_KEY_THORN                         0x00de  /* U+00DE LATIN CAPITAL LETTER THORN */
+#define XKB_KEY_Thorn                         0x00de  /* deprecated */
+#define XKB_KEY_ssharp                        0x00df  /* U+00DF LATIN SMALL LETTER SHARP S */
+#define XKB_KEY_agrave                        0x00e0  /* U+00E0 LATIN SMALL LETTER A WITH GRAVE */
+#define XKB_KEY_aacute                        0x00e1  /* U+00E1 LATIN SMALL LETTER A WITH ACUTE */
+#define XKB_KEY_acircumflex                   0x00e2  /* U+00E2 LATIN SMALL LETTER A WITH CIRCUMFLEX */
+#define XKB_KEY_atilde                        0x00e3  /* U+00E3 LATIN SMALL LETTER A WITH TILDE */
+#define XKB_KEY_adiaeresis                    0x00e4  /* U+00E4 LATIN SMALL LETTER A WITH DIAERESIS */
+#define XKB_KEY_aring                         0x00e5  /* U+00E5 LATIN SMALL LETTER A WITH RING ABOVE */
+#define XKB_KEY_ae                            0x00e6  /* U+00E6 LATIN SMALL LETTER AE */
+#define XKB_KEY_ccedilla                      0x00e7  /* U+00E7 LATIN SMALL LETTER C WITH CEDILLA */
+#define XKB_KEY_egrave                        0x00e8  /* U+00E8 LATIN SMALL LETTER E WITH GRAVE */
+#define XKB_KEY_eacute                        0x00e9  /* U+00E9 LATIN SMALL LETTER E WITH ACUTE */
+#define XKB_KEY_ecircumflex                   0x00ea  /* U+00EA LATIN SMALL LETTER E WITH CIRCUMFLEX */
+#define XKB_KEY_ediaeresis                    0x00eb  /* U+00EB LATIN SMALL LETTER E WITH DIAERESIS */
+#define XKB_KEY_igrave                        0x00ec  /* U+00EC LATIN SMALL LETTER I WITH GRAVE */
+#define XKB_KEY_iacute                        0x00ed  /* U+00ED LATIN SMALL LETTER I WITH ACUTE */
+#define XKB_KEY_icircumflex                   0x00ee  /* U+00EE LATIN SMALL LETTER I WITH CIRCUMFLEX */
+#define XKB_KEY_idiaeresis                    0x00ef  /* U+00EF LATIN SMALL LETTER I WITH DIAERESIS */
+#define XKB_KEY_eth                           0x00f0  /* U+00F0 LATIN SMALL LETTER ETH */
+#define XKB_KEY_ntilde                        0x00f1  /* U+00F1 LATIN SMALL LETTER N WITH TILDE */
+#define XKB_KEY_ograve                        0x00f2  /* U+00F2 LATIN SMALL LETTER O WITH GRAVE */
+#define XKB_KEY_oacute                        0x00f3  /* U+00F3 LATIN SMALL LETTER O WITH ACUTE */
+#define XKB_KEY_ocircumflex                   0x00f4  /* U+00F4 LATIN SMALL LETTER O WITH CIRCUMFLEX */
+#define XKB_KEY_otilde                        0x00f5  /* U+00F5 LATIN SMALL LETTER O WITH TILDE */
+#define XKB_KEY_odiaeresis                    0x00f6  /* U+00F6 LATIN SMALL LETTER O WITH DIAERESIS */
+#define XKB_KEY_division                      0x00f7  /* U+00F7 DIVISION SIGN */
+#define XKB_KEY_oslash                        0x00f8  /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
+#define XKB_KEY_ooblique                      0x00f8  /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
+#define XKB_KEY_ugrave                        0x00f9  /* U+00F9 LATIN SMALL LETTER U WITH GRAVE */
+#define XKB_KEY_uacute                        0x00fa  /* U+00FA LATIN SMALL LETTER U WITH ACUTE */
+#define XKB_KEY_ucircumflex                   0x00fb  /* U+00FB LATIN SMALL LETTER U WITH CIRCUMFLEX */
+#define XKB_KEY_udiaeresis                    0x00fc  /* U+00FC LATIN SMALL LETTER U WITH DIAERESIS */
+#define XKB_KEY_yacute                        0x00fd  /* U+00FD LATIN SMALL LETTER Y WITH ACUTE */
+#define XKB_KEY_thorn                         0x00fe  /* U+00FE LATIN SMALL LETTER THORN */
+#define XKB_KEY_ydiaeresis                    0x00ff  /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
+
+/*
+ * Latin 2
+ * Byte 3 = 1
+ */
+
+#define XKB_KEY_Aogonek                       0x01a1  /* U+0104 LATIN CAPITAL LETTER A WITH OGONEK */
+#define XKB_KEY_breve                         0x01a2  /* U+02D8 BREVE */
+#define XKB_KEY_Lstroke                       0x01a3  /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */
+#define XKB_KEY_Lcaron                        0x01a5  /* U+013D LATIN CAPITAL LETTER L WITH CARON */
+#define XKB_KEY_Sacute                        0x01a6  /* U+015A LATIN CAPITAL LETTER S WITH ACUTE */
+#define XKB_KEY_Scaron                        0x01a9  /* U+0160 LATIN CAPITAL LETTER S WITH CARON */
+#define XKB_KEY_Scedilla                      0x01aa  /* U+015E LATIN CAPITAL LETTER S WITH CEDILLA */
+#define XKB_KEY_Tcaron                        0x01ab  /* U+0164 LATIN CAPITAL LETTER T WITH CARON */
+#define XKB_KEY_Zacute                        0x01ac  /* U+0179 LATIN CAPITAL LETTER Z WITH ACUTE */
+#define XKB_KEY_Zcaron                        0x01ae  /* U+017D LATIN CAPITAL LETTER Z WITH CARON */
+#define XKB_KEY_Zabovedot                     0x01af  /* U+017B LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+#define XKB_KEY_aogonek                       0x01b1  /* U+0105 LATIN SMALL LETTER A WITH OGONEK */
+#define XKB_KEY_ogonek                        0x01b2  /* U+02DB OGONEK */
+#define XKB_KEY_lstroke                       0x01b3  /* U+0142 LATIN SMALL LETTER L WITH STROKE */
+#define XKB_KEY_lcaron                        0x01b5  /* U+013E LATIN SMALL LETTER L WITH CARON */
+#define XKB_KEY_sacute                        0x01b6  /* U+015B LATIN SMALL LETTER S WITH ACUTE */
+#define XKB_KEY_caron                         0x01b7  /* U+02C7 CARON */
+#define XKB_KEY_scaron                        0x01b9  /* U+0161 LATIN SMALL LETTER S WITH CARON */
+#define XKB_KEY_scedilla                      0x01ba  /* U+015F LATIN SMALL LETTER S WITH CEDILLA */
+#define XKB_KEY_tcaron                        0x01bb  /* U+0165 LATIN SMALL LETTER T WITH CARON */
+#define XKB_KEY_zacute                        0x01bc  /* U+017A LATIN SMALL LETTER Z WITH ACUTE */
+#define XKB_KEY_doubleacute                   0x01bd  /* U+02DD DOUBLE ACUTE ACCENT */
+#define XKB_KEY_zcaron                        0x01be  /* U+017E LATIN SMALL LETTER Z WITH CARON */
+#define XKB_KEY_zabovedot                     0x01bf  /* U+017C LATIN SMALL LETTER Z WITH DOT ABOVE */
+#define XKB_KEY_Racute                        0x01c0  /* U+0154 LATIN CAPITAL LETTER R WITH ACUTE */
+#define XKB_KEY_Abreve                        0x01c3  /* U+0102 LATIN CAPITAL LETTER A WITH BREVE */
+#define XKB_KEY_Lacute                        0x01c5  /* U+0139 LATIN CAPITAL LETTER L WITH ACUTE */
+#define XKB_KEY_Cacute                        0x01c6  /* U+0106 LATIN CAPITAL LETTER C WITH ACUTE */
+#define XKB_KEY_Ccaron                        0x01c8  /* U+010C LATIN CAPITAL LETTER C WITH CARON */
+#define XKB_KEY_Eogonek                       0x01ca  /* U+0118 LATIN CAPITAL LETTER E WITH OGONEK */
+#define XKB_KEY_Ecaron                        0x01cc  /* U+011A LATIN CAPITAL LETTER E WITH CARON */
+#define XKB_KEY_Dcaron                        0x01cf  /* U+010E LATIN CAPITAL LETTER D WITH CARON */
+#define XKB_KEY_Dstroke                       0x01d0  /* U+0110 LATIN CAPITAL LETTER D WITH STROKE */
+#define XKB_KEY_Nacute                        0x01d1  /* U+0143 LATIN CAPITAL LETTER N WITH ACUTE */
+#define XKB_KEY_Ncaron                        0x01d2  /* U+0147 LATIN CAPITAL LETTER N WITH CARON */
+#define XKB_KEY_Odoubleacute                  0x01d5  /* U+0150 LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+#define XKB_KEY_Rcaron                        0x01d8  /* U+0158 LATIN CAPITAL LETTER R WITH CARON */
+#define XKB_KEY_Uring                         0x01d9  /* U+016E LATIN CAPITAL LETTER U WITH RING ABOVE */
+#define XKB_KEY_Udoubleacute                  0x01db  /* U+0170 LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+#define XKB_KEY_Tcedilla                      0x01de  /* U+0162 LATIN CAPITAL LETTER T WITH CEDILLA */
+#define XKB_KEY_racute                        0x01e0  /* U+0155 LATIN SMALL LETTER R WITH ACUTE */
+#define XKB_KEY_abreve                        0x01e3  /* U+0103 LATIN SMALL LETTER A WITH BREVE */
+#define XKB_KEY_lacute                        0x01e5  /* U+013A LATIN SMALL LETTER L WITH ACUTE */
+#define XKB_KEY_cacute                        0x01e6  /* U+0107 LATIN SMALL LETTER C WITH ACUTE */
+#define XKB_KEY_ccaron                        0x01e8  /* U+010D LATIN SMALL LETTER C WITH CARON */
+#define XKB_KEY_eogonek                       0x01ea  /* U+0119 LATIN SMALL LETTER E WITH OGONEK */
+#define XKB_KEY_ecaron                        0x01ec  /* U+011B LATIN SMALL LETTER E WITH CARON */
+#define XKB_KEY_dcaron                        0x01ef  /* U+010F LATIN SMALL LETTER D WITH CARON */
+#define XKB_KEY_dstroke                       0x01f0  /* U+0111 LATIN SMALL LETTER D WITH STROKE */
+#define XKB_KEY_nacute                        0x01f1  /* U+0144 LATIN SMALL LETTER N WITH ACUTE */
+#define XKB_KEY_ncaron                        0x01f2  /* U+0148 LATIN SMALL LETTER N WITH CARON */
+#define XKB_KEY_odoubleacute                  0x01f5  /* U+0151 LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+#define XKB_KEY_rcaron                        0x01f8  /* U+0159 LATIN SMALL LETTER R WITH CARON */
+#define XKB_KEY_uring                         0x01f9  /* U+016F LATIN SMALL LETTER U WITH RING ABOVE */
+#define XKB_KEY_udoubleacute                  0x01fb  /* U+0171 LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+#define XKB_KEY_tcedilla                      0x01fe  /* U+0163 LATIN SMALL LETTER T WITH CEDILLA */
+#define XKB_KEY_abovedot                      0x01ff  /* U+02D9 DOT ABOVE */
+
+/*
+ * Latin 3
+ * Byte 3 = 2
+ */
+
+#define XKB_KEY_Hstroke                       0x02a1  /* U+0126 LATIN CAPITAL LETTER H WITH STROKE */
+#define XKB_KEY_Hcircumflex                   0x02a6  /* U+0124 LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
+#define XKB_KEY_Iabovedot                     0x02a9  /* U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE */
+#define XKB_KEY_Gbreve                        0x02ab  /* U+011E LATIN CAPITAL LETTER G WITH BREVE */
+#define XKB_KEY_Jcircumflex                   0x02ac  /* U+0134 LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
+#define XKB_KEY_hstroke                       0x02b1  /* U+0127 LATIN SMALL LETTER H WITH STROKE */
+#define XKB_KEY_hcircumflex                   0x02b6  /* U+0125 LATIN SMALL LETTER H WITH CIRCUMFLEX */
+#define XKB_KEY_idotless                      0x02b9  /* U+0131 LATIN SMALL LETTER DOTLESS I */
+#define XKB_KEY_gbreve                        0x02bb  /* U+011F LATIN SMALL LETTER G WITH BREVE */
+#define XKB_KEY_jcircumflex                   0x02bc  /* U+0135 LATIN SMALL LETTER J WITH CIRCUMFLEX */
+#define XKB_KEY_Cabovedot                     0x02c5  /* U+010A LATIN CAPITAL LETTER C WITH DOT ABOVE */
+#define XKB_KEY_Ccircumflex                   0x02c6  /* U+0108 LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
+#define XKB_KEY_Gabovedot                     0x02d5  /* U+0120 LATIN CAPITAL LETTER G WITH DOT ABOVE */
+#define XKB_KEY_Gcircumflex                   0x02d8  /* U+011C LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
+#define XKB_KEY_Ubreve                        0x02dd  /* U+016C LATIN CAPITAL LETTER U WITH BREVE */
+#define XKB_KEY_Scircumflex                   0x02de  /* U+015C LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
+#define XKB_KEY_cabovedot                     0x02e5  /* U+010B LATIN SMALL LETTER C WITH DOT ABOVE */
+#define XKB_KEY_ccircumflex                   0x02e6  /* U+0109 LATIN SMALL LETTER C WITH CIRCUMFLEX */
+#define XKB_KEY_gabovedot                     0x02f5  /* U+0121 LATIN SMALL LETTER G WITH DOT ABOVE */
+#define XKB_KEY_gcircumflex                   0x02f8  /* U+011D LATIN SMALL LETTER G WITH CIRCUMFLEX */
+#define XKB_KEY_ubreve                        0x02fd  /* U+016D LATIN SMALL LETTER U WITH BREVE */
+#define XKB_KEY_scircumflex                   0x02fe  /* U+015D LATIN SMALL LETTER S WITH CIRCUMFLEX */
+
+
+/*
+ * Latin 4
+ * Byte 3 = 3
+ */
+
+#define XKB_KEY_kra                           0x03a2  /* U+0138 LATIN SMALL LETTER KRA */
+#define XKB_KEY_kappa                         0x03a2  /* deprecated */
+#define XKB_KEY_Rcedilla                      0x03a3  /* U+0156 LATIN CAPITAL LETTER R WITH CEDILLA */
+#define XKB_KEY_Itilde                        0x03a5  /* U+0128 LATIN CAPITAL LETTER I WITH TILDE */
+#define XKB_KEY_Lcedilla                      0x03a6  /* U+013B LATIN CAPITAL LETTER L WITH CEDILLA */
+#define XKB_KEY_Emacron                       0x03aa  /* U+0112 LATIN CAPITAL LETTER E WITH MACRON */
+#define XKB_KEY_Gcedilla                      0x03ab  /* U+0122 LATIN CAPITAL LETTER G WITH CEDILLA */
+#define XKB_KEY_Tslash                        0x03ac  /* U+0166 LATIN CAPITAL LETTER T WITH STROKE */
+#define XKB_KEY_rcedilla                      0x03b3  /* U+0157 LATIN SMALL LETTER R WITH CEDILLA */
+#define XKB_KEY_itilde                        0x03b5  /* U+0129 LATIN SMALL LETTER I WITH TILDE */
+#define XKB_KEY_lcedilla                      0x03b6  /* U+013C LATIN SMALL LETTER L WITH CEDILLA */
+#define XKB_KEY_emacron                       0x03ba  /* U+0113 LATIN SMALL LETTER E WITH MACRON */
+#define XKB_KEY_gcedilla                      0x03bb  /* U+0123 LATIN SMALL LETTER G WITH CEDILLA */
+#define XKB_KEY_tslash                        0x03bc  /* U+0167 LATIN SMALL LETTER T WITH STROKE */
+#define XKB_KEY_ENG                           0x03bd  /* U+014A LATIN CAPITAL LETTER ENG */
+#define XKB_KEY_eng                           0x03bf  /* U+014B LATIN SMALL LETTER ENG */
+#define XKB_KEY_Amacron                       0x03c0  /* U+0100 LATIN CAPITAL LETTER A WITH MACRON */
+#define XKB_KEY_Iogonek                       0x03c7  /* U+012E LATIN CAPITAL LETTER I WITH OGONEK */
+#define XKB_KEY_Eabovedot                     0x03cc  /* U+0116 LATIN CAPITAL LETTER E WITH DOT ABOVE */
+#define XKB_KEY_Imacron                       0x03cf  /* U+012A LATIN CAPITAL LETTER I WITH MACRON */
+#define XKB_KEY_Ncedilla                      0x03d1  /* U+0145 LATIN CAPITAL LETTER N WITH CEDILLA */
+#define XKB_KEY_Omacron                       0x03d2  /* U+014C LATIN CAPITAL LETTER O WITH MACRON */
+#define XKB_KEY_Kcedilla                      0x03d3  /* U+0136 LATIN CAPITAL LETTER K WITH CEDILLA */
+#define XKB_KEY_Uogonek                       0x03d9  /* U+0172 LATIN CAPITAL LETTER U WITH OGONEK */
+#define XKB_KEY_Utilde                        0x03dd  /* U+0168 LATIN CAPITAL LETTER U WITH TILDE */
+#define XKB_KEY_Umacron                       0x03de  /* U+016A LATIN CAPITAL LETTER U WITH MACRON */
+#define XKB_KEY_amacron                       0x03e0  /* U+0101 LATIN SMALL LETTER A WITH MACRON */
+#define XKB_KEY_iogonek                       0x03e7  /* U+012F LATIN SMALL LETTER I WITH OGONEK */
+#define XKB_KEY_eabovedot                     0x03ec  /* U+0117 LATIN SMALL LETTER E WITH DOT ABOVE */
+#define XKB_KEY_imacron                       0x03ef  /* U+012B LATIN SMALL LETTER I WITH MACRON */
+#define XKB_KEY_ncedilla                      0x03f1  /* U+0146 LATIN SMALL LETTER N WITH CEDILLA */
+#define XKB_KEY_omacron                       0x03f2  /* U+014D LATIN SMALL LETTER O WITH MACRON */
+#define XKB_KEY_kcedilla                      0x03f3  /* U+0137 LATIN SMALL LETTER K WITH CEDILLA */
+#define XKB_KEY_uogonek                       0x03f9  /* U+0173 LATIN SMALL LETTER U WITH OGONEK */
+#define XKB_KEY_utilde                        0x03fd  /* U+0169 LATIN SMALL LETTER U WITH TILDE */
+#define XKB_KEY_umacron                       0x03fe  /* U+016B LATIN SMALL LETTER U WITH MACRON */
+
+/*
+ * Latin 8
+ */
+#define XKB_KEY_Wcircumflex                0x1000174  /* U+0174 LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
+#define XKB_KEY_wcircumflex                0x1000175  /* U+0175 LATIN SMALL LETTER W WITH CIRCUMFLEX */
+#define XKB_KEY_Ycircumflex                0x1000176  /* U+0176 LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
+#define XKB_KEY_ycircumflex                0x1000177  /* U+0177 LATIN SMALL LETTER Y WITH CIRCUMFLEX */
+#define XKB_KEY_Babovedot                  0x1001e02  /* U+1E02 LATIN CAPITAL LETTER B WITH DOT ABOVE */
+#define XKB_KEY_babovedot                  0x1001e03  /* U+1E03 LATIN SMALL LETTER B WITH DOT ABOVE */
+#define XKB_KEY_Dabovedot                  0x1001e0a  /* U+1E0A LATIN CAPITAL LETTER D WITH DOT ABOVE */
+#define XKB_KEY_dabovedot                  0x1001e0b  /* U+1E0B LATIN SMALL LETTER D WITH DOT ABOVE */
+#define XKB_KEY_Fabovedot                  0x1001e1e  /* U+1E1E LATIN CAPITAL LETTER F WITH DOT ABOVE */
+#define XKB_KEY_fabovedot                  0x1001e1f  /* U+1E1F LATIN SMALL LETTER F WITH DOT ABOVE */
+#define XKB_KEY_Mabovedot                  0x1001e40  /* U+1E40 LATIN CAPITAL LETTER M WITH DOT ABOVE */
+#define XKB_KEY_mabovedot                  0x1001e41  /* U+1E41 LATIN SMALL LETTER M WITH DOT ABOVE */
+#define XKB_KEY_Pabovedot                  0x1001e56  /* U+1E56 LATIN CAPITAL LETTER P WITH DOT ABOVE */
+#define XKB_KEY_pabovedot                  0x1001e57  /* U+1E57 LATIN SMALL LETTER P WITH DOT ABOVE */
+#define XKB_KEY_Sabovedot                  0x1001e60  /* U+1E60 LATIN CAPITAL LETTER S WITH DOT ABOVE */
+#define XKB_KEY_sabovedot                  0x1001e61  /* U+1E61 LATIN SMALL LETTER S WITH DOT ABOVE */
+#define XKB_KEY_Tabovedot                  0x1001e6a  /* U+1E6A LATIN CAPITAL LETTER T WITH DOT ABOVE */
+#define XKB_KEY_tabovedot                  0x1001e6b  /* U+1E6B LATIN SMALL LETTER T WITH DOT ABOVE */
+#define XKB_KEY_Wgrave                     0x1001e80  /* U+1E80 LATIN CAPITAL LETTER W WITH GRAVE */
+#define XKB_KEY_wgrave                     0x1001e81  /* U+1E81 LATIN SMALL LETTER W WITH GRAVE */
+#define XKB_KEY_Wacute                     0x1001e82  /* U+1E82 LATIN CAPITAL LETTER W WITH ACUTE */
+#define XKB_KEY_wacute                     0x1001e83  /* U+1E83 LATIN SMALL LETTER W WITH ACUTE */
+#define XKB_KEY_Wdiaeresis                 0x1001e84  /* U+1E84 LATIN CAPITAL LETTER W WITH DIAERESIS */
+#define XKB_KEY_wdiaeresis                 0x1001e85  /* U+1E85 LATIN SMALL LETTER W WITH DIAERESIS */
+#define XKB_KEY_Ygrave                     0x1001ef2  /* U+1EF2 LATIN CAPITAL LETTER Y WITH GRAVE */
+#define XKB_KEY_ygrave                     0x1001ef3  /* U+1EF3 LATIN SMALL LETTER Y WITH GRAVE */
+
+/*
+ * Latin 9
+ * Byte 3 = 0x13
+ */
+
+#define XKB_KEY_OE                            0x13bc  /* U+0152 LATIN CAPITAL LIGATURE OE */
+#define XKB_KEY_oe                            0x13bd  /* U+0153 LATIN SMALL LIGATURE OE */
+#define XKB_KEY_Ydiaeresis                    0x13be  /* U+0178 LATIN CAPITAL LETTER Y WITH DIAERESIS */
+
+/*
+ * Katakana
+ * Byte 3 = 4
+ */
+
+#define XKB_KEY_overline                      0x047e  /* U+203E OVERLINE */
+#define XKB_KEY_kana_fullstop                 0x04a1  /* U+3002 IDEOGRAPHIC FULL STOP */
+#define XKB_KEY_kana_openingbracket           0x04a2  /* U+300C LEFT CORNER BRACKET */
+#define XKB_KEY_kana_closingbracket           0x04a3  /* U+300D RIGHT CORNER BRACKET */
+#define XKB_KEY_kana_comma                    0x04a4  /* U+3001 IDEOGRAPHIC COMMA */
+#define XKB_KEY_kana_conjunctive              0x04a5  /* U+30FB KATAKANA MIDDLE DOT */
+#define XKB_KEY_kana_middledot                0x04a5  /* deprecated */
+#define XKB_KEY_kana_WO                       0x04a6  /* U+30F2 KATAKANA LETTER WO */
+#define XKB_KEY_kana_a                        0x04a7  /* U+30A1 KATAKANA LETTER SMALL A */
+#define XKB_KEY_kana_i                        0x04a8  /* U+30A3 KATAKANA LETTER SMALL I */
+#define XKB_KEY_kana_u                        0x04a9  /* U+30A5 KATAKANA LETTER SMALL U */
+#define XKB_KEY_kana_e                        0x04aa  /* U+30A7 KATAKANA LETTER SMALL E */
+#define XKB_KEY_kana_o                        0x04ab  /* U+30A9 KATAKANA LETTER SMALL O */
+#define XKB_KEY_kana_ya                       0x04ac  /* U+30E3 KATAKANA LETTER SMALL YA */
+#define XKB_KEY_kana_yu                       0x04ad  /* U+30E5 KATAKANA LETTER SMALL YU */
+#define XKB_KEY_kana_yo                       0x04ae  /* U+30E7 KATAKANA LETTER SMALL YO */
+#define XKB_KEY_kana_tsu                      0x04af  /* U+30C3 KATAKANA LETTER SMALL TU */
+#define XKB_KEY_kana_tu                       0x04af  /* deprecated */
+#define XKB_KEY_prolongedsound                0x04b0  /* U+30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK */
+#define XKB_KEY_kana_A                        0x04b1  /* U+30A2 KATAKANA LETTER A */
+#define XKB_KEY_kana_I                        0x04b2  /* U+30A4 KATAKANA LETTER I */
+#define XKB_KEY_kana_U                        0x04b3  /* U+30A6 KATAKANA LETTER U */
+#define XKB_KEY_kana_E                        0x04b4  /* U+30A8 KATAKANA LETTER E */
+#define XKB_KEY_kana_O                        0x04b5  /* U+30AA KATAKANA LETTER O */
+#define XKB_KEY_kana_KA                       0x04b6  /* U+30AB KATAKANA LETTER KA */
+#define XKB_KEY_kana_KI                       0x04b7  /* U+30AD KATAKANA LETTER KI */
+#define XKB_KEY_kana_KU                       0x04b8  /* U+30AF KATAKANA LETTER KU */
+#define XKB_KEY_kana_KE                       0x04b9  /* U+30B1 KATAKANA LETTER KE */
+#define XKB_KEY_kana_KO                       0x04ba  /* U+30B3 KATAKANA LETTER KO */
+#define XKB_KEY_kana_SA                       0x04bb  /* U+30B5 KATAKANA LETTER SA */
+#define XKB_KEY_kana_SHI                      0x04bc  /* U+30B7 KATAKANA LETTER SI */
+#define XKB_KEY_kana_SU                       0x04bd  /* U+30B9 KATAKANA LETTER SU */
+#define XKB_KEY_kana_SE                       0x04be  /* U+30BB KATAKANA LETTER SE */
+#define XKB_KEY_kana_SO                       0x04bf  /* U+30BD KATAKANA LETTER SO */
+#define XKB_KEY_kana_TA                       0x04c0  /* U+30BF KATAKANA LETTER TA */
+#define XKB_KEY_kana_CHI                      0x04c1  /* U+30C1 KATAKANA LETTER TI */
+#define XKB_KEY_kana_TI                       0x04c1  /* deprecated */
+#define XKB_KEY_kana_TSU                      0x04c2  /* U+30C4 KATAKANA LETTER TU */
+#define XKB_KEY_kana_TU                       0x04c2  /* deprecated */
+#define XKB_KEY_kana_TE                       0x04c3  /* U+30C6 KATAKANA LETTER TE */
+#define XKB_KEY_kana_TO                       0x04c4  /* U+30C8 KATAKANA LETTER TO */
+#define XKB_KEY_kana_NA                       0x04c5  /* U+30CA KATAKANA LETTER NA */
+#define XKB_KEY_kana_NI                       0x04c6  /* U+30CB KATAKANA LETTER NI */
+#define XKB_KEY_kana_NU                       0x04c7  /* U+30CC KATAKANA LETTER NU */
+#define XKB_KEY_kana_NE                       0x04c8  /* U+30CD KATAKANA LETTER NE */
+#define XKB_KEY_kana_NO                       0x04c9  /* U+30CE KATAKANA LETTER NO */
+#define XKB_KEY_kana_HA                       0x04ca  /* U+30CF KATAKANA LETTER HA */
+#define XKB_KEY_kana_HI                       0x04cb  /* U+30D2 KATAKANA LETTER HI */
+#define XKB_KEY_kana_FU                       0x04cc  /* U+30D5 KATAKANA LETTER HU */
+#define XKB_KEY_kana_HU                       0x04cc  /* deprecated */
+#define XKB_KEY_kana_HE                       0x04cd  /* U+30D8 KATAKANA LETTER HE */
+#define XKB_KEY_kana_HO                       0x04ce  /* U+30DB KATAKANA LETTER HO */
+#define XKB_KEY_kana_MA                       0x04cf  /* U+30DE KATAKANA LETTER MA */
+#define XKB_KEY_kana_MI                       0x04d0  /* U+30DF KATAKANA LETTER MI */
+#define XKB_KEY_kana_MU                       0x04d1  /* U+30E0 KATAKANA LETTER MU */
+#define XKB_KEY_kana_ME                       0x04d2  /* U+30E1 KATAKANA LETTER ME */
+#define XKB_KEY_kana_MO                       0x04d3  /* U+30E2 KATAKANA LETTER MO */
+#define XKB_KEY_kana_YA                       0x04d4  /* U+30E4 KATAKANA LETTER YA */
+#define XKB_KEY_kana_YU                       0x04d5  /* U+30E6 KATAKANA LETTER YU */
+#define XKB_KEY_kana_YO                       0x04d6  /* U+30E8 KATAKANA LETTER YO */
+#define XKB_KEY_kana_RA                       0x04d7  /* U+30E9 KATAKANA LETTER RA */
+#define XKB_KEY_kana_RI                       0x04d8  /* U+30EA KATAKANA LETTER RI */
+#define XKB_KEY_kana_RU                       0x04d9  /* U+30EB KATAKANA LETTER RU */
+#define XKB_KEY_kana_RE                       0x04da  /* U+30EC KATAKANA LETTER RE */
+#define XKB_KEY_kana_RO                       0x04db  /* U+30ED KATAKANA LETTER RO */
+#define XKB_KEY_kana_WA                       0x04dc  /* U+30EF KATAKANA LETTER WA */
+#define XKB_KEY_kana_N                        0x04dd  /* U+30F3 KATAKANA LETTER N */
+#define XKB_KEY_voicedsound                   0x04de  /* U+309B KATAKANA-HIRAGANA VOICED SOUND MARK */
+#define XKB_KEY_semivoicedsound               0x04df  /* U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
+#define XKB_KEY_kana_switch                   0xff7e  /* Alias for mode_switch */
+
+/*
+ * Arabic
+ * Byte 3 = 5
+ */
+
+#define XKB_KEY_Farsi_0                    0x10006f0  /* U+06F0 EXTENDED ARABIC-INDIC DIGIT ZERO */
+#define XKB_KEY_Farsi_1                    0x10006f1  /* U+06F1 EXTENDED ARABIC-INDIC DIGIT ONE */
+#define XKB_KEY_Farsi_2                    0x10006f2  /* U+06F2 EXTENDED ARABIC-INDIC DIGIT TWO */
+#define XKB_KEY_Farsi_3                    0x10006f3  /* U+06F3 EXTENDED ARABIC-INDIC DIGIT THREE */
+#define XKB_KEY_Farsi_4                    0x10006f4  /* U+06F4 EXTENDED ARABIC-INDIC DIGIT FOUR */
+#define XKB_KEY_Farsi_5                    0x10006f5  /* U+06F5 EXTENDED ARABIC-INDIC DIGIT FIVE */
+#define XKB_KEY_Farsi_6                    0x10006f6  /* U+06F6 EXTENDED ARABIC-INDIC DIGIT SIX */
+#define XKB_KEY_Farsi_7                    0x10006f7  /* U+06F7 EXTENDED ARABIC-INDIC DIGIT SEVEN */
+#define XKB_KEY_Farsi_8                    0x10006f8  /* U+06F8 EXTENDED ARABIC-INDIC DIGIT EIGHT */
+#define XKB_KEY_Farsi_9                    0x10006f9  /* U+06F9 EXTENDED ARABIC-INDIC DIGIT NINE */
+#define XKB_KEY_Arabic_percent             0x100066a  /* U+066A ARABIC PERCENT SIGN */
+#define XKB_KEY_Arabic_superscript_alef    0x1000670  /* U+0670 ARABIC LETTER SUPERSCRIPT ALEF */
+#define XKB_KEY_Arabic_tteh                0x1000679  /* U+0679 ARABIC LETTER TTEH */
+#define XKB_KEY_Arabic_peh                 0x100067e  /* U+067E ARABIC LETTER PEH */
+#define XKB_KEY_Arabic_tcheh               0x1000686  /* U+0686 ARABIC LETTER TCHEH */
+#define XKB_KEY_Arabic_ddal                0x1000688  /* U+0688 ARABIC LETTER DDAL */
+#define XKB_KEY_Arabic_rreh                0x1000691  /* U+0691 ARABIC LETTER RREH */
+#define XKB_KEY_Arabic_comma                  0x05ac  /* U+060C ARABIC COMMA */
+#define XKB_KEY_Arabic_fullstop            0x10006d4  /* U+06D4 ARABIC FULL STOP */
+#define XKB_KEY_Arabic_0                   0x1000660  /* U+0660 ARABIC-INDIC DIGIT ZERO */
+#define XKB_KEY_Arabic_1                   0x1000661  /* U+0661 ARABIC-INDIC DIGIT ONE */
+#define XKB_KEY_Arabic_2                   0x1000662  /* U+0662 ARABIC-INDIC DIGIT TWO */
+#define XKB_KEY_Arabic_3                   0x1000663  /* U+0663 ARABIC-INDIC DIGIT THREE */
+#define XKB_KEY_Arabic_4                   0x1000664  /* U+0664 ARABIC-INDIC DIGIT FOUR */
+#define XKB_KEY_Arabic_5                   0x1000665  /* U+0665 ARABIC-INDIC DIGIT FIVE */
+#define XKB_KEY_Arabic_6                   0x1000666  /* U+0666 ARABIC-INDIC DIGIT SIX */
+#define XKB_KEY_Arabic_7                   0x1000667  /* U+0667 ARABIC-INDIC DIGIT SEVEN */
+#define XKB_KEY_Arabic_8                   0x1000668  /* U+0668 ARABIC-INDIC DIGIT EIGHT */
+#define XKB_KEY_Arabic_9                   0x1000669  /* U+0669 ARABIC-INDIC DIGIT NINE */
+#define XKB_KEY_Arabic_semicolon              0x05bb  /* U+061B ARABIC SEMICOLON */
+#define XKB_KEY_Arabic_question_mark          0x05bf  /* U+061F ARABIC QUESTION MARK */
+#define XKB_KEY_Arabic_hamza                  0x05c1  /* U+0621 ARABIC LETTER HAMZA */
+#define XKB_KEY_Arabic_maddaonalef            0x05c2  /* U+0622 ARABIC LETTER ALEF WITH MADDA ABOVE */
+#define XKB_KEY_Arabic_hamzaonalef            0x05c3  /* U+0623 ARABIC LETTER ALEF WITH HAMZA ABOVE */
+#define XKB_KEY_Arabic_hamzaonwaw             0x05c4  /* U+0624 ARABIC LETTER WAW WITH HAMZA ABOVE */
+#define XKB_KEY_Arabic_hamzaunderalef         0x05c5  /* U+0625 ARABIC LETTER ALEF WITH HAMZA BELOW */
+#define XKB_KEY_Arabic_hamzaonyeh             0x05c6  /* U+0626 ARABIC LETTER YEH WITH HAMZA ABOVE */
+#define XKB_KEY_Arabic_alef                   0x05c7  /* U+0627 ARABIC LETTER ALEF */
+#define XKB_KEY_Arabic_beh                    0x05c8  /* U+0628 ARABIC LETTER BEH */
+#define XKB_KEY_Arabic_tehmarbuta             0x05c9  /* U+0629 ARABIC LETTER TEH MARBUTA */
+#define XKB_KEY_Arabic_teh                    0x05ca  /* U+062A ARABIC LETTER TEH */
+#define XKB_KEY_Arabic_theh                   0x05cb  /* U+062B ARABIC LETTER THEH */
+#define XKB_KEY_Arabic_jeem                   0x05cc  /* U+062C ARABIC LETTER JEEM */
+#define XKB_KEY_Arabic_hah                    0x05cd  /* U+062D ARABIC LETTER HAH */
+#define XKB_KEY_Arabic_khah                   0x05ce  /* U+062E ARABIC LETTER KHAH */
+#define XKB_KEY_Arabic_dal                    0x05cf  /* U+062F ARABIC LETTER DAL */
+#define XKB_KEY_Arabic_thal                   0x05d0  /* U+0630 ARABIC LETTER THAL */
+#define XKB_KEY_Arabic_ra                     0x05d1  /* U+0631 ARABIC LETTER REH */
+#define XKB_KEY_Arabic_zain                   0x05d2  /* U+0632 ARABIC LETTER ZAIN */
+#define XKB_KEY_Arabic_seen                   0x05d3  /* U+0633 ARABIC LETTER SEEN */
+#define XKB_KEY_Arabic_sheen                  0x05d4  /* U+0634 ARABIC LETTER SHEEN */
+#define XKB_KEY_Arabic_sad                    0x05d5  /* U+0635 ARABIC LETTER SAD */
+#define XKB_KEY_Arabic_dad                    0x05d6  /* U+0636 ARABIC LETTER DAD */
+#define XKB_KEY_Arabic_tah                    0x05d7  /* U+0637 ARABIC LETTER TAH */
+#define XKB_KEY_Arabic_zah                    0x05d8  /* U+0638 ARABIC LETTER ZAH */
+#define XKB_KEY_Arabic_ain                    0x05d9  /* U+0639 ARABIC LETTER AIN */
+#define XKB_KEY_Arabic_ghain                  0x05da  /* U+063A ARABIC LETTER GHAIN */
+#define XKB_KEY_Arabic_tatweel                0x05e0  /* U+0640 ARABIC TATWEEL */
+#define XKB_KEY_Arabic_feh                    0x05e1  /* U+0641 ARABIC LETTER FEH */
+#define XKB_KEY_Arabic_qaf                    0x05e2  /* U+0642 ARABIC LETTER QAF */
+#define XKB_KEY_Arabic_kaf                    0x05e3  /* U+0643 ARABIC LETTER KAF */
+#define XKB_KEY_Arabic_lam                    0x05e4  /* U+0644 ARABIC LETTER LAM */
+#define XKB_KEY_Arabic_meem                   0x05e5  /* U+0645 ARABIC LETTER MEEM */
+#define XKB_KEY_Arabic_noon                   0x05e6  /* U+0646 ARABIC LETTER NOON */
+#define XKB_KEY_Arabic_ha                     0x05e7  /* U+0647 ARABIC LETTER HEH */
+#define XKB_KEY_Arabic_heh                    0x05e7  /* deprecated */
+#define XKB_KEY_Arabic_waw                    0x05e8  /* U+0648 ARABIC LETTER WAW */
+#define XKB_KEY_Arabic_alefmaksura            0x05e9  /* U+0649 ARABIC LETTER ALEF MAKSURA */
+#define XKB_KEY_Arabic_yeh                    0x05ea  /* U+064A ARABIC LETTER YEH */
+#define XKB_KEY_Arabic_fathatan               0x05eb  /* U+064B ARABIC FATHATAN */
+#define XKB_KEY_Arabic_dammatan               0x05ec  /* U+064C ARABIC DAMMATAN */
+#define XKB_KEY_Arabic_kasratan               0x05ed  /* U+064D ARABIC KASRATAN */
+#define XKB_KEY_Arabic_fatha                  0x05ee  /* U+064E ARABIC FATHA */
+#define XKB_KEY_Arabic_damma                  0x05ef  /* U+064F ARABIC DAMMA */
+#define XKB_KEY_Arabic_kasra                  0x05f0  /* U+0650 ARABIC KASRA */
+#define XKB_KEY_Arabic_shadda                 0x05f1  /* U+0651 ARABIC SHADDA */
+#define XKB_KEY_Arabic_sukun                  0x05f2  /* U+0652 ARABIC SUKUN */
+#define XKB_KEY_Arabic_madda_above         0x1000653  /* U+0653 ARABIC MADDAH ABOVE */
+#define XKB_KEY_Arabic_hamza_above         0x1000654  /* U+0654 ARABIC HAMZA ABOVE */
+#define XKB_KEY_Arabic_hamza_below         0x1000655  /* U+0655 ARABIC HAMZA BELOW */
+#define XKB_KEY_Arabic_jeh                 0x1000698  /* U+0698 ARABIC LETTER JEH */
+#define XKB_KEY_Arabic_veh                 0x10006a4  /* U+06A4 ARABIC LETTER VEH */
+#define XKB_KEY_Arabic_keheh               0x10006a9  /* U+06A9 ARABIC LETTER KEHEH */
+#define XKB_KEY_Arabic_gaf                 0x10006af  /* U+06AF ARABIC LETTER GAF */
+#define XKB_KEY_Arabic_noon_ghunna         0x10006ba  /* U+06BA ARABIC LETTER NOON GHUNNA */
+#define XKB_KEY_Arabic_heh_doachashmee     0x10006be  /* U+06BE ARABIC LETTER HEH DOACHASHMEE */
+#define XKB_KEY_Farsi_yeh                  0x10006cc  /* U+06CC ARABIC LETTER FARSI YEH */
+#define XKB_KEY_Arabic_farsi_yeh           0x10006cc  /* U+06CC ARABIC LETTER FARSI YEH */
+#define XKB_KEY_Arabic_yeh_baree           0x10006d2  /* U+06D2 ARABIC LETTER YEH BARREE */
+#define XKB_KEY_Arabic_heh_goal            0x10006c1  /* U+06C1 ARABIC LETTER HEH GOAL */
+#define XKB_KEY_Arabic_switch                 0xff7e  /* Alias for mode_switch */
+
+/*
+ * Cyrillic
+ * Byte 3 = 6
+ */
+#define XKB_KEY_Cyrillic_GHE_bar           0x1000492  /* U+0492 CYRILLIC CAPITAL LETTER GHE WITH STROKE */
+#define XKB_KEY_Cyrillic_ghe_bar           0x1000493  /* U+0493 CYRILLIC SMALL LETTER GHE WITH STROKE */
+#define XKB_KEY_Cyrillic_ZHE_descender     0x1000496  /* U+0496 CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER */
+#define XKB_KEY_Cyrillic_zhe_descender     0x1000497  /* U+0497 CYRILLIC SMALL LETTER ZHE WITH DESCENDER */
+#define XKB_KEY_Cyrillic_KA_descender      0x100049a  /* U+049A CYRILLIC CAPITAL LETTER KA WITH DESCENDER */
+#define XKB_KEY_Cyrillic_ka_descender      0x100049b  /* U+049B CYRILLIC SMALL LETTER KA WITH DESCENDER */
+#define XKB_KEY_Cyrillic_KA_vertstroke     0x100049c  /* U+049C CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE */
+#define XKB_KEY_Cyrillic_ka_vertstroke     0x100049d  /* U+049D CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE */
+#define XKB_KEY_Cyrillic_EN_descender      0x10004a2  /* U+04A2 CYRILLIC CAPITAL LETTER EN WITH DESCENDER */
+#define XKB_KEY_Cyrillic_en_descender      0x10004a3  /* U+04A3 CYRILLIC SMALL LETTER EN WITH DESCENDER */
+#define XKB_KEY_Cyrillic_U_straight        0x10004ae  /* U+04AE CYRILLIC CAPITAL LETTER STRAIGHT U */
+#define XKB_KEY_Cyrillic_u_straight        0x10004af  /* U+04AF CYRILLIC SMALL LETTER STRAIGHT U */
+#define XKB_KEY_Cyrillic_U_straight_bar    0x10004b0  /* U+04B0 CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE */
+#define XKB_KEY_Cyrillic_u_straight_bar    0x10004b1  /* U+04B1 CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE */
+#define XKB_KEY_Cyrillic_HA_descender      0x10004b2  /* U+04B2 CYRILLIC CAPITAL LETTER HA WITH DESCENDER */
+#define XKB_KEY_Cyrillic_ha_descender      0x10004b3  /* U+04B3 CYRILLIC SMALL LETTER HA WITH DESCENDER */
+#define XKB_KEY_Cyrillic_CHE_descender     0x10004b6  /* U+04B6 CYRILLIC CAPITAL LETTER CHE WITH DESCENDER */
+#define XKB_KEY_Cyrillic_che_descender     0x10004b7  /* U+04B7 CYRILLIC SMALL LETTER CHE WITH DESCENDER */
+#define XKB_KEY_Cyrillic_CHE_vertstroke    0x10004b8  /* U+04B8 CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE */
+#define XKB_KEY_Cyrillic_che_vertstroke    0x10004b9  /* U+04B9 CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE */
+#define XKB_KEY_Cyrillic_SHHA              0x10004ba  /* U+04BA CYRILLIC CAPITAL LETTER SHHA */
+#define XKB_KEY_Cyrillic_shha              0x10004bb  /* U+04BB CYRILLIC SMALL LETTER SHHA */
+
+#define XKB_KEY_Cyrillic_SCHWA             0x10004d8  /* U+04D8 CYRILLIC CAPITAL LETTER SCHWA */
+#define XKB_KEY_Cyrillic_schwa             0x10004d9  /* U+04D9 CYRILLIC SMALL LETTER SCHWA */
+#define XKB_KEY_Cyrillic_I_macron          0x10004e2  /* U+04E2 CYRILLIC CAPITAL LETTER I WITH MACRON */
+#define XKB_KEY_Cyrillic_i_macron          0x10004e3  /* U+04E3 CYRILLIC SMALL LETTER I WITH MACRON */
+#define XKB_KEY_Cyrillic_O_bar             0x10004e8  /* U+04E8 CYRILLIC CAPITAL LETTER BARRED O */
+#define XKB_KEY_Cyrillic_o_bar             0x10004e9  /* U+04E9 CYRILLIC SMALL LETTER BARRED O */
+#define XKB_KEY_Cyrillic_U_macron          0x10004ee  /* U+04EE CYRILLIC CAPITAL LETTER U WITH MACRON */
+#define XKB_KEY_Cyrillic_u_macron          0x10004ef  /* U+04EF CYRILLIC SMALL LETTER U WITH MACRON */
+
+#define XKB_KEY_Serbian_dje                   0x06a1  /* U+0452 CYRILLIC SMALL LETTER DJE */
+#define XKB_KEY_Macedonia_gje                 0x06a2  /* U+0453 CYRILLIC SMALL LETTER GJE */
+#define XKB_KEY_Cyrillic_io                   0x06a3  /* U+0451 CYRILLIC SMALL LETTER IO */
+#define XKB_KEY_Ukrainian_ie                  0x06a4  /* U+0454 CYRILLIC SMALL LETTER UKRAINIAN IE */
+#define XKB_KEY_Ukranian_je                   0x06a4  /* deprecated */
+#define XKB_KEY_Macedonia_dse                 0x06a5  /* U+0455 CYRILLIC SMALL LETTER DZE */
+#define XKB_KEY_Ukrainian_i                   0x06a6  /* U+0456 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+#define XKB_KEY_Ukranian_i                    0x06a6  /* deprecated */
+#define XKB_KEY_Ukrainian_yi                  0x06a7  /* U+0457 CYRILLIC SMALL LETTER YI */
+#define XKB_KEY_Ukranian_yi                   0x06a7  /* deprecated */
+#define XKB_KEY_Cyrillic_je                   0x06a8  /* U+0458 CYRILLIC SMALL LETTER JE */
+#define XKB_KEY_Serbian_je                    0x06a8  /* deprecated */
+#define XKB_KEY_Cyrillic_lje                  0x06a9  /* U+0459 CYRILLIC SMALL LETTER LJE */
+#define XKB_KEY_Serbian_lje                   0x06a9  /* deprecated */
+#define XKB_KEY_Cyrillic_nje                  0x06aa  /* U+045A CYRILLIC SMALL LETTER NJE */
+#define XKB_KEY_Serbian_nje                   0x06aa  /* deprecated */
+#define XKB_KEY_Serbian_tshe                  0x06ab  /* U+045B CYRILLIC SMALL LETTER TSHE */
+#define XKB_KEY_Macedonia_kje                 0x06ac  /* U+045C CYRILLIC SMALL LETTER KJE */
+#define XKB_KEY_Ukrainian_ghe_with_upturn     0x06ad  /* U+0491 CYRILLIC SMALL LETTER GHE WITH UPTURN */
+#define XKB_KEY_Byelorussian_shortu           0x06ae  /* U+045E CYRILLIC SMALL LETTER SHORT U */
+#define XKB_KEY_Cyrillic_dzhe                 0x06af  /* U+045F CYRILLIC SMALL LETTER DZHE */
+#define XKB_KEY_Serbian_dze                   0x06af  /* deprecated */
+#define XKB_KEY_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */
+#define XKB_KEY_Serbian_DJE                   0x06b1  /* U+0402 CYRILLIC CAPITAL LETTER DJE */
+#define XKB_KEY_Macedonia_GJE                 0x06b2  /* U+0403 CYRILLIC CAPITAL LETTER GJE */
+#define XKB_KEY_Cyrillic_IO                   0x06b3  /* U+0401 CYRILLIC CAPITAL LETTER IO */
+#define XKB_KEY_Ukrainian_IE                  0x06b4  /* U+0404 CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+#define XKB_KEY_Ukranian_JE                   0x06b4  /* deprecated */
+#define XKB_KEY_Macedonia_DSE                 0x06b5  /* U+0405 CYRILLIC CAPITAL LETTER DZE */
+#define XKB_KEY_Ukrainian_I                   0x06b6  /* U+0406 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+#define XKB_KEY_Ukranian_I                    0x06b6  /* deprecated */
+#define XKB_KEY_Ukrainian_YI                  0x06b7  /* U+0407 CYRILLIC CAPITAL LETTER YI */
+#define XKB_KEY_Ukranian_YI                   0x06b7  /* deprecated */
+#define XKB_KEY_Cyrillic_JE                   0x06b8  /* U+0408 CYRILLIC CAPITAL LETTER JE */
+#define XKB_KEY_Serbian_JE                    0x06b8  /* deprecated */
+#define XKB_KEY_Cyrillic_LJE                  0x06b9  /* U+0409 CYRILLIC CAPITAL LETTER LJE */
+#define XKB_KEY_Serbian_LJE                   0x06b9  /* deprecated */
+#define XKB_KEY_Cyrillic_NJE                  0x06ba  /* U+040A CYRILLIC CAPITAL LETTER NJE */
+#define XKB_KEY_Serbian_NJE                   0x06ba  /* deprecated */
+#define XKB_KEY_Serbian_TSHE                  0x06bb  /* U+040B CYRILLIC CAPITAL LETTER TSHE */
+#define XKB_KEY_Macedonia_KJE                 0x06bc  /* U+040C CYRILLIC CAPITAL LETTER KJE */
+#define XKB_KEY_Ukrainian_GHE_WITH_UPTURN     0x06bd  /* U+0490 CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
+#define XKB_KEY_Byelorussian_SHORTU           0x06be  /* U+040E CYRILLIC CAPITAL LETTER SHORT U */
+#define XKB_KEY_Cyrillic_DZHE                 0x06bf  /* U+040F CYRILLIC CAPITAL LETTER DZHE */
+#define XKB_KEY_Serbian_DZE                   0x06bf  /* deprecated */
+#define XKB_KEY_Cyrillic_yu                   0x06c0  /* U+044E CYRILLIC SMALL LETTER YU */
+#define XKB_KEY_Cyrillic_a                    0x06c1  /* U+0430 CYRILLIC SMALL LETTER A */
+#define XKB_KEY_Cyrillic_be                   0x06c2  /* U+0431 CYRILLIC SMALL LETTER BE */
+#define XKB_KEY_Cyrillic_tse                  0x06c3  /* U+0446 CYRILLIC SMALL LETTER TSE */
+#define XKB_KEY_Cyrillic_de                   0x06c4  /* U+0434 CYRILLIC SMALL LETTER DE */
+#define XKB_KEY_Cyrillic_ie                   0x06c5  /* U+0435 CYRILLIC SMALL LETTER IE */
+#define XKB_KEY_Cyrillic_ef                   0x06c6  /* U+0444 CYRILLIC SMALL LETTER EF */
+#define XKB_KEY_Cyrillic_ghe                  0x06c7  /* U+0433 CYRILLIC SMALL LETTER GHE */
+#define XKB_KEY_Cyrillic_ha                   0x06c8  /* U+0445 CYRILLIC SMALL LETTER HA */
+#define XKB_KEY_Cyrillic_i                    0x06c9  /* U+0438 CYRILLIC SMALL LETTER I */
+#define XKB_KEY_Cyrillic_shorti               0x06ca  /* U+0439 CYRILLIC SMALL LETTER SHORT I */
+#define XKB_KEY_Cyrillic_ka                   0x06cb  /* U+043A CYRILLIC SMALL LETTER KA */
+#define XKB_KEY_Cyrillic_el                   0x06cc  /* U+043B CYRILLIC SMALL LETTER EL */
+#define XKB_KEY_Cyrillic_em                   0x06cd  /* U+043C CYRILLIC SMALL LETTER EM */
+#define XKB_KEY_Cyrillic_en                   0x06ce  /* U+043D CYRILLIC SMALL LETTER EN */
+#define XKB_KEY_Cyrillic_o                    0x06cf  /* U+043E CYRILLIC SMALL LETTER O */
+#define XKB_KEY_Cyrillic_pe                   0x06d0  /* U+043F CYRILLIC SMALL LETTER PE */
+#define XKB_KEY_Cyrillic_ya                   0x06d1  /* U+044F CYRILLIC SMALL LETTER YA */
+#define XKB_KEY_Cyrillic_er                   0x06d2  /* U+0440 CYRILLIC SMALL LETTER ER */
+#define XKB_KEY_Cyrillic_es                   0x06d3  /* U+0441 CYRILLIC SMALL LETTER ES */
+#define XKB_KEY_Cyrillic_te                   0x06d4  /* U+0442 CYRILLIC SMALL LETTER TE */
+#define XKB_KEY_Cyrillic_u                    0x06d5  /* U+0443 CYRILLIC SMALL LETTER U */
+#define XKB_KEY_Cyrillic_zhe                  0x06d6  /* U+0436 CYRILLIC SMALL LETTER ZHE */
+#define XKB_KEY_Cyrillic_ve                   0x06d7  /* U+0432 CYRILLIC SMALL LETTER VE */
+#define XKB_KEY_Cyrillic_softsign             0x06d8  /* U+044C CYRILLIC SMALL LETTER SOFT SIGN */
+#define XKB_KEY_Cyrillic_yeru                 0x06d9  /* U+044B CYRILLIC SMALL LETTER YERU */
+#define XKB_KEY_Cyrillic_ze                   0x06da  /* U+0437 CYRILLIC SMALL LETTER ZE */
+#define XKB_KEY_Cyrillic_sha                  0x06db  /* U+0448 CYRILLIC SMALL LETTER SHA */
+#define XKB_KEY_Cyrillic_e                    0x06dc  /* U+044D CYRILLIC SMALL LETTER E */
+#define XKB_KEY_Cyrillic_shcha                0x06dd  /* U+0449 CYRILLIC SMALL LETTER SHCHA */
+#define XKB_KEY_Cyrillic_che                  0x06de  /* U+0447 CYRILLIC SMALL LETTER CHE */
+#define XKB_KEY_Cyrillic_hardsign             0x06df  /* U+044A CYRILLIC SMALL LETTER HARD SIGN */
+#define XKB_KEY_Cyrillic_YU                   0x06e0  /* U+042E CYRILLIC CAPITAL LETTER YU */
+#define XKB_KEY_Cyrillic_A                    0x06e1  /* U+0410 CYRILLIC CAPITAL LETTER A */
+#define XKB_KEY_Cyrillic_BE                   0x06e2  /* U+0411 CYRILLIC CAPITAL LETTER BE */
+#define XKB_KEY_Cyrillic_TSE                  0x06e3  /* U+0426 CYRILLIC CAPITAL LETTER TSE */
+#define XKB_KEY_Cyrillic_DE                   0x06e4  /* U+0414 CYRILLIC CAPITAL LETTER DE */
+#define XKB_KEY_Cyrillic_IE                   0x06e5  /* U+0415 CYRILLIC CAPITAL LETTER IE */
+#define XKB_KEY_Cyrillic_EF                   0x06e6  /* U+0424 CYRILLIC CAPITAL LETTER EF */
+#define XKB_KEY_Cyrillic_GHE                  0x06e7  /* U+0413 CYRILLIC CAPITAL LETTER GHE */
+#define XKB_KEY_Cyrillic_HA                   0x06e8  /* U+0425 CYRILLIC CAPITAL LETTER HA */
+#define XKB_KEY_Cyrillic_I                    0x06e9  /* U+0418 CYRILLIC CAPITAL LETTER I */
+#define XKB_KEY_Cyrillic_SHORTI               0x06ea  /* U+0419 CYRILLIC CAPITAL LETTER SHORT I */
+#define XKB_KEY_Cyrillic_KA                   0x06eb  /* U+041A CYRILLIC CAPITAL LETTER KA */
+#define XKB_KEY_Cyrillic_EL                   0x06ec  /* U+041B CYRILLIC CAPITAL LETTER EL */
+#define XKB_KEY_Cyrillic_EM                   0x06ed  /* U+041C CYRILLIC CAPITAL LETTER EM */
+#define XKB_KEY_Cyrillic_EN                   0x06ee  /* U+041D CYRILLIC CAPITAL LETTER EN */
+#define XKB_KEY_Cyrillic_O                    0x06ef  /* U+041E CYRILLIC CAPITAL LETTER O */
+#define XKB_KEY_Cyrillic_PE                   0x06f0  /* U+041F CYRILLIC CAPITAL LETTER PE */
+#define XKB_KEY_Cyrillic_YA                   0x06f1  /* U+042F CYRILLIC CAPITAL LETTER YA */
+#define XKB_KEY_Cyrillic_ER                   0x06f2  /* U+0420 CYRILLIC CAPITAL LETTER ER */
+#define XKB_KEY_Cyrillic_ES                   0x06f3  /* U+0421 CYRILLIC CAPITAL LETTER ES */
+#define XKB_KEY_Cyrillic_TE                   0x06f4  /* U+0422 CYRILLIC CAPITAL LETTER TE */
+#define XKB_KEY_Cyrillic_U                    0x06f5  /* U+0423 CYRILLIC CAPITAL LETTER U */
+#define XKB_KEY_Cyrillic_ZHE                  0x06f6  /* U+0416 CYRILLIC CAPITAL LETTER ZHE */
+#define XKB_KEY_Cyrillic_VE                   0x06f7  /* U+0412 CYRILLIC CAPITAL LETTER VE */
+#define XKB_KEY_Cyrillic_SOFTSIGN             0x06f8  /* U+042C CYRILLIC CAPITAL LETTER SOFT SIGN */
+#define XKB_KEY_Cyrillic_YERU                 0x06f9  /* U+042B CYRILLIC CAPITAL LETTER YERU */
+#define XKB_KEY_Cyrillic_ZE                   0x06fa  /* U+0417 CYRILLIC CAPITAL LETTER ZE */
+#define XKB_KEY_Cyrillic_SHA                  0x06fb  /* U+0428 CYRILLIC CAPITAL LETTER SHA */
+#define XKB_KEY_Cyrillic_E                    0x06fc  /* U+042D CYRILLIC CAPITAL LETTER E */
+#define XKB_KEY_Cyrillic_SHCHA                0x06fd  /* U+0429 CYRILLIC CAPITAL LETTER SHCHA */
+#define XKB_KEY_Cyrillic_CHE                  0x06fe  /* U+0427 CYRILLIC CAPITAL LETTER CHE */
+#define XKB_KEY_Cyrillic_HARDSIGN             0x06ff  /* U+042A CYRILLIC CAPITAL LETTER HARD SIGN */
+
+/*
+ * Greek
+ * (based on an early draft of, and not quite identical to, ISO/IEC 8859-7)
+ * Byte 3 = 7
+ */
+
+#define XKB_KEY_Greek_ALPHAaccent             0x07a1  /* U+0386 GREEK CAPITAL LETTER ALPHA WITH TONOS */
+#define XKB_KEY_Greek_EPSILONaccent           0x07a2  /* U+0388 GREEK CAPITAL LETTER EPSILON WITH TONOS */
+#define XKB_KEY_Greek_ETAaccent               0x07a3  /* U+0389 GREEK CAPITAL LETTER ETA WITH TONOS */
+#define XKB_KEY_Greek_IOTAaccent              0x07a4  /* U+038A GREEK CAPITAL LETTER IOTA WITH TONOS */
+#define XKB_KEY_Greek_IOTAdieresis            0x07a5  /* U+03AA GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+#define XKB_KEY_Greek_IOTAdiaeresis           0x07a5  /* old typo */
+#define XKB_KEY_Greek_OMICRONaccent           0x07a7  /* U+038C GREEK CAPITAL LETTER OMICRON WITH TONOS */
+#define XKB_KEY_Greek_UPSILONaccent           0x07a8  /* U+038E GREEK CAPITAL LETTER UPSILON WITH TONOS */
+#define XKB_KEY_Greek_UPSILONdieresis         0x07a9  /* U+03AB GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
+#define XKB_KEY_Greek_OMEGAaccent             0x07ab  /* U+038F GREEK CAPITAL LETTER OMEGA WITH TONOS */
+#define XKB_KEY_Greek_accentdieresis          0x07ae  /* U+0385 GREEK DIALYTIKA TONOS */
+#define XKB_KEY_Greek_horizbar                0x07af  /* U+2015 HORIZONTAL BAR */
+#define XKB_KEY_Greek_alphaaccent             0x07b1  /* U+03AC GREEK SMALL LETTER ALPHA WITH TONOS */
+#define XKB_KEY_Greek_epsilonaccent           0x07b2  /* U+03AD GREEK SMALL LETTER EPSILON WITH TONOS */
+#define XKB_KEY_Greek_etaaccent               0x07b3  /* U+03AE GREEK SMALL LETTER ETA WITH TONOS */
+#define XKB_KEY_Greek_iotaaccent              0x07b4  /* U+03AF GREEK SMALL LETTER IOTA WITH TONOS */
+#define XKB_KEY_Greek_iotadieresis            0x07b5  /* U+03CA GREEK SMALL LETTER IOTA WITH DIALYTIKA */
+#define XKB_KEY_Greek_iotaaccentdieresis      0x07b6  /* U+0390 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
+#define XKB_KEY_Greek_omicronaccent           0x07b7  /* U+03CC GREEK SMALL LETTER OMICRON WITH TONOS */
+#define XKB_KEY_Greek_upsilonaccent           0x07b8  /* U+03CD GREEK SMALL LETTER UPSILON WITH TONOS */
+#define XKB_KEY_Greek_upsilondieresis         0x07b9  /* U+03CB GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
+#define XKB_KEY_Greek_upsilonaccentdieresis   0x07ba  /* U+03B0 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
+#define XKB_KEY_Greek_omegaaccent             0x07bb  /* U+03CE GREEK SMALL LETTER OMEGA WITH TONOS */
+#define XKB_KEY_Greek_ALPHA                   0x07c1  /* U+0391 GREEK CAPITAL LETTER ALPHA */
+#define XKB_KEY_Greek_BETA                    0x07c2  /* U+0392 GREEK CAPITAL LETTER BETA */
+#define XKB_KEY_Greek_GAMMA                   0x07c3  /* U+0393 GREEK CAPITAL LETTER GAMMA */
+#define XKB_KEY_Greek_DELTA                   0x07c4  /* U+0394 GREEK CAPITAL LETTER DELTA */
+#define XKB_KEY_Greek_EPSILON                 0x07c5  /* U+0395 GREEK CAPITAL LETTER EPSILON */
+#define XKB_KEY_Greek_ZETA                    0x07c6  /* U+0396 GREEK CAPITAL LETTER ZETA */
+#define XKB_KEY_Greek_ETA                     0x07c7  /* U+0397 GREEK CAPITAL LETTER ETA */
+#define XKB_KEY_Greek_THETA                   0x07c8  /* U+0398 GREEK CAPITAL LETTER THETA */
+#define XKB_KEY_Greek_IOTA                    0x07c9  /* U+0399 GREEK CAPITAL LETTER IOTA */
+#define XKB_KEY_Greek_KAPPA                   0x07ca  /* U+039A GREEK CAPITAL LETTER KAPPA */
+#define XKB_KEY_Greek_LAMDA                   0x07cb  /* U+039B GREEK CAPITAL LETTER LAMDA */
+#define XKB_KEY_Greek_LAMBDA                  0x07cb  /* U+039B GREEK CAPITAL LETTER LAMDA */
+#define XKB_KEY_Greek_MU                      0x07cc  /* U+039C GREEK CAPITAL LETTER MU */
+#define XKB_KEY_Greek_NU                      0x07cd  /* U+039D GREEK CAPITAL LETTER NU */
+#define XKB_KEY_Greek_XI                      0x07ce  /* U+039E GREEK CAPITAL LETTER XI */
+#define XKB_KEY_Greek_OMICRON                 0x07cf  /* U+039F GREEK CAPITAL LETTER OMICRON */
+#define XKB_KEY_Greek_PI                      0x07d0  /* U+03A0 GREEK CAPITAL LETTER PI */
+#define XKB_KEY_Greek_RHO                     0x07d1  /* U+03A1 GREEK CAPITAL LETTER RHO */
+#define XKB_KEY_Greek_SIGMA                   0x07d2  /* U+03A3 GREEK CAPITAL LETTER SIGMA */
+#define XKB_KEY_Greek_TAU                     0x07d4  /* U+03A4 GREEK CAPITAL LETTER TAU */
+#define XKB_KEY_Greek_UPSILON                 0x07d5  /* U+03A5 GREEK CAPITAL LETTER UPSILON */
+#define XKB_KEY_Greek_PHI                     0x07d6  /* U+03A6 GREEK CAPITAL LETTER PHI */
+#define XKB_KEY_Greek_CHI                     0x07d7  /* U+03A7 GREEK CAPITAL LETTER CHI */
+#define XKB_KEY_Greek_PSI                     0x07d8  /* U+03A8 GREEK CAPITAL LETTER PSI */
+#define XKB_KEY_Greek_OMEGA                   0x07d9  /* U+03A9 GREEK CAPITAL LETTER OMEGA */
+#define XKB_KEY_Greek_alpha                   0x07e1  /* U+03B1 GREEK SMALL LETTER ALPHA */
+#define XKB_KEY_Greek_beta                    0x07e2  /* U+03B2 GREEK SMALL LETTER BETA */
+#define XKB_KEY_Greek_gamma                   0x07e3  /* U+03B3 GREEK SMALL LETTER GAMMA */
+#define XKB_KEY_Greek_delta                   0x07e4  /* U+03B4 GREEK SMALL LETTER DELTA */
+#define XKB_KEY_Greek_epsilon                 0x07e5  /* U+03B5 GREEK SMALL LETTER EPSILON */
+#define XKB_KEY_Greek_zeta                    0x07e6  /* U+03B6 GREEK SMALL LETTER ZETA */
+#define XKB_KEY_Greek_eta                     0x07e7  /* U+03B7 GREEK SMALL LETTER ETA */
+#define XKB_KEY_Greek_theta                   0x07e8  /* U+03B8 GREEK SMALL LETTER THETA */
+#define XKB_KEY_Greek_iota                    0x07e9  /* U+03B9 GREEK SMALL LETTER IOTA */
+#define XKB_KEY_Greek_kappa                   0x07ea  /* U+03BA GREEK SMALL LETTER KAPPA */
+#define XKB_KEY_Greek_lamda                   0x07eb  /* U+03BB GREEK SMALL LETTER LAMDA */
+#define XKB_KEY_Greek_lambda                  0x07eb  /* U+03BB GREEK SMALL LETTER LAMDA */
+#define XKB_KEY_Greek_mu                      0x07ec  /* U+03BC GREEK SMALL LETTER MU */
+#define XKB_KEY_Greek_nu                      0x07ed  /* U+03BD GREEK SMALL LETTER NU */
+#define XKB_KEY_Greek_xi                      0x07ee  /* U+03BE GREEK SMALL LETTER XI */
+#define XKB_KEY_Greek_omicron                 0x07ef  /* U+03BF GREEK SMALL LETTER OMICRON */
+#define XKB_KEY_Greek_pi                      0x07f0  /* U+03C0 GREEK SMALL LETTER PI */
+#define XKB_KEY_Greek_rho                     0x07f1  /* U+03C1 GREEK SMALL LETTER RHO */
+#define XKB_KEY_Greek_sigma                   0x07f2  /* U+03C3 GREEK SMALL LETTER SIGMA */
+#define XKB_KEY_Greek_finalsmallsigma         0x07f3  /* U+03C2 GREEK SMALL LETTER FINAL SIGMA */
+#define XKB_KEY_Greek_tau                     0x07f4  /* U+03C4 GREEK SMALL LETTER TAU */
+#define XKB_KEY_Greek_upsilon                 0x07f5  /* U+03C5 GREEK SMALL LETTER UPSILON */
+#define XKB_KEY_Greek_phi                     0x07f6  /* U+03C6 GREEK SMALL LETTER PHI */
+#define XKB_KEY_Greek_chi                     0x07f7  /* U+03C7 GREEK SMALL LETTER CHI */
+#define XKB_KEY_Greek_psi                     0x07f8  /* U+03C8 GREEK SMALL LETTER PSI */
+#define XKB_KEY_Greek_omega                   0x07f9  /* U+03C9 GREEK SMALL LETTER OMEGA */
+#define XKB_KEY_Greek_switch                  0xff7e  /* Alias for mode_switch */
+
+/*
+ * Technical
+ * (from the DEC VT330/VT420 Technical Character Set, http://vt100.net/charsets/technical.html)
+ * Byte 3 = 8
+ */
+
+#define XKB_KEY_leftradical                   0x08a1  /* U+23B7 RADICAL SYMBOL BOTTOM */
+#define XKB_KEY_topleftradical                0x08a2  /*(U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT)*/
+#define XKB_KEY_horizconnector                0x08a3  /*(U+2500 BOX DRAWINGS LIGHT HORIZONTAL)*/
+#define XKB_KEY_topintegral                   0x08a4  /* U+2320 TOP HALF INTEGRAL */
+#define XKB_KEY_botintegral                   0x08a5  /* U+2321 BOTTOM HALF INTEGRAL */
+#define XKB_KEY_vertconnector                 0x08a6  /*(U+2502 BOX DRAWINGS LIGHT VERTICAL)*/
+#define XKB_KEY_topleftsqbracket              0x08a7  /* U+23A1 LEFT SQUARE BRACKET UPPER CORNER */
+#define XKB_KEY_botleftsqbracket              0x08a8  /* U+23A3 LEFT SQUARE BRACKET LOWER CORNER */
+#define XKB_KEY_toprightsqbracket             0x08a9  /* U+23A4 RIGHT SQUARE BRACKET UPPER CORNER */
+#define XKB_KEY_botrightsqbracket             0x08aa  /* U+23A6 RIGHT SQUARE BRACKET LOWER CORNER */
+#define XKB_KEY_topleftparens                 0x08ab  /* U+239B LEFT PARENTHESIS UPPER HOOK */
+#define XKB_KEY_botleftparens                 0x08ac  /* U+239D LEFT PARENTHESIS LOWER HOOK */
+#define XKB_KEY_toprightparens                0x08ad  /* U+239E RIGHT PARENTHESIS UPPER HOOK */
+#define XKB_KEY_botrightparens                0x08ae  /* U+23A0 RIGHT PARENTHESIS LOWER HOOK */
+#define XKB_KEY_leftmiddlecurlybrace          0x08af  /* U+23A8 LEFT CURLY BRACKET MIDDLE PIECE */
+#define XKB_KEY_rightmiddlecurlybrace         0x08b0  /* U+23AC RIGHT CURLY BRACKET MIDDLE PIECE */
+#define XKB_KEY_topleftsummation              0x08b1
+#define XKB_KEY_botleftsummation              0x08b2
+#define XKB_KEY_topvertsummationconnector     0x08b3
+#define XKB_KEY_botvertsummationconnector     0x08b4
+#define XKB_KEY_toprightsummation             0x08b5
+#define XKB_KEY_botrightsummation             0x08b6
+#define XKB_KEY_rightmiddlesummation          0x08b7
+#define XKB_KEY_lessthanequal                 0x08bc  /* U+2264 LESS-THAN OR EQUAL TO */
+#define XKB_KEY_notequal                      0x08bd  /* U+2260 NOT EQUAL TO */
+#define XKB_KEY_greaterthanequal              0x08be  /* U+2265 GREATER-THAN OR EQUAL TO */
+#define XKB_KEY_integral                      0x08bf  /* U+222B INTEGRAL */
+#define XKB_KEY_therefore                     0x08c0  /* U+2234 THEREFORE */
+#define XKB_KEY_variation                     0x08c1  /* U+221D PROPORTIONAL TO */
+#define XKB_KEY_infinity                      0x08c2  /* U+221E INFINITY */
+#define XKB_KEY_nabla                         0x08c5  /* U+2207 NABLA */
+#define XKB_KEY_approximate                   0x08c8  /* U+223C TILDE OPERATOR */
+#define XKB_KEY_similarequal                  0x08c9  /* U+2243 ASYMPTOTICALLY EQUAL TO */
+#define XKB_KEY_ifonlyif                      0x08cd  /* U+21D4 LEFT RIGHT DOUBLE ARROW */
+#define XKB_KEY_implies                       0x08ce  /* U+21D2 RIGHTWARDS DOUBLE ARROW */
+#define XKB_KEY_identical                     0x08cf  /* U+2261 IDENTICAL TO */
+#define XKB_KEY_radical                       0x08d6  /* U+221A SQUARE ROOT */
+#define XKB_KEY_includedin                    0x08da  /* U+2282 SUBSET OF */
+#define XKB_KEY_includes                      0x08db  /* U+2283 SUPERSET OF */
+#define XKB_KEY_intersection                  0x08dc  /* U+2229 INTERSECTION */
+#define XKB_KEY_union                         0x08dd  /* U+222A UNION */
+#define XKB_KEY_logicaland                    0x08de  /* U+2227 LOGICAL AND */
+#define XKB_KEY_logicalor                     0x08df  /* U+2228 LOGICAL OR */
+#define XKB_KEY_partialderivative             0x08ef  /* U+2202 PARTIAL DIFFERENTIAL */
+#define XKB_KEY_function                      0x08f6  /* U+0192 LATIN SMALL LETTER F WITH HOOK */
+#define XKB_KEY_leftarrow                     0x08fb  /* U+2190 LEFTWARDS ARROW */
+#define XKB_KEY_uparrow                       0x08fc  /* U+2191 UPWARDS ARROW */
+#define XKB_KEY_rightarrow                    0x08fd  /* U+2192 RIGHTWARDS ARROW */
+#define XKB_KEY_downarrow                     0x08fe  /* U+2193 DOWNWARDS ARROW */
+
+/*
+ * Special
+ * (from the DEC VT100 Special Graphics Character Set)
+ * Byte 3 = 9
+ */
+
+#define XKB_KEY_blank                         0x09df
+#define XKB_KEY_soliddiamond                  0x09e0  /* U+25C6 BLACK DIAMOND */
+#define XKB_KEY_checkerboard                  0x09e1  /* U+2592 MEDIUM SHADE */
+#define XKB_KEY_ht                            0x09e2  /* U+2409 SYMBOL FOR HORIZONTAL TABULATION */
+#define XKB_KEY_ff                            0x09e3  /* U+240C SYMBOL FOR FORM FEED */
+#define XKB_KEY_cr                            0x09e4  /* U+240D SYMBOL FOR CARRIAGE RETURN */
+#define XKB_KEY_lf                            0x09e5  /* U+240A SYMBOL FOR LINE FEED */
+#define XKB_KEY_nl                            0x09e8  /* U+2424 SYMBOL FOR NEWLINE */
+#define XKB_KEY_vt                            0x09e9  /* U+240B SYMBOL FOR VERTICAL TABULATION */
+#define XKB_KEY_lowrightcorner                0x09ea  /* U+2518 BOX DRAWINGS LIGHT UP AND LEFT */
+#define XKB_KEY_uprightcorner                 0x09eb  /* U+2510 BOX DRAWINGS LIGHT DOWN AND LEFT */
+#define XKB_KEY_upleftcorner                  0x09ec  /* U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT */
+#define XKB_KEY_lowleftcorner                 0x09ed  /* U+2514 BOX DRAWINGS LIGHT UP AND RIGHT */
+#define XKB_KEY_crossinglines                 0x09ee  /* U+253C BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+#define XKB_KEY_horizlinescan1                0x09ef  /* U+23BA HORIZONTAL SCAN LINE-1 */
+#define XKB_KEY_horizlinescan3                0x09f0  /* U+23BB HORIZONTAL SCAN LINE-3 */
+#define XKB_KEY_horizlinescan5                0x09f1  /* U+2500 BOX DRAWINGS LIGHT HORIZONTAL */
+#define XKB_KEY_horizlinescan7                0x09f2  /* U+23BC HORIZONTAL SCAN LINE-7 */
+#define XKB_KEY_horizlinescan9                0x09f3  /* U+23BD HORIZONTAL SCAN LINE-9 */
+#define XKB_KEY_leftt                         0x09f4  /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+#define XKB_KEY_rightt                        0x09f5  /* U+2524 BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+#define XKB_KEY_bott                          0x09f6  /* U+2534 BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+#define XKB_KEY_topt                          0x09f7  /* U+252C BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+#define XKB_KEY_vertbar                       0x09f8  /* U+2502 BOX DRAWINGS LIGHT VERTICAL */
+
+/*
+ * Publishing
+ * (these are probably from a long forgotten DEC Publishing
+ * font that once shipped with DECwrite)
+ * Byte 3 = 0x0a
+ */
+
+#define XKB_KEY_emspace                       0x0aa1  /* U+2003 EM SPACE */
+#define XKB_KEY_enspace                       0x0aa2  /* U+2002 EN SPACE */
+#define XKB_KEY_em3space                      0x0aa3  /* U+2004 THREE-PER-EM SPACE */
+#define XKB_KEY_em4space                      0x0aa4  /* U+2005 FOUR-PER-EM SPACE */
+#define XKB_KEY_digitspace                    0x0aa5  /* U+2007 FIGURE SPACE */
+#define XKB_KEY_punctspace                    0x0aa6  /* U+2008 PUNCTUATION SPACE */
+#define XKB_KEY_thinspace                     0x0aa7  /* U+2009 THIN SPACE */
+#define XKB_KEY_hairspace                     0x0aa8  /* U+200A HAIR SPACE */
+#define XKB_KEY_emdash                        0x0aa9  /* U+2014 EM DASH */
+#define XKB_KEY_endash                        0x0aaa  /* U+2013 EN DASH */
+#define XKB_KEY_signifblank                   0x0aac  /*(U+2423 OPEN BOX)*/
+#define XKB_KEY_ellipsis                      0x0aae  /* U+2026 HORIZONTAL ELLIPSIS */
+#define XKB_KEY_doubbaselinedot               0x0aaf  /* U+2025 TWO DOT LEADER */
+#define XKB_KEY_onethird                      0x0ab0  /* U+2153 VULGAR FRACTION ONE THIRD */
+#define XKB_KEY_twothirds                     0x0ab1  /* U+2154 VULGAR FRACTION TWO THIRDS */
+#define XKB_KEY_onefifth                      0x0ab2  /* U+2155 VULGAR FRACTION ONE FIFTH */
+#define XKB_KEY_twofifths                     0x0ab3  /* U+2156 VULGAR FRACTION TWO FIFTHS */
+#define XKB_KEY_threefifths                   0x0ab4  /* U+2157 VULGAR FRACTION THREE FIFTHS */
+#define XKB_KEY_fourfifths                    0x0ab5  /* U+2158 VULGAR FRACTION FOUR FIFTHS */
+#define XKB_KEY_onesixth                      0x0ab6  /* U+2159 VULGAR FRACTION ONE SIXTH */
+#define XKB_KEY_fivesixths                    0x0ab7  /* U+215A VULGAR FRACTION FIVE SIXTHS */
+#define XKB_KEY_careof                        0x0ab8  /* U+2105 CARE OF */
+#define XKB_KEY_figdash                       0x0abb  /* U+2012 FIGURE DASH */
+#define XKB_KEY_leftanglebracket              0x0abc  /*(U+2329 LEFT-POINTING ANGLE BRACKET)*/
+#define XKB_KEY_decimalpoint                  0x0abd  /*(U+002E FULL STOP)*/
+#define XKB_KEY_rightanglebracket             0x0abe  /*(U+232A RIGHT-POINTING ANGLE BRACKET)*/
+#define XKB_KEY_marker                        0x0abf
+#define XKB_KEY_oneeighth                     0x0ac3  /* U+215B VULGAR FRACTION ONE EIGHTH */
+#define XKB_KEY_threeeighths                  0x0ac4  /* U+215C VULGAR FRACTION THREE EIGHTHS */
+#define XKB_KEY_fiveeighths                   0x0ac5  /* U+215D VULGAR FRACTION FIVE EIGHTHS */
+#define XKB_KEY_seveneighths                  0x0ac6  /* U+215E VULGAR FRACTION SEVEN EIGHTHS */
+#define XKB_KEY_trademark                     0x0ac9  /* U+2122 TRADE MARK SIGN */
+#define XKB_KEY_signaturemark                 0x0aca  /*(U+2613 SALTIRE)*/
+#define XKB_KEY_trademarkincircle             0x0acb
+#define XKB_KEY_leftopentriangle              0x0acc  /*(U+25C1 WHITE LEFT-POINTING TRIANGLE)*/
+#define XKB_KEY_rightopentriangle             0x0acd  /*(U+25B7 WHITE RIGHT-POINTING TRIANGLE)*/
+#define XKB_KEY_emopencircle                  0x0ace  /*(U+25CB WHITE CIRCLE)*/
+#define XKB_KEY_emopenrectangle               0x0acf  /*(U+25AF WHITE VERTICAL RECTANGLE)*/
+#define XKB_KEY_leftsinglequotemark           0x0ad0  /* U+2018 LEFT SINGLE QUOTATION MARK */
+#define XKB_KEY_rightsinglequotemark          0x0ad1  /* U+2019 RIGHT SINGLE QUOTATION MARK */
+#define XKB_KEY_leftdoublequotemark           0x0ad2  /* U+201C LEFT DOUBLE QUOTATION MARK */
+#define XKB_KEY_rightdoublequotemark          0x0ad3  /* U+201D RIGHT DOUBLE QUOTATION MARK */
+#define XKB_KEY_prescription                  0x0ad4  /* U+211E PRESCRIPTION TAKE */
+#define XKB_KEY_permille                      0x0ad5  /* U+2030 PER MILLE SIGN */
+#define XKB_KEY_minutes                       0x0ad6  /* U+2032 PRIME */
+#define XKB_KEY_seconds                       0x0ad7  /* U+2033 DOUBLE PRIME */
+#define XKB_KEY_latincross                    0x0ad9  /* U+271D LATIN CROSS */
+#define XKB_KEY_hexagram                      0x0ada
+#define XKB_KEY_filledrectbullet              0x0adb  /*(U+25AC BLACK RECTANGLE)*/
+#define XKB_KEY_filledlefttribullet           0x0adc  /*(U+25C0 BLACK LEFT-POINTING TRIANGLE)*/
+#define XKB_KEY_filledrighttribullet          0x0add  /*(U+25B6 BLACK RIGHT-POINTING TRIANGLE)*/
+#define XKB_KEY_emfilledcircle                0x0ade  /*(U+25CF BLACK CIRCLE)*/
+#define XKB_KEY_emfilledrect                  0x0adf  /*(U+25AE BLACK VERTICAL RECTANGLE)*/
+#define XKB_KEY_enopencircbullet              0x0ae0  /*(U+25E6 WHITE BULLET)*/
+#define XKB_KEY_enopensquarebullet            0x0ae1  /*(U+25AB WHITE SMALL SQUARE)*/
+#define XKB_KEY_openrectbullet                0x0ae2  /*(U+25AD WHITE RECTANGLE)*/
+#define XKB_KEY_opentribulletup               0x0ae3  /*(U+25B3 WHITE UP-POINTING TRIANGLE)*/
+#define XKB_KEY_opentribulletdown             0x0ae4  /*(U+25BD WHITE DOWN-POINTING TRIANGLE)*/
+#define XKB_KEY_openstar                      0x0ae5  /*(U+2606 WHITE STAR)*/
+#define XKB_KEY_enfilledcircbullet            0x0ae6  /*(U+2022 BULLET)*/
+#define XKB_KEY_enfilledsqbullet              0x0ae7  /*(U+25AA BLACK SMALL SQUARE)*/
+#define XKB_KEY_filledtribulletup             0x0ae8  /*(U+25B2 BLACK UP-POINTING TRIANGLE)*/
+#define XKB_KEY_filledtribulletdown           0x0ae9  /*(U+25BC BLACK DOWN-POINTING TRIANGLE)*/
+#define XKB_KEY_leftpointer                   0x0aea  /*(U+261C WHITE LEFT POINTING INDEX)*/
+#define XKB_KEY_rightpointer                  0x0aeb  /*(U+261E WHITE RIGHT POINTING INDEX)*/
+#define XKB_KEY_club                          0x0aec  /* U+2663 BLACK CLUB SUIT */
+#define XKB_KEY_diamond                       0x0aed  /* U+2666 BLACK DIAMOND SUIT */
+#define XKB_KEY_heart                         0x0aee  /* U+2665 BLACK HEART SUIT */
+#define XKB_KEY_maltesecross                  0x0af0  /* U+2720 MALTESE CROSS */
+#define XKB_KEY_dagger                        0x0af1  /* U+2020 DAGGER */
+#define XKB_KEY_doubledagger                  0x0af2  /* U+2021 DOUBLE DAGGER */
+#define XKB_KEY_checkmark                     0x0af3  /* U+2713 CHECK MARK */
+#define XKB_KEY_ballotcross                   0x0af4  /* U+2717 BALLOT X */
+#define XKB_KEY_musicalsharp                  0x0af5  /* U+266F MUSIC SHARP SIGN */
+#define XKB_KEY_musicalflat                   0x0af6  /* U+266D MUSIC FLAT SIGN */
+#define XKB_KEY_malesymbol                    0x0af7  /* U+2642 MALE SIGN */
+#define XKB_KEY_femalesymbol                  0x0af8  /* U+2640 FEMALE SIGN */
+#define XKB_KEY_telephone                     0x0af9  /* U+260E BLACK TELEPHONE */
+#define XKB_KEY_telephonerecorder             0x0afa  /* U+2315 TELEPHONE RECORDER */
+#define XKB_KEY_phonographcopyright           0x0afb  /* U+2117 SOUND RECORDING COPYRIGHT */
+#define XKB_KEY_caret                         0x0afc  /* U+2038 CARET */
+#define XKB_KEY_singlelowquotemark            0x0afd  /* U+201A SINGLE LOW-9 QUOTATION MARK */
+#define XKB_KEY_doublelowquotemark            0x0afe  /* U+201E DOUBLE LOW-9 QUOTATION MARK */
+#define XKB_KEY_cursor                        0x0aff
+
+/*
+ * APL
+ * Byte 3 = 0x0b
+ */
+
+#define XKB_KEY_leftcaret                     0x0ba3  /*(U+003C LESS-THAN SIGN)*/
+#define XKB_KEY_rightcaret                    0x0ba6  /*(U+003E GREATER-THAN SIGN)*/
+#define XKB_KEY_downcaret                     0x0ba8  /*(U+2228 LOGICAL OR)*/
+#define XKB_KEY_upcaret                       0x0ba9  /*(U+2227 LOGICAL AND)*/
+#define XKB_KEY_overbar                       0x0bc0  /*(U+00AF MACRON)*/
+#define XKB_KEY_downtack                      0x0bc2  /* U+22A4 DOWN TACK */
+#define XKB_KEY_upshoe                        0x0bc3  /*(U+2229 INTERSECTION)*/
+#define XKB_KEY_downstile                     0x0bc4  /* U+230A LEFT FLOOR */
+#define XKB_KEY_underbar                      0x0bc6  /*(U+005F LOW LINE)*/
+#define XKB_KEY_jot                           0x0bca  /* U+2218 RING OPERATOR */
+#define XKB_KEY_quad                          0x0bcc  /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
+#define XKB_KEY_uptack                        0x0bce  /* U+22A5 UP TACK */
+#define XKB_KEY_circle                        0x0bcf  /* U+25CB WHITE CIRCLE */
+#define XKB_KEY_upstile                       0x0bd3  /* U+2308 LEFT CEILING */
+#define XKB_KEY_downshoe                      0x0bd6  /*(U+222A UNION)*/
+#define XKB_KEY_rightshoe                     0x0bd8  /*(U+2283 SUPERSET OF)*/
+#define XKB_KEY_leftshoe                      0x0bda  /*(U+2282 SUBSET OF)*/
+#define XKB_KEY_lefttack                      0x0bdc  /* U+22A3 LEFT TACK */
+#define XKB_KEY_righttack                     0x0bfc  /* U+22A2 RIGHT TACK */
+
+/*
+ * Hebrew
+ * Byte 3 = 0x0c
+ */
+
+#define XKB_KEY_hebrew_doublelowline          0x0cdf  /* U+2017 DOUBLE LOW LINE */
+#define XKB_KEY_hebrew_aleph                  0x0ce0  /* U+05D0 HEBREW LETTER ALEF */
+#define XKB_KEY_hebrew_bet                    0x0ce1  /* U+05D1 HEBREW LETTER BET */
+#define XKB_KEY_hebrew_beth                   0x0ce1  /* deprecated */
+#define XKB_KEY_hebrew_gimel                  0x0ce2  /* U+05D2 HEBREW LETTER GIMEL */
+#define XKB_KEY_hebrew_gimmel                 0x0ce2  /* deprecated */
+#define XKB_KEY_hebrew_dalet                  0x0ce3  /* U+05D3 HEBREW LETTER DALET */
+#define XKB_KEY_hebrew_daleth                 0x0ce3  /* deprecated */
+#define XKB_KEY_hebrew_he                     0x0ce4  /* U+05D4 HEBREW LETTER HE */
+#define XKB_KEY_hebrew_waw                    0x0ce5  /* U+05D5 HEBREW LETTER VAV */
+#define XKB_KEY_hebrew_zain                   0x0ce6  /* U+05D6 HEBREW LETTER ZAYIN */
+#define XKB_KEY_hebrew_zayin                  0x0ce6  /* deprecated */
+#define XKB_KEY_hebrew_chet                   0x0ce7  /* U+05D7 HEBREW LETTER HET */
+#define XKB_KEY_hebrew_het                    0x0ce7  /* deprecated */
+#define XKB_KEY_hebrew_tet                    0x0ce8  /* U+05D8 HEBREW LETTER TET */
+#define XKB_KEY_hebrew_teth                   0x0ce8  /* deprecated */
+#define XKB_KEY_hebrew_yod                    0x0ce9  /* U+05D9 HEBREW LETTER YOD */
+#define XKB_KEY_hebrew_finalkaph              0x0cea  /* U+05DA HEBREW LETTER FINAL KAF */
+#define XKB_KEY_hebrew_kaph                   0x0ceb  /* U+05DB HEBREW LETTER KAF */
+#define XKB_KEY_hebrew_lamed                  0x0cec  /* U+05DC HEBREW LETTER LAMED */
+#define XKB_KEY_hebrew_finalmem               0x0ced  /* U+05DD HEBREW LETTER FINAL MEM */
+#define XKB_KEY_hebrew_mem                    0x0cee  /* U+05DE HEBREW LETTER MEM */
+#define XKB_KEY_hebrew_finalnun               0x0cef  /* U+05DF HEBREW LETTER FINAL NUN */
+#define XKB_KEY_hebrew_nun                    0x0cf0  /* U+05E0 HEBREW LETTER NUN */
+#define XKB_KEY_hebrew_samech                 0x0cf1  /* U+05E1 HEBREW LETTER SAMEKH */
+#define XKB_KEY_hebrew_samekh                 0x0cf1  /* deprecated */
+#define XKB_KEY_hebrew_ayin                   0x0cf2  /* U+05E2 HEBREW LETTER AYIN */
+#define XKB_KEY_hebrew_finalpe                0x0cf3  /* U+05E3 HEBREW LETTER FINAL PE */
+#define XKB_KEY_hebrew_pe                     0x0cf4  /* U+05E4 HEBREW LETTER PE */
+#define XKB_KEY_hebrew_finalzade              0x0cf5  /* U+05E5 HEBREW LETTER FINAL TSADI */
+#define XKB_KEY_hebrew_finalzadi              0x0cf5  /* deprecated */
+#define XKB_KEY_hebrew_zade                   0x0cf6  /* U+05E6 HEBREW LETTER TSADI */
+#define XKB_KEY_hebrew_zadi                   0x0cf6  /* deprecated */
+#define XKB_KEY_hebrew_qoph                   0x0cf7  /* U+05E7 HEBREW LETTER QOF */
+#define XKB_KEY_hebrew_kuf                    0x0cf7  /* deprecated */
+#define XKB_KEY_hebrew_resh                   0x0cf8  /* U+05E8 HEBREW LETTER RESH */
+#define XKB_KEY_hebrew_shin                   0x0cf9  /* U+05E9 HEBREW LETTER SHIN */
+#define XKB_KEY_hebrew_taw                    0x0cfa  /* U+05EA HEBREW LETTER TAV */
+#define XKB_KEY_hebrew_taf                    0x0cfa  /* deprecated */
+#define XKB_KEY_Hebrew_switch                 0xff7e  /* Alias for mode_switch */
+
+/*
+ * Thai
+ * Byte 3 = 0x0d
+ */
+
+#define XKB_KEY_Thai_kokai                    0x0da1  /* U+0E01 THAI CHARACTER KO KAI */
+#define XKB_KEY_Thai_khokhai                  0x0da2  /* U+0E02 THAI CHARACTER KHO KHAI */
+#define XKB_KEY_Thai_khokhuat                 0x0da3  /* U+0E03 THAI CHARACTER KHO KHUAT */
+#define XKB_KEY_Thai_khokhwai                 0x0da4  /* U+0E04 THAI CHARACTER KHO KHWAI */
+#define XKB_KEY_Thai_khokhon                  0x0da5  /* U+0E05 THAI CHARACTER KHO KHON */
+#define XKB_KEY_Thai_khorakhang               0x0da6  /* U+0E06 THAI CHARACTER KHO RAKHANG */
+#define XKB_KEY_Thai_ngongu                   0x0da7  /* U+0E07 THAI CHARACTER NGO NGU */
+#define XKB_KEY_Thai_chochan                  0x0da8  /* U+0E08 THAI CHARACTER CHO CHAN */
+#define XKB_KEY_Thai_choching                 0x0da9  /* U+0E09 THAI CHARACTER CHO CHING */
+#define XKB_KEY_Thai_chochang                 0x0daa  /* U+0E0A THAI CHARACTER CHO CHANG */
+#define XKB_KEY_Thai_soso                     0x0dab  /* U+0E0B THAI CHARACTER SO SO */
+#define XKB_KEY_Thai_chochoe                  0x0dac  /* U+0E0C THAI CHARACTER CHO CHOE */
+#define XKB_KEY_Thai_yoying                   0x0dad  /* U+0E0D THAI CHARACTER YO YING */
+#define XKB_KEY_Thai_dochada                  0x0dae  /* U+0E0E THAI CHARACTER DO CHADA */
+#define XKB_KEY_Thai_topatak                  0x0daf  /* U+0E0F THAI CHARACTER TO PATAK */
+#define XKB_KEY_Thai_thothan                  0x0db0  /* U+0E10 THAI CHARACTER THO THAN */
+#define XKB_KEY_Thai_thonangmontho            0x0db1  /* U+0E11 THAI CHARACTER THO NANGMONTHO */
+#define XKB_KEY_Thai_thophuthao               0x0db2  /* U+0E12 THAI CHARACTER THO PHUTHAO */
+#define XKB_KEY_Thai_nonen                    0x0db3  /* U+0E13 THAI CHARACTER NO NEN */
+#define XKB_KEY_Thai_dodek                    0x0db4  /* U+0E14 THAI CHARACTER DO DEK */
+#define XKB_KEY_Thai_totao                    0x0db5  /* U+0E15 THAI CHARACTER TO TAO */
+#define XKB_KEY_Thai_thothung                 0x0db6  /* U+0E16 THAI CHARACTER THO THUNG */
+#define XKB_KEY_Thai_thothahan                0x0db7  /* U+0E17 THAI CHARACTER THO THAHAN */
+#define XKB_KEY_Thai_thothong                 0x0db8  /* U+0E18 THAI CHARACTER THO THONG */
+#define XKB_KEY_Thai_nonu                     0x0db9  /* U+0E19 THAI CHARACTER NO NU */
+#define XKB_KEY_Thai_bobaimai                 0x0dba  /* U+0E1A THAI CHARACTER BO BAIMAI */
+#define XKB_KEY_Thai_popla                    0x0dbb  /* U+0E1B THAI CHARACTER PO PLA */
+#define XKB_KEY_Thai_phophung                 0x0dbc  /* U+0E1C THAI CHARACTER PHO PHUNG */
+#define XKB_KEY_Thai_fofa                     0x0dbd  /* U+0E1D THAI CHARACTER FO FA */
+#define XKB_KEY_Thai_phophan                  0x0dbe  /* U+0E1E THAI CHARACTER PHO PHAN */
+#define XKB_KEY_Thai_fofan                    0x0dbf  /* U+0E1F THAI CHARACTER FO FAN */
+#define XKB_KEY_Thai_phosamphao               0x0dc0  /* U+0E20 THAI CHARACTER PHO SAMPHAO */
+#define XKB_KEY_Thai_moma                     0x0dc1  /* U+0E21 THAI CHARACTER MO MA */
+#define XKB_KEY_Thai_yoyak                    0x0dc2  /* U+0E22 THAI CHARACTER YO YAK */
+#define XKB_KEY_Thai_rorua                    0x0dc3  /* U+0E23 THAI CHARACTER RO RUA */
+#define XKB_KEY_Thai_ru                       0x0dc4  /* U+0E24 THAI CHARACTER RU */
+#define XKB_KEY_Thai_loling                   0x0dc5  /* U+0E25 THAI CHARACTER LO LING */
+#define XKB_KEY_Thai_lu                       0x0dc6  /* U+0E26 THAI CHARACTER LU */
+#define XKB_KEY_Thai_wowaen                   0x0dc7  /* U+0E27 THAI CHARACTER WO WAEN */
+#define XKB_KEY_Thai_sosala                   0x0dc8  /* U+0E28 THAI CHARACTER SO SALA */
+#define XKB_KEY_Thai_sorusi                   0x0dc9  /* U+0E29 THAI CHARACTER SO RUSI */
+#define XKB_KEY_Thai_sosua                    0x0dca  /* U+0E2A THAI CHARACTER SO SUA */
+#define XKB_KEY_Thai_hohip                    0x0dcb  /* U+0E2B THAI CHARACTER HO HIP */
+#define XKB_KEY_Thai_lochula                  0x0dcc  /* U+0E2C THAI CHARACTER LO CHULA */
+#define XKB_KEY_Thai_oang                     0x0dcd  /* U+0E2D THAI CHARACTER O ANG */
+#define XKB_KEY_Thai_honokhuk                 0x0dce  /* U+0E2E THAI CHARACTER HO NOKHUK */
+#define XKB_KEY_Thai_paiyannoi                0x0dcf  /* U+0E2F THAI CHARACTER PAIYANNOI */
+#define XKB_KEY_Thai_saraa                    0x0dd0  /* U+0E30 THAI CHARACTER SARA A */
+#define XKB_KEY_Thai_maihanakat               0x0dd1  /* U+0E31 THAI CHARACTER MAI HAN-AKAT */
+#define XKB_KEY_Thai_saraaa                   0x0dd2  /* U+0E32 THAI CHARACTER SARA AA */
+#define XKB_KEY_Thai_saraam                   0x0dd3  /* U+0E33 THAI CHARACTER SARA AM */
+#define XKB_KEY_Thai_sarai                    0x0dd4  /* U+0E34 THAI CHARACTER SARA I */
+#define XKB_KEY_Thai_saraii                   0x0dd5  /* U+0E35 THAI CHARACTER SARA II */
+#define XKB_KEY_Thai_saraue                   0x0dd6  /* U+0E36 THAI CHARACTER SARA UE */
+#define XKB_KEY_Thai_sarauee                  0x0dd7  /* U+0E37 THAI CHARACTER SARA UEE */
+#define XKB_KEY_Thai_sarau                    0x0dd8  /* U+0E38 THAI CHARACTER SARA U */
+#define XKB_KEY_Thai_sarauu                   0x0dd9  /* U+0E39 THAI CHARACTER SARA UU */
+#define XKB_KEY_Thai_phinthu                  0x0dda  /* U+0E3A THAI CHARACTER PHINTHU */
+#define XKB_KEY_Thai_maihanakat_maitho        0x0dde
+#define XKB_KEY_Thai_baht                     0x0ddf  /* U+0E3F THAI CURRENCY SYMBOL BAHT */
+#define XKB_KEY_Thai_sarae                    0x0de0  /* U+0E40 THAI CHARACTER SARA E */
+#define XKB_KEY_Thai_saraae                   0x0de1  /* U+0E41 THAI CHARACTER SARA AE */
+#define XKB_KEY_Thai_sarao                    0x0de2  /* U+0E42 THAI CHARACTER SARA O */
+#define XKB_KEY_Thai_saraaimaimuan            0x0de3  /* U+0E43 THAI CHARACTER SARA AI MAIMUAN */
+#define XKB_KEY_Thai_saraaimaimalai           0x0de4  /* U+0E44 THAI CHARACTER SARA AI MAIMALAI */
+#define XKB_KEY_Thai_lakkhangyao              0x0de5  /* U+0E45 THAI CHARACTER LAKKHANGYAO */
+#define XKB_KEY_Thai_maiyamok                 0x0de6  /* U+0E46 THAI CHARACTER MAIYAMOK */
+#define XKB_KEY_Thai_maitaikhu                0x0de7  /* U+0E47 THAI CHARACTER MAITAIKHU */
+#define XKB_KEY_Thai_maiek                    0x0de8  /* U+0E48 THAI CHARACTER MAI EK */
+#define XKB_KEY_Thai_maitho                   0x0de9  /* U+0E49 THAI CHARACTER MAI THO */
+#define XKB_KEY_Thai_maitri                   0x0dea  /* U+0E4A THAI CHARACTER MAI TRI */
+#define XKB_KEY_Thai_maichattawa              0x0deb  /* U+0E4B THAI CHARACTER MAI CHATTAWA */
+#define XKB_KEY_Thai_thanthakhat              0x0dec  /* U+0E4C THAI CHARACTER THANTHAKHAT */
+#define XKB_KEY_Thai_nikhahit                 0x0ded  /* U+0E4D THAI CHARACTER NIKHAHIT */
+#define XKB_KEY_Thai_leksun                   0x0df0  /* U+0E50 THAI DIGIT ZERO */
+#define XKB_KEY_Thai_leknung                  0x0df1  /* U+0E51 THAI DIGIT ONE */
+#define XKB_KEY_Thai_leksong                  0x0df2  /* U+0E52 THAI DIGIT TWO */
+#define XKB_KEY_Thai_leksam                   0x0df3  /* U+0E53 THAI DIGIT THREE */
+#define XKB_KEY_Thai_leksi                    0x0df4  /* U+0E54 THAI DIGIT FOUR */
+#define XKB_KEY_Thai_lekha                    0x0df5  /* U+0E55 THAI DIGIT FIVE */
+#define XKB_KEY_Thai_lekhok                   0x0df6  /* U+0E56 THAI DIGIT SIX */
+#define XKB_KEY_Thai_lekchet                  0x0df7  /* U+0E57 THAI DIGIT SEVEN */
+#define XKB_KEY_Thai_lekpaet                  0x0df8  /* U+0E58 THAI DIGIT EIGHT */
+#define XKB_KEY_Thai_lekkao                   0x0df9  /* U+0E59 THAI DIGIT NINE */
+
+/*
+ * Korean
+ * Byte 3 = 0x0e
+ */
+
+
+#define XKB_KEY_Hangul                        0xff31  /* Hangul start/stop(toggle) */
+#define XKB_KEY_Hangul_Start                  0xff32  /* Hangul start */
+#define XKB_KEY_Hangul_End                    0xff33  /* Hangul end, English start */
+#define XKB_KEY_Hangul_Hanja                  0xff34  /* Start Hangul->Hanja Conversion */
+#define XKB_KEY_Hangul_Jamo                   0xff35  /* Hangul Jamo mode */
+#define XKB_KEY_Hangul_Romaja                 0xff36  /* Hangul Romaja mode */
+#define XKB_KEY_Hangul_Codeinput              0xff37  /* Hangul code input mode */
+#define XKB_KEY_Hangul_Jeonja                 0xff38  /* Jeonja mode */
+#define XKB_KEY_Hangul_Banja                  0xff39  /* Banja mode */
+#define XKB_KEY_Hangul_PreHanja               0xff3a  /* Pre Hanja conversion */
+#define XKB_KEY_Hangul_PostHanja              0xff3b  /* Post Hanja conversion */
+#define XKB_KEY_Hangul_SingleCandidate        0xff3c  /* Single candidate */
+#define XKB_KEY_Hangul_MultipleCandidate      0xff3d  /* Multiple candidate */
+#define XKB_KEY_Hangul_PreviousCandidate      0xff3e  /* Previous candidate */
+#define XKB_KEY_Hangul_Special                0xff3f  /* Special symbols */
+#define XKB_KEY_Hangul_switch                 0xff7e  /* Alias for mode_switch */
+
+/* Hangul Consonant Characters */
+#define XKB_KEY_Hangul_Kiyeog                 0x0ea1  /* U+3131 HANGUL LETTER KIYEOK */
+#define XKB_KEY_Hangul_SsangKiyeog            0x0ea2  /* U+3132 HANGUL LETTER SSANGKIYEOK */
+#define XKB_KEY_Hangul_KiyeogSios             0x0ea3  /* U+3133 HANGUL LETTER KIYEOK-SIOS */
+#define XKB_KEY_Hangul_Nieun                  0x0ea4  /* U+3134 HANGUL LETTER NIEUN */
+#define XKB_KEY_Hangul_NieunJieuj             0x0ea5  /* U+3135 HANGUL LETTER NIEUN-CIEUC */
+#define XKB_KEY_Hangul_NieunHieuh             0x0ea6  /* U+3136 HANGUL LETTER NIEUN-HIEUH */
+#define XKB_KEY_Hangul_Dikeud                 0x0ea7  /* U+3137 HANGUL LETTER TIKEUT */
+#define XKB_KEY_Hangul_SsangDikeud            0x0ea8  /* U+3138 HANGUL LETTER SSANGTIKEUT */
+#define XKB_KEY_Hangul_Rieul                  0x0ea9  /* U+3139 HANGUL LETTER RIEUL */
+#define XKB_KEY_Hangul_RieulKiyeog            0x0eaa  /* U+313A HANGUL LETTER RIEUL-KIYEOK */
+#define XKB_KEY_Hangul_RieulMieum             0x0eab  /* U+313B HANGUL LETTER RIEUL-MIEUM */
+#define XKB_KEY_Hangul_RieulPieub             0x0eac  /* U+313C HANGUL LETTER RIEUL-PIEUP */
+#define XKB_KEY_Hangul_RieulSios              0x0ead  /* U+313D HANGUL LETTER RIEUL-SIOS */
+#define XKB_KEY_Hangul_RieulTieut             0x0eae  /* U+313E HANGUL LETTER RIEUL-THIEUTH */
+#define XKB_KEY_Hangul_RieulPhieuf            0x0eaf  /* U+313F HANGUL LETTER RIEUL-PHIEUPH */
+#define XKB_KEY_Hangul_RieulHieuh             0x0eb0  /* U+3140 HANGUL LETTER RIEUL-HIEUH */
+#define XKB_KEY_Hangul_Mieum                  0x0eb1  /* U+3141 HANGUL LETTER MIEUM */
+#define XKB_KEY_Hangul_Pieub                  0x0eb2  /* U+3142 HANGUL LETTER PIEUP */
+#define XKB_KEY_Hangul_SsangPieub             0x0eb3  /* U+3143 HANGUL LETTER SSANGPIEUP */
+#define XKB_KEY_Hangul_PieubSios              0x0eb4  /* U+3144 HANGUL LETTER PIEUP-SIOS */
+#define XKB_KEY_Hangul_Sios                   0x0eb5  /* U+3145 HANGUL LETTER SIOS */
+#define XKB_KEY_Hangul_SsangSios              0x0eb6  /* U+3146 HANGUL LETTER SSANGSIOS */
+#define XKB_KEY_Hangul_Ieung                  0x0eb7  /* U+3147 HANGUL LETTER IEUNG */
+#define XKB_KEY_Hangul_Jieuj                  0x0eb8  /* U+3148 HANGUL LETTER CIEUC */
+#define XKB_KEY_Hangul_SsangJieuj             0x0eb9  /* U+3149 HANGUL LETTER SSANGCIEUC */
+#define XKB_KEY_Hangul_Cieuc                  0x0eba  /* U+314A HANGUL LETTER CHIEUCH */
+#define XKB_KEY_Hangul_Khieuq                 0x0ebb  /* U+314B HANGUL LETTER KHIEUKH */
+#define XKB_KEY_Hangul_Tieut                  0x0ebc  /* U+314C HANGUL LETTER THIEUTH */
+#define XKB_KEY_Hangul_Phieuf                 0x0ebd  /* U+314D HANGUL LETTER PHIEUPH */
+#define XKB_KEY_Hangul_Hieuh                  0x0ebe  /* U+314E HANGUL LETTER HIEUH */
+
+/* Hangul Vowel Characters */
+#define XKB_KEY_Hangul_A                      0x0ebf  /* U+314F HANGUL LETTER A */
+#define XKB_KEY_Hangul_AE                     0x0ec0  /* U+3150 HANGUL LETTER AE */
+#define XKB_KEY_Hangul_YA                     0x0ec1  /* U+3151 HANGUL LETTER YA */
+#define XKB_KEY_Hangul_YAE                    0x0ec2  /* U+3152 HANGUL LETTER YAE */
+#define XKB_KEY_Hangul_EO                     0x0ec3  /* U+3153 HANGUL LETTER EO */
+#define XKB_KEY_Hangul_E                      0x0ec4  /* U+3154 HANGUL LETTER E */
+#define XKB_KEY_Hangul_YEO                    0x0ec5  /* U+3155 HANGUL LETTER YEO */
+#define XKB_KEY_Hangul_YE                     0x0ec6  /* U+3156 HANGUL LETTER YE */
+#define XKB_KEY_Hangul_O                      0x0ec7  /* U+3157 HANGUL LETTER O */
+#define XKB_KEY_Hangul_WA                     0x0ec8  /* U+3158 HANGUL LETTER WA */
+#define XKB_KEY_Hangul_WAE                    0x0ec9  /* U+3159 HANGUL LETTER WAE */
+#define XKB_KEY_Hangul_OE                     0x0eca  /* U+315A HANGUL LETTER OE */
+#define XKB_KEY_Hangul_YO                     0x0ecb  /* U+315B HANGUL LETTER YO */
+#define XKB_KEY_Hangul_U                      0x0ecc  /* U+315C HANGUL LETTER U */
+#define XKB_KEY_Hangul_WEO                    0x0ecd  /* U+315D HANGUL LETTER WEO */
+#define XKB_KEY_Hangul_WE                     0x0ece  /* U+315E HANGUL LETTER WE */
+#define XKB_KEY_Hangul_WI                     0x0ecf  /* U+315F HANGUL LETTER WI */
+#define XKB_KEY_Hangul_YU                     0x0ed0  /* U+3160 HANGUL LETTER YU */
+#define XKB_KEY_Hangul_EU                     0x0ed1  /* U+3161 HANGUL LETTER EU */
+#define XKB_KEY_Hangul_YI                     0x0ed2  /* U+3162 HANGUL LETTER YI */
+#define XKB_KEY_Hangul_I                      0x0ed3  /* U+3163 HANGUL LETTER I */
+
+/* Hangul syllable-final (JongSeong) Characters */
+#define XKB_KEY_Hangul_J_Kiyeog               0x0ed4  /* U+11A8 HANGUL JONGSEONG KIYEOK */
+#define XKB_KEY_Hangul_J_SsangKiyeog          0x0ed5  /* U+11A9 HANGUL JONGSEONG SSANGKIYEOK */
+#define XKB_KEY_Hangul_J_KiyeogSios           0x0ed6  /* U+11AA HANGUL JONGSEONG KIYEOK-SIOS */
+#define XKB_KEY_Hangul_J_Nieun                0x0ed7  /* U+11AB HANGUL JONGSEONG NIEUN */
+#define XKB_KEY_Hangul_J_NieunJieuj           0x0ed8  /* U+11AC HANGUL JONGSEONG NIEUN-CIEUC */
+#define XKB_KEY_Hangul_J_NieunHieuh           0x0ed9  /* U+11AD HANGUL JONGSEONG NIEUN-HIEUH */
+#define XKB_KEY_Hangul_J_Dikeud               0x0eda  /* U+11AE HANGUL JONGSEONG TIKEUT */
+#define XKB_KEY_Hangul_J_Rieul                0x0edb  /* U+11AF HANGUL JONGSEONG RIEUL */
+#define XKB_KEY_Hangul_J_RieulKiyeog          0x0edc  /* U+11B0 HANGUL JONGSEONG RIEUL-KIYEOK */
+#define XKB_KEY_Hangul_J_RieulMieum           0x0edd  /* U+11B1 HANGUL JONGSEONG RIEUL-MIEUM */
+#define XKB_KEY_Hangul_J_RieulPieub           0x0ede  /* U+11B2 HANGUL JONGSEONG RIEUL-PIEUP */
+#define XKB_KEY_Hangul_J_RieulSios            0x0edf  /* U+11B3 HANGUL JONGSEONG RIEUL-SIOS */
+#define XKB_KEY_Hangul_J_RieulTieut           0x0ee0  /* U+11B4 HANGUL JONGSEONG RIEUL-THIEUTH */
+#define XKB_KEY_Hangul_J_RieulPhieuf          0x0ee1  /* U+11B5 HANGUL JONGSEONG RIEUL-PHIEUPH */
+#define XKB_KEY_Hangul_J_RieulHieuh           0x0ee2  /* U+11B6 HANGUL JONGSEONG RIEUL-HIEUH */
+#define XKB_KEY_Hangul_J_Mieum                0x0ee3  /* U+11B7 HANGUL JONGSEONG MIEUM */
+#define XKB_KEY_Hangul_J_Pieub                0x0ee4  /* U+11B8 HANGUL JONGSEONG PIEUP */
+#define XKB_KEY_Hangul_J_PieubSios            0x0ee5  /* U+11B9 HANGUL JONGSEONG PIEUP-SIOS */
+#define XKB_KEY_Hangul_J_Sios                 0x0ee6  /* U+11BA HANGUL JONGSEONG SIOS */
+#define XKB_KEY_Hangul_J_SsangSios            0x0ee7  /* U+11BB HANGUL JONGSEONG SSANGSIOS */
+#define XKB_KEY_Hangul_J_Ieung                0x0ee8  /* U+11BC HANGUL JONGSEONG IEUNG */
+#define XKB_KEY_Hangul_J_Jieuj                0x0ee9  /* U+11BD HANGUL JONGSEONG CIEUC */
+#define XKB_KEY_Hangul_J_Cieuc                0x0eea  /* U+11BE HANGUL JONGSEONG CHIEUCH */
+#define XKB_KEY_Hangul_J_Khieuq               0x0eeb  /* U+11BF HANGUL JONGSEONG KHIEUKH */
+#define XKB_KEY_Hangul_J_Tieut                0x0eec  /* U+11C0 HANGUL JONGSEONG THIEUTH */
+#define XKB_KEY_Hangul_J_Phieuf               0x0eed  /* U+11C1 HANGUL JONGSEONG PHIEUPH */
+#define XKB_KEY_Hangul_J_Hieuh                0x0eee  /* U+11C2 HANGUL JONGSEONG HIEUH */
+
+/* Ancient Hangul Consonant Characters */
+#define XKB_KEY_Hangul_RieulYeorinHieuh       0x0eef  /* U+316D HANGUL LETTER RIEUL-YEORINHIEUH */
+#define XKB_KEY_Hangul_SunkyeongeumMieum      0x0ef0  /* U+3171 HANGUL LETTER KAPYEOUNMIEUM */
+#define XKB_KEY_Hangul_SunkyeongeumPieub      0x0ef1  /* U+3178 HANGUL LETTER KAPYEOUNPIEUP */
+#define XKB_KEY_Hangul_PanSios                0x0ef2  /* U+317F HANGUL LETTER PANSIOS */
+#define XKB_KEY_Hangul_KkogjiDalrinIeung      0x0ef3  /* U+3181 HANGUL LETTER YESIEUNG */
+#define XKB_KEY_Hangul_SunkyeongeumPhieuf     0x0ef4  /* U+3184 HANGUL LETTER KAPYEOUNPHIEUPH */
+#define XKB_KEY_Hangul_YeorinHieuh            0x0ef5  /* U+3186 HANGUL LETTER YEORINHIEUH */
+
+/* Ancient Hangul Vowel Characters */
+#define XKB_KEY_Hangul_AraeA                  0x0ef6  /* U+318D HANGUL LETTER ARAEA */
+#define XKB_KEY_Hangul_AraeAE                 0x0ef7  /* U+318E HANGUL LETTER ARAEAE */
+
+/* Ancient Hangul syllable-final (JongSeong) Characters */
+#define XKB_KEY_Hangul_J_PanSios              0x0ef8  /* U+11EB HANGUL JONGSEONG PANSIOS */
+#define XKB_KEY_Hangul_J_KkogjiDalrinIeung    0x0ef9  /* U+11F0 HANGUL JONGSEONG YESIEUNG */
+#define XKB_KEY_Hangul_J_YeorinHieuh          0x0efa  /* U+11F9 HANGUL JONGSEONG YEORINHIEUH */
+
+/* Korean currency symbol */
+#define XKB_KEY_Korean_Won                    0x0eff  /*(U+20A9 WON SIGN)*/
+
+
+/*
+ * Armenian
+ */
+
+#define XKB_KEY_Armenian_ligature_ew       0x1000587  /* U+0587 ARMENIAN SMALL LIGATURE ECH YIWN */
+#define XKB_KEY_Armenian_full_stop         0x1000589  /* U+0589 ARMENIAN FULL STOP */
+#define XKB_KEY_Armenian_verjaket          0x1000589  /* U+0589 ARMENIAN FULL STOP */
+#define XKB_KEY_Armenian_separation_mark   0x100055d  /* U+055D ARMENIAN COMMA */
+#define XKB_KEY_Armenian_but               0x100055d  /* U+055D ARMENIAN COMMA */
+#define XKB_KEY_Armenian_hyphen            0x100058a  /* U+058A ARMENIAN HYPHEN */
+#define XKB_KEY_Armenian_yentamna          0x100058a  /* U+058A ARMENIAN HYPHEN */
+#define XKB_KEY_Armenian_exclam            0x100055c  /* U+055C ARMENIAN EXCLAMATION MARK */
+#define XKB_KEY_Armenian_amanak            0x100055c  /* U+055C ARMENIAN EXCLAMATION MARK */
+#define XKB_KEY_Armenian_accent            0x100055b  /* U+055B ARMENIAN EMPHASIS MARK */
+#define XKB_KEY_Armenian_shesht            0x100055b  /* U+055B ARMENIAN EMPHASIS MARK */
+#define XKB_KEY_Armenian_question          0x100055e  /* U+055E ARMENIAN QUESTION MARK */
+#define XKB_KEY_Armenian_paruyk            0x100055e  /* U+055E ARMENIAN QUESTION MARK */
+#define XKB_KEY_Armenian_AYB               0x1000531  /* U+0531 ARMENIAN CAPITAL LETTER AYB */
+#define XKB_KEY_Armenian_ayb               0x1000561  /* U+0561 ARMENIAN SMALL LETTER AYB */
+#define XKB_KEY_Armenian_BEN               0x1000532  /* U+0532 ARMENIAN CAPITAL LETTER BEN */
+#define XKB_KEY_Armenian_ben               0x1000562  /* U+0562 ARMENIAN SMALL LETTER BEN */
+#define XKB_KEY_Armenian_GIM               0x1000533  /* U+0533 ARMENIAN CAPITAL LETTER GIM */
+#define XKB_KEY_Armenian_gim               0x1000563  /* U+0563 ARMENIAN SMALL LETTER GIM */
+#define XKB_KEY_Armenian_DA                0x1000534  /* U+0534 ARMENIAN CAPITAL LETTER DA */
+#define XKB_KEY_Armenian_da                0x1000564  /* U+0564 ARMENIAN SMALL LETTER DA */
+#define XKB_KEY_Armenian_YECH              0x1000535  /* U+0535 ARMENIAN CAPITAL LETTER ECH */
+#define XKB_KEY_Armenian_yech              0x1000565  /* U+0565 ARMENIAN SMALL LETTER ECH */
+#define XKB_KEY_Armenian_ZA                0x1000536  /* U+0536 ARMENIAN CAPITAL LETTER ZA */
+#define XKB_KEY_Armenian_za                0x1000566  /* U+0566 ARMENIAN SMALL LETTER ZA */
+#define XKB_KEY_Armenian_E                 0x1000537  /* U+0537 ARMENIAN CAPITAL LETTER EH */
+#define XKB_KEY_Armenian_e                 0x1000567  /* U+0567 ARMENIAN SMALL LETTER EH */
+#define XKB_KEY_Armenian_AT                0x1000538  /* U+0538 ARMENIAN CAPITAL LETTER ET */
+#define XKB_KEY_Armenian_at                0x1000568  /* U+0568 ARMENIAN SMALL LETTER ET */
+#define XKB_KEY_Armenian_TO                0x1000539  /* U+0539 ARMENIAN CAPITAL LETTER TO */
+#define XKB_KEY_Armenian_to                0x1000569  /* U+0569 ARMENIAN SMALL LETTER TO */
+#define XKB_KEY_Armenian_ZHE               0x100053a  /* U+053A ARMENIAN CAPITAL LETTER ZHE */
+#define XKB_KEY_Armenian_zhe               0x100056a  /* U+056A ARMENIAN SMALL LETTER ZHE */
+#define XKB_KEY_Armenian_INI               0x100053b  /* U+053B ARMENIAN CAPITAL LETTER INI */
+#define XKB_KEY_Armenian_ini               0x100056b  /* U+056B ARMENIAN SMALL LETTER INI */
+#define XKB_KEY_Armenian_LYUN              0x100053c  /* U+053C ARMENIAN CAPITAL LETTER LIWN */
+#define XKB_KEY_Armenian_lyun              0x100056c  /* U+056C ARMENIAN SMALL LETTER LIWN */
+#define XKB_KEY_Armenian_KHE               0x100053d  /* U+053D ARMENIAN CAPITAL LETTER XEH */
+#define XKB_KEY_Armenian_khe               0x100056d  /* U+056D ARMENIAN SMALL LETTER XEH */
+#define XKB_KEY_Armenian_TSA               0x100053e  /* U+053E ARMENIAN CAPITAL LETTER CA */
+#define XKB_KEY_Armenian_tsa               0x100056e  /* U+056E ARMENIAN SMALL LETTER CA */
+#define XKB_KEY_Armenian_KEN               0x100053f  /* U+053F ARMENIAN CAPITAL LETTER KEN */
+#define XKB_KEY_Armenian_ken               0x100056f  /* U+056F ARMENIAN SMALL LETTER KEN */
+#define XKB_KEY_Armenian_HO                0x1000540  /* U+0540 ARMENIAN CAPITAL LETTER HO */
+#define XKB_KEY_Armenian_ho                0x1000570  /* U+0570 ARMENIAN SMALL LETTER HO */
+#define XKB_KEY_Armenian_DZA               0x1000541  /* U+0541 ARMENIAN CAPITAL LETTER JA */
+#define XKB_KEY_Armenian_dza               0x1000571  /* U+0571 ARMENIAN SMALL LETTER JA */
+#define XKB_KEY_Armenian_GHAT              0x1000542  /* U+0542 ARMENIAN CAPITAL LETTER GHAD */
+#define XKB_KEY_Armenian_ghat              0x1000572  /* U+0572 ARMENIAN SMALL LETTER GHAD */
+#define XKB_KEY_Armenian_TCHE              0x1000543  /* U+0543 ARMENIAN CAPITAL LETTER CHEH */
+#define XKB_KEY_Armenian_tche              0x1000573  /* U+0573 ARMENIAN SMALL LETTER CHEH */
+#define XKB_KEY_Armenian_MEN               0x1000544  /* U+0544 ARMENIAN CAPITAL LETTER MEN */
+#define XKB_KEY_Armenian_men               0x1000574  /* U+0574 ARMENIAN SMALL LETTER MEN */
+#define XKB_KEY_Armenian_HI                0x1000545  /* U+0545 ARMENIAN CAPITAL LETTER YI */
+#define XKB_KEY_Armenian_hi                0x1000575  /* U+0575 ARMENIAN SMALL LETTER YI */
+#define XKB_KEY_Armenian_NU                0x1000546  /* U+0546 ARMENIAN CAPITAL LETTER NOW */
+#define XKB_KEY_Armenian_nu                0x1000576  /* U+0576 ARMENIAN SMALL LETTER NOW */
+#define XKB_KEY_Armenian_SHA               0x1000547  /* U+0547 ARMENIAN CAPITAL LETTER SHA */
+#define XKB_KEY_Armenian_sha               0x1000577  /* U+0577 ARMENIAN SMALL LETTER SHA */
+#define XKB_KEY_Armenian_VO                0x1000548  /* U+0548 ARMENIAN CAPITAL LETTER VO */
+#define XKB_KEY_Armenian_vo                0x1000578  /* U+0578 ARMENIAN SMALL LETTER VO */
+#define XKB_KEY_Armenian_CHA               0x1000549  /* U+0549 ARMENIAN CAPITAL LETTER CHA */
+#define XKB_KEY_Armenian_cha               0x1000579  /* U+0579 ARMENIAN SMALL LETTER CHA */
+#define XKB_KEY_Armenian_PE                0x100054a  /* U+054A ARMENIAN CAPITAL LETTER PEH */
+#define XKB_KEY_Armenian_pe                0x100057a  /* U+057A ARMENIAN SMALL LETTER PEH */
+#define XKB_KEY_Armenian_JE                0x100054b  /* U+054B ARMENIAN CAPITAL LETTER JHEH */
+#define XKB_KEY_Armenian_je                0x100057b  /* U+057B ARMENIAN SMALL LETTER JHEH */
+#define XKB_KEY_Armenian_RA                0x100054c  /* U+054C ARMENIAN CAPITAL LETTER RA */
+#define XKB_KEY_Armenian_ra                0x100057c  /* U+057C ARMENIAN SMALL LETTER RA */
+#define XKB_KEY_Armenian_SE                0x100054d  /* U+054D ARMENIAN CAPITAL LETTER SEH */
+#define XKB_KEY_Armenian_se                0x100057d  /* U+057D ARMENIAN SMALL LETTER SEH */
+#define XKB_KEY_Armenian_VEV               0x100054e  /* U+054E ARMENIAN CAPITAL LETTER VEW */
+#define XKB_KEY_Armenian_vev               0x100057e  /* U+057E ARMENIAN SMALL LETTER VEW */
+#define XKB_KEY_Armenian_TYUN              0x100054f  /* U+054F ARMENIAN CAPITAL LETTER TIWN */
+#define XKB_KEY_Armenian_tyun              0x100057f  /* U+057F ARMENIAN SMALL LETTER TIWN */
+#define XKB_KEY_Armenian_RE                0x1000550  /* U+0550 ARMENIAN CAPITAL LETTER REH */
+#define XKB_KEY_Armenian_re                0x1000580  /* U+0580 ARMENIAN SMALL LETTER REH */
+#define XKB_KEY_Armenian_TSO               0x1000551  /* U+0551 ARMENIAN CAPITAL LETTER CO */
+#define XKB_KEY_Armenian_tso               0x1000581  /* U+0581 ARMENIAN SMALL LETTER CO */
+#define XKB_KEY_Armenian_VYUN              0x1000552  /* U+0552 ARMENIAN CAPITAL LETTER YIWN */
+#define XKB_KEY_Armenian_vyun              0x1000582  /* U+0582 ARMENIAN SMALL LETTER YIWN */
+#define XKB_KEY_Armenian_PYUR              0x1000553  /* U+0553 ARMENIAN CAPITAL LETTER PIWR */
+#define XKB_KEY_Armenian_pyur              0x1000583  /* U+0583 ARMENIAN SMALL LETTER PIWR */
+#define XKB_KEY_Armenian_KE                0x1000554  /* U+0554 ARMENIAN CAPITAL LETTER KEH */
+#define XKB_KEY_Armenian_ke                0x1000584  /* U+0584 ARMENIAN SMALL LETTER KEH */
+#define XKB_KEY_Armenian_O                 0x1000555  /* U+0555 ARMENIAN CAPITAL LETTER OH */
+#define XKB_KEY_Armenian_o                 0x1000585  /* U+0585 ARMENIAN SMALL LETTER OH */
+#define XKB_KEY_Armenian_FE                0x1000556  /* U+0556 ARMENIAN CAPITAL LETTER FEH */
+#define XKB_KEY_Armenian_fe                0x1000586  /* U+0586 ARMENIAN SMALL LETTER FEH */
+#define XKB_KEY_Armenian_apostrophe        0x100055a  /* U+055A ARMENIAN APOSTROPHE */
+
+/*
+ * Georgian
+ */
+
+#define XKB_KEY_Georgian_an                0x10010d0  /* U+10D0 GEORGIAN LETTER AN */
+#define XKB_KEY_Georgian_ban               0x10010d1  /* U+10D1 GEORGIAN LETTER BAN */
+#define XKB_KEY_Georgian_gan               0x10010d2  /* U+10D2 GEORGIAN LETTER GAN */
+#define XKB_KEY_Georgian_don               0x10010d3  /* U+10D3 GEORGIAN LETTER DON */
+#define XKB_KEY_Georgian_en                0x10010d4  /* U+10D4 GEORGIAN LETTER EN */
+#define XKB_KEY_Georgian_vin               0x10010d5  /* U+10D5 GEORGIAN LETTER VIN */
+#define XKB_KEY_Georgian_zen               0x10010d6  /* U+10D6 GEORGIAN LETTER ZEN */
+#define XKB_KEY_Georgian_tan               0x10010d7  /* U+10D7 GEORGIAN LETTER TAN */
+#define XKB_KEY_Georgian_in                0x10010d8  /* U+10D8 GEORGIAN LETTER IN */
+#define XKB_KEY_Georgian_kan               0x10010d9  /* U+10D9 GEORGIAN LETTER KAN */
+#define XKB_KEY_Georgian_las               0x10010da  /* U+10DA GEORGIAN LETTER LAS */
+#define XKB_KEY_Georgian_man               0x10010db  /* U+10DB GEORGIAN LETTER MAN */
+#define XKB_KEY_Georgian_nar               0x10010dc  /* U+10DC GEORGIAN LETTER NAR */
+#define XKB_KEY_Georgian_on                0x10010dd  /* U+10DD GEORGIAN LETTER ON */
+#define XKB_KEY_Georgian_par               0x10010de  /* U+10DE GEORGIAN LETTER PAR */
+#define XKB_KEY_Georgian_zhar              0x10010df  /* U+10DF GEORGIAN LETTER ZHAR */
+#define XKB_KEY_Georgian_rae               0x10010e0  /* U+10E0 GEORGIAN LETTER RAE */
+#define XKB_KEY_Georgian_san               0x10010e1  /* U+10E1 GEORGIAN LETTER SAN */
+#define XKB_KEY_Georgian_tar               0x10010e2  /* U+10E2 GEORGIAN LETTER TAR */
+#define XKB_KEY_Georgian_un                0x10010e3  /* U+10E3 GEORGIAN LETTER UN */
+#define XKB_KEY_Georgian_phar              0x10010e4  /* U+10E4 GEORGIAN LETTER PHAR */
+#define XKB_KEY_Georgian_khar              0x10010e5  /* U+10E5 GEORGIAN LETTER KHAR */
+#define XKB_KEY_Georgian_ghan              0x10010e6  /* U+10E6 GEORGIAN LETTER GHAN */
+#define XKB_KEY_Georgian_qar               0x10010e7  /* U+10E7 GEORGIAN LETTER QAR */
+#define XKB_KEY_Georgian_shin              0x10010e8  /* U+10E8 GEORGIAN LETTER SHIN */
+#define XKB_KEY_Georgian_chin              0x10010e9  /* U+10E9 GEORGIAN LETTER CHIN */
+#define XKB_KEY_Georgian_can               0x10010ea  /* U+10EA GEORGIAN LETTER CAN */
+#define XKB_KEY_Georgian_jil               0x10010eb  /* U+10EB GEORGIAN LETTER JIL */
+#define XKB_KEY_Georgian_cil               0x10010ec  /* U+10EC GEORGIAN LETTER CIL */
+#define XKB_KEY_Georgian_char              0x10010ed  /* U+10ED GEORGIAN LETTER CHAR */
+#define XKB_KEY_Georgian_xan               0x10010ee  /* U+10EE GEORGIAN LETTER XAN */
+#define XKB_KEY_Georgian_jhan              0x10010ef  /* U+10EF GEORGIAN LETTER JHAN */
+#define XKB_KEY_Georgian_hae               0x10010f0  /* U+10F0 GEORGIAN LETTER HAE */
+#define XKB_KEY_Georgian_he                0x10010f1  /* U+10F1 GEORGIAN LETTER HE */
+#define XKB_KEY_Georgian_hie               0x10010f2  /* U+10F2 GEORGIAN LETTER HIE */
+#define XKB_KEY_Georgian_we                0x10010f3  /* U+10F3 GEORGIAN LETTER WE */
+#define XKB_KEY_Georgian_har               0x10010f4  /* U+10F4 GEORGIAN LETTER HAR */
+#define XKB_KEY_Georgian_hoe               0x10010f5  /* U+10F5 GEORGIAN LETTER HOE */
+#define XKB_KEY_Georgian_fi                0x10010f6  /* U+10F6 GEORGIAN LETTER FI */
+
+/*
+ * Azeri (and other Turkic or Caucasian languages)
+ */
+
+/* latin */
+#define XKB_KEY_Xabovedot                  0x1001e8a  /* U+1E8A LATIN CAPITAL LETTER X WITH DOT ABOVE */
+#define XKB_KEY_Ibreve                     0x100012c  /* U+012C LATIN CAPITAL LETTER I WITH BREVE */
+#define XKB_KEY_Zstroke                    0x10001b5  /* U+01B5 LATIN CAPITAL LETTER Z WITH STROKE */
+#define XKB_KEY_Gcaron                     0x10001e6  /* U+01E6 LATIN CAPITAL LETTER G WITH CARON */
+#define XKB_KEY_Ocaron                     0x10001d1  /* U+01D1 LATIN CAPITAL LETTER O WITH CARON */
+#define XKB_KEY_Obarred                    0x100019f  /* U+019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE */
+#define XKB_KEY_xabovedot                  0x1001e8b  /* U+1E8B LATIN SMALL LETTER X WITH DOT ABOVE */
+#define XKB_KEY_ibreve                     0x100012d  /* U+012D LATIN SMALL LETTER I WITH BREVE */
+#define XKB_KEY_zstroke                    0x10001b6  /* U+01B6 LATIN SMALL LETTER Z WITH STROKE */
+#define XKB_KEY_gcaron                     0x10001e7  /* U+01E7 LATIN SMALL LETTER G WITH CARON */
+#define XKB_KEY_ocaron                     0x10001d2  /* U+01D2 LATIN SMALL LETTER O WITH CARON */
+#define XKB_KEY_obarred                    0x1000275  /* U+0275 LATIN SMALL LETTER BARRED O */
+#define XKB_KEY_SCHWA                      0x100018f  /* U+018F LATIN CAPITAL LETTER SCHWA */
+#define XKB_KEY_schwa                      0x1000259  /* U+0259 LATIN SMALL LETTER SCHWA */
+#define XKB_KEY_EZH                        0x10001b7  /* U+01B7 LATIN CAPITAL LETTER EZH */
+#define XKB_KEY_ezh                        0x1000292  /* U+0292 LATIN SMALL LETTER EZH */
+/* those are not really Caucasus */
+/* For Inupiak */
+#define XKB_KEY_Lbelowdot                  0x1001e36  /* U+1E36 LATIN CAPITAL LETTER L WITH DOT BELOW */
+#define XKB_KEY_lbelowdot                  0x1001e37  /* U+1E37 LATIN SMALL LETTER L WITH DOT BELOW */
+
+/*
+ * Vietnamese
+ */
+
+#define XKB_KEY_Abelowdot                  0x1001ea0  /* U+1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW */
+#define XKB_KEY_abelowdot                  0x1001ea1  /* U+1EA1 LATIN SMALL LETTER A WITH DOT BELOW */
+#define XKB_KEY_Ahook                      0x1001ea2  /* U+1EA2 LATIN CAPITAL LETTER A WITH HOOK ABOVE */
+#define XKB_KEY_ahook                      0x1001ea3  /* U+1EA3 LATIN SMALL LETTER A WITH HOOK ABOVE */
+#define XKB_KEY_Acircumflexacute           0x1001ea4  /* U+1EA4 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
+#define XKB_KEY_acircumflexacute           0x1001ea5  /* U+1EA5 LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */
+#define XKB_KEY_Acircumflexgrave           0x1001ea6  /* U+1EA6 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
+#define XKB_KEY_acircumflexgrave           0x1001ea7  /* U+1EA7 LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */
+#define XKB_KEY_Acircumflexhook            0x1001ea8  /* U+1EA8 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+#define XKB_KEY_acircumflexhook            0x1001ea9  /* U+1EA9 LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+#define XKB_KEY_Acircumflextilde           0x1001eaa  /* U+1EAA LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */
+#define XKB_KEY_acircumflextilde           0x1001eab  /* U+1EAB LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */
+#define XKB_KEY_Acircumflexbelowdot        0x1001eac  /* U+1EAC LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+#define XKB_KEY_acircumflexbelowdot        0x1001ead  /* U+1EAD LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+#define XKB_KEY_Abreveacute                0x1001eae  /* U+1EAE LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
+#define XKB_KEY_abreveacute                0x1001eaf  /* U+1EAF LATIN SMALL LETTER A WITH BREVE AND ACUTE */
+#define XKB_KEY_Abrevegrave                0x1001eb0  /* U+1EB0 LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
+#define XKB_KEY_abrevegrave                0x1001eb1  /* U+1EB1 LATIN SMALL LETTER A WITH BREVE AND GRAVE */
+#define XKB_KEY_Abrevehook                 0x1001eb2  /* U+1EB2 LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */
+#define XKB_KEY_abrevehook                 0x1001eb3  /* U+1EB3 LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */
+#define XKB_KEY_Abrevetilde                0x1001eb4  /* U+1EB4 LATIN CAPITAL LETTER A WITH BREVE AND TILDE */
+#define XKB_KEY_abrevetilde                0x1001eb5  /* U+1EB5 LATIN SMALL LETTER A WITH BREVE AND TILDE */
+#define XKB_KEY_Abrevebelowdot             0x1001eb6  /* U+1EB6 LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
+#define XKB_KEY_abrevebelowdot             0x1001eb7  /* U+1EB7 LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */
+#define XKB_KEY_Ebelowdot                  0x1001eb8  /* U+1EB8 LATIN CAPITAL LETTER E WITH DOT BELOW */
+#define XKB_KEY_ebelowdot                  0x1001eb9  /* U+1EB9 LATIN SMALL LETTER E WITH DOT BELOW */
+#define XKB_KEY_Ehook                      0x1001eba  /* U+1EBA LATIN CAPITAL LETTER E WITH HOOK ABOVE */
+#define XKB_KEY_ehook                      0x1001ebb  /* U+1EBB LATIN SMALL LETTER E WITH HOOK ABOVE */
+#define XKB_KEY_Etilde                     0x1001ebc  /* U+1EBC LATIN CAPITAL LETTER E WITH TILDE */
+#define XKB_KEY_etilde                     0x1001ebd  /* U+1EBD LATIN SMALL LETTER E WITH TILDE */
+#define XKB_KEY_Ecircumflexacute           0x1001ebe  /* U+1EBE LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
+#define XKB_KEY_ecircumflexacute           0x1001ebf  /* U+1EBF LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */
+#define XKB_KEY_Ecircumflexgrave           0x1001ec0  /* U+1EC0 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
+#define XKB_KEY_ecircumflexgrave           0x1001ec1  /* U+1EC1 LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */
+#define XKB_KEY_Ecircumflexhook            0x1001ec2  /* U+1EC2 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+#define XKB_KEY_ecircumflexhook            0x1001ec3  /* U+1EC3 LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+#define XKB_KEY_Ecircumflextilde           0x1001ec4  /* U+1EC4 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
+#define XKB_KEY_ecircumflextilde           0x1001ec5  /* U+1EC5 LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */
+#define XKB_KEY_Ecircumflexbelowdot        0x1001ec6  /* U+1EC6 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+#define XKB_KEY_ecircumflexbelowdot        0x1001ec7  /* U+1EC7 LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+#define XKB_KEY_Ihook                      0x1001ec8  /* U+1EC8 LATIN CAPITAL LETTER I WITH HOOK ABOVE */
+#define XKB_KEY_ihook                      0x1001ec9  /* U+1EC9 LATIN SMALL LETTER I WITH HOOK ABOVE */
+#define XKB_KEY_Ibelowdot                  0x1001eca  /* U+1ECA LATIN CAPITAL LETTER I WITH DOT BELOW */
+#define XKB_KEY_ibelowdot                  0x1001ecb  /* U+1ECB LATIN SMALL LETTER I WITH DOT BELOW */
+#define XKB_KEY_Obelowdot                  0x1001ecc  /* U+1ECC LATIN CAPITAL LETTER O WITH DOT BELOW */
+#define XKB_KEY_obelowdot                  0x1001ecd  /* U+1ECD LATIN SMALL LETTER O WITH DOT BELOW */
+#define XKB_KEY_Ohook                      0x1001ece  /* U+1ECE LATIN CAPITAL LETTER O WITH HOOK ABOVE */
+#define XKB_KEY_ohook                      0x1001ecf  /* U+1ECF LATIN SMALL LETTER O WITH HOOK ABOVE */
+#define XKB_KEY_Ocircumflexacute           0x1001ed0  /* U+1ED0 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
+#define XKB_KEY_ocircumflexacute           0x1001ed1  /* U+1ED1 LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */
+#define XKB_KEY_Ocircumflexgrave           0x1001ed2  /* U+1ED2 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
+#define XKB_KEY_ocircumflexgrave           0x1001ed3  /* U+1ED3 LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */
+#define XKB_KEY_Ocircumflexhook            0x1001ed4  /* U+1ED4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+#define XKB_KEY_ocircumflexhook            0x1001ed5  /* U+1ED5 LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+#define XKB_KEY_Ocircumflextilde           0x1001ed6  /* U+1ED6 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
+#define XKB_KEY_ocircumflextilde           0x1001ed7  /* U+1ED7 LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */
+#define XKB_KEY_Ocircumflexbelowdot        0x1001ed8  /* U+1ED8 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+#define XKB_KEY_ocircumflexbelowdot        0x1001ed9  /* U+1ED9 LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+#define XKB_KEY_Ohornacute                 0x1001eda  /* U+1EDA LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
+#define XKB_KEY_ohornacute                 0x1001edb  /* U+1EDB LATIN SMALL LETTER O WITH HORN AND ACUTE */
+#define XKB_KEY_Ohorngrave                 0x1001edc  /* U+1EDC LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
+#define XKB_KEY_ohorngrave                 0x1001edd  /* U+1EDD LATIN SMALL LETTER O WITH HORN AND GRAVE */
+#define XKB_KEY_Ohornhook                  0x1001ede  /* U+1EDE LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
+#define XKB_KEY_ohornhook                  0x1001edf  /* U+1EDF LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
+#define XKB_KEY_Ohorntilde                 0x1001ee0  /* U+1EE0 LATIN CAPITAL LETTER O WITH HORN AND TILDE */
+#define XKB_KEY_ohorntilde                 0x1001ee1  /* U+1EE1 LATIN SMALL LETTER O WITH HORN AND TILDE */
+#define XKB_KEY_Ohornbelowdot              0x1001ee2  /* U+1EE2 LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
+#define XKB_KEY_ohornbelowdot              0x1001ee3  /* U+1EE3 LATIN SMALL LETTER O WITH HORN AND DOT BELOW */
+#define XKB_KEY_Ubelowdot                  0x1001ee4  /* U+1EE4 LATIN CAPITAL LETTER U WITH DOT BELOW */
+#define XKB_KEY_ubelowdot                  0x1001ee5  /* U+1EE5 LATIN SMALL LETTER U WITH DOT BELOW */
+#define XKB_KEY_Uhook                      0x1001ee6  /* U+1EE6 LATIN CAPITAL LETTER U WITH HOOK ABOVE */
+#define XKB_KEY_uhook                      0x1001ee7  /* U+1EE7 LATIN SMALL LETTER U WITH HOOK ABOVE */
+#define XKB_KEY_Uhornacute                 0x1001ee8  /* U+1EE8 LATIN CAPITAL LETTER U WITH HORN AND ACUTE */
+#define XKB_KEY_uhornacute                 0x1001ee9  /* U+1EE9 LATIN SMALL LETTER U WITH HORN AND ACUTE */
+#define XKB_KEY_Uhorngrave                 0x1001eea  /* U+1EEA LATIN CAPITAL LETTER U WITH HORN AND GRAVE */
+#define XKB_KEY_uhorngrave                 0x1001eeb  /* U+1EEB LATIN SMALL LETTER U WITH HORN AND GRAVE */
+#define XKB_KEY_Uhornhook                  0x1001eec  /* U+1EEC LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */
+#define XKB_KEY_uhornhook                  0x1001eed  /* U+1EED LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */
+#define XKB_KEY_Uhorntilde                 0x1001eee  /* U+1EEE LATIN CAPITAL LETTER U WITH HORN AND TILDE */
+#define XKB_KEY_uhorntilde                 0x1001eef  /* U+1EEF LATIN SMALL LETTER U WITH HORN AND TILDE */
+#define XKB_KEY_Uhornbelowdot              0x1001ef0  /* U+1EF0 LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */
+#define XKB_KEY_uhornbelowdot              0x1001ef1  /* U+1EF1 LATIN SMALL LETTER U WITH HORN AND DOT BELOW */
+#define XKB_KEY_Ybelowdot                  0x1001ef4  /* U+1EF4 LATIN CAPITAL LETTER Y WITH DOT BELOW */
+#define XKB_KEY_ybelowdot                  0x1001ef5  /* U+1EF5 LATIN SMALL LETTER Y WITH DOT BELOW */
+#define XKB_KEY_Yhook                      0x1001ef6  /* U+1EF6 LATIN CAPITAL LETTER Y WITH HOOK ABOVE */
+#define XKB_KEY_yhook                      0x1001ef7  /* U+1EF7 LATIN SMALL LETTER Y WITH HOOK ABOVE */
+#define XKB_KEY_Ytilde                     0x1001ef8  /* U+1EF8 LATIN CAPITAL LETTER Y WITH TILDE */
+#define XKB_KEY_ytilde                     0x1001ef9  /* U+1EF9 LATIN SMALL LETTER Y WITH TILDE */
+#define XKB_KEY_Ohorn                      0x10001a0  /* U+01A0 LATIN CAPITAL LETTER O WITH HORN */
+#define XKB_KEY_ohorn                      0x10001a1  /* U+01A1 LATIN SMALL LETTER O WITH HORN */
+#define XKB_KEY_Uhorn                      0x10001af  /* U+01AF LATIN CAPITAL LETTER U WITH HORN */
+#define XKB_KEY_uhorn                      0x10001b0  /* U+01B0 LATIN SMALL LETTER U WITH HORN */
+#define XKB_KEY_combining_tilde            0x1000303  /* U+0303 COMBINING TILDE */
+#define XKB_KEY_combining_grave            0x1000300  /* U+0300 COMBINING GRAVE ACCENT */
+#define XKB_KEY_combining_acute            0x1000301  /* U+0301 COMBINING ACUTE ACCENT */
+#define XKB_KEY_combining_hook             0x1000309  /* U+0309 COMBINING HOOK ABOVE */
+#define XKB_KEY_combining_belowdot         0x1000323  /* U+0323 COMBINING DOT BELOW */
+
+
+#define XKB_KEY_EcuSign                    0x10020a0  /* U+20A0 EURO-CURRENCY SIGN */
+#define XKB_KEY_ColonSign                  0x10020a1  /* U+20A1 COLON SIGN */
+#define XKB_KEY_CruzeiroSign               0x10020a2  /* U+20A2 CRUZEIRO SIGN */
+#define XKB_KEY_FFrancSign                 0x10020a3  /* U+20A3 FRENCH FRANC SIGN */
+#define XKB_KEY_LiraSign                   0x10020a4  /* U+20A4 LIRA SIGN */
+#define XKB_KEY_MillSign                   0x10020a5  /* U+20A5 MILL SIGN */
+#define XKB_KEY_NairaSign                  0x10020a6  /* U+20A6 NAIRA SIGN */
+#define XKB_KEY_PesetaSign                 0x10020a7  /* U+20A7 PESETA SIGN */
+#define XKB_KEY_RupeeSign                  0x10020a8  /* U+20A8 RUPEE SIGN */
+#define XKB_KEY_WonSign                    0x10020a9  /* U+20A9 WON SIGN */
+#define XKB_KEY_NewSheqelSign              0x10020aa  /* U+20AA NEW SHEQEL SIGN */
+#define XKB_KEY_DongSign                   0x10020ab  /* U+20AB DONG SIGN */
+#define XKB_KEY_EuroSign                      0x20ac  /* U+20AC EURO SIGN */
+
+/* one, two and three are defined above. */
+#define XKB_KEY_zerosuperior               0x1002070  /* U+2070 SUPERSCRIPT ZERO */
+#define XKB_KEY_foursuperior               0x1002074  /* U+2074 SUPERSCRIPT FOUR */
+#define XKB_KEY_fivesuperior               0x1002075  /* U+2075 SUPERSCRIPT FIVE */
+#define XKB_KEY_sixsuperior                0x1002076  /* U+2076 SUPERSCRIPT SIX */
+#define XKB_KEY_sevensuperior              0x1002077  /* U+2077 SUPERSCRIPT SEVEN */
+#define XKB_KEY_eightsuperior              0x1002078  /* U+2078 SUPERSCRIPT EIGHT */
+#define XKB_KEY_ninesuperior               0x1002079  /* U+2079 SUPERSCRIPT NINE */
+#define XKB_KEY_zerosubscript              0x1002080  /* U+2080 SUBSCRIPT ZERO */
+#define XKB_KEY_onesubscript               0x1002081  /* U+2081 SUBSCRIPT ONE */
+#define XKB_KEY_twosubscript               0x1002082  /* U+2082 SUBSCRIPT TWO */
+#define XKB_KEY_threesubscript             0x1002083  /* U+2083 SUBSCRIPT THREE */
+#define XKB_KEY_foursubscript              0x1002084  /* U+2084 SUBSCRIPT FOUR */
+#define XKB_KEY_fivesubscript              0x1002085  /* U+2085 SUBSCRIPT FIVE */
+#define XKB_KEY_sixsubscript               0x1002086  /* U+2086 SUBSCRIPT SIX */
+#define XKB_KEY_sevensubscript             0x1002087  /* U+2087 SUBSCRIPT SEVEN */
+#define XKB_KEY_eightsubscript             0x1002088  /* U+2088 SUBSCRIPT EIGHT */
+#define XKB_KEY_ninesubscript              0x1002089  /* U+2089 SUBSCRIPT NINE */
+#define XKB_KEY_partdifferential           0x1002202  /* U+2202 PARTIAL DIFFERENTIAL */
+#define XKB_KEY_emptyset                   0x1002205  /* U+2205 NULL SET */
+#define XKB_KEY_elementof                  0x1002208  /* U+2208 ELEMENT OF */
+#define XKB_KEY_notelementof               0x1002209  /* U+2209 NOT AN ELEMENT OF */
+#define XKB_KEY_containsas                 0x100220B  /* U+220B CONTAINS AS MEMBER */
+#define XKB_KEY_squareroot                 0x100221A  /* U+221A SQUARE ROOT */
+#define XKB_KEY_cuberoot                   0x100221B  /* U+221B CUBE ROOT */
+#define XKB_KEY_fourthroot                 0x100221C  /* U+221C FOURTH ROOT */
+#define XKB_KEY_dintegral                  0x100222C  /* U+222C DOUBLE INTEGRAL */
+#define XKB_KEY_tintegral                  0x100222D  /* U+222D TRIPLE INTEGRAL */
+#define XKB_KEY_because                    0x1002235  /* U+2235 BECAUSE */
+#define XKB_KEY_approxeq                   0x1002248  /* U+2245 ALMOST EQUAL TO */
+#define XKB_KEY_notapproxeq                0x1002247  /* U+2247 NOT ALMOST EQUAL TO */
+#define XKB_KEY_notidentical               0x1002262  /* U+2262 NOT IDENTICAL TO */
+#define XKB_KEY_stricteq                   0x1002263  /* U+2263 STRICTLY EQUIVALENT TO */
+
+#define XKB_KEY_braille_dot_1                 0xfff1
+#define XKB_KEY_braille_dot_2                 0xfff2
+#define XKB_KEY_braille_dot_3                 0xfff3
+#define XKB_KEY_braille_dot_4                 0xfff4
+#define XKB_KEY_braille_dot_5                 0xfff5
+#define XKB_KEY_braille_dot_6                 0xfff6
+#define XKB_KEY_braille_dot_7                 0xfff7
+#define XKB_KEY_braille_dot_8                 0xfff8
+#define XKB_KEY_braille_dot_9                 0xfff9
+#define XKB_KEY_braille_dot_10                0xfffa
+#define XKB_KEY_braille_blank              0x1002800  /* U+2800 BRAILLE PATTERN BLANK */
+#define XKB_KEY_braille_dots_1             0x1002801  /* U+2801 BRAILLE PATTERN DOTS-1 */
+#define XKB_KEY_braille_dots_2             0x1002802  /* U+2802 BRAILLE PATTERN DOTS-2 */
+#define XKB_KEY_braille_dots_12            0x1002803  /* U+2803 BRAILLE PATTERN DOTS-12 */
+#define XKB_KEY_braille_dots_3             0x1002804  /* U+2804 BRAILLE PATTERN DOTS-3 */
+#define XKB_KEY_braille_dots_13            0x1002805  /* U+2805 BRAILLE PATTERN DOTS-13 */
+#define XKB_KEY_braille_dots_23            0x1002806  /* U+2806 BRAILLE PATTERN DOTS-23 */
+#define XKB_KEY_braille_dots_123           0x1002807  /* U+2807 BRAILLE PATTERN DOTS-123 */
+#define XKB_KEY_braille_dots_4             0x1002808  /* U+2808 BRAILLE PATTERN DOTS-4 */
+#define XKB_KEY_braille_dots_14            0x1002809  /* U+2809 BRAILLE PATTERN DOTS-14 */
+#define XKB_KEY_braille_dots_24            0x100280a  /* U+280a BRAILLE PATTERN DOTS-24 */
+#define XKB_KEY_braille_dots_124           0x100280b  /* U+280b BRAILLE PATTERN DOTS-124 */
+#define XKB_KEY_braille_dots_34            0x100280c  /* U+280c BRAILLE PATTERN DOTS-34 */
+#define XKB_KEY_braille_dots_134           0x100280d  /* U+280d BRAILLE PATTERN DOTS-134 */
+#define XKB_KEY_braille_dots_234           0x100280e  /* U+280e BRAILLE PATTERN DOTS-234 */
+#define XKB_KEY_braille_dots_1234          0x100280f  /* U+280f BRAILLE PATTERN DOTS-1234 */
+#define XKB_KEY_braille_dots_5             0x1002810  /* U+2810 BRAILLE PATTERN DOTS-5 */
+#define XKB_KEY_braille_dots_15            0x1002811  /* U+2811 BRAILLE PATTERN DOTS-15 */
+#define XKB_KEY_braille_dots_25            0x1002812  /* U+2812 BRAILLE PATTERN DOTS-25 */
+#define XKB_KEY_braille_dots_125           0x1002813  /* U+2813 BRAILLE PATTERN DOTS-125 */
+#define XKB_KEY_braille_dots_35            0x1002814  /* U+2814 BRAILLE PATTERN DOTS-35 */
+#define XKB_KEY_braille_dots_135           0x1002815  /* U+2815 BRAILLE PATTERN DOTS-135 */
+#define XKB_KEY_braille_dots_235           0x1002816  /* U+2816 BRAILLE PATTERN DOTS-235 */
+#define XKB_KEY_braille_dots_1235          0x1002817  /* U+2817 BRAILLE PATTERN DOTS-1235 */
+#define XKB_KEY_braille_dots_45            0x1002818  /* U+2818 BRAILLE PATTERN DOTS-45 */
+#define XKB_KEY_braille_dots_145           0x1002819  /* U+2819 BRAILLE PATTERN DOTS-145 */
+#define XKB_KEY_braille_dots_245           0x100281a  /* U+281a BRAILLE PATTERN DOTS-245 */
+#define XKB_KEY_braille_dots_1245          0x100281b  /* U+281b BRAILLE PATTERN DOTS-1245 */
+#define XKB_KEY_braille_dots_345           0x100281c  /* U+281c BRAILLE PATTERN DOTS-345 */
+#define XKB_KEY_braille_dots_1345          0x100281d  /* U+281d BRAILLE PATTERN DOTS-1345 */
+#define XKB_KEY_braille_dots_2345          0x100281e  /* U+281e BRAILLE PATTERN DOTS-2345 */
+#define XKB_KEY_braille_dots_12345         0x100281f  /* U+281f BRAILLE PATTERN DOTS-12345 */
+#define XKB_KEY_braille_dots_6             0x1002820  /* U+2820 BRAILLE PATTERN DOTS-6 */
+#define XKB_KEY_braille_dots_16            0x1002821  /* U+2821 BRAILLE PATTERN DOTS-16 */
+#define XKB_KEY_braille_dots_26            0x1002822  /* U+2822 BRAILLE PATTERN DOTS-26 */
+#define XKB_KEY_braille_dots_126           0x1002823  /* U+2823 BRAILLE PATTERN DOTS-126 */
+#define XKB_KEY_braille_dots_36            0x1002824  /* U+2824 BRAILLE PATTERN DOTS-36 */
+#define XKB_KEY_braille_dots_136           0x1002825  /* U+2825 BRAILLE PATTERN DOTS-136 */
+#define XKB_KEY_braille_dots_236           0x1002826  /* U+2826 BRAILLE PATTERN DOTS-236 */
+#define XKB_KEY_braille_dots_1236          0x1002827  /* U+2827 BRAILLE PATTERN DOTS-1236 */
+#define XKB_KEY_braille_dots_46            0x1002828  /* U+2828 BRAILLE PATTERN DOTS-46 */
+#define XKB_KEY_braille_dots_146           0x1002829  /* U+2829 BRAILLE PATTERN DOTS-146 */
+#define XKB_KEY_braille_dots_246           0x100282a  /* U+282a BRAILLE PATTERN DOTS-246 */
+#define XKB_KEY_braille_dots_1246          0x100282b  /* U+282b BRAILLE PATTERN DOTS-1246 */
+#define XKB_KEY_braille_dots_346           0x100282c  /* U+282c BRAILLE PATTERN DOTS-346 */
+#define XKB_KEY_braille_dots_1346          0x100282d  /* U+282d BRAILLE PATTERN DOTS-1346 */
+#define XKB_KEY_braille_dots_2346          0x100282e  /* U+282e BRAILLE PATTERN DOTS-2346 */
+#define XKB_KEY_braille_dots_12346         0x100282f  /* U+282f BRAILLE PATTERN DOTS-12346 */
+#define XKB_KEY_braille_dots_56            0x1002830  /* U+2830 BRAILLE PATTERN DOTS-56 */
+#define XKB_KEY_braille_dots_156           0x1002831  /* U+2831 BRAILLE PATTERN DOTS-156 */
+#define XKB_KEY_braille_dots_256           0x1002832  /* U+2832 BRAILLE PATTERN DOTS-256 */
+#define XKB_KEY_braille_dots_1256          0x1002833  /* U+2833 BRAILLE PATTERN DOTS-1256 */
+#define XKB_KEY_braille_dots_356           0x1002834  /* U+2834 BRAILLE PATTERN DOTS-356 */
+#define XKB_KEY_braille_dots_1356          0x1002835  /* U+2835 BRAILLE PATTERN DOTS-1356 */
+#define XKB_KEY_braille_dots_2356          0x1002836  /* U+2836 BRAILLE PATTERN DOTS-2356 */
+#define XKB_KEY_braille_dots_12356         0x1002837  /* U+2837 BRAILLE PATTERN DOTS-12356 */
+#define XKB_KEY_braille_dots_456           0x1002838  /* U+2838 BRAILLE PATTERN DOTS-456 */
+#define XKB_KEY_braille_dots_1456          0x1002839  /* U+2839 BRAILLE PATTERN DOTS-1456 */
+#define XKB_KEY_braille_dots_2456          0x100283a  /* U+283a BRAILLE PATTERN DOTS-2456 */
+#define XKB_KEY_braille_dots_12456         0x100283b  /* U+283b BRAILLE PATTERN DOTS-12456 */
+#define XKB_KEY_braille_dots_3456          0x100283c  /* U+283c BRAILLE PATTERN DOTS-3456 */
+#define XKB_KEY_braille_dots_13456         0x100283d  /* U+283d BRAILLE PATTERN DOTS-13456 */
+#define XKB_KEY_braille_dots_23456         0x100283e  /* U+283e BRAILLE PATTERN DOTS-23456 */
+#define XKB_KEY_braille_dots_123456        0x100283f  /* U+283f BRAILLE PATTERN DOTS-123456 */
+#define XKB_KEY_braille_dots_7             0x1002840  /* U+2840 BRAILLE PATTERN DOTS-7 */
+#define XKB_KEY_braille_dots_17            0x1002841  /* U+2841 BRAILLE PATTERN DOTS-17 */
+#define XKB_KEY_braille_dots_27            0x1002842  /* U+2842 BRAILLE PATTERN DOTS-27 */
+#define XKB_KEY_braille_dots_127           0x1002843  /* U+2843 BRAILLE PATTERN DOTS-127 */
+#define XKB_KEY_braille_dots_37            0x1002844  /* U+2844 BRAILLE PATTERN DOTS-37 */
+#define XKB_KEY_braille_dots_137           0x1002845  /* U+2845 BRAILLE PATTERN DOTS-137 */
+#define XKB_KEY_braille_dots_237           0x1002846  /* U+2846 BRAILLE PATTERN DOTS-237 */
+#define XKB_KEY_braille_dots_1237          0x1002847  /* U+2847 BRAILLE PATTERN DOTS-1237 */
+#define XKB_KEY_braille_dots_47            0x1002848  /* U+2848 BRAILLE PATTERN DOTS-47 */
+#define XKB_KEY_braille_dots_147           0x1002849  /* U+2849 BRAILLE PATTERN DOTS-147 */
+#define XKB_KEY_braille_dots_247           0x100284a  /* U+284a BRAILLE PATTERN DOTS-247 */
+#define XKB_KEY_braille_dots_1247          0x100284b  /* U+284b BRAILLE PATTERN DOTS-1247 */
+#define XKB_KEY_braille_dots_347           0x100284c  /* U+284c BRAILLE PATTERN DOTS-347 */
+#define XKB_KEY_braille_dots_1347          0x100284d  /* U+284d BRAILLE PATTERN DOTS-1347 */
+#define XKB_KEY_braille_dots_2347          0x100284e  /* U+284e BRAILLE PATTERN DOTS-2347 */
+#define XKB_KEY_braille_dots_12347         0x100284f  /* U+284f BRAILLE PATTERN DOTS-12347 */
+#define XKB_KEY_braille_dots_57            0x1002850  /* U+2850 BRAILLE PATTERN DOTS-57 */
+#define XKB_KEY_braille_dots_157           0x1002851  /* U+2851 BRAILLE PATTERN DOTS-157 */
+#define XKB_KEY_braille_dots_257           0x1002852  /* U+2852 BRAILLE PATTERN DOTS-257 */
+#define XKB_KEY_braille_dots_1257          0x1002853  /* U+2853 BRAILLE PATTERN DOTS-1257 */
+#define XKB_KEY_braille_dots_357           0x1002854  /* U+2854 BRAILLE PATTERN DOTS-357 */
+#define XKB_KEY_braille_dots_1357          0x1002855  /* U+2855 BRAILLE PATTERN DOTS-1357 */
+#define XKB_KEY_braille_dots_2357          0x1002856  /* U+2856 BRAILLE PATTERN DOTS-2357 */
+#define XKB_KEY_braille_dots_12357         0x1002857  /* U+2857 BRAILLE PATTERN DOTS-12357 */
+#define XKB_KEY_braille_dots_457           0x1002858  /* U+2858 BRAILLE PATTERN DOTS-457 */
+#define XKB_KEY_braille_dots_1457          0x1002859  /* U+2859 BRAILLE PATTERN DOTS-1457 */
+#define XKB_KEY_braille_dots_2457          0x100285a  /* U+285a BRAILLE PATTERN DOTS-2457 */
+#define XKB_KEY_braille_dots_12457         0x100285b  /* U+285b BRAILLE PATTERN DOTS-12457 */
+#define XKB_KEY_braille_dots_3457          0x100285c  /* U+285c BRAILLE PATTERN DOTS-3457 */
+#define XKB_KEY_braille_dots_13457         0x100285d  /* U+285d BRAILLE PATTERN DOTS-13457 */
+#define XKB_KEY_braille_dots_23457         0x100285e  /* U+285e BRAILLE PATTERN DOTS-23457 */
+#define XKB_KEY_braille_dots_123457        0x100285f  /* U+285f BRAILLE PATTERN DOTS-123457 */
+#define XKB_KEY_braille_dots_67            0x1002860  /* U+2860 BRAILLE PATTERN DOTS-67 */
+#define XKB_KEY_braille_dots_167           0x1002861  /* U+2861 BRAILLE PATTERN DOTS-167 */
+#define XKB_KEY_braille_dots_267           0x1002862  /* U+2862 BRAILLE PATTERN DOTS-267 */
+#define XKB_KEY_braille_dots_1267          0x1002863  /* U+2863 BRAILLE PATTERN DOTS-1267 */
+#define XKB_KEY_braille_dots_367           0x1002864  /* U+2864 BRAILLE PATTERN DOTS-367 */
+#define XKB_KEY_braille_dots_1367          0x1002865  /* U+2865 BRAILLE PATTERN DOTS-1367 */
+#define XKB_KEY_braille_dots_2367          0x1002866  /* U+2866 BRAILLE PATTERN DOTS-2367 */
+#define XKB_KEY_braille_dots_12367         0x1002867  /* U+2867 BRAILLE PATTERN DOTS-12367 */
+#define XKB_KEY_braille_dots_467           0x1002868  /* U+2868 BRAILLE PATTERN DOTS-467 */
+#define XKB_KEY_braille_dots_1467          0x1002869  /* U+2869 BRAILLE PATTERN DOTS-1467 */
+#define XKB_KEY_braille_dots_2467          0x100286a  /* U+286a BRAILLE PATTERN DOTS-2467 */
+#define XKB_KEY_braille_dots_12467         0x100286b  /* U+286b BRAILLE PATTERN DOTS-12467 */
+#define XKB_KEY_braille_dots_3467          0x100286c  /* U+286c BRAILLE PATTERN DOTS-3467 */
+#define XKB_KEY_braille_dots_13467         0x100286d  /* U+286d BRAILLE PATTERN DOTS-13467 */
+#define XKB_KEY_braille_dots_23467         0x100286e  /* U+286e BRAILLE PATTERN DOTS-23467 */
+#define XKB_KEY_braille_dots_123467        0x100286f  /* U+286f BRAILLE PATTERN DOTS-123467 */
+#define XKB_KEY_braille_dots_567           0x1002870  /* U+2870 BRAILLE PATTERN DOTS-567 */
+#define XKB_KEY_braille_dots_1567          0x1002871  /* U+2871 BRAILLE PATTERN DOTS-1567 */
+#define XKB_KEY_braille_dots_2567          0x1002872  /* U+2872 BRAILLE PATTERN DOTS-2567 */
+#define XKB_KEY_braille_dots_12567         0x1002873  /* U+2873 BRAILLE PATTERN DOTS-12567 */
+#define XKB_KEY_braille_dots_3567          0x1002874  /* U+2874 BRAILLE PATTERN DOTS-3567 */
+#define XKB_KEY_braille_dots_13567         0x1002875  /* U+2875 BRAILLE PATTERN DOTS-13567 */
+#define XKB_KEY_braille_dots_23567         0x1002876  /* U+2876 BRAILLE PATTERN DOTS-23567 */
+#define XKB_KEY_braille_dots_123567        0x1002877  /* U+2877 BRAILLE PATTERN DOTS-123567 */
+#define XKB_KEY_braille_dots_4567          0x1002878  /* U+2878 BRAILLE PATTERN DOTS-4567 */
+#define XKB_KEY_braille_dots_14567         0x1002879  /* U+2879 BRAILLE PATTERN DOTS-14567 */
+#define XKB_KEY_braille_dots_24567         0x100287a  /* U+287a BRAILLE PATTERN DOTS-24567 */
+#define XKB_KEY_braille_dots_124567        0x100287b  /* U+287b BRAILLE PATTERN DOTS-124567 */
+#define XKB_KEY_braille_dots_34567         0x100287c  /* U+287c BRAILLE PATTERN DOTS-34567 */
+#define XKB_KEY_braille_dots_134567        0x100287d  /* U+287d BRAILLE PATTERN DOTS-134567 */
+#define XKB_KEY_braille_dots_234567        0x100287e  /* U+287e BRAILLE PATTERN DOTS-234567 */
+#define XKB_KEY_braille_dots_1234567       0x100287f  /* U+287f BRAILLE PATTERN DOTS-1234567 */
+#define XKB_KEY_braille_dots_8             0x1002880  /* U+2880 BRAILLE PATTERN DOTS-8 */
+#define XKB_KEY_braille_dots_18            0x1002881  /* U+2881 BRAILLE PATTERN DOTS-18 */
+#define XKB_KEY_braille_dots_28            0x1002882  /* U+2882 BRAILLE PATTERN DOTS-28 */
+#define XKB_KEY_braille_dots_128           0x1002883  /* U+2883 BRAILLE PATTERN DOTS-128 */
+#define XKB_KEY_braille_dots_38            0x1002884  /* U+2884 BRAILLE PATTERN DOTS-38 */
+#define XKB_KEY_braille_dots_138           0x1002885  /* U+2885 BRAILLE PATTERN DOTS-138 */
+#define XKB_KEY_braille_dots_238           0x1002886  /* U+2886 BRAILLE PATTERN DOTS-238 */
+#define XKB_KEY_braille_dots_1238          0x1002887  /* U+2887 BRAILLE PATTERN DOTS-1238 */
+#define XKB_KEY_braille_dots_48            0x1002888  /* U+2888 BRAILLE PATTERN DOTS-48 */
+#define XKB_KEY_braille_dots_148           0x1002889  /* U+2889 BRAILLE PATTERN DOTS-148 */
+#define XKB_KEY_braille_dots_248           0x100288a  /* U+288a BRAILLE PATTERN DOTS-248 */
+#define XKB_KEY_braille_dots_1248          0x100288b  /* U+288b BRAILLE PATTERN DOTS-1248 */
+#define XKB_KEY_braille_dots_348           0x100288c  /* U+288c BRAILLE PATTERN DOTS-348 */
+#define XKB_KEY_braille_dots_1348          0x100288d  /* U+288d BRAILLE PATTERN DOTS-1348 */
+#define XKB_KEY_braille_dots_2348          0x100288e  /* U+288e BRAILLE PATTERN DOTS-2348 */
+#define XKB_KEY_braille_dots_12348         0x100288f  /* U+288f BRAILLE PATTERN DOTS-12348 */
+#define XKB_KEY_braille_dots_58            0x1002890  /* U+2890 BRAILLE PATTERN DOTS-58 */
+#define XKB_KEY_braille_dots_158           0x1002891  /* U+2891 BRAILLE PATTERN DOTS-158 */
+#define XKB_KEY_braille_dots_258           0x1002892  /* U+2892 BRAILLE PATTERN DOTS-258 */
+#define XKB_KEY_braille_dots_1258          0x1002893  /* U+2893 BRAILLE PATTERN DOTS-1258 */
+#define XKB_KEY_braille_dots_358           0x1002894  /* U+2894 BRAILLE PATTERN DOTS-358 */
+#define XKB_KEY_braille_dots_1358          0x1002895  /* U+2895 BRAILLE PATTERN DOTS-1358 */
+#define XKB_KEY_braille_dots_2358          0x1002896  /* U+2896 BRAILLE PATTERN DOTS-2358 */
+#define XKB_KEY_braille_dots_12358         0x1002897  /* U+2897 BRAILLE PATTERN DOTS-12358 */
+#define XKB_KEY_braille_dots_458           0x1002898  /* U+2898 BRAILLE PATTERN DOTS-458 */
+#define XKB_KEY_braille_dots_1458          0x1002899  /* U+2899 BRAILLE PATTERN DOTS-1458 */
+#define XKB_KEY_braille_dots_2458          0x100289a  /* U+289a BRAILLE PATTERN DOTS-2458 */
+#define XKB_KEY_braille_dots_12458         0x100289b  /* U+289b BRAILLE PATTERN DOTS-12458 */
+#define XKB_KEY_braille_dots_3458          0x100289c  /* U+289c BRAILLE PATTERN DOTS-3458 */
+#define XKB_KEY_braille_dots_13458         0x100289d  /* U+289d BRAILLE PATTERN DOTS-13458 */
+#define XKB_KEY_braille_dots_23458         0x100289e  /* U+289e BRAILLE PATTERN DOTS-23458 */
+#define XKB_KEY_braille_dots_123458        0x100289f  /* U+289f BRAILLE PATTERN DOTS-123458 */
+#define XKB_KEY_braille_dots_68            0x10028a0  /* U+28a0 BRAILLE PATTERN DOTS-68 */
+#define XKB_KEY_braille_dots_168           0x10028a1  /* U+28a1 BRAILLE PATTERN DOTS-168 */
+#define XKB_KEY_braille_dots_268           0x10028a2  /* U+28a2 BRAILLE PATTERN DOTS-268 */
+#define XKB_KEY_braille_dots_1268          0x10028a3  /* U+28a3 BRAILLE PATTERN DOTS-1268 */
+#define XKB_KEY_braille_dots_368           0x10028a4  /* U+28a4 BRAILLE PATTERN DOTS-368 */
+#define XKB_KEY_braille_dots_1368          0x10028a5  /* U+28a5 BRAILLE PATTERN DOTS-1368 */
+#define XKB_KEY_braille_dots_2368          0x10028a6  /* U+28a6 BRAILLE PATTERN DOTS-2368 */
+#define XKB_KEY_braille_dots_12368         0x10028a7  /* U+28a7 BRAILLE PATTERN DOTS-12368 */
+#define XKB_KEY_braille_dots_468           0x10028a8  /* U+28a8 BRAILLE PATTERN DOTS-468 */
+#define XKB_KEY_braille_dots_1468          0x10028a9  /* U+28a9 BRAILLE PATTERN DOTS-1468 */
+#define XKB_KEY_braille_dots_2468          0x10028aa  /* U+28aa BRAILLE PATTERN DOTS-2468 */
+#define XKB_KEY_braille_dots_12468         0x10028ab  /* U+28ab BRAILLE PATTERN DOTS-12468 */
+#define XKB_KEY_braille_dots_3468          0x10028ac  /* U+28ac BRAILLE PATTERN DOTS-3468 */
+#define XKB_KEY_braille_dots_13468         0x10028ad  /* U+28ad BRAILLE PATTERN DOTS-13468 */
+#define XKB_KEY_braille_dots_23468         0x10028ae  /* U+28ae BRAILLE PATTERN DOTS-23468 */
+#define XKB_KEY_braille_dots_123468        0x10028af  /* U+28af BRAILLE PATTERN DOTS-123468 */
+#define XKB_KEY_braille_dots_568           0x10028b0  /* U+28b0 BRAILLE PATTERN DOTS-568 */
+#define XKB_KEY_braille_dots_1568          0x10028b1  /* U+28b1 BRAILLE PATTERN DOTS-1568 */
+#define XKB_KEY_braille_dots_2568          0x10028b2  /* U+28b2 BRAILLE PATTERN DOTS-2568 */
+#define XKB_KEY_braille_dots_12568         0x10028b3  /* U+28b3 BRAILLE PATTERN DOTS-12568 */
+#define XKB_KEY_braille_dots_3568          0x10028b4  /* U+28b4 BRAILLE PATTERN DOTS-3568 */
+#define XKB_KEY_braille_dots_13568         0x10028b5  /* U+28b5 BRAILLE PATTERN DOTS-13568 */
+#define XKB_KEY_braille_dots_23568         0x10028b6  /* U+28b6 BRAILLE PATTERN DOTS-23568 */
+#define XKB_KEY_braille_dots_123568        0x10028b7  /* U+28b7 BRAILLE PATTERN DOTS-123568 */
+#define XKB_KEY_braille_dots_4568          0x10028b8  /* U+28b8 BRAILLE PATTERN DOTS-4568 */
+#define XKB_KEY_braille_dots_14568         0x10028b9  /* U+28b9 BRAILLE PATTERN DOTS-14568 */
+#define XKB_KEY_braille_dots_24568         0x10028ba  /* U+28ba BRAILLE PATTERN DOTS-24568 */
+#define XKB_KEY_braille_dots_124568        0x10028bb  /* U+28bb BRAILLE PATTERN DOTS-124568 */
+#define XKB_KEY_braille_dots_34568         0x10028bc  /* U+28bc BRAILLE PATTERN DOTS-34568 */
+#define XKB_KEY_braille_dots_134568        0x10028bd  /* U+28bd BRAILLE PATTERN DOTS-134568 */
+#define XKB_KEY_braille_dots_234568        0x10028be  /* U+28be BRAILLE PATTERN DOTS-234568 */
+#define XKB_KEY_braille_dots_1234568       0x10028bf  /* U+28bf BRAILLE PATTERN DOTS-1234568 */
+#define XKB_KEY_braille_dots_78            0x10028c0  /* U+28c0 BRAILLE PATTERN DOTS-78 */
+#define XKB_KEY_braille_dots_178           0x10028c1  /* U+28c1 BRAILLE PATTERN DOTS-178 */
+#define XKB_KEY_braille_dots_278           0x10028c2  /* U+28c2 BRAILLE PATTERN DOTS-278 */
+#define XKB_KEY_braille_dots_1278          0x10028c3  /* U+28c3 BRAILLE PATTERN DOTS-1278 */
+#define XKB_KEY_braille_dots_378           0x10028c4  /* U+28c4 BRAILLE PATTERN DOTS-378 */
+#define XKB_KEY_braille_dots_1378          0x10028c5  /* U+28c5 BRAILLE PATTERN DOTS-1378 */
+#define XKB_KEY_braille_dots_2378          0x10028c6  /* U+28c6 BRAILLE PATTERN DOTS-2378 */
+#define XKB_KEY_braille_dots_12378         0x10028c7  /* U+28c7 BRAILLE PATTERN DOTS-12378 */
+#define XKB_KEY_braille_dots_478           0x10028c8  /* U+28c8 BRAILLE PATTERN DOTS-478 */
+#define XKB_KEY_braille_dots_1478          0x10028c9  /* U+28c9 BRAILLE PATTERN DOTS-1478 */
+#define XKB_KEY_braille_dots_2478          0x10028ca  /* U+28ca BRAILLE PATTERN DOTS-2478 */
+#define XKB_KEY_braille_dots_12478         0x10028cb  /* U+28cb BRAILLE PATTERN DOTS-12478 */
+#define XKB_KEY_braille_dots_3478          0x10028cc  /* U+28cc BRAILLE PATTERN DOTS-3478 */
+#define XKB_KEY_braille_dots_13478         0x10028cd  /* U+28cd BRAILLE PATTERN DOTS-13478 */
+#define XKB_KEY_braille_dots_23478         0x10028ce  /* U+28ce BRAILLE PATTERN DOTS-23478 */
+#define XKB_KEY_braille_dots_123478        0x10028cf  /* U+28cf BRAILLE PATTERN DOTS-123478 */
+#define XKB_KEY_braille_dots_578           0x10028d0  /* U+28d0 BRAILLE PATTERN DOTS-578 */
+#define XKB_KEY_braille_dots_1578          0x10028d1  /* U+28d1 BRAILLE PATTERN DOTS-1578 */
+#define XKB_KEY_braille_dots_2578          0x10028d2  /* U+28d2 BRAILLE PATTERN DOTS-2578 */
+#define XKB_KEY_braille_dots_12578         0x10028d3  /* U+28d3 BRAILLE PATTERN DOTS-12578 */
+#define XKB_KEY_braille_dots_3578          0x10028d4  /* U+28d4 BRAILLE PATTERN DOTS-3578 */
+#define XKB_KEY_braille_dots_13578         0x10028d5  /* U+28d5 BRAILLE PATTERN DOTS-13578 */
+#define XKB_KEY_braille_dots_23578         0x10028d6  /* U+28d6 BRAILLE PATTERN DOTS-23578 */
+#define XKB_KEY_braille_dots_123578        0x10028d7  /* U+28d7 BRAILLE PATTERN DOTS-123578 */
+#define XKB_KEY_braille_dots_4578          0x10028d8  /* U+28d8 BRAILLE PATTERN DOTS-4578 */
+#define XKB_KEY_braille_dots_14578         0x10028d9  /* U+28d9 BRAILLE PATTERN DOTS-14578 */
+#define XKB_KEY_braille_dots_24578         0x10028da  /* U+28da BRAILLE PATTERN DOTS-24578 */
+#define XKB_KEY_braille_dots_124578        0x10028db  /* U+28db BRAILLE PATTERN DOTS-124578 */
+#define XKB_KEY_braille_dots_34578         0x10028dc  /* U+28dc BRAILLE PATTERN DOTS-34578 */
+#define XKB_KEY_braille_dots_134578        0x10028dd  /* U+28dd BRAILLE PATTERN DOTS-134578 */
+#define XKB_KEY_braille_dots_234578        0x10028de  /* U+28de BRAILLE PATTERN DOTS-234578 */
+#define XKB_KEY_braille_dots_1234578       0x10028df  /* U+28df BRAILLE PATTERN DOTS-1234578 */
+#define XKB_KEY_braille_dots_678           0x10028e0  /* U+28e0 BRAILLE PATTERN DOTS-678 */
+#define XKB_KEY_braille_dots_1678          0x10028e1  /* U+28e1 BRAILLE PATTERN DOTS-1678 */
+#define XKB_KEY_braille_dots_2678          0x10028e2  /* U+28e2 BRAILLE PATTERN DOTS-2678 */
+#define XKB_KEY_braille_dots_12678         0x10028e3  /* U+28e3 BRAILLE PATTERN DOTS-12678 */
+#define XKB_KEY_braille_dots_3678          0x10028e4  /* U+28e4 BRAILLE PATTERN DOTS-3678 */
+#define XKB_KEY_braille_dots_13678         0x10028e5  /* U+28e5 BRAILLE PATTERN DOTS-13678 */
+#define XKB_KEY_braille_dots_23678         0x10028e6  /* U+28e6 BRAILLE PATTERN DOTS-23678 */
+#define XKB_KEY_braille_dots_123678        0x10028e7  /* U+28e7 BRAILLE PATTERN DOTS-123678 */
+#define XKB_KEY_braille_dots_4678          0x10028e8  /* U+28e8 BRAILLE PATTERN DOTS-4678 */
+#define XKB_KEY_braille_dots_14678         0x10028e9  /* U+28e9 BRAILLE PATTERN DOTS-14678 */
+#define XKB_KEY_braille_dots_24678         0x10028ea  /* U+28ea BRAILLE PATTERN DOTS-24678 */
+#define XKB_KEY_braille_dots_124678        0x10028eb  /* U+28eb BRAILLE PATTERN DOTS-124678 */
+#define XKB_KEY_braille_dots_34678         0x10028ec  /* U+28ec BRAILLE PATTERN DOTS-34678 */
+#define XKB_KEY_braille_dots_134678        0x10028ed  /* U+28ed BRAILLE PATTERN DOTS-134678 */
+#define XKB_KEY_braille_dots_234678        0x10028ee  /* U+28ee BRAILLE PATTERN DOTS-234678 */
+#define XKB_KEY_braille_dots_1234678       0x10028ef  /* U+28ef BRAILLE PATTERN DOTS-1234678 */
+#define XKB_KEY_braille_dots_5678          0x10028f0  /* U+28f0 BRAILLE PATTERN DOTS-5678 */
+#define XKB_KEY_braille_dots_15678         0x10028f1  /* U+28f1 BRAILLE PATTERN DOTS-15678 */
+#define XKB_KEY_braille_dots_25678         0x10028f2  /* U+28f2 BRAILLE PATTERN DOTS-25678 */
+#define XKB_KEY_braille_dots_125678        0x10028f3  /* U+28f3 BRAILLE PATTERN DOTS-125678 */
+#define XKB_KEY_braille_dots_35678         0x10028f4  /* U+28f4 BRAILLE PATTERN DOTS-35678 */
+#define XKB_KEY_braille_dots_135678        0x10028f5  /* U+28f5 BRAILLE PATTERN DOTS-135678 */
+#define XKB_KEY_braille_dots_235678        0x10028f6  /* U+28f6 BRAILLE PATTERN DOTS-235678 */
+#define XKB_KEY_braille_dots_1235678       0x10028f7  /* U+28f7 BRAILLE PATTERN DOTS-1235678 */
+#define XKB_KEY_braille_dots_45678         0x10028f8  /* U+28f8 BRAILLE PATTERN DOTS-45678 */
+#define XKB_KEY_braille_dots_145678        0x10028f9  /* U+28f9 BRAILLE PATTERN DOTS-145678 */
+#define XKB_KEY_braille_dots_245678        0x10028fa  /* U+28fa BRAILLE PATTERN DOTS-245678 */
+#define XKB_KEY_braille_dots_1245678       0x10028fb  /* U+28fb BRAILLE PATTERN DOTS-1245678 */
+#define XKB_KEY_braille_dots_345678        0x10028fc  /* U+28fc BRAILLE PATTERN DOTS-345678 */
+#define XKB_KEY_braille_dots_1345678       0x10028fd  /* U+28fd BRAILLE PATTERN DOTS-1345678 */
+#define XKB_KEY_braille_dots_2345678       0x10028fe  /* U+28fe BRAILLE PATTERN DOTS-2345678 */
+#define XKB_KEY_braille_dots_12345678      0x10028ff  /* U+28ff BRAILLE PATTERN DOTS-12345678 */
+
+/*
+ * Sinhala (http://unicode.org/charts/PDF/U0D80.pdf)
+ * http://www.nongnu.org/sinhala/doc/transliteration/sinhala-transliteration_6.html
+ */
+
+#define XKB_KEY_Sinh_ng            0x1000d82  /* U+0D82 SINHALA ANUSVARAYA */
+#define XKB_KEY_Sinh_h2            0x1000d83  /* U+0D83 SINHALA VISARGAYA */
+#define XKB_KEY_Sinh_a             0x1000d85  /* U+0D85 SINHALA AYANNA */
+#define XKB_KEY_Sinh_aa            0x1000d86  /* U+0D86 SINHALA AAYANNA */
+#define XKB_KEY_Sinh_ae            0x1000d87  /* U+0D87 SINHALA AEYANNA */
+#define XKB_KEY_Sinh_aee           0x1000d88  /* U+0D88 SINHALA AEEYANNA */
+#define XKB_KEY_Sinh_i             0x1000d89  /* U+0D89 SINHALA IYANNA */
+#define XKB_KEY_Sinh_ii            0x1000d8a  /* U+0D8A SINHALA IIYANNA */
+#define XKB_KEY_Sinh_u             0x1000d8b  /* U+0D8B SINHALA UYANNA */
+#define XKB_KEY_Sinh_uu            0x1000d8c  /* U+0D8C SINHALA UUYANNA */
+#define XKB_KEY_Sinh_ri            0x1000d8d  /* U+0D8D SINHALA IRUYANNA */
+#define XKB_KEY_Sinh_rii           0x1000d8e  /* U+0D8E SINHALA IRUUYANNA */
+#define XKB_KEY_Sinh_lu            0x1000d8f  /* U+0D8F SINHALA ILUYANNA */
+#define XKB_KEY_Sinh_luu           0x1000d90  /* U+0D90 SINHALA ILUUYANNA */
+#define XKB_KEY_Sinh_e             0x1000d91  /* U+0D91 SINHALA EYANNA */
+#define XKB_KEY_Sinh_ee            0x1000d92  /* U+0D92 SINHALA EEYANNA */
+#define XKB_KEY_Sinh_ai            0x1000d93  /* U+0D93 SINHALA AIYANNA */
+#define XKB_KEY_Sinh_o             0x1000d94  /* U+0D94 SINHALA OYANNA */
+#define XKB_KEY_Sinh_oo            0x1000d95  /* U+0D95 SINHALA OOYANNA */
+#define XKB_KEY_Sinh_au            0x1000d96  /* U+0D96 SINHALA AUYANNA */
+#define XKB_KEY_Sinh_ka            0x1000d9a  /* U+0D9A SINHALA KAYANNA */
+#define XKB_KEY_Sinh_kha           0x1000d9b  /* U+0D9B SINHALA MAHA. KAYANNA */
+#define XKB_KEY_Sinh_ga            0x1000d9c  /* U+0D9C SINHALA GAYANNA */
+#define XKB_KEY_Sinh_gha           0x1000d9d  /* U+0D9D SINHALA MAHA. GAYANNA */
+#define XKB_KEY_Sinh_ng2           0x1000d9e  /* U+0D9E SINHALA KANTAJA NAASIKYAYA */
+#define XKB_KEY_Sinh_nga           0x1000d9f  /* U+0D9F SINHALA SANYAKA GAYANNA */
+#define XKB_KEY_Sinh_ca            0x1000da0  /* U+0DA0 SINHALA CAYANNA */
+#define XKB_KEY_Sinh_cha           0x1000da1  /* U+0DA1 SINHALA MAHA. CAYANNA */
+#define XKB_KEY_Sinh_ja            0x1000da2  /* U+0DA2 SINHALA JAYANNA */
+#define XKB_KEY_Sinh_jha           0x1000da3  /* U+0DA3 SINHALA MAHA. JAYANNA */
+#define XKB_KEY_Sinh_nya           0x1000da4  /* U+0DA4 SINHALA TAALUJA NAASIKYAYA */
+#define XKB_KEY_Sinh_jnya          0x1000da5  /* U+0DA5 SINHALA TAALUJA SANYOOGA NAASIKYAYA */
+#define XKB_KEY_Sinh_nja           0x1000da6  /* U+0DA6 SINHALA SANYAKA JAYANNA */
+#define XKB_KEY_Sinh_tta           0x1000da7  /* U+0DA7 SINHALA TTAYANNA */
+#define XKB_KEY_Sinh_ttha          0x1000da8  /* U+0DA8 SINHALA MAHA. TTAYANNA */
+#define XKB_KEY_Sinh_dda           0x1000da9  /* U+0DA9 SINHALA DDAYANNA */
+#define XKB_KEY_Sinh_ddha          0x1000daa  /* U+0DAA SINHALA MAHA. DDAYANNA */
+#define XKB_KEY_Sinh_nna           0x1000dab  /* U+0DAB SINHALA MUURDHAJA NAYANNA */
+#define XKB_KEY_Sinh_ndda          0x1000dac  /* U+0DAC SINHALA SANYAKA DDAYANNA */
+#define XKB_KEY_Sinh_tha           0x1000dad  /* U+0DAD SINHALA TAYANNA */
+#define XKB_KEY_Sinh_thha          0x1000dae  /* U+0DAE SINHALA MAHA. TAYANNA */
+#define XKB_KEY_Sinh_dha           0x1000daf  /* U+0DAF SINHALA DAYANNA */
+#define XKB_KEY_Sinh_dhha          0x1000db0  /* U+0DB0 SINHALA MAHA. DAYANNA */
+#define XKB_KEY_Sinh_na            0x1000db1  /* U+0DB1 SINHALA DANTAJA NAYANNA */
+#define XKB_KEY_Sinh_ndha          0x1000db3  /* U+0DB3 SINHALA SANYAKA DAYANNA */
+#define XKB_KEY_Sinh_pa            0x1000db4  /* U+0DB4 SINHALA PAYANNA */
+#define XKB_KEY_Sinh_pha           0x1000db5  /* U+0DB5 SINHALA MAHA. PAYANNA */
+#define XKB_KEY_Sinh_ba            0x1000db6  /* U+0DB6 SINHALA BAYANNA */
+#define XKB_KEY_Sinh_bha           0x1000db7  /* U+0DB7 SINHALA MAHA. BAYANNA */
+#define XKB_KEY_Sinh_ma            0x1000db8  /* U+0DB8 SINHALA MAYANNA */
+#define XKB_KEY_Sinh_mba           0x1000db9  /* U+0DB9 SINHALA AMBA BAYANNA */
+#define XKB_KEY_Sinh_ya            0x1000dba  /* U+0DBA SINHALA YAYANNA */
+#define XKB_KEY_Sinh_ra            0x1000dbb  /* U+0DBB SINHALA RAYANNA */
+#define XKB_KEY_Sinh_la            0x1000dbd  /* U+0DBD SINHALA DANTAJA LAYANNA */
+#define XKB_KEY_Sinh_va            0x1000dc0  /* U+0DC0 SINHALA VAYANNA */
+#define XKB_KEY_Sinh_sha           0x1000dc1  /* U+0DC1 SINHALA TAALUJA SAYANNA */
+#define XKB_KEY_Sinh_ssha          0x1000dc2  /* U+0DC2 SINHALA MUURDHAJA SAYANNA */
+#define XKB_KEY_Sinh_sa            0x1000dc3  /* U+0DC3 SINHALA DANTAJA SAYANNA */
+#define XKB_KEY_Sinh_ha            0x1000dc4  /* U+0DC4 SINHALA HAYANNA */
+#define XKB_KEY_Sinh_lla           0x1000dc5  /* U+0DC5 SINHALA MUURDHAJA LAYANNA */
+#define XKB_KEY_Sinh_fa            0x1000dc6  /* U+0DC6 SINHALA FAYANNA */
+#define XKB_KEY_Sinh_al            0x1000dca  /* U+0DCA SINHALA AL-LAKUNA */
+#define XKB_KEY_Sinh_aa2           0x1000dcf  /* U+0DCF SINHALA AELA-PILLA */
+#define XKB_KEY_Sinh_ae2           0x1000dd0  /* U+0DD0 SINHALA AEDA-PILLA */
+#define XKB_KEY_Sinh_aee2          0x1000dd1  /* U+0DD1 SINHALA DIGA AEDA-PILLA */
+#define XKB_KEY_Sinh_i2            0x1000dd2  /* U+0DD2 SINHALA IS-PILLA */
+#define XKB_KEY_Sinh_ii2           0x1000dd3  /* U+0DD3 SINHALA DIGA IS-PILLA */
+#define XKB_KEY_Sinh_u2            0x1000dd4  /* U+0DD4 SINHALA PAA-PILLA */
+#define XKB_KEY_Sinh_uu2           0x1000dd6  /* U+0DD6 SINHALA DIGA PAA-PILLA */
+#define XKB_KEY_Sinh_ru2           0x1000dd8  /* U+0DD8 SINHALA GAETTA-PILLA */
+#define XKB_KEY_Sinh_e2            0x1000dd9  /* U+0DD9 SINHALA KOMBUVA */
+#define XKB_KEY_Sinh_ee2           0x1000dda  /* U+0DDA SINHALA DIGA KOMBUVA */
+#define XKB_KEY_Sinh_ai2           0x1000ddb  /* U+0DDB SINHALA KOMBU DEKA */
+#define XKB_KEY_Sinh_o2            0x1000ddc  /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA*/
+#define XKB_KEY_Sinh_oo2           0x1000ddd  /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA*/
+#define XKB_KEY_Sinh_au2           0x1000dde  /* U+0DDE SINHALA KOMBUVA HAA GAYANUKITTA */
+#define XKB_KEY_Sinh_lu2           0x1000ddf  /* U+0DDF SINHALA GAYANUKITTA */
+#define XKB_KEY_Sinh_ruu2          0x1000df2  /* U+0DF2 SINHALA DIGA GAETTA-PILLA */
+#define XKB_KEY_Sinh_luu2          0x1000df3  /* U+0DF3 SINHALA DIGA GAYANUKITTA */
+#define XKB_KEY_Sinh_kunddaliya    0x1000df4  /* U+0DF4 SINHALA KUNDDALIYA */
+/*
+ * XFree86 vendor specific keysyms.
+ *
+ * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
+ *
+ * The XF86 set of keysyms is a catch-all set of defines for keysyms found
+ * on various multimedia keyboards. Originally specific to XFree86 they have
+ * been been adopted over time and are considered a "standard" part of X
+ * keysym definitions.
+ * XFree86 never properly commented these keysyms, so we have done our
+ * best to explain the semantic meaning of these keys.
+ *
+ * XFree86 has removed their mail archives of the period, that might have
+ * shed more light on some of these definitions. Until/unless we resurrect
+ * these archives, these are from memory and usage.
+ */
+
+/*
+ * ModeLock
+ *
+ * This one is old, and not really used any more since XKB offers this
+ * functionality.
+ */
+
+#define XKB_KEY_XF86ModeLock		0x1008FF01	/* Mode Switch Lock */
+
+/* Backlight controls. */
+#define XKB_KEY_XF86MonBrightnessUp    0x1008FF02  /* Monitor/panel brightness */
+#define XKB_KEY_XF86MonBrightnessDown  0x1008FF03  /* Monitor/panel brightness */
+#define XKB_KEY_XF86KbdLightOnOff      0x1008FF04  /* Keyboards may be lit     */
+#define XKB_KEY_XF86KbdBrightnessUp    0x1008FF05  /* Keyboards may be lit     */
+#define XKB_KEY_XF86KbdBrightnessDown  0x1008FF06  /* Keyboards may be lit     */
+#define XKB_KEY_XF86MonBrightnessCycle 0x1008FF07  /* Monitor/panel brightness */
+
+/*
+ * Keys found on some "Internet" keyboards.
+ */
+#define XKB_KEY_XF86Standby		0x1008FF10   /* System into standby mode   */
+#define XKB_KEY_XF86AudioLowerVolume	0x1008FF11   /* Volume control down        */
+#define XKB_KEY_XF86AudioMute	0x1008FF12   /* Mute sound from the system */
+#define XKB_KEY_XF86AudioRaiseVolume	0x1008FF13   /* Volume control up          */
+#define XKB_KEY_XF86AudioPlay	0x1008FF14   /* Start playing of audio >   */
+#define XKB_KEY_XF86AudioStop	0x1008FF15   /* Stop playing audio         */
+#define XKB_KEY_XF86AudioPrev	0x1008FF16   /* Previous track             */
+#define XKB_KEY_XF86AudioNext	0x1008FF17   /* Next track                 */
+#define XKB_KEY_XF86HomePage		0x1008FF18   /* Display user's home page   */
+#define XKB_KEY_XF86Mail		0x1008FF19   /* Invoke user's mail program */
+#define XKB_KEY_XF86Start		0x1008FF1A   /* Start application          */
+#define XKB_KEY_XF86Search		0x1008FF1B   /* Search                     */
+#define XKB_KEY_XF86AudioRecord	0x1008FF1C   /* Record audio application   */
+
+/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere)   */
+#define XKB_KEY_XF86Calculator	0x1008FF1D   /* Invoke calculator program  */
+#define XKB_KEY_XF86Memo		0x1008FF1E   /* Invoke Memo taking program */
+#define XKB_KEY_XF86ToDoList		0x1008FF1F   /* Invoke To Do List program  */
+#define XKB_KEY_XF86Calendar		0x1008FF20   /* Invoke Calendar program    */
+#define XKB_KEY_XF86PowerDown	0x1008FF21   /* Deep sleep the system      */
+#define XKB_KEY_XF86ContrastAdjust	0x1008FF22   /* Adjust screen contrast     */
+#define XKB_KEY_XF86RockerUp		0x1008FF23   /* Rocker switches exist up   */
+#define XKB_KEY_XF86RockerDown	0x1008FF24   /* and down                   */
+#define XKB_KEY_XF86RockerEnter	0x1008FF25   /* and let you press them     */
+
+/* Some more "Internet" keyboard symbols */
+#define XKB_KEY_XF86Back		0x1008FF26   /* Like back on a browser     */
+#define XKB_KEY_XF86Forward		0x1008FF27   /* Like forward on a browser  */
+#define XKB_KEY_XF86Stop		0x1008FF28   /* Stop current operation     */
+#define XKB_KEY_XF86Refresh		0x1008FF29   /* Refresh the page           */
+#define XKB_KEY_XF86PowerOff		0x1008FF2A   /* Power off system entirely  */
+#define XKB_KEY_XF86WakeUp		0x1008FF2B   /* Wake up system from sleep  */
+#define XKB_KEY_XF86Eject            0x1008FF2C   /* Eject device (e.g. DVD)    */
+#define XKB_KEY_XF86ScreenSaver      0x1008FF2D   /* Invoke screensaver         */
+#define XKB_KEY_XF86WWW              0x1008FF2E   /* Invoke web browser         */
+#define XKB_KEY_XF86Sleep            0x1008FF2F   /* Put system to sleep        */
+#define XKB_KEY_XF86Favorites	0x1008FF30   /* Show favorite locations    */
+#define XKB_KEY_XF86AudioPause	0x1008FF31   /* Pause audio playing        */
+#define XKB_KEY_XF86AudioMedia	0x1008FF32   /* Launch media collection app */
+#define XKB_KEY_XF86MyComputer	0x1008FF33   /* Display "My Computer" window */
+#define XKB_KEY_XF86VendorHome	0x1008FF34   /* Display vendor home web site */
+#define XKB_KEY_XF86LightBulb	0x1008FF35   /* Light bulb keys exist       */
+#define XKB_KEY_XF86Shop		0x1008FF36   /* Display shopping web site   */
+#define XKB_KEY_XF86History		0x1008FF37   /* Show history of web surfing */
+#define XKB_KEY_XF86OpenURL		0x1008FF38   /* Open selected URL           */
+#define XKB_KEY_XF86AddFavorite	0x1008FF39   /* Add URL to favorites list   */
+#define XKB_KEY_XF86HotLinks		0x1008FF3A   /* Show "hot" links            */
+#define XKB_KEY_XF86BrightnessAdjust	0x1008FF3B   /* Invoke brightness adj. UI   */
+#define XKB_KEY_XF86Finance		0x1008FF3C   /* Display financial site      */
+#define XKB_KEY_XF86Community	0x1008FF3D   /* Display user's community    */
+#define XKB_KEY_XF86AudioRewind	0x1008FF3E   /* "rewind" audio track        */
+#define XKB_KEY_XF86BackForward	0x1008FF3F   /* ??? */
+#define XKB_KEY_XF86Launch0		0x1008FF40   /* Launch Application          */
+#define XKB_KEY_XF86Launch1		0x1008FF41   /* Launch Application          */
+#define XKB_KEY_XF86Launch2		0x1008FF42   /* Launch Application          */
+#define XKB_KEY_XF86Launch3		0x1008FF43   /* Launch Application          */
+#define XKB_KEY_XF86Launch4		0x1008FF44   /* Launch Application          */
+#define XKB_KEY_XF86Launch5		0x1008FF45   /* Launch Application          */
+#define XKB_KEY_XF86Launch6		0x1008FF46   /* Launch Application          */
+#define XKB_KEY_XF86Launch7		0x1008FF47   /* Launch Application          */
+#define XKB_KEY_XF86Launch8		0x1008FF48   /* Launch Application          */
+#define XKB_KEY_XF86Launch9		0x1008FF49   /* Launch Application          */
+#define XKB_KEY_XF86LaunchA		0x1008FF4A   /* Launch Application          */
+#define XKB_KEY_XF86LaunchB		0x1008FF4B   /* Launch Application          */
+#define XKB_KEY_XF86LaunchC		0x1008FF4C   /* Launch Application          */
+#define XKB_KEY_XF86LaunchD		0x1008FF4D   /* Launch Application          */
+#define XKB_KEY_XF86LaunchE		0x1008FF4E   /* Launch Application          */
+#define XKB_KEY_XF86LaunchF		0x1008FF4F   /* Launch Application          */
+
+#define XKB_KEY_XF86ApplicationLeft	0x1008FF50   /* switch to application, left */
+#define XKB_KEY_XF86ApplicationRight	0x1008FF51   /* switch to application, right*/
+#define XKB_KEY_XF86Book		0x1008FF52   /* Launch bookreader           */
+#define XKB_KEY_XF86CD		0x1008FF53   /* Launch CD/DVD player        */
+#define XKB_KEY_XF86Calculater	0x1008FF54   /* Launch Calculater           */
+#define XKB_KEY_XF86Clear		0x1008FF55   /* Clear window, screen        */
+#define XKB_KEY_XF86Close		0x1008FF56   /* Close window                */
+#define XKB_KEY_XF86Copy		0x1008FF57   /* Copy selection              */
+#define XKB_KEY_XF86Cut		0x1008FF58   /* Cut selection               */
+#define XKB_KEY_XF86Display		0x1008FF59   /* Output switch key           */
+#define XKB_KEY_XF86DOS		0x1008FF5A   /* Launch DOS (emulation)      */
+#define XKB_KEY_XF86Documents	0x1008FF5B   /* Open documents window       */
+#define XKB_KEY_XF86Excel		0x1008FF5C   /* Launch spread sheet         */
+#define XKB_KEY_XF86Explorer		0x1008FF5D   /* Launch file explorer        */
+#define XKB_KEY_XF86Game		0x1008FF5E   /* Launch game                 */
+#define XKB_KEY_XF86Go		0x1008FF5F   /* Go to URL                   */
+#define XKB_KEY_XF86iTouch		0x1008FF60   /* Logitech iTouch- don't use  */
+#define XKB_KEY_XF86LogOff		0x1008FF61   /* Log off system              */
+#define XKB_KEY_XF86Market		0x1008FF62   /* ??                          */
+#define XKB_KEY_XF86Meeting		0x1008FF63   /* enter meeting in calendar   */
+#define XKB_KEY_XF86MenuKB		0x1008FF65   /* distinguish keyboard from PB */
+#define XKB_KEY_XF86MenuPB		0x1008FF66   /* distinguish PB from keyboard */
+#define XKB_KEY_XF86MySites		0x1008FF67   /* Favourites                  */
+#define XKB_KEY_XF86New		0x1008FF68   /* New (folder, document...    */
+#define XKB_KEY_XF86News		0x1008FF69   /* News                        */
+#define XKB_KEY_XF86OfficeHome	0x1008FF6A   /* Office home (old Staroffice)*/
+#define XKB_KEY_XF86Open		0x1008FF6B   /* Open                        */
+#define XKB_KEY_XF86Option		0x1008FF6C   /* ?? */
+#define XKB_KEY_XF86Paste		0x1008FF6D   /* Paste                       */
+#define XKB_KEY_XF86Phone		0x1008FF6E   /* Launch phone; dial number   */
+#define XKB_KEY_XF86Q		0x1008FF70   /* Compaq's Q - don't use      */
+#define XKB_KEY_XF86Reply		0x1008FF72   /* Reply e.g., mail            */
+#define XKB_KEY_XF86Reload		0x1008FF73   /* Reload web page, file, etc. */
+#define XKB_KEY_XF86RotateWindows	0x1008FF74   /* Rotate windows e.g. xrandr  */
+#define XKB_KEY_XF86RotationPB	0x1008FF75   /* don't use                   */
+#define XKB_KEY_XF86RotationKB	0x1008FF76   /* don't use                   */
+#define XKB_KEY_XF86Save		0x1008FF77   /* Save (file, document, state */
+#define XKB_KEY_XF86ScrollUp		0x1008FF78   /* Scroll window/contents up   */
+#define XKB_KEY_XF86ScrollDown	0x1008FF79   /* Scrool window/contentd down */
+#define XKB_KEY_XF86ScrollClick	0x1008FF7A   /* Use XKB mousekeys instead   */
+#define XKB_KEY_XF86Send		0x1008FF7B   /* Send mail, file, object     */
+#define XKB_KEY_XF86Spell		0x1008FF7C   /* Spell checker               */
+#define XKB_KEY_XF86SplitScreen	0x1008FF7D   /* Split window or screen      */
+#define XKB_KEY_XF86Support		0x1008FF7E   /* Get support (??)            */
+#define XKB_KEY_XF86TaskPane		0x1008FF7F   /* Show tasks */
+#define XKB_KEY_XF86Terminal		0x1008FF80   /* Launch terminal emulator    */
+#define XKB_KEY_XF86Tools		0x1008FF81   /* toolbox of desktop/app.     */
+#define XKB_KEY_XF86Travel		0x1008FF82   /* ?? */
+#define XKB_KEY_XF86UserPB		0x1008FF84   /* ?? */
+#define XKB_KEY_XF86User1KB		0x1008FF85   /* ?? */
+#define XKB_KEY_XF86User2KB		0x1008FF86   /* ?? */
+#define XKB_KEY_XF86Video		0x1008FF87   /* Launch video player       */
+#define XKB_KEY_XF86WheelButton	0x1008FF88   /* button from a mouse wheel */
+#define XKB_KEY_XF86Word		0x1008FF89   /* Launch word processor     */
+#define XKB_KEY_XF86Xfer		0x1008FF8A
+#define XKB_KEY_XF86ZoomIn		0x1008FF8B   /* zoom in view, map, etc.   */
+#define XKB_KEY_XF86ZoomOut		0x1008FF8C   /* zoom out view, map, etc.  */
+
+#define XKB_KEY_XF86Away		0x1008FF8D   /* mark yourself as away     */
+#define XKB_KEY_XF86Messenger	0x1008FF8E   /* as in instant messaging   */
+#define XKB_KEY_XF86WebCam		0x1008FF8F   /* Launch web camera app.    */
+#define XKB_KEY_XF86MailForward	0x1008FF90   /* Forward in mail           */
+#define XKB_KEY_XF86Pictures		0x1008FF91   /* Show pictures             */
+#define XKB_KEY_XF86Music		0x1008FF92   /* Launch music application  */
+
+#define XKB_KEY_XF86Battery		0x1008FF93   /* Display battery information */
+#define XKB_KEY_XF86Bluetooth	0x1008FF94   /* Enable/disable Bluetooth    */
+#define XKB_KEY_XF86WLAN		0x1008FF95   /* Enable/disable WLAN         */
+#define XKB_KEY_XF86UWB		0x1008FF96   /* Enable/disable UWB	    */
+
+#define XKB_KEY_XF86AudioForward	0x1008FF97   /* fast-forward audio track    */
+#define XKB_KEY_XF86AudioRepeat	0x1008FF98   /* toggle repeat mode          */
+#define XKB_KEY_XF86AudioRandomPlay	0x1008FF99   /* toggle shuffle mode         */
+#define XKB_KEY_XF86Subtitle		0x1008FF9A   /* cycle through subtitle      */
+#define XKB_KEY_XF86AudioCycleTrack	0x1008FF9B   /* cycle through audio tracks  */
+#define XKB_KEY_XF86CycleAngle	0x1008FF9C   /* cycle through angles        */
+#define XKB_KEY_XF86FrameBack	0x1008FF9D   /* video: go one frame back    */
+#define XKB_KEY_XF86FrameForward	0x1008FF9E   /* video: go one frame forward */
+#define XKB_KEY_XF86Time		0x1008FF9F   /* display, or shows an entry for time seeking */
+#define XKB_KEY_XF86Select		0x1008FFA0   /* Select button on joypads and remotes */
+#define XKB_KEY_XF86View		0x1008FFA1   /* Show a view options/properties */
+#define XKB_KEY_XF86TopMenu		0x1008FFA2   /* Go to a top-level menu in a video */
+
+#define XKB_KEY_XF86Red		0x1008FFA3   /* Red button                  */
+#define XKB_KEY_XF86Green		0x1008FFA4   /* Green button                */
+#define XKB_KEY_XF86Yellow		0x1008FFA5   /* Yellow button               */
+#define XKB_KEY_XF86Blue             0x1008FFA6   /* Blue button                 */
+
+#define XKB_KEY_XF86Suspend		0x1008FFA7   /* Sleep to RAM                */
+#define XKB_KEY_XF86Hibernate	0x1008FFA8   /* Sleep to disk               */
+#define XKB_KEY_XF86TouchpadToggle	0x1008FFA9   /* Toggle between touchpad/trackstick */
+#define XKB_KEY_XF86TouchpadOn	0x1008FFB0   /* The touchpad got switched on */
+#define XKB_KEY_XF86TouchpadOff	0x1008FFB1   /* The touchpad got switched off */
+
+#define XKB_KEY_XF86AudioMicMute	0x1008FFB2   /* Mute the Mic from the system */
+
+#define XKB_KEY_XF86Keyboard		0x1008FFB3   /* User defined keyboard related action */
+
+#define XKB_KEY_XF86WWAN		0x1008FFB4   /* Toggle WWAN (LTE, UMTS, etc.) radio */
+#define XKB_KEY_XF86RFKill		0x1008FFB5   /* Toggle radios on/off */
+
+#define XKB_KEY_XF86AudioPreset	0x1008FFB6   /* Select equalizer preset, e.g. theatre-mode */
+
+#define XKB_KEY_XF86RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */
+
+#define XKB_KEY_XF86FullScreen	0x1008FFB8   /* Toggle fullscreen */
+
+/* Keys for special action keys (hot keys) */
+/* Virtual terminals on some operating systems */
+#define XKB_KEY_XF86Switch_VT_1	0x1008FE01
+#define XKB_KEY_XF86Switch_VT_2	0x1008FE02
+#define XKB_KEY_XF86Switch_VT_3	0x1008FE03
+#define XKB_KEY_XF86Switch_VT_4	0x1008FE04
+#define XKB_KEY_XF86Switch_VT_5	0x1008FE05
+#define XKB_KEY_XF86Switch_VT_6	0x1008FE06
+#define XKB_KEY_XF86Switch_VT_7	0x1008FE07
+#define XKB_KEY_XF86Switch_VT_8	0x1008FE08
+#define XKB_KEY_XF86Switch_VT_9	0x1008FE09
+#define XKB_KEY_XF86Switch_VT_10	0x1008FE0A
+#define XKB_KEY_XF86Switch_VT_11	0x1008FE0B
+#define XKB_KEY_XF86Switch_VT_12	0x1008FE0C
+
+#define XKB_KEY_XF86Ungrab		0x1008FE20   /* force ungrab               */
+#define XKB_KEY_XF86ClearGrab	0x1008FE21   /* kill application with grab */
+#define XKB_KEY_XF86Next_VMode	0x1008FE22   /* next video mode available  */
+#define XKB_KEY_XF86Prev_VMode	0x1008FE23   /* prev. video mode available */
+#define XKB_KEY_XF86LogWindowTree	0x1008FE24   /* print window tree to log   */
+#define XKB_KEY_XF86LogGrabInfo	0x1008FE25   /* print all active grabs to log */
+
+
+/*
+ * Reserved range for evdev symbols: 0x10081000-0x10081FFF
+ *
+ * Key syms within this range must match the Linux kernel
+ * input-event-codes.h file in the format:
+ *     XF86XK_CamelCaseKernelName	_EVDEVK(kernel value)
+ * For example, the kernel
+ *   #define KEY_MACRO_RECORD_START	0x2b0
+ * effectively ends up as:
+ *   #define XKB_KEY_XF86MacroRecordStart	0x100812b0
+ *
+ * For historical reasons, some keysyms within the reserved range will be
+ * missing, most notably all "normal" keys that are mapped through default
+ * XKB layouts (e.g. KEY_Q).
+ *
+ * CamelCasing is done with a human control as last authority, e.g. see VOD
+ * instead of Vod for the Video on Demand key.
+ *
+ * The format for #defines is strict:
+ *
+ * #define XKB_KEY_XF86FOO<tab...>_EVDEVK(0xABC)<tab><tab> |* kver KEY_FOO *|
+ *
+ * Where
+ * - alignment by tabs
+ * - the _EVDEVK macro must be used
+ * - the hex code must be in uppercase hex
+ * - the kernel version (kver) is in the form v5.10
+ * - kver and key name are within a slash-star comment (a pipe is used in
+ *   this example for technical reasons)
+ * These #defines are parsed by scripts. Do not stray from the given format.
+ *
+ * Where the evdev keycode is mapped to a different symbol, please add a
+ * comment line starting with Use: but otherwise the same format, e.g.
+ *  Use: XF86XK_RotationLockToggle	_EVDEVK(0x231)		   v4.16 KEY_ROTATE_LOCK_TOGGLE
+ *
+ */
+/* Use: XF86XK_Eject			_EVDEVK(0x0A2)		         KEY_EJECTCLOSECD */
+/* Use: XF86XK_New			_EVDEVK(0x0B5)		   v2.6.14 KEY_NEW */
+/* Use: XK_Redo				_EVDEVK(0x0B6)		   v2.6.14 KEY_REDO */
+/* KEY_DASHBOARD has been mapped to LaunchB in xkeyboard-config since 2011 */
+/* Use: XF86XK_LaunchB			_EVDEVK(0x0CC)		   v2.6.28 KEY_DASHBOARD */
+/* Use: XF86XK_Display			_EVDEVK(0x0E3)		   v2.6.12 KEY_SWITCHVIDEOMODE */
+/* Use: XF86XK_KbdLightOnOff		_EVDEVK(0x0E4)		   v2.6.12 KEY_KBDILLUMTOGGLE */
+/* Use: XF86XK_KbdBrightnessDown	_EVDEVK(0x0E5)		   v2.6.12 KEY_KBDILLUMDOWN */
+/* Use: XF86XK_KbdBrightnessUp		_EVDEVK(0x0E6)		   v2.6.12 KEY_KBDILLUMUP */
+/* Use: XF86XK_Send			_EVDEVK(0x0E7)		   v2.6.14 KEY_SEND */
+/* Use: XF86XK_Reply			_EVDEVK(0x0E8)		   v2.6.14 KEY_REPLY */
+/* Use: XF86XK_MailForward		_EVDEVK(0x0E9)		   v2.6.14 KEY_FORWARDMAIL */
+/* Use: XF86XK_Save			_EVDEVK(0x0EA)		   v2.6.14 KEY_SAVE */
+/* Use: XF86XK_Documents		_EVDEVK(0x0EB)		   v2.6.14 KEY_DOCUMENTS */
+/* Use: XF86XK_Battery			_EVDEVK(0x0EC)		   v2.6.17 KEY_BATTERY */
+/* Use: XF86XK_Bluetooth		_EVDEVK(0x0ED)		   v2.6.19 KEY_BLUETOOTH */
+/* Use: XF86XK_WLAN			_EVDEVK(0x0EE)		   v2.6.19 KEY_WLAN */
+/* Use: XF86XK_UWB			_EVDEVK(0x0EF)		   v2.6.24 KEY_UWB */
+/* Use: XF86XK_Next_VMode		_EVDEVK(0x0F1)		   v2.6.23 KEY_VIDEO_NEXT */
+/* Use: XF86XK_Prev_VMode		_EVDEVK(0x0F2)		   v2.6.23 KEY_VIDEO_PREV */
+/* Use: XF86XK_MonBrightnessCycle	_EVDEVK(0x0F3)		   v2.6.23 KEY_BRIGHTNESS_CYCLE */
+#define XKB_KEY_XF86BrightnessAuto		0x100810f4		/* v3.16 KEY_BRIGHTNESS_AUTO */
+#define XKB_KEY_XF86DisplayOff		0x100810f5		/* v2.6.23 KEY_DISPLAY_OFF */
+/* Use: XF86XK_WWAN			_EVDEVK(0x0F6)		   v3.13 KEY_WWAN */
+/* Use: XF86XK_RFKill			_EVDEVK(0x0F7)		   v2.6.33 KEY_RFKILL */
+/* Use: XF86XK_AudioMicMute		_EVDEVK(0x0F8)		   v3.1  KEY_MICMUTE */
+#define XKB_KEY_XF86Info			0x10081166		/*       KEY_INFO */
+/* Use: XF86XK_CycleAngle		_EVDEVK(0x173)		         KEY_ANGLE */
+/* Use: XF86XK_FullScreen		_EVDEVK(0x174)		   v5.1  KEY_FULL_SCREEN */
+#define XKB_KEY_XF86AspectRatio		0x10081177		/* v5.1  KEY_ASPECT_RATIO */
+#define XKB_KEY_XF86DVD			0x10081185		/*       KEY_DVD */
+#define XKB_KEY_XF86Audio			0x10081188		/*       KEY_AUDIO */
+/* Use: XF86XK_Video			_EVDEVK(0x189)		         KEY_VIDEO */
+/* Use: XF86XK_Calendar			_EVDEVK(0x18D)		         KEY_CALENDAR */
+#define XKB_KEY_XF86ChannelUp		0x10081192		/*       KEY_CHANNELUP */
+#define XKB_KEY_XF86ChannelDown		0x10081193		/*       KEY_CHANNELDOWN */
+/* Use: XF86XK_AudioRandomPlay		_EVDEVK(0x19A)		         KEY_SHUFFLE */
+#define XKB_KEY_XF86Break			0x1008119b		/*       KEY_BREAK */
+#define XKB_KEY_XF86VideoPhone		0x100811a0		/* v2.6.20 KEY_VIDEOPHONE */
+/* Use: XF86XK_Game			_EVDEVK(0x1A1)		   v2.6.20 KEY_GAMES */
+/* Use: XF86XK_ZoomIn			_EVDEVK(0x1A2)		   v2.6.20 KEY_ZOOMIN */
+/* Use: XF86XK_ZoomOut			_EVDEVK(0x1A3)		   v2.6.20 KEY_ZOOMOUT */
+#define XKB_KEY_XF86ZoomReset		0x100811a4		/* v2.6.20 KEY_ZOOMRESET */
+/* Use: XF86XK_Word			_EVDEVK(0x1A5)		   v2.6.20 KEY_WORDPROCESSOR */
+#define XKB_KEY_XF86Editor			0x100811a6		/* v2.6.20 KEY_EDITOR */
+/* Use: XF86XK_Excel			_EVDEVK(0x1A7)		   v2.6.20 KEY_SPREADSHEET */
+#define XKB_KEY_XF86GraphicsEditor		0x100811a8		/* v2.6.20 KEY_GRAPHICSEDITOR */
+#define XKB_KEY_XF86Presentation		0x100811a9		/* v2.6.20 KEY_PRESENTATION */
+#define XKB_KEY_XF86Database			0x100811aa		/* v2.6.20 KEY_DATABASE */
+/* Use: XF86XK_News			_EVDEVK(0x1AB)		   v2.6.20 KEY_NEWS */
+#define XKB_KEY_XF86Voicemail		0x100811ac		/* v2.6.20 KEY_VOICEMAIL */
+#define XKB_KEY_XF86Addressbook		0x100811ad		/* v2.6.20 KEY_ADDRESSBOOK */
+/* Use: XF86XK_Messenger		_EVDEVK(0x1AE)		   v2.6.20 KEY_MESSENGER */
+#define XKB_KEY_XF86DisplayToggle		0x100811af		/* v2.6.20 KEY_DISPLAYTOGGLE */
+#define XKB_KEY_XF86SpellCheck		0x100811b0		/* v2.6.24 KEY_SPELLCHECK */
+/* Use: XF86XK_LogOff			_EVDEVK(0x1B1)		   v2.6.24 KEY_LOGOFF */
+/* Use: XK_dollar			_EVDEVK(0x1B2)		   v2.6.24 KEY_DOLLAR */
+/* Use: XK_EuroSign			_EVDEVK(0x1B3)		   v2.6.24 KEY_EURO */
+/* Use: XF86XK_FrameBack		_EVDEVK(0x1B4)		   v2.6.24 KEY_FRAMEBACK */
+/* Use: XF86XK_FrameForward		_EVDEVK(0x1B5)		   v2.6.24 KEY_FRAMEFORWARD */
+#define XKB_KEY_XF86ContextMenu		0x100811b6		/* v2.6.24 KEY_CONTEXT_MENU */
+#define XKB_KEY_XF86MediaRepeat		0x100811b7		/* v2.6.26 KEY_MEDIA_REPEAT */
+#define XKB_KEY_XF8610ChannelsUp		0x100811b8		/* v2.6.38 KEY_10CHANNELSUP */
+#define XKB_KEY_XF8610ChannelsDown		0x100811b9		/* v2.6.38 KEY_10CHANNELSDOWN */
+#define XKB_KEY_XF86Images			0x100811ba		/* v2.6.39 KEY_IMAGES */
+#define XKB_KEY_XF86NotificationCenter	0x100811bc		/* v5.10 KEY_NOTIFICATION_CENTER */
+#define XKB_KEY_XF86PickupPhone		0x100811bd		/* v5.10 KEY_PICKUP_PHONE */
+#define XKB_KEY_XF86HangupPhone		0x100811be		/* v5.10 KEY_HANGUP_PHONE */
+#define XKB_KEY_XF86Fn			0x100811d0		/*       KEY_FN */
+#define XKB_KEY_XF86Fn_Esc			0x100811d1		/*       KEY_FN_ESC */
+#define XKB_KEY_XF86FnRightShift		0x100811e5		/* v5.10 KEY_FN_RIGHT_SHIFT */
+/* Use: XK_braille_dot_1		_EVDEVK(0x1F1)		   v2.6.17 KEY_BRL_DOT1 */
+/* Use: XK_braille_dot_2		_EVDEVK(0x1F2)		   v2.6.17 KEY_BRL_DOT2 */
+/* Use: XK_braille_dot_3		_EVDEVK(0x1F3)		   v2.6.17 KEY_BRL_DOT3 */
+/* Use: XK_braille_dot_4		_EVDEVK(0x1F4)		   v2.6.17 KEY_BRL_DOT4 */
+/* Use: XK_braille_dot_5		_EVDEVK(0x1F5)		   v2.6.17 KEY_BRL_DOT5 */
+/* Use: XK_braille_dot_6		_EVDEVK(0x1F6)		   v2.6.17 KEY_BRL_DOT6 */
+/* Use: XK_braille_dot_7		_EVDEVK(0x1F7)		   v2.6.17 KEY_BRL_DOT7 */
+/* Use: XK_braille_dot_8		_EVDEVK(0x1F8)		   v2.6.17 KEY_BRL_DOT8 */
+/* Use: XK_braille_dot_9		_EVDEVK(0x1F9)		   v2.6.23 KEY_BRL_DOT9 */
+/* Use: XK_braille_dot_1		_EVDEVK(0x1FA)		   v2.6.23 KEY_BRL_DOT10 */
+#define XKB_KEY_XF86Numeric0			0x10081200		/* v2.6.28 KEY_NUMERIC_0 */
+#define XKB_KEY_XF86Numeric1			0x10081201		/* v2.6.28 KEY_NUMERIC_1 */
+#define XKB_KEY_XF86Numeric2			0x10081202		/* v2.6.28 KEY_NUMERIC_2 */
+#define XKB_KEY_XF86Numeric3			0x10081203		/* v2.6.28 KEY_NUMERIC_3 */
+#define XKB_KEY_XF86Numeric4			0x10081204		/* v2.6.28 KEY_NUMERIC_4 */
+#define XKB_KEY_XF86Numeric5			0x10081205		/* v2.6.28 KEY_NUMERIC_5 */
+#define XKB_KEY_XF86Numeric6			0x10081206		/* v2.6.28 KEY_NUMERIC_6 */
+#define XKB_KEY_XF86Numeric7			0x10081207		/* v2.6.28 KEY_NUMERIC_7 */
+#define XKB_KEY_XF86Numeric8			0x10081208		/* v2.6.28 KEY_NUMERIC_8 */
+#define XKB_KEY_XF86Numeric9			0x10081209		/* v2.6.28 KEY_NUMERIC_9 */
+#define XKB_KEY_XF86NumericStar		0x1008120a		/* v2.6.28 KEY_NUMERIC_STAR */
+#define XKB_KEY_XF86NumericPound		0x1008120b		/* v2.6.28 KEY_NUMERIC_POUND */
+#define XKB_KEY_XF86NumericA			0x1008120c		/* v4.1  KEY_NUMERIC_A */
+#define XKB_KEY_XF86NumericB			0x1008120d		/* v4.1  KEY_NUMERIC_B */
+#define XKB_KEY_XF86NumericC			0x1008120e		/* v4.1  KEY_NUMERIC_C */
+#define XKB_KEY_XF86NumericD			0x1008120f		/* v4.1  KEY_NUMERIC_D */
+#define XKB_KEY_XF86CameraFocus		0x10081210		/* v2.6.33 KEY_CAMERA_FOCUS */
+#define XKB_KEY_XF86WPSButton		0x10081211		/* v2.6.34 KEY_WPS_BUTTON */
+/* Use: XF86XK_TouchpadToggle		_EVDEVK(0x212)		   v2.6.37 KEY_TOUCHPAD_TOGGLE */
+/* Use: XF86XK_TouchpadOn		_EVDEVK(0x213)		   v2.6.37 KEY_TOUCHPAD_ON */
+/* Use: XF86XK_TouchpadOff		_EVDEVK(0x214)		   v2.6.37 KEY_TOUCHPAD_OFF */
+#define XKB_KEY_XF86CameraZoomIn		0x10081215		/* v2.6.39 KEY_CAMERA_ZOOMIN */
+#define XKB_KEY_XF86CameraZoomOut		0x10081216		/* v2.6.39 KEY_CAMERA_ZOOMOUT */
+#define XKB_KEY_XF86CameraUp			0x10081217		/* v2.6.39 KEY_CAMERA_UP */
+#define XKB_KEY_XF86CameraDown		0x10081218		/* v2.6.39 KEY_CAMERA_DOWN */
+#define XKB_KEY_XF86CameraLeft		0x10081219		/* v2.6.39 KEY_CAMERA_LEFT */
+#define XKB_KEY_XF86CameraRight		0x1008121a		/* v2.6.39 KEY_CAMERA_RIGHT */
+#define XKB_KEY_XF86AttendantOn		0x1008121b		/* v3.10 KEY_ATTENDANT_ON */
+#define XKB_KEY_XF86AttendantOff		0x1008121c		/* v3.10 KEY_ATTENDANT_OFF */
+#define XKB_KEY_XF86AttendantToggle		0x1008121d		/* v3.10 KEY_ATTENDANT_TOGGLE */
+#define XKB_KEY_XF86LightsToggle		0x1008121e		/* v3.10 KEY_LIGHTS_TOGGLE */
+#define XKB_KEY_XF86ALSToggle		0x10081230		/* v3.13 KEY_ALS_TOGGLE */
+/* Use: XF86XK_RotationLockToggle	_EVDEVK(0x231)		   v4.16 KEY_ROTATE_LOCK_TOGGLE */
+#define XKB_KEY_XF86Buttonconfig		0x10081240		/* v3.16 KEY_BUTTONCONFIG */
+#define XKB_KEY_XF86Taskmanager		0x10081241		/* v3.16 KEY_TASKMANAGER */
+#define XKB_KEY_XF86Journal			0x10081242		/* v3.16 KEY_JOURNAL */
+#define XKB_KEY_XF86ControlPanel		0x10081243		/* v3.16 KEY_CONTROLPANEL */
+#define XKB_KEY_XF86AppSelect		0x10081244		/* v3.16 KEY_APPSELECT */
+#define XKB_KEY_XF86Screensaver		0x10081245		/* v3.16 KEY_SCREENSAVER */
+#define XKB_KEY_XF86VoiceCommand		0x10081246		/* v3.16 KEY_VOICECOMMAND */
+#define XKB_KEY_XF86Assistant		0x10081247		/* v4.13 KEY_ASSISTANT */
+/* Use: XK_ISO_Next_Group		_EVDEVK(0x248)		   v5.2  KEY_KBD_LAYOUT_NEXT */
+#define XKB_KEY_XF86BrightnessMin		0x10081250		/* v3.16 KEY_BRIGHTNESS_MIN */
+#define XKB_KEY_XF86BrightnessMax		0x10081251		/* v3.16 KEY_BRIGHTNESS_MAX */
+#define XKB_KEY_XF86KbdInputAssistPrev	0x10081260		/* v3.18 KEY_KBDINPUTASSIST_PREV */
+#define XKB_KEY_XF86KbdInputAssistNext	0x10081261		/* v3.18 KEY_KBDINPUTASSIST_NEXT */
+#define XKB_KEY_XF86KbdInputAssistPrevgroup	0x10081262		/* v3.18 KEY_KBDINPUTASSIST_PREVGROUP */
+#define XKB_KEY_XF86KbdInputAssistNextgroup	0x10081263		/* v3.18 KEY_KBDINPUTASSIST_NEXTGROUP */
+#define XKB_KEY_XF86KbdInputAssistAccept	0x10081264		/* v3.18 KEY_KBDINPUTASSIST_ACCEPT */
+#define XKB_KEY_XF86KbdInputAssistCancel	0x10081265		/* v3.18 KEY_KBDINPUTASSIST_CANCEL */
+#define XKB_KEY_XF86RightUp			0x10081266		/* v4.7  KEY_RIGHT_UP */
+#define XKB_KEY_XF86RightDown		0x10081267		/* v4.7  KEY_RIGHT_DOWN */
+#define XKB_KEY_XF86LeftUp			0x10081268		/* v4.7  KEY_LEFT_UP */
+#define XKB_KEY_XF86LeftDown			0x10081269		/* v4.7  KEY_LEFT_DOWN */
+#define XKB_KEY_XF86RootMenu			0x1008126a		/* v4.7  KEY_ROOT_MENU */
+#define XKB_KEY_XF86MediaTopMenu		0x1008126b		/* v4.7  KEY_MEDIA_TOP_MENU */
+#define XKB_KEY_XF86Numeric11		0x1008126c		/* v4.7  KEY_NUMERIC_11 */
+#define XKB_KEY_XF86Numeric12		0x1008126d		/* v4.7  KEY_NUMERIC_12 */
+#define XKB_KEY_XF86AudioDesc		0x1008126e		/* v4.7  KEY_AUDIO_DESC */
+#define XKB_KEY_XF863DMode			0x1008126f		/* v4.7  KEY_3D_MODE */
+#define XKB_KEY_XF86NextFavorite		0x10081270		/* v4.7  KEY_NEXT_FAVORITE */
+#define XKB_KEY_XF86StopRecord		0x10081271		/* v4.7  KEY_STOP_RECORD */
+#define XKB_KEY_XF86PauseRecord		0x10081272		/* v4.7  KEY_PAUSE_RECORD */
+#define XKB_KEY_XF86VOD			0x10081273		/* v4.7  KEY_VOD */
+#define XKB_KEY_XF86Unmute			0x10081274		/* v4.7  KEY_UNMUTE */
+#define XKB_KEY_XF86FastReverse		0x10081275		/* v4.7  KEY_FASTREVERSE */
+#define XKB_KEY_XF86SlowReverse		0x10081276		/* v4.7  KEY_SLOWREVERSE */
+#define XKB_KEY_XF86Data			0x10081277		/* v4.7  KEY_DATA */
+#define XKB_KEY_XF86OnScreenKeyboard		0x10081278		/* v4.12 KEY_ONSCREEN_KEYBOARD */
+#define XKB_KEY_XF86PrivacyScreenToggle	0x10081279		/* v5.5  KEY_PRIVACY_SCREEN_TOGGLE */
+#define XKB_KEY_XF86SelectiveScreenshot	0x1008127a		/* v5.6  KEY_SELECTIVE_SCREENSHOT */
+#define XKB_KEY_XF86Macro1			0x10081290		/* v5.5  KEY_MACRO1 */
+#define XKB_KEY_XF86Macro2			0x10081291		/* v5.5  KEY_MACRO2 */
+#define XKB_KEY_XF86Macro3			0x10081292		/* v5.5  KEY_MACRO3 */
+#define XKB_KEY_XF86Macro4			0x10081293		/* v5.5  KEY_MACRO4 */
+#define XKB_KEY_XF86Macro5			0x10081294		/* v5.5  KEY_MACRO5 */
+#define XKB_KEY_XF86Macro6			0x10081295		/* v5.5  KEY_MACRO6 */
+#define XKB_KEY_XF86Macro7			0x10081296		/* v5.5  KEY_MACRO7 */
+#define XKB_KEY_XF86Macro8			0x10081297		/* v5.5  KEY_MACRO8 */
+#define XKB_KEY_XF86Macro9			0x10081298		/* v5.5  KEY_MACRO9 */
+#define XKB_KEY_XF86Macro10			0x10081299		/* v5.5  KEY_MACRO10 */
+#define XKB_KEY_XF86Macro11			0x1008129a		/* v5.5  KEY_MACRO11 */
+#define XKB_KEY_XF86Macro12			0x1008129b		/* v5.5  KEY_MACRO12 */
+#define XKB_KEY_XF86Macro13			0x1008129c		/* v5.5  KEY_MACRO13 */
+#define XKB_KEY_XF86Macro14			0x1008129d		/* v5.5  KEY_MACRO14 */
+#define XKB_KEY_XF86Macro15			0x1008129e		/* v5.5  KEY_MACRO15 */
+#define XKB_KEY_XF86Macro16			0x1008129f		/* v5.5  KEY_MACRO16 */
+#define XKB_KEY_XF86Macro17			0x100812a0		/* v5.5  KEY_MACRO17 */
+#define XKB_KEY_XF86Macro18			0x100812a1		/* v5.5  KEY_MACRO18 */
+#define XKB_KEY_XF86Macro19			0x100812a2		/* v5.5  KEY_MACRO19 */
+#define XKB_KEY_XF86Macro20			0x100812a3		/* v5.5  KEY_MACRO20 */
+#define XKB_KEY_XF86Macro21			0x100812a4		/* v5.5  KEY_MACRO21 */
+#define XKB_KEY_XF86Macro22			0x100812a5		/* v5.5  KEY_MACRO22 */
+#define XKB_KEY_XF86Macro23			0x100812a6		/* v5.5  KEY_MACRO23 */
+#define XKB_KEY_XF86Macro24			0x100812a7		/* v5.5  KEY_MACRO24 */
+#define XKB_KEY_XF86Macro25			0x100812a8		/* v5.5  KEY_MACRO25 */
+#define XKB_KEY_XF86Macro26			0x100812a9		/* v5.5  KEY_MACRO26 */
+#define XKB_KEY_XF86Macro27			0x100812aa		/* v5.5  KEY_MACRO27 */
+#define XKB_KEY_XF86Macro28			0x100812ab		/* v5.5  KEY_MACRO28 */
+#define XKB_KEY_XF86Macro29			0x100812ac		/* v5.5  KEY_MACRO29 */
+#define XKB_KEY_XF86Macro30			0x100812ad		/* v5.5  KEY_MACRO30 */
+#define XKB_KEY_XF86MacroRecordStart		0x100812b0		/* v5.5  KEY_MACRO_RECORD_START */
+#define XKB_KEY_XF86MacroRecordStop		0x100812b1		/* v5.5  KEY_MACRO_RECORD_STOP */
+#define XKB_KEY_XF86MacroPresetCycle		0x100812b2		/* v5.5  KEY_MACRO_PRESET_CYCLE */
+#define XKB_KEY_XF86MacroPreset1		0x100812b3		/* v5.5  KEY_MACRO_PRESET1 */
+#define XKB_KEY_XF86MacroPreset2		0x100812b4		/* v5.5  KEY_MACRO_PRESET2 */
+#define XKB_KEY_XF86MacroPreset3		0x100812b5		/* v5.5  KEY_MACRO_PRESET3 */
+#define XKB_KEY_XF86KbdLcdMenu1		0x100812b8		/* v5.5  KEY_KBD_LCD_MENU1 */
+#define XKB_KEY_XF86KbdLcdMenu2		0x100812b9		/* v5.5  KEY_KBD_LCD_MENU2 */
+#define XKB_KEY_XF86KbdLcdMenu3		0x100812ba		/* v5.5  KEY_KBD_LCD_MENU3 */
+#define XKB_KEY_XF86KbdLcdMenu4		0x100812bb		/* v5.5  KEY_KBD_LCD_MENU4 */
+#define XKB_KEY_XF86KbdLcdMenu5		0x100812bc		/* v5.5  KEY_KBD_LCD_MENU5 */
+#undef _EVDEVK
+/*
+ * Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/************************************************************
+
+Copyright 1991, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+***********************************************************/
+
+/*
+ * Floating Accent
+ */
+
+#define XKB_KEY_SunFA_Grave		0x1005FF00
+#define XKB_KEY_SunFA_Circum		0x1005FF01
+#define XKB_KEY_SunFA_Tilde		0x1005FF02
+#define XKB_KEY_SunFA_Acute		0x1005FF03
+#define XKB_KEY_SunFA_Diaeresis	0x1005FF04
+#define XKB_KEY_SunFA_Cedilla	0x1005FF05
+
+/*
+ * Miscellaneous Functions
+ */
+
+#define XKB_KEY_SunF36		0x1005FF10	/* Labeled F11 */
+#define XKB_KEY_SunF37		0x1005FF11	/* Labeled F12 */
+
+#define XKB_KEY_SunSys_Req   	0x1005FF60
+#define XKB_KEY_SunPrint_Screen	0x0000FF61	/* Same as XK_Print */
+
+/*
+ * International & Multi-Key Character Composition
+ */
+
+#define XKB_KEY_SunCompose		0x0000FF20	/* Same as XK_Multi_key */
+#define XKB_KEY_SunAltGraph		0x0000FF7E	/* Same as XK_Mode_switch */
+
+/*
+ * Cursor Control
+ */
+
+#define XKB_KEY_SunPageUp		0x0000FF55 	/* Same as XK_Prior */
+#define XKB_KEY_SunPageDown		0x0000FF56	/* Same as XK_Next */
+
+/*
+ * Open Look Functions
+ */
+
+#define XKB_KEY_SunUndo		0x0000FF65	/* Same as XK_Undo */
+#define XKB_KEY_SunAgain		0x0000FF66	/* Same as XK_Redo */
+#define XKB_KEY_SunFind		0x0000FF68	/* Same as XK_Find */
+#define XKB_KEY_SunStop		0x0000FF69	/* Same as XK_Cancel */
+#define XKB_KEY_SunProps		0x1005FF70
+#define XKB_KEY_SunFront		0x1005FF71
+#define XKB_KEY_SunCopy		0x1005FF72
+#define XKB_KEY_SunOpen		0x1005FF73
+#define XKB_KEY_SunPaste		0x1005FF74
+#define XKB_KEY_SunCut		0x1005FF75
+
+#define XKB_KEY_SunPowerSwitch		0x1005FF76
+#define XKB_KEY_SunAudioLowerVolume		0x1005FF77
+#define XKB_KEY_SunAudioMute			0x1005FF78
+#define XKB_KEY_SunAudioRaiseVolume		0x1005FF79
+#define XKB_KEY_SunVideoDegauss		0x1005FF7A
+#define XKB_KEY_SunVideoLowerBrightness	0x1005FF7B
+#define XKB_KEY_SunVideoRaiseBrightness	0x1005FF7C
+#define XKB_KEY_SunPowerSwitchShift		0x1005FF7D
+/***********************************************************
+
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+/*
+ * DEC private keysyms
+ * (29th bit set)
+ */
+
+/* two-key compose sequence initiators, chosen to map to Latin1 characters */
+
+#define XKB_KEY_Dring_accent         0x1000FEB0
+#define XKB_KEY_Dcircumflex_accent   0x1000FE5E
+#define XKB_KEY_Dcedilla_accent      0x1000FE2C
+#define XKB_KEY_Dacute_accent        0x1000FE27
+#define XKB_KEY_Dgrave_accent        0x1000FE60
+#define XKB_KEY_Dtilde               0x1000FE7E
+#define XKB_KEY_Ddiaeresis           0x1000FE22
+
+/* special keysym for LK2** "Remove" key on editing keypad */
+
+#define XKB_KEY_DRemove	0x1000FF00   /* Remove */
+/*
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Hewlett Packard
+or Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
+TO THIS SOFTWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  Hewlett-Packard shall not be liable for errors
+contained herein or direct, indirect, special, incidental or
+consequential damages in connection with the furnishing,
+performance, or use of this material.
+
+*/
+
+
+
+#define XKB_KEY_hpClearLine		0x1000FF6F
+#define XKB_KEY_hpInsertLine		0x1000FF70
+#define XKB_KEY_hpDeleteLine		0x1000FF71
+#define XKB_KEY_hpInsertChar		0x1000FF72
+#define XKB_KEY_hpDeleteChar		0x1000FF73
+#define XKB_KEY_hpBackTab		0x1000FF74
+#define XKB_KEY_hpKP_BackTab		0x1000FF75
+#define XKB_KEY_hpModelock1		0x1000FF48
+#define XKB_KEY_hpModelock2		0x1000FF49
+#define XKB_KEY_hpReset		0x1000FF6C
+#define XKB_KEY_hpSystem		0x1000FF6D
+#define XKB_KEY_hpUser		0x1000FF6E
+#define XKB_KEY_hpmute_acute		0x100000A8
+#define XKB_KEY_hpmute_grave		0x100000A9
+#define XKB_KEY_hpmute_asciicircum	0x100000AA
+#define XKB_KEY_hpmute_diaeresis	0x100000AB
+#define XKB_KEY_hpmute_asciitilde	0x100000AC
+#define XKB_KEY_hplira		0x100000AF
+#define XKB_KEY_hpguilder		0x100000BE
+#define XKB_KEY_hpYdiaeresis		0x100000EE
+#define XKB_KEY_hpIO			0x100000EE
+#define XKB_KEY_hplongminus		0x100000F6
+#define XKB_KEY_hpblock		0x100000FC
+
+
+
+#define XKB_KEY_osfCopy		0x1004FF02
+#define XKB_KEY_osfCut		0x1004FF03
+#define XKB_KEY_osfPaste		0x1004FF04
+#define XKB_KEY_osfBackTab		0x1004FF07
+#define XKB_KEY_osfBackSpace		0x1004FF08
+#define XKB_KEY_osfClear		0x1004FF0B
+#define XKB_KEY_osfEscape		0x1004FF1B
+#define XKB_KEY_osfAddMode		0x1004FF31
+#define XKB_KEY_osfPrimaryPaste	0x1004FF32
+#define XKB_KEY_osfQuickPaste	0x1004FF33
+#define XKB_KEY_osfPageLeft		0x1004FF40
+#define XKB_KEY_osfPageUp		0x1004FF41
+#define XKB_KEY_osfPageDown		0x1004FF42
+#define XKB_KEY_osfPageRight		0x1004FF43
+#define XKB_KEY_osfActivate		0x1004FF44
+#define XKB_KEY_osfMenuBar		0x1004FF45
+#define XKB_KEY_osfLeft		0x1004FF51
+#define XKB_KEY_osfUp		0x1004FF52
+#define XKB_KEY_osfRight		0x1004FF53
+#define XKB_KEY_osfDown		0x1004FF54
+#define XKB_KEY_osfEndLine		0x1004FF57
+#define XKB_KEY_osfBeginLine		0x1004FF58
+#define XKB_KEY_osfEndData		0x1004FF59
+#define XKB_KEY_osfBeginData		0x1004FF5A
+#define XKB_KEY_osfPrevMenu		0x1004FF5B
+#define XKB_KEY_osfNextMenu		0x1004FF5C
+#define XKB_KEY_osfPrevField		0x1004FF5D
+#define XKB_KEY_osfNextField		0x1004FF5E
+#define XKB_KEY_osfSelect		0x1004FF60
+#define XKB_KEY_osfInsert		0x1004FF63
+#define XKB_KEY_osfUndo		0x1004FF65
+#define XKB_KEY_osfMenu		0x1004FF67
+#define XKB_KEY_osfCancel		0x1004FF69
+#define XKB_KEY_osfHelp		0x1004FF6A
+#define XKB_KEY_osfSelectAll		0x1004FF71
+#define XKB_KEY_osfDeselectAll	0x1004FF72
+#define XKB_KEY_osfReselect		0x1004FF73
+#define XKB_KEY_osfExtend		0x1004FF74
+#define XKB_KEY_osfRestore		0x1004FF78
+#define XKB_KEY_osfDelete		0x1004FFFF
+
+
+
+/**************************************************************
+ * The use of the following macros is deprecated.
+ * They are listed below only for backwards compatibility.
+ */
+#define XKB_KEY_Reset                0x1000FF6C
+#define XKB_KEY_System               0x1000FF6D
+#define XKB_KEY_User                 0x1000FF6E
+#define XKB_KEY_ClearLine            0x1000FF6F
+#define XKB_KEY_InsertLine           0x1000FF70
+#define XKB_KEY_DeleteLine           0x1000FF71
+#define XKB_KEY_InsertChar           0x1000FF72
+#define XKB_KEY_DeleteChar           0x1000FF73
+#define XKB_KEY_BackTab              0x1000FF74
+#define XKB_KEY_KP_BackTab           0x1000FF75
+#define XKB_KEY_Ext16bit_L           0x1000FF76
+#define XKB_KEY_Ext16bit_R           0x1000FF77
+#define XKB_KEY_mute_acute           0x100000a8
+#define XKB_KEY_mute_grave           0x100000a9
+#define XKB_KEY_mute_asciicircum     0x100000aa
+#define XKB_KEY_mute_diaeresis       0x100000ab
+#define XKB_KEY_mute_asciitilde      0x100000ac
+#define XKB_KEY_lira                 0x100000af
+#define XKB_KEY_guilder              0x100000be
+#define XKB_KEY_IO                   0x100000ee
+#define XKB_KEY_longminus            0x100000f6
+#define XKB_KEY_block                0x100000fc
+
+
+
+#endif
diff --git a/include/xkbcommon/xkbcommon-names.h b/include/xkbcommon/xkbcommon-names.h
new file mode 100644
index 0000000..ecb551f
--- /dev/null
+++ b/include/xkbcommon/xkbcommon-names.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Daniel Stone <daniel@fooishbar.org>
+ */
+
+#ifndef _XKBCOMMON_NAMES_H
+#define _XKBCOMMON_NAMES_H
+
+/**
+ * @file
+ * @brief Predefined names for common modifiers and LEDs.
+ */
+
+#define XKB_MOD_NAME_SHIFT      "Shift"
+#define XKB_MOD_NAME_CAPS       "Lock"
+#define XKB_MOD_NAME_CTRL       "Control"
+#define XKB_MOD_NAME_ALT        "Mod1"
+#define XKB_MOD_NAME_NUM        "Mod2"
+#define XKB_MOD_NAME_LOGO       "Mod4"
+
+#define XKB_LED_NAME_CAPS       "Caps Lock"
+#define XKB_LED_NAME_NUM        "Num Lock"
+#define XKB_LED_NAME_SCROLL     "Scroll Lock"
+
+#endif
diff --git a/include/xkbcommon/xkbcommon-x11.h b/include/xkbcommon/xkbcommon-x11.h
new file mode 100644
index 0000000..4eb716a
--- /dev/null
+++ b/include/xkbcommon/xkbcommon-x11.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright © 2013 Ran Benita
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _XKBCOMMON_X11_H
+#define _XKBCOMMON_X11_H
+
+#include <xcb/xcb.h>
+#include <xkbcommon/xkbcommon.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file
+ * libxkbcommon-x11 API - Additional X11 support for xkbcommon.
+ */
+
+/**
+ * @defgroup x11 X11 support
+ * Additional X11 support for xkbcommon.
+ * @since 0.4.0
+ *
+ * @{
+ */
+
+/**
+ * @page x11-overview Overview
+ * @parblock
+ *
+ * The xkbcommon-x11 module provides a means for creating an xkb_keymap
+ * corresponding to the currently active keymap on the X server.  To do
+ * so, it queries the XKB X11 extension using the xcb-xkb library.  It
+ * can be used as a replacement for Xlib's keyboard handling.
+ *
+ * Following is an example workflow using xkbcommon-x11.  A complete
+ * example may be found in the tools/interactive-x11.c file in the
+ * xkbcommon source repository.  On startup:
+ *
+ * 1. Connect to the X server using xcb_connect().
+ * 2. Setup the XKB X11 extension.  You can do this either by using the
+ *    xcb_xkb_use_extension() request directly, or by using the
+ *    xkb_x11_setup_xkb_extension() helper function.
+ *
+ * The XKB extension supports using separate keymaps and states for
+ * different keyboard devices.  The devices are identified by an integer
+ * device ID and are managed by another X11 extension, XInput. The
+ * original X11 protocol only had one keyboard device, called the "core
+ * keyboard", which is still supported as a "virtual device".
+ *
+ * 3. We will use the core keyboard as an example.  To get its device ID,
+ *    use either the xcb_xkb_get_device_info() request directly, or the
+ *    xkb_x11_get_core_keyboard_device_id() helper function.
+ * 4. Create an initial xkb_keymap for this device, using the
+ *    xkb_x11_keymap_new_from_device() function.
+ * 5. Create an initial xkb_state for this device, using the
+ *    xkb_x11_state_new_from_device() function.
+ *
+ * @note At this point, you may consider setting various XKB controls and
+ * XKB per-client flags.  For example, enabling detectable autorepeat: \n
+ * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Detectable_Autorepeat
+ *
+ * Next, you need to react to state changes (e.g. a modifier was pressed,
+ * the layout was changed) and to keymap changes (e.g. a tool like xkbcomp,
+ * setxkbmap or xmodmap was used):
+ *
+ * 6. Select to listen to at least the following XKB events:
+ *    NewKeyboardNotify, MapNotify, StateNotify; using the
+ *    xcb_xkb_select_events_aux() request.
+ * 7. When NewKeyboardNotify or MapNotify are received, recreate the
+ *    xkb_keymap and xkb_state as described above.
+ * 8. When StateNotify is received, update the xkb_state accordingly
+ *    using the xkb_state_update_mask() function.
+ *
+ * @note It is also possible to use the KeyPress/KeyRelease @p state
+ * field to find the effective modifier and layout state, instead of
+ * using XkbStateNotify: \n
+ * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Computing_A_State_Field_from_an_XKB_State
+ * \n However, XkbStateNotify is more accurate.
+ *
+ * @note There is no need to call xkb_state_update_key(); the state is
+ * already synchronized.
+ *
+ * Finally, when a key event is received, you can use ordinary xkbcommon
+ * functions, like xkb_state_key_get_one_sym() and xkb_state_key_get_utf8(),
+ * as you normally would.
+ *
+ * @endparblock
+ */
+
+/**
+ * The minimal compatible major version of the XKB X11 extension which
+ * this library can use.
+ */
+#define XKB_X11_MIN_MAJOR_XKB_VERSION 1
+/**
+ * The minimal compatible minor version of the XKB X11 extension which
+ * this library can use (for the minimal major version).
+ */
+#define XKB_X11_MIN_MINOR_XKB_VERSION 0
+
+/** Flags for the xkb_x11_setup_xkb_extension() function. */
+enum xkb_x11_setup_xkb_extension_flags {
+    /** Do not apply any flags. */
+    XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS = 0
+};
+
+/**
+ * Setup the XKB X11 extension for this X client.
+ *
+ * The xkbcommon-x11 library uses various XKB requests.  Before doing so,
+ * an X client must notify the server that it will be using the extension.
+ * This function (or an XCB equivalent) must be called before any other
+ * function in this library is used.
+ *
+ * Some X servers may not support or disable the XKB extension.  If you
+ * want to support such servers, you need to use a different fallback.
+ *
+ * You may call this function several times; it is idempotent.
+ *
+ * @param connection
+ *     An XCB connection to the X server.
+ * @param major_xkb_version
+ *     See @p minor_xkb_version.
+ * @param minor_xkb_version
+ *     The XKB extension version to request.  To operate correctly, you
+ *     must have (major_xkb_version, minor_xkb_version) >=
+ *     (XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION),
+ *     though this is not enforced.
+ * @param flags
+ *     Optional flags, or 0.
+ * @param[out] major_xkb_version_out
+ *     See @p minor_xkb_version_out.
+ * @param[out] minor_xkb_version_out
+ *     Backfilled with the compatible XKB extension version numbers picked
+ *     by the server.  Can be NULL.
+ * @param[out] base_event_out
+ *     Backfilled with the XKB base (also known as first) event code, needed
+ *     to distinguish XKB events.  Can be NULL.
+ * @param[out] base_error_out
+ *     Backfilled with the XKB base (also known as first) error code, needed
+ *     to distinguish XKB errors.  Can be NULL.
+ *
+ * @returns 1 on success, or 0 on failure.
+ */
+int
+xkb_x11_setup_xkb_extension(xcb_connection_t *connection,
+                            uint16_t major_xkb_version,
+                            uint16_t minor_xkb_version,
+                            enum xkb_x11_setup_xkb_extension_flags flags,
+                            uint16_t *major_xkb_version_out,
+                            uint16_t *minor_xkb_version_out,
+                            uint8_t *base_event_out,
+                            uint8_t *base_error_out);
+
+/**
+ * Get the keyboard device ID of the core X11 keyboard.
+ *
+ * @param connection An XCB connection to the X server.
+ *
+ * @returns A device ID which may be used with other xkb_x11_* functions,
+ *          or -1 on failure.
+ */
+int32_t
+xkb_x11_get_core_keyboard_device_id(xcb_connection_t *connection);
+
+/**
+ * Create a keymap from an X11 keyboard device.
+ *
+ * This function queries the X server with various requests, fetches the
+ * details of the active keymap on a keyboard device, and creates an
+ * xkb_keymap from these details.
+ *
+ * @param context
+ *     The context in which to create the keymap.
+ * @param connection
+ *     An XCB connection to the X server.
+ * @param device_id
+ *     An XInput device ID (in the range 0-127) with input class KEY.
+ *     Passing values outside of this range is an error (the XKB protocol
+ *     predates the XInput2 protocol, which first allowed IDs > 127).
+ * @param flags
+ *     Optional flags for the keymap, or 0.
+ *
+ * @returns A keymap retrieved from the X server, or NULL on failure.
+ *
+ * @memberof xkb_keymap
+ */
+struct xkb_keymap *
+xkb_x11_keymap_new_from_device(struct xkb_context *context,
+                               xcb_connection_t *connection,
+                               int32_t device_id,
+                               enum xkb_keymap_compile_flags flags);
+
+/**
+ * Create a new keyboard state object from an X11 keyboard device.
+ *
+ * This function is the same as xkb_state_new(), only pre-initialized
+ * with the state of the device at the time this function is called.
+ *
+ * @param keymap
+ *     The keymap for which to create the state.
+ * @param connection
+ *     An XCB connection to the X server.
+ * @param device_id
+ *     An XInput 1 device ID (in the range 0-255) with input class KEY.
+ *     Passing values outside of this range is an error.
+ *
+ * @returns A new keyboard state object, or NULL on failure.
+ *
+ * @memberof xkb_state
+ */
+struct xkb_state *
+xkb_x11_state_new_from_device(struct xkb_keymap *keymap,
+                              xcb_connection_t *connection,
+                              int32_t device_id);
+
+/** @} */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _XKBCOMMON_X11_H */
diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h
new file mode 100644
index 0000000..f52dcfa
--- /dev/null
+++ b/include/xkbcommon/xkbcommon.h
@@ -0,0 +1,1954 @@
+/*
+ * Copyright 1985, 1987, 1990, 1998  The Open Group
+ * Copyright 2008  Dan Nicholson
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the names of the authors or their
+ * institutions shall not be used in advertising or otherwise to promote the
+ * sale, use or other dealings in this Software without prior written
+ * authorization from the authors.
+ */
+
+/************************************************************
+ * Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of Silicon Graphics not be
+ * used in advertising or publicity pertaining to distribution
+ * of the software without specific prior written permission.
+ * Silicon Graphics makes no representation about the suitability
+ * of this software for any purpose. It is provided "as is"
+ * without any express or implied warranty.
+ *
+ * SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ * GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ * THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ ********************************************************/
+
+/*
+ * Copyright © 2009-2012 Daniel Stone
+ * Copyright © 2012 Intel Corporation
+ * Copyright © 2012 Ran Benita
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Daniel Stone <daniel@fooishbar.org>
+ */
+
+#ifndef _XKBCOMMON_H_
+#define _XKBCOMMON_H_
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include <xkbcommon/xkbcommon-names.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file
+ * Main libxkbcommon API.
+ */
+
+/**
+ * @struct xkb_context
+ * Opaque top level library context object.
+ *
+ * The context contains various general library data and state, like
+ * logging level and include paths.
+ *
+ * Objects are created in a specific context, and multiple contexts may
+ * coexist simultaneously.  Objects from different contexts are completely
+ * separated and do not share any memory or state.
+ */
+struct xkb_context;
+
+/**
+ * @struct xkb_keymap
+ * Opaque compiled keymap object.
+ *
+ * The keymap object holds all of the static keyboard information obtained
+ * from compiling XKB files.
+ *
+ * A keymap is immutable after it is created (besides reference counts, etc.);
+ * if you need to change it, you must create a new one.
+ */
+struct xkb_keymap;
+
+/**
+ * @struct xkb_state
+ * Opaque keyboard state object.
+ *
+ * State objects contain the active state of a keyboard (or keyboards), such
+ * as the currently effective layout and the active modifiers.  It acts as a
+ * simple state machine, wherein key presses and releases are the input, and
+ * key symbols (keysyms) are the output.
+ */
+struct xkb_state;
+
+/**
+ * A number used to represent a physical key on a keyboard.
+ *
+ * A standard PC-compatible keyboard might have 102 keys.  An appropriate
+ * keymap would assign each of them a keycode, by which the user should
+ * refer to the key throughout the library.
+ *
+ * Historically, the X11 protocol, and consequentially the XKB protocol,
+ * assign only 8 bits for keycodes.  This limits the number of different
+ * keys that can be used simultaneously in a single keymap to 256
+ * (disregarding other limitations).  This library does not share this limit;
+ * keycodes beyond 255 ('extended keycodes') are not treated specially.
+ * Keymaps and applications which are compatible with X11 should not use
+ * these keycodes.
+ *
+ * The values of specific keycodes are determined by the keymap and the
+ * underlying input system.  For example, with an X11-compatible keymap
+ * and Linux evdev scan codes (see linux/input.h), a fixed offset is used:
+ *
+ * The keymap defines a canonical name for each key, plus possible aliases.
+ * Historically, the XKB protocol restricts these names to at most 4 (ASCII)
+ * characters, but this library does not share this limit.
+ *
+ * @code
+ * xkb_keycode_t keycode_A = KEY_A + 8;
+ * @endcode
+ *
+ * @sa xkb_keycode_is_legal_ext() xkb_keycode_is_legal_x11()
+ */
+typedef uint32_t xkb_keycode_t;
+
+/**
+ * A number used to represent the symbols generated from a key on a keyboard.
+ *
+ * A key, represented by a keycode, may generate different symbols according
+ * to keyboard state.  For example, on a QWERTY keyboard, pressing the key
+ * labled \<A\> generates the symbol 'a'.  If the Shift key is held, it
+ * generates the symbol 'A'.  If a different layout is used, say Greek,
+ * it generates the symbol 'α'.  And so on.
+ *
+ * Each such symbol is represented by a keysym.  Note that keysyms are
+ * somewhat more general, in that they can also represent some "function",
+ * such as "Left" or "Right" for the arrow keys.  For more information,
+ * see:
+ * https://www.x.org/releases/current/doc/xproto/x11protocol.html#keysym_encoding
+ *
+ * Specifically named keysyms can be found in the
+ * xkbcommon/xkbcommon-keysyms.h header file.  Their name does not include
+ * the XKB_KEY_ prefix.
+ *
+ * Besides those, any Unicode/ISO 10646 character in the range U0100 to
+ * U10FFFF can be represented by a keysym value in the range 0x01000100 to
+ * 0x0110FFFF.  The name of Unicode keysyms is "U<codepoint>", e.g. "UA1B2".
+ *
+ * The name of other unnamed keysyms is the hexadecimal representation of
+ * their value, e.g. "0xabcd1234".
+ *
+ * Keysym names are case-sensitive.
+ */
+typedef uint32_t xkb_keysym_t;
+
+/**
+ * Index of a keyboard layout.
+ *
+ * The layout index is a state component which detemines which <em>keyboard
+ * layout</em> is active.  These may be different alphabets, different key
+ * arrangements, etc.
+ *
+ * Layout indices are consecutive.  The first layout has index 0.
+ *
+ * Each layout is not required to have a name, and the names are not
+ * guaranteed to be unique (though they are usually provided and unique).
+ * Therefore, it is not safe to use the name as a unique identifier for a
+ * layout.  Layout names are case-sensitive.
+ *
+ * Layout names are specified in the layout's definition, for example
+ * "English (US)".  These are different from the (conventionally) short names
+ * which are used to locate the layout, for example "us" or "us(intl)".  These
+ * names are not present in a compiled keymap.
+ *
+ * If the user selects layouts from a list generated from the XKB registry
+ * (using libxkbregistry or directly), and this metadata is needed later on, it
+ * is recommended to store it along with the keymap.
+ *
+ * Layouts are also called "groups" by XKB.
+ *
+ * @sa xkb_keymap_num_layouts() xkb_keymap_num_layouts_for_key()
+ */
+typedef uint32_t xkb_layout_index_t;
+/** A mask of layout indices. */
+typedef uint32_t xkb_layout_mask_t;
+
+/**
+ * Index of a shift level.
+ *
+ * Any key, in any layout, can have several <em>shift levels</em>.  Each
+ * shift level can assign different keysyms to the key.  The shift level
+ * to use is chosen according to the current keyboard state; for example,
+ * if no keys are pressed, the first level may be used; if the Left Shift
+ * key is pressed, the second; if Num Lock is pressed, the third; and
+ * many such combinations are possible (see xkb_mod_index_t).
+ *
+ * Level indices are consecutive.  The first level has index 0.
+ */
+typedef uint32_t xkb_level_index_t;
+
+/**
+ * Index of a modifier.
+ *
+ * A @e modifier is a state component which changes the way keys are
+ * interpreted.  A keymap defines a set of modifiers, such as Alt, Shift,
+ * Num Lock or Meta, and specifies which keys may @e activate which
+ * modifiers (in a many-to-many relationship, i.e. a key can activate
+ * several modifiers, and a modifier may be activated by several keys.
+ * Different keymaps do this differently).
+ *
+ * When retrieving the keysyms for a key, the active modifier set is
+ * consulted; this detemines the correct shift level to use within the
+ * currently active layout (see xkb_level_index_t).
+ *
+ * Modifier indices are consecutive.  The first modifier has index 0.
+ *
+ * Each modifier must have a name, and the names are unique.  Therefore, it
+ * is safe to use the name as a unique identifier for a modifier.  The names
+ * of some common modifiers are provided in the xkbcommon/xkbcommon-names.h
+ * header file.  Modifier names are case-sensitive.
+ *
+ * @sa xkb_keymap_num_mods()
+ */
+typedef uint32_t xkb_mod_index_t;
+/** A mask of modifier indices. */
+typedef uint32_t xkb_mod_mask_t;
+
+/**
+ * Index of a keyboard LED.
+ *
+ * LEDs are logical objects which may be @e active or @e inactive.  They
+ * typically correspond to the lights on the keyboard. Their state is
+ * determined by the current keyboard state.
+ *
+ * LED indices are non-consecutive.  The first LED has index 0.
+ *
+ * Each LED must have a name, and the names are unique. Therefore,
+ * it is safe to use the name as a unique identifier for a LED.  The names
+ * of some common LEDs are provided in the xkbcommon/xkbcommon-names.h
+ * header file.  LED names are case-sensitive.
+ *
+ * @warning A given keymap may specify an exact index for a given LED.
+ * Therefore, LED indexing is not necessarily sequential, as opposed to
+ * modifiers and layouts.  This means that when iterating over the LEDs
+ * in a keymap using e.g. xkb_keymap_num_leds(), some indices might be
+ * invalid.  Given such an index, functions like xkb_keymap_led_get_name()
+ * will return NULL, and xkb_state_led_index_is_active() will return -1.
+ *
+ * LEDs are also called "indicators" by XKB.
+ *
+ * @sa xkb_keymap_num_leds()
+ */
+typedef uint32_t xkb_led_index_t;
+/** A mask of LED indices. */
+typedef uint32_t xkb_led_mask_t;
+
+#define XKB_KEYCODE_INVALID (0xffffffff)
+#define XKB_LAYOUT_INVALID  (0xffffffff)
+#define XKB_LEVEL_INVALID   (0xffffffff)
+#define XKB_MOD_INVALID     (0xffffffff)
+#define XKB_LED_INVALID     (0xffffffff)
+
+#define XKB_KEYCODE_MAX     (0xffffffff - 1)
+
+/**
+ * Test whether a value is a valid extended keycode.
+ * @sa xkb_keycode_t
+ **/
+#define xkb_keycode_is_legal_ext(key) (key <= XKB_KEYCODE_MAX)
+
+/**
+ * Test whether a value is a valid X11 keycode.
+ * @sa xkb_keycode_t
+ */
+#define xkb_keycode_is_legal_x11(key) (key >= 8 && key <= 255)
+
+/**
+ * Names to compile a keymap with, also known as RMLVO.
+ *
+ * The names are the common configuration values by which a user picks
+ * a keymap.
+ *
+ * If the entire struct is NULL, then each field is taken to be NULL.
+ * You should prefer passing NULL instead of choosing your own defaults.
+ */
+struct xkb_rule_names {
+    /**
+     * The rules file to use. The rules file describes how to interpret
+     * the values of the model, layout, variant and options fields.
+     *
+     * If NULL or the empty string "", a default value is used.
+     * If the XKB_DEFAULT_RULES environment variable is set, it is used
+     * as the default.  Otherwise the system default is used.
+     */
+    const char *rules;
+    /**
+     * The keyboard model by which to interpret keycodes and LEDs.
+     *
+     * If NULL or the empty string "", a default value is used.
+     * If the XKB_DEFAULT_MODEL environment variable is set, it is used
+     * as the default.  Otherwise the system default is used.
+     */
+    const char *model;
+    /**
+     * A comma separated list of layouts (languages) to include in the
+     * keymap.
+     *
+     * If NULL or the empty string "", a default value is used.
+     * If the XKB_DEFAULT_LAYOUT environment variable is set, it is used
+     * as the default.  Otherwise the system default is used.
+     */
+    const char *layout;
+    /**
+     * A comma separated list of variants, one per layout, which may
+     * modify or augment the respective layout in various ways.
+     *
+     * Generally, should either be empty or have the same number of values
+     * as the number of layouts. You may use empty values as in "intl,,neo".
+     *
+     * If NULL or the empty string "", and a default value is also used
+     * for the layout, a default value is used.  Otherwise no variant is
+     * used.
+     * If the XKB_DEFAULT_VARIANT environment variable is set, it is used
+     * as the default.  Otherwise the system default is used.
+     */
+    const char *variant;
+    /**
+     * A comma separated list of options, through which the user specifies
+     * non-layout related preferences, like which key combinations are used
+     * for switching layouts, or which key is the Compose key.
+     *
+     * If NULL, a default value is used.  If the empty string "", no
+     * options are used.
+     * If the XKB_DEFAULT_OPTIONS environment variable is set, it is used
+     * as the default.  Otherwise the system default is used.
+     */
+    const char *options;
+};
+
+/**
+ * @defgroup keysyms Keysyms
+ * Utility functions related to keysyms.
+ *
+ * @{
+ */
+
+/**
+ * @page keysym-transformations Keysym Transformations
+ *
+ * Keysym translation is subject to several "keysym transformations",
+ * as described in the XKB specification.  These are:
+ *
+ * - Capitalization transformation.  If the Caps Lock modifier is
+ *   active and was not consumed by the translation process, a single
+ *   keysym is transformed to its upper-case form (if applicable).
+ *   Similarly, the UTF-8/UTF-32 string produced is capitalized.
+ *
+ *   This is described in:
+ *   https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
+ *
+ * - Control transformation.  If the Control modifier is active and
+ *   was not consumed by the translation process, the string produced
+ *   is transformed to its matching ASCII control character (if
+ *   applicable).  Keysyms are not affected.
+ *
+ *   This is described in:
+ *   https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
+ *
+ * Each relevant function discusses which transformations it performs.
+ *
+ * These transformations are not applicable when a key produces multiple
+ * keysyms.
+ */
+
+
+/**
+ * Get the name of a keysym.
+ *
+ * For a description of how keysyms are named, see @ref xkb_keysym_t.
+ *
+ * @param[in]  keysym The keysym.
+ * @param[out] buffer A string buffer to write the name into.
+ * @param[in]  size   Size of the buffer.
+ *
+ * @warning If the buffer passed is too small, the string is truncated
+ * (though still NUL-terminated); a size of at least 64 bytes is recommended.
+ *
+ * @returns The number of bytes in the name, excluding the NUL byte. If
+ * the keysym is invalid, returns -1.
+ *
+ * You may check if truncation has occurred by comparing the return value
+ * with the length of buffer, similarly to the snprintf(3) function.
+ *
+ * @sa xkb_keysym_t
+ */
+int
+xkb_keysym_get_name(xkb_keysym_t keysym, char *buffer, size_t size);
+
+/** Flags for xkb_keysym_from_name(). */
+enum xkb_keysym_flags {
+    /** Do not apply any flags. */
+    XKB_KEYSYM_NO_FLAGS = 0,
+    /** Find keysym by case-insensitive search. */
+    XKB_KEYSYM_CASE_INSENSITIVE = (1 << 0)
+};
+
+/**
+ * Get a keysym from its name.
+ *
+ * @param name The name of a keysym. See remarks in xkb_keysym_get_name();
+ * this function will accept any name returned by that function.
+ * @param flags A set of flags controlling how the search is done. If
+ * invalid flags are passed, this will fail with XKB_KEY_NoSymbol.
+ *
+ * If you use the XKB_KEYSYM_CASE_INSENSITIVE flag and two keysym names
+ * differ only by case, then the lower-case keysym is returned.  For
+ * instance, for KEY_a and KEY_A, this function would return KEY_a for the
+ * case-insensitive search.  If this functionality is needed, it is
+ * recommended to first call this function without this flag; and if that
+ * fails, only then to try with this flag, while possibly warning the user
+ * he had misspelled the name, and might get wrong results.
+ *
+ * Case folding is done according to the C locale; the current locale is not
+ * consulted.
+ *
+ * @returns The keysym. If the name is invalid, returns XKB_KEY_NoSymbol.
+ *
+ * @sa xkb_keysym_t
+ */
+xkb_keysym_t
+xkb_keysym_from_name(const char *name, enum xkb_keysym_flags flags);
+
+/**
+ * Get the Unicode/UTF-8 representation of a keysym.
+ *
+ * @param[in]  keysym The keysym.
+ * @param[out] buffer A buffer to write the UTF-8 string into.
+ * @param[in]  size   The size of buffer.  Must be at least 7.
+ *
+ * @returns The number of bytes written to the buffer (including the
+ * terminating byte).  If the keysym does not have a Unicode
+ * representation, returns 0.  If the buffer is too small, returns -1.
+ *
+ * This function does not perform any @ref keysym-transformations.
+ * Therefore, prefer to use xkb_state_key_get_utf8() if possible.
+ *
+ * @sa xkb_state_key_get_utf8()
+ */
+int
+xkb_keysym_to_utf8(xkb_keysym_t keysym, char *buffer, size_t size);
+
+/**
+ * Get the Unicode/UTF-32 representation of a keysym.
+ *
+ * @returns The Unicode/UTF-32 representation of keysym, which is also
+ * compatible with UCS-4.  If the keysym does not have a Unicode
+ * representation, returns 0.
+ *
+ * This function does not perform any @ref keysym-transformations.
+ * Therefore, prefer to use xkb_state_key_get_utf32() if possible.
+ *
+ * @sa xkb_state_key_get_utf32()
+ */
+uint32_t
+xkb_keysym_to_utf32(xkb_keysym_t keysym);
+
+/**
+ * Get the keysym corresponding to a Unicode/UTF-32 codepoint.
+ *
+ * @returns The keysym corresponding to the specified Unicode
+ * codepoint, or XKB_KEY_NoSymbol if there is none.
+ *
+ * This function is the inverse of @ref xkb_keysym_to_utf32. In cases
+ * where a single codepoint corresponds to multiple keysyms, returns
+ * the keysym with the lowest value.
+ *
+ * Unicode codepoints which do not have a special (legacy) keysym
+ * encoding use a direct encoding scheme. These keysyms don't usually
+ * have an associated keysym constant (XKB_KEY_*).
+ *
+ * For noncharacter Unicode codepoints and codepoints outside of the
+ * defined Unicode planes this function returns XKB_KEY_NoSymbol.
+ *
+ * @sa xkb_keysym_to_utf32()
+ * @since 1.0.0
+ */
+xkb_keysym_t
+xkb_utf32_to_keysym(uint32_t ucs);
+
+/**
+ * Convert a keysym to its uppercase form.
+ *
+ * If there is no such form, the keysym is returned unchanged.
+ *
+ * The conversion rules may be incomplete; prefer to work with the Unicode
+ * representation instead, when possible.
+ */
+xkb_keysym_t
+xkb_keysym_to_upper(xkb_keysym_t ks);
+
+/**
+ * Convert a keysym to its lowercase form.
+ *
+ * The conversion rules may be incomplete; prefer to work with the Unicode
+ * representation instead, when possible.
+ */
+xkb_keysym_t
+xkb_keysym_to_lower(xkb_keysym_t ks);
+
+/** @} */
+
+/**
+ * @defgroup context Library Context
+ * Creating, destroying and using library contexts.
+ *
+ * Every keymap compilation request must have a context associated with
+ * it.  The context keeps around state such as the include path.
+ *
+ * @{
+ */
+
+/**
+ * @page envvars Environment Variables
+ *
+ * The user may set some environment variables which affect the library:
+ *
+ * - `XKB_CONFIG_ROOT`, `XKB_CONFIG_EXTRA_PATH`, `XDG_CONFIG_DIR`, `HOME` - see @ref include-path.
+ * - `XKB_LOG_LEVEL` - see xkb_context_set_log_level().
+ * - `XKB_LOG_VERBOSITY` - see xkb_context_set_log_verbosity().
+ * - `XKB_DEFAULT_RULES`, `XKB_DEFAULT_MODEL`, `XKB_DEFAULT_LAYOUT`,
+ *   `XKB_DEFAULT_VARIANT`, `XKB_DEFAULT_OPTIONS` - see xkb_rule_names.
+ */
+
+/** Flags for context creation. */
+enum xkb_context_flags {
+    /** Do not apply any context flags. */
+    XKB_CONTEXT_NO_FLAGS = 0,
+    /** Create this context with an empty include path. */
+    XKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0),
+    /**
+     * Don't take RMLVO names from the environment.
+     * @since 0.3.0
+     */
+    XKB_CONTEXT_NO_ENVIRONMENT_NAMES = (1 << 1)
+};
+
+/**
+ * Create a new context.
+ *
+ * @param flags Optional flags for the context, or 0.
+ *
+ * @returns A new context, or NULL on failure.
+ *
+ * @memberof xkb_context
+ */
+struct xkb_context *
+xkb_context_new(enum xkb_context_flags flags);
+
+/**
+ * Take a new reference on a context.
+ *
+ * @returns The passed in context.
+ *
+ * @memberof xkb_context
+ */
+struct xkb_context *
+xkb_context_ref(struct xkb_context *context);
+
+/**
+ * Release a reference on a context, and possibly free it.
+ *
+ * @param context The context.  If it is NULL, this function does nothing.
+ *
+ * @memberof xkb_context
+ */
+void
+xkb_context_unref(struct xkb_context *context);
+
+/**
+ * Store custom user data in the context.
+ *
+ * This may be useful in conjunction with xkb_context_set_log_fn() or other
+ * callbacks.
+ *
+ * @memberof xkb_context
+ */
+void
+xkb_context_set_user_data(struct xkb_context *context, void *user_data);
+
+/**
+ * Retrieves stored user data from the context.
+ *
+ * @returns The stored user data.  If the user data wasn't set, or the
+ * passed in context is NULL, returns NULL.
+ *
+ * This may be useful to access private user data from callbacks like a
+ * custom logging function.
+ *
+ * @memberof xkb_context
+ **/
+void *
+xkb_context_get_user_data(struct xkb_context *context);
+
+/** @} */
+
+/**
+ * @defgroup include-path Include Paths
+ * Manipulating the include paths in a context.
+ *
+ * The include paths are the file-system paths that are searched when an
+ * include statement is encountered during keymap compilation.
+ *
+ * The default include paths are, in that lookup order:
+ * - The path `$XDG_CONFIG_HOME/xkb`, with the usual `XDG_CONFIG_HOME`
+ *   fallback to `$HOME/.config/` if unset.
+ * - The path `$HOME/.xkb`, where $HOME is the value of the environment
+ *   variable `HOME`.
+ * - The `XKB_CONFIG_EXTRA_PATH` environment variable, if defined, otherwise the
+ *   system configuration directory, defined at library configuration time
+ *   (usually `/etc/xkb`).
+ * - The `XKB_CONFIG_ROOT` environment variable, if defined, otherwise
+ *   the system XKB root, defined at library configuration time.
+ *
+ * @{
+ */
+
+/**
+ * Append a new entry to the context's include path.
+ *
+ * @returns 1 on success, or 0 if the include path could not be added or is
+ * inaccessible.
+ *
+ * @memberof xkb_context
+ */
+int
+xkb_context_include_path_append(struct xkb_context *context, const char *path);
+
+/**
+ * Append the default include paths to the context's include path.
+ *
+ * @returns 1 on success, or 0 if the primary include path could not be added.
+ *
+ * @memberof xkb_context
+ */
+int
+xkb_context_include_path_append_default(struct xkb_context *context);
+
+/**
+ * Reset the context's include path to the default.
+ *
+ * Removes all entries from the context's include path, and inserts the
+ * default paths.
+ *
+ * @returns 1 on success, or 0 if the primary include path could not be added.
+ *
+ * @memberof xkb_context
+ */
+int
+xkb_context_include_path_reset_defaults(struct xkb_context *context);
+
+/**
+ * Remove all entries from the context's include path.
+ *
+ * @memberof xkb_context
+ */
+void
+xkb_context_include_path_clear(struct xkb_context *context);
+
+/**
+ * Get the number of paths in the context's include path.
+ *
+ * @memberof xkb_context
+ */
+unsigned int
+xkb_context_num_include_paths(struct xkb_context *context);
+
+/**
+ * Get a specific include path from the context's include path.
+ *
+ * @returns The include path at the specified index.  If the index is
+ * invalid, returns NULL.
+ *
+ * @memberof xkb_context
+ */
+const char *
+xkb_context_include_path_get(struct xkb_context *context, unsigned int index);
+
+/** @} */
+
+/**
+ * @defgroup logging Logging Handling
+ * Manipulating how logging from this library is handled.
+ *
+ * @{
+ */
+
+/** Specifies a logging level. */
+enum xkb_log_level {
+    XKB_LOG_LEVEL_CRITICAL = 10, /**< Log critical internal errors only. */
+    XKB_LOG_LEVEL_ERROR = 20,    /**< Log all errors. */
+    XKB_LOG_LEVEL_WARNING = 30,  /**< Log warnings and errors. */
+    XKB_LOG_LEVEL_INFO = 40,     /**< Log information, warnings, and errors. */
+    XKB_LOG_LEVEL_DEBUG = 50     /**< Log everything. */
+};
+
+/**
+ * Set the current logging level.
+ *
+ * @param context The context in which to set the logging level.
+ * @param level   The logging level to use.  Only messages from this level
+ * and below will be logged.
+ *
+ * The default level is XKB_LOG_LEVEL_ERROR.  The environment variable
+ * XKB_LOG_LEVEL, if set in the time the context was created, overrides the
+ * default value.  It may be specified as a level number or name.
+ *
+ * @memberof xkb_context
+ */
+void
+xkb_context_set_log_level(struct xkb_context *context,
+                          enum xkb_log_level level);
+
+/**
+ * Get the current logging level.
+ *
+ * @memberof xkb_context
+ */
+enum xkb_log_level
+xkb_context_get_log_level(struct xkb_context *context);
+
+/**
+ * Sets the current logging verbosity.
+ *
+ * The library can generate a number of warnings which are not helpful to
+ * ordinary users of the library.  The verbosity may be increased if more
+ * information is desired (e.g. when developing a new keymap).
+ *
+ * The default verbosity is 0.  The environment variable XKB_LOG_VERBOSITY,
+ * if set in the time the context was created, overrides the default value.
+ *
+ * @param context   The context in which to use the set verbosity.
+ * @param verbosity The verbosity to use.  Currently used values are
+ * 1 to 10, higher values being more verbose.  0 would result in no verbose
+ * messages being logged.
+ *
+ * Most verbose messages are of level XKB_LOG_LEVEL_WARNING or lower.
+ *
+ * @memberof xkb_context
+ */
+void
+xkb_context_set_log_verbosity(struct xkb_context *context, int verbosity);
+
+/**
+ * Get the current logging verbosity of the context.
+ *
+ * @memberof xkb_context
+ */
+int
+xkb_context_get_log_verbosity(struct xkb_context *context);
+
+/**
+ * Set a custom function to handle logging messages.
+ *
+ * @param context The context in which to use the set logging function.
+ * @param log_fn  The function that will be called for logging messages.
+ * Passing NULL restores the default function, which logs to stderr.
+ *
+ * By default, log messages from this library are printed to stderr.  This
+ * function allows you to replace the default behavior with a custom
+ * handler.  The handler is only called with messages which match the
+ * current logging level and verbosity settings for the context.
+ * level is the logging level of the message.  @a format and @a args are
+ * the same as in the vprintf(3) function.
+ *
+ * You may use xkb_context_set_user_data() on the context, and then call
+ * xkb_context_get_user_data() from within the logging function to provide
+ * it with additional private context.
+ *
+ * @memberof xkb_context
+ */
+void
+xkb_context_set_log_fn(struct xkb_context *context,
+                       void (*log_fn)(struct xkb_context *context,
+                                      enum xkb_log_level level,
+                                      const char *format, va_list args));
+
+/** @} */
+
+/**
+ * @defgroup keymap Keymap Creation
+ * Creating and destroying keymaps.
+ *
+ * @{
+ */
+
+/** Flags for keymap compilation. */
+enum xkb_keymap_compile_flags {
+    /** Do not apply any flags. */
+    XKB_KEYMAP_COMPILE_NO_FLAGS = 0
+};
+
+/**
+ * Create a keymap from RMLVO names.
+ *
+ * The primary keymap entry point: creates a new XKB keymap from a set of
+ * RMLVO (Rules + Model + Layouts + Variants + Options) names.
+ *
+ * @param context The context in which to create the keymap.
+ * @param names   The RMLVO names to use.  See xkb_rule_names.
+ * @param flags   Optional flags for the keymap, or 0.
+ *
+ * @returns A keymap compiled according to the RMLVO names, or NULL if
+ * the compilation failed.
+ *
+ * @sa xkb_rule_names
+ * @memberof xkb_keymap
+ */
+struct xkb_keymap *
+xkb_keymap_new_from_names(struct xkb_context *context,
+                          const struct xkb_rule_names *names,
+                          enum xkb_keymap_compile_flags flags);
+
+/** The possible keymap formats. */
+enum xkb_keymap_format {
+    /** The current/classic XKB text format, as generated by xkbcomp -xkb. */
+    XKB_KEYMAP_FORMAT_TEXT_V1 = 1
+};
+
+/**
+ * Create a keymap from a keymap file.
+ *
+ * @param context The context in which to create the keymap.
+ * @param file    The keymap file to compile.
+ * @param format  The text format of the keymap file to compile.
+ * @param flags   Optional flags for the keymap, or 0.
+ *
+ * @returns A keymap compiled from the given XKB keymap file, or NULL if
+ * the compilation failed.
+ *
+ * The file must contain a complete keymap.  For example, in the
+ * XKB_KEYMAP_FORMAT_TEXT_V1 format, this means the file must contain one
+ * top level '%xkb_keymap' section, which in turn contains other required
+ * sections.
+ *
+ * @memberof xkb_keymap
+ */
+struct xkb_keymap *
+xkb_keymap_new_from_file(struct xkb_context *context, FILE *file,
+                         enum xkb_keymap_format format,
+                         enum xkb_keymap_compile_flags flags);
+
+/**
+ * Create a keymap from a keymap string.
+ *
+ * This is just like xkb_keymap_new_from_file(), but instead of a file, gets
+ * the keymap as one enormous string.
+ *
+ * @see xkb_keymap_new_from_file()
+ * @memberof xkb_keymap
+ */
+struct xkb_keymap *
+xkb_keymap_new_from_string(struct xkb_context *context, const char *string,
+                           enum xkb_keymap_format format,
+                           enum xkb_keymap_compile_flags flags);
+
+/**
+ * Create a keymap from a memory buffer.
+ *
+ * This is just like xkb_keymap_new_from_string(), but takes a length argument
+ * so the input string does not have to be zero-terminated.
+ *
+ * @see xkb_keymap_new_from_string()
+ * @memberof xkb_keymap
+ * @since 0.3.0
+ */
+struct xkb_keymap *
+xkb_keymap_new_from_buffer(struct xkb_context *context, const char *buffer,
+                           size_t length, enum xkb_keymap_format format,
+                           enum xkb_keymap_compile_flags flags);
+
+/**
+ * Take a new reference on a keymap.
+ *
+ * @returns The passed in keymap.
+ *
+ * @memberof xkb_keymap
+ */
+struct xkb_keymap *
+xkb_keymap_ref(struct xkb_keymap *keymap);
+
+/**
+ * Release a reference on a keymap, and possibly free it.
+ *
+ * @param keymap The keymap.  If it is NULL, this function does nothing.
+ *
+ * @memberof xkb_keymap
+ */
+void
+xkb_keymap_unref(struct xkb_keymap *keymap);
+
+/**
+ * Get the keymap as a string in the format from which it was created.
+ * @sa xkb_keymap_get_as_string()
+ **/
+#define XKB_KEYMAP_USE_ORIGINAL_FORMAT ((enum xkb_keymap_format) -1)
+
+/**
+ * Get the compiled keymap as a string.
+ *
+ * @param keymap The keymap to get as a string.
+ * @param format The keymap format to use for the string.  You can pass
+ * in the special value XKB_KEYMAP_USE_ORIGINAL_FORMAT to use the format
+ * from which the keymap was originally created.
+ *
+ * @returns The keymap as a NUL-terminated string, or NULL if unsuccessful.
+ *
+ * The returned string may be fed back into xkb_keymap_new_from_string() to get
+ * the exact same keymap (possibly in another process, etc.).
+ *
+ * The returned string is dynamically allocated and should be freed by the
+ * caller.
+ *
+ * @memberof xkb_keymap
+ */
+char *
+xkb_keymap_get_as_string(struct xkb_keymap *keymap,
+                         enum xkb_keymap_format format);
+
+/** @} */
+
+/**
+ * @defgroup components Keymap Components
+ * Enumeration of state components in a keymap.
+ *
+ * @{
+ */
+
+/**
+ * Get the minimum keycode in the keymap.
+ *
+ * @sa xkb_keycode_t
+ * @memberof xkb_keymap
+ * @since 0.3.1
+ */
+xkb_keycode_t
+xkb_keymap_min_keycode(struct xkb_keymap *keymap);
+
+/**
+ * Get the maximum keycode in the keymap.
+ *
+ * @sa xkb_keycode_t
+ * @memberof xkb_keymap
+ * @since 0.3.1
+ */
+xkb_keycode_t
+xkb_keymap_max_keycode(struct xkb_keymap *keymap);
+
+/**
+ * The iterator used by xkb_keymap_key_for_each().
+ *
+ * @sa xkb_keymap_key_for_each
+ * @memberof xkb_keymap
+ * @since 0.3.1
+ */
+typedef void
+(*xkb_keymap_key_iter_t)(struct xkb_keymap *keymap, xkb_keycode_t key,
+                         void *data);
+
+/**
+ * Run a specified function for every valid keycode in the keymap.  If a
+ * keymap is sparse, this function may be called fewer than
+ * (max_keycode - min_keycode + 1) times.
+ *
+ * @sa xkb_keymap_min_keycode() xkb_keymap_max_keycode() xkb_keycode_t
+ * @memberof xkb_keymap
+ * @since 0.3.1
+ */
+void
+xkb_keymap_key_for_each(struct xkb_keymap *keymap, xkb_keymap_key_iter_t iter,
+                        void *data);
+
+/**
+ * Find the name of the key with the given keycode.
+ *
+ * This function always returns the canonical name of the key (see
+ * description in xkb_keycode_t).
+ *
+ * @returns The key name. If no key with this keycode exists,
+ * returns NULL.
+ *
+ * @sa xkb_keycode_t
+ * @memberof xkb_keymap
+ * @since 0.6.0
+ */
+const char *
+xkb_keymap_key_get_name(struct xkb_keymap *keymap, xkb_keycode_t key);
+
+/**
+ * Find the keycode of the key with the given name.
+ *
+ * The name can be either a canonical name or an alias.
+ *
+ * @returns The keycode. If no key with this name exists,
+ * returns XKB_KEYCODE_INVALID.
+ *
+ * @sa xkb_keycode_t
+ * @memberof xkb_keymap
+ * @since 0.6.0
+ */
+xkb_keycode_t
+xkb_keymap_key_by_name(struct xkb_keymap *keymap, const char *name);
+
+/**
+ * Get the number of modifiers in the keymap.
+ *
+ * @sa xkb_mod_index_t
+ * @memberof xkb_keymap
+ */
+xkb_mod_index_t
+xkb_keymap_num_mods(struct xkb_keymap *keymap);
+
+/**
+ * Get the name of a modifier by index.
+ *
+ * @returns The name.  If the index is invalid, returns NULL.
+ *
+ * @sa xkb_mod_index_t
+ * @memberof xkb_keymap
+ */
+const char *
+xkb_keymap_mod_get_name(struct xkb_keymap *keymap, xkb_mod_index_t idx);
+
+/**
+ * Get the index of a modifier by name.
+ *
+ * @returns The index.  If no modifier with this name exists, returns
+ * XKB_MOD_INVALID.
+ *
+ * @sa xkb_mod_index_t
+ * @memberof xkb_keymap
+ */
+xkb_mod_index_t
+xkb_keymap_mod_get_index(struct xkb_keymap *keymap, const char *name);
+
+/**
+ * Get the number of layouts in the keymap.
+ *
+ * @sa xkb_layout_index_t xkb_rule_names xkb_keymap_num_layouts_for_key()
+ * @memberof xkb_keymap
+ */
+xkb_layout_index_t
+xkb_keymap_num_layouts(struct xkb_keymap *keymap);
+
+/**
+ * Get the name of a layout by index.
+ *
+ * @returns The name.  If the index is invalid, or the layout does not have
+ * a name, returns NULL.
+ *
+ * @sa xkb_layout_index_t
+ *     For notes on layout names.
+ * @memberof xkb_keymap
+ */
+const char *
+xkb_keymap_layout_get_name(struct xkb_keymap *keymap, xkb_layout_index_t idx);
+
+/**
+ * Get the index of a layout by name.
+ *
+ * @returns The index.  If no layout exists with this name, returns
+ * XKB_LAYOUT_INVALID.  If more than one layout in the keymap has this name,
+ * returns the lowest index among them.
+ *
+ * @sa xkb_layout_index_t
+ *     For notes on layout names.
+ * @memberof xkb_keymap
+ */
+xkb_layout_index_t
+xkb_keymap_layout_get_index(struct xkb_keymap *keymap, const char *name);
+
+/**
+ * Get the number of LEDs in the keymap.
+ *
+ * @warning The range [ 0...xkb_keymap_num_leds() ) includes all of the LEDs
+ * in the keymap, but may also contain inactive LEDs.  When iterating over
+ * this range, you need the handle this case when calling functions such as
+ * xkb_keymap_led_get_name() or xkb_state_led_index_is_active().
+ *
+ * @sa xkb_led_index_t
+ * @memberof xkb_keymap
+ */
+xkb_led_index_t
+xkb_keymap_num_leds(struct xkb_keymap *keymap);
+
+/**
+ * Get the name of a LED by index.
+ *
+ * @returns The name.  If the index is invalid, returns NULL.
+ *
+ * @memberof xkb_keymap
+ */
+const char *
+xkb_keymap_led_get_name(struct xkb_keymap *keymap, xkb_led_index_t idx);
+
+/**
+ * Get the index of a LED by name.
+ *
+ * @returns The index.  If no LED with this name exists, returns
+ * XKB_LED_INVALID.
+ *
+ * @memberof xkb_keymap
+ */
+xkb_led_index_t
+xkb_keymap_led_get_index(struct xkb_keymap *keymap, const char *name);
+
+/**
+ * Get the number of layouts for a specific key.
+ *
+ * This number can be different from xkb_keymap_num_layouts(), but is always
+ * smaller.  It is the appropriate value to use when iterating over the
+ * layouts of a key.
+ *
+ * @sa xkb_layout_index_t
+ * @memberof xkb_keymap
+ */
+xkb_layout_index_t
+xkb_keymap_num_layouts_for_key(struct xkb_keymap *keymap, xkb_keycode_t key);
+
+/**
+ * Get the number of shift levels for a specific key and layout.
+ *
+ * If @c layout is out of range for this key (that is, larger or equal to
+ * the value returned by xkb_keymap_num_layouts_for_key()), it is brought
+ * back into range in a manner consistent with xkb_state_key_get_layout().
+ *
+ * @sa xkb_level_index_t
+ * @memberof xkb_keymap
+ */
+xkb_level_index_t
+xkb_keymap_num_levels_for_key(struct xkb_keymap *keymap, xkb_keycode_t key,
+                              xkb_layout_index_t layout);
+
+/**
+ * Retrieves every possible modifier mask that produces the specified
+ * shift level for a specific key and layout.
+ *
+ * This API is useful for inverse key transformation; i.e. finding out
+ * which modifiers need to be active in order to be able to type the
+ * keysym(s) corresponding to the specific key code, layout and level.
+ *
+ * @warning It returns only up to masks_size modifier masks. If the
+ * buffer passed is too small, some of the possible modifier combinations
+ * will not be returned.
+ *
+ * @param[in] keymap      The keymap.
+ * @param[in] key         The keycode of the key.
+ * @param[in] layout      The layout for which to get modifiers.
+ * @param[in] level       The shift level in the layout for which to get the
+ * modifiers. This should be smaller than:
+ * @code xkb_keymap_num_levels_for_key(keymap, key) @endcode
+ * @param[out] masks_out  A buffer in which the requested masks should be
+ * stored.
+ * @param[out] masks_size The size of the buffer pointed to by masks_out.
+ *
+ * If @c layout is out of range for this key (that is, larger or equal to
+ * the value returned by xkb_keymap_num_layouts_for_key()), it is brought
+ * back into range in a manner consistent with xkb_state_key_get_layout().
+ *
+ * @returns The number of modifier masks stored in the masks_out array.
+ * If the key is not in the keymap or if the specified shift level cannot
+ * be reached it returns 0 and does not modify the masks_out buffer.
+ *
+ * @sa xkb_level_index_t
+ * @sa xkb_mod_mask_t
+ * @memberof xkb_keymap
+ * @since 1.0.0
+ */
+size_t
+xkb_keymap_key_get_mods_for_level(struct xkb_keymap *keymap,
+                                  xkb_keycode_t key,
+                                  xkb_layout_index_t layout,
+                                  xkb_level_index_t level,
+                                  xkb_mod_mask_t *masks_out,
+                                  size_t masks_size);
+
+/**
+ * Get the keysyms obtained from pressing a key in a given layout and
+ * shift level.
+ *
+ * This function is like xkb_state_key_get_syms(), only the layout and
+ * shift level are not derived from the keyboard state but are instead
+ * specified explicitly.
+ *
+ * @param[in] keymap    The keymap.
+ * @param[in] key       The keycode of the key.
+ * @param[in] layout    The layout for which to get the keysyms.
+ * @param[in] level     The shift level in the layout for which to get the
+ * keysyms. This should be smaller than:
+ * @code xkb_keymap_num_levels_for_key(keymap, key) @endcode
+ * @param[out] syms_out An immutable array of keysyms corresponding to the
+ * key in the given layout and shift level.
+ *
+ * If @c layout is out of range for this key (that is, larger or equal to
+ * the value returned by xkb_keymap_num_layouts_for_key()), it is brought
+ * back into range in a manner consistent with xkb_state_key_get_layout().
+ *
+ * @returns The number of keysyms in the syms_out array.  If no keysyms
+ * are produced by the key in the given layout and shift level, returns 0
+ * and sets syms_out to NULL.
+ *
+ * @sa xkb_state_key_get_syms()
+ * @memberof xkb_keymap
+ */
+int
+xkb_keymap_key_get_syms_by_level(struct xkb_keymap *keymap,
+                                 xkb_keycode_t key,
+                                 xkb_layout_index_t layout,
+                                 xkb_level_index_t level,
+                                 const xkb_keysym_t **syms_out);
+
+/**
+ * Determine whether a key should repeat or not.
+ *
+ * A keymap may specify different repeat behaviors for different keys.
+ * Most keys should generally exhibit repeat behavior; for example, holding
+ * the 'a' key down in a text editor should normally insert a single 'a'
+ * character every few milliseconds, until the key is released.  However,
+ * there are keys which should not or do not need to be repeated.  For
+ * example, repeating modifier keys such as Left/Right Shift or Caps Lock
+ * is not generally useful or desired.
+ *
+ * @returns 1 if the key should repeat, 0 otherwise.
+ *
+ * @memberof xkb_keymap
+ */
+int
+xkb_keymap_key_repeats(struct xkb_keymap *keymap, xkb_keycode_t key);
+
+/** @} */
+
+/**
+ * @defgroup state Keyboard State
+ * Creating, destroying and manipulating keyboard state objects.
+ *
+ * @{
+ */
+
+/**
+ * Create a new keyboard state object.
+ *
+ * @param keymap The keymap which the state will use.
+ *
+ * @returns A new keyboard state object, or NULL on failure.
+ *
+ * @memberof xkb_state
+ */
+struct xkb_state *
+xkb_state_new(struct xkb_keymap *keymap);
+
+/**
+ * Take a new reference on a keyboard state object.
+ *
+ * @returns The passed in object.
+ *
+ * @memberof xkb_state
+ */
+struct xkb_state *
+xkb_state_ref(struct xkb_state *state);
+
+/**
+ * Release a reference on a keybaord state object, and possibly free it.
+ *
+ * @param state The state.  If it is NULL, this function does nothing.
+ *
+ * @memberof xkb_state
+ */
+void
+xkb_state_unref(struct xkb_state *state);
+
+/**
+ * Get the keymap which a keyboard state object is using.
+ *
+ * @returns The keymap which was passed to xkb_state_new() when creating
+ * this state object.
+ *
+ * This function does not take a new reference on the keymap; you must
+ * explicitly reference it yourself if you plan to use it beyond the
+ * lifetime of the state.
+ *
+ * @memberof xkb_state
+ */
+struct xkb_keymap *
+xkb_state_get_keymap(struct xkb_state *state);
+
+/** Specifies the direction of the key (press / release). */
+enum xkb_key_direction {
+    XKB_KEY_UP,   /**< The key was released. */
+    XKB_KEY_DOWN  /**< The key was pressed. */
+};
+
+/**
+ * Modifier and layout types for state objects.  This enum is bitmaskable,
+ * e.g. (XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED) is valid to
+ * exclude locked modifiers.
+ *
+ * In XKB, the DEPRESSED components are also known as 'base'.
+ */
+enum xkb_state_component {
+    /** Depressed modifiers, i.e. a key is physically holding them. */
+    XKB_STATE_MODS_DEPRESSED = (1 << 0),
+    /** Latched modifiers, i.e. will be unset after the next non-modifier
+     *  key press. */
+    XKB_STATE_MODS_LATCHED = (1 << 1),
+    /** Locked modifiers, i.e. will be unset after the key provoking the
+     *  lock has been pressed again. */
+    XKB_STATE_MODS_LOCKED = (1 << 2),
+    /** Effective modifiers, i.e. currently active and affect key
+     *  processing (derived from the other state components).
+     *  Use this unless you explicitly care how the state came about. */
+    XKB_STATE_MODS_EFFECTIVE = (1 << 3),
+    /** Depressed layout, i.e. a key is physically holding it. */
+    XKB_STATE_LAYOUT_DEPRESSED = (1 << 4),
+    /** Latched layout, i.e. will be unset after the next non-modifier
+     *  key press. */
+    XKB_STATE_LAYOUT_LATCHED = (1 << 5),
+    /** Locked layout, i.e. will be unset after the key provoking the lock
+     *  has been pressed again. */
+    XKB_STATE_LAYOUT_LOCKED = (1 << 6),
+    /** Effective layout, i.e. currently active and affects key processing
+     *  (derived from the other state components).
+     *  Use this unless you explicitly care how the state came about. */
+    XKB_STATE_LAYOUT_EFFECTIVE = (1 << 7),
+    /** LEDs (derived from the other state components). */
+    XKB_STATE_LEDS = (1 << 8)
+};
+
+/**
+ * Update the keyboard state to reflect a given key being pressed or
+ * released.
+ *
+ * This entry point is intended for programs which track the keyboard state
+ * explicitly (like an evdev client).  If the state is serialized to you by
+ * a master process (like a Wayland compositor) using functions like
+ * xkb_state_serialize_mods(), you should use xkb_state_update_mask() instead.
+ * The two functions should not generally be used together.
+ *
+ * A series of calls to this function should be consistent; that is, a call
+ * with XKB_KEY_DOWN for a key should be matched by an XKB_KEY_UP; if a key
+ * is pressed twice, it should be released twice; etc. Otherwise (e.g. due
+ * to missed input events), situations like "stuck modifiers" may occur.
+ *
+ * This function is often used in conjunction with the function
+ * xkb_state_key_get_syms() (or xkb_state_key_get_one_sym()), for example,
+ * when handling a key event.  In this case, you should prefer to get the
+ * keysyms *before* updating the key, such that the keysyms reported for
+ * the key event are not affected by the event itself.  This is the
+ * conventional behavior.
+ *
+ * @returns A mask of state components that have changed as a result of
+ * the update.  If nothing in the state has changed, returns 0.
+ *
+ * @memberof xkb_state
+ *
+ * @sa xkb_state_update_mask()
+ */
+enum xkb_state_component
+xkb_state_update_key(struct xkb_state *state, xkb_keycode_t key,
+                     enum xkb_key_direction direction);
+
+/**
+ * Update a keyboard state from a set of explicit masks.
+ *
+ * This entry point is intended for window systems and the like, where a
+ * master process holds an xkb_state, then serializes it over a wire
+ * protocol, and clients then use the serialization to feed in to their own
+ * xkb_state.
+ *
+ * All parameters must always be passed, or the resulting state may be
+ * incoherent.
+ *
+ * The serialization is lossy and will not survive round trips; it must only
+ * be used to feed slave state objects, and must not be used to update the
+ * master state.
+ *
+ * If you do not fit the description above, you should use
+ * xkb_state_update_key() instead.  The two functions should not generally be
+ * used together.
+ *
+ * @returns A mask of state components that have changed as a result of
+ * the update.  If nothing in the state has changed, returns 0.
+ *
+ * @memberof xkb_state
+ *
+ * @sa xkb_state_component
+ * @sa xkb_state_update_key
+ */
+enum xkb_state_component
+xkb_state_update_mask(struct xkb_state *state,
+                      xkb_mod_mask_t depressed_mods,
+                      xkb_mod_mask_t latched_mods,
+                      xkb_mod_mask_t locked_mods,
+                      xkb_layout_index_t depressed_layout,
+                      xkb_layout_index_t latched_layout,
+                      xkb_layout_index_t locked_layout);
+
+/**
+ * Get the keysyms obtained from pressing a particular key in a given
+ * keyboard state.
+ *
+ * Get the keysyms for a key according to the current active layout,
+ * modifiers and shift level for the key, as determined by a keyboard
+ * state.
+ *
+ * @param[in]  state    The keyboard state object.
+ * @param[in]  key      The keycode of the key.
+ * @param[out] syms_out An immutable array of keysyms corresponding the
+ * key in the given keyboard state.
+ *
+ * As an extension to XKB, this function can return more than one keysym.
+ * If you do not want to handle this case, you can use
+ * xkb_state_key_get_one_sym() for a simpler interface.
+ *
+ * This function does not perform any @ref keysym-transformations.
+ * (This might change).
+ *
+ * @returns The number of keysyms in the syms_out array.  If no keysyms
+ * are produced by the key in the given keyboard state, returns 0 and sets
+ * syms_out to NULL.
+ *
+ * @memberof xkb_state
+ */
+int
+xkb_state_key_get_syms(struct xkb_state *state, xkb_keycode_t key,
+                       const xkb_keysym_t **syms_out);
+
+/**
+ * Get the Unicode/UTF-8 string obtained from pressing a particular key
+ * in a given keyboard state.
+ *
+ * @param[in]  state  The keyboard state object.
+ * @param[in]  key    The keycode of the key.
+ * @param[out] buffer A buffer to write the string into.
+ * @param[in]  size   Size of the buffer.
+ *
+ * @warning If the buffer passed is too small, the string is truncated
+ * (though still NUL-terminated).
+ *
+ * @returns The number of bytes required for the string, excluding the
+ * NUL byte.  If there is nothing to write, returns 0.
+ *
+ * You may check if truncation has occurred by comparing the return value
+ * with the size of @p buffer, similarly to the snprintf(3) function.
+ * You may safely pass NULL and 0 to @p buffer and @p size to find the
+ * required size (without the NUL-byte).
+ *
+ * This function performs Capitalization and Control @ref
+ * keysym-transformations.
+ *
+ * @memberof xkb_state
+ * @since 0.4.1
+ */
+int
+xkb_state_key_get_utf8(struct xkb_state *state, xkb_keycode_t key,
+                       char *buffer, size_t size);
+
+/**
+ * Get the Unicode/UTF-32 codepoint obtained from pressing a particular
+ * key in a a given keyboard state.
+ *
+ * @returns The UTF-32 representation for the key, if it consists of only
+ * a single codepoint.  Otherwise, returns 0.
+ *
+ * This function performs Capitalization and Control @ref
+ * keysym-transformations.
+ *
+ * @memberof xkb_state
+ * @since 0.4.1
+ */
+uint32_t
+xkb_state_key_get_utf32(struct xkb_state *state, xkb_keycode_t key);
+
+/**
+ * Get the single keysym obtained from pressing a particular key in a
+ * given keyboard state.
+ *
+ * This function is similar to xkb_state_key_get_syms(), but intended
+ * for users which cannot or do not want to handle the case where
+ * multiple keysyms are returned (in which case this function is
+ * preferred).
+ *
+ * @returns The keysym.  If the key does not have exactly one keysym,
+ * returns XKB_KEY_NoSymbol
+ *
+ * This function performs Capitalization @ref keysym-transformations.
+ *
+ * @sa xkb_state_key_get_syms()
+ * @memberof xkb_state
+ */
+xkb_keysym_t
+xkb_state_key_get_one_sym(struct xkb_state *state, xkb_keycode_t key);
+
+/**
+ * Get the effective layout index for a key in a given keyboard state.
+ *
+ * @returns The layout index for the key in the given keyboard state.  If
+ * the given keycode is invalid, or if the key is not included in any
+ * layout at all, returns XKB_LAYOUT_INVALID.
+ *
+ * @invariant If the returned layout is valid, the following always holds:
+ * @code
+ * xkb_state_key_get_layout(state, key) < xkb_keymap_num_layouts_for_key(keymap, key)
+ * @endcode
+ *
+ * @memberof xkb_state
+ */
+xkb_layout_index_t
+xkb_state_key_get_layout(struct xkb_state *state, xkb_keycode_t key);
+
+/**
+ * Get the effective shift level for a key in a given keyboard state and
+ * layout.
+ *
+ * @param state The keyboard state.
+ * @param key The keycode of the key.
+ * @param layout The layout for which to get the shift level.  This must be
+ * smaller than:
+ * @code xkb_keymap_num_layouts_for_key(keymap, key) @endcode
+ * usually it would be:
+ * @code xkb_state_key_get_layout(state, key) @endcode
+ *
+ * @return The shift level index.  If the key or layout are invalid,
+ * returns XKB_LEVEL_INVALID.
+ *
+ * @invariant If the returned level is valid, the following always holds:
+ * @code
+ * xkb_state_key_get_level(state, key, layout) < xkb_keymap_num_levels_for_key(keymap, key, layout)
+ * @endcode
+ *
+ * @memberof xkb_state
+ */
+xkb_level_index_t
+xkb_state_key_get_level(struct xkb_state *state, xkb_keycode_t key,
+                        xkb_layout_index_t layout);
+
+/**
+ * Match flags for xkb_state_mod_indices_are_active() and
+ * xkb_state_mod_names_are_active(), specifying the conditions for a
+ * successful match.  XKB_STATE_MATCH_NON_EXCLUSIVE is bitmaskable with
+ * the other modes.
+ */
+enum xkb_state_match {
+    /** Returns true if any of the modifiers are active. */
+    XKB_STATE_MATCH_ANY = (1 << 0),
+    /** Returns true if all of the modifiers are active. */
+    XKB_STATE_MATCH_ALL = (1 << 1),
+    /** Makes matching non-exclusive, i.e. will not return false if a
+     *  modifier not specified in the arguments is active. */
+    XKB_STATE_MATCH_NON_EXCLUSIVE = (1 << 16)
+};
+
+/**
+ * The counterpart to xkb_state_update_mask for modifiers, to be used on
+ * the server side of serialization.
+ *
+ * @param state      The keyboard state.
+ * @param components A mask of the modifier state components to serialize.
+ * State components other than XKB_STATE_MODS_* are ignored.
+ * If XKB_STATE_MODS_EFFECTIVE is included, all other state components are
+ * ignored.
+ *
+ * @returns A xkb_mod_mask_t representing the given components of the
+ * modifier state.
+ *
+ * This function should not be used in regular clients; please use the
+ * xkb_state_mod_*_is_active API instead.
+ *
+ * @memberof xkb_state
+ */
+xkb_mod_mask_t
+xkb_state_serialize_mods(struct xkb_state *state,
+                         enum xkb_state_component components);
+
+/**
+ * The counterpart to xkb_state_update_mask for layouts, to be used on
+ * the server side of serialization.
+ *
+ * @param state      The keyboard state.
+ * @param components A mask of the layout state components to serialize.
+ * State components other than XKB_STATE_LAYOUT_* are ignored.
+ * If XKB_STATE_LAYOUT_EFFECTIVE is included, all other state components are
+ * ignored.
+ *
+ * @returns A layout index representing the given components of the
+ * layout state.
+ *
+ * This function should not be used in regular clients; please use the
+ * xkb_state_layout_*_is_active API instead.
+ *
+ * @memberof xkb_state
+ */
+xkb_layout_index_t
+xkb_state_serialize_layout(struct xkb_state *state,
+                           enum xkb_state_component components);
+
+/**
+ * Test whether a modifier is active in a given keyboard state by name.
+ *
+ * @returns 1 if the modifier is active, 0 if it is not.  If the modifier
+ * name does not exist in the keymap, returns -1.
+ *
+ * @memberof xkb_state
+ */
+int
+xkb_state_mod_name_is_active(struct xkb_state *state, const char *name,
+                             enum xkb_state_component type);
+
+/**
+ * Test whether a set of modifiers are active in a given keyboard state by
+ * name.
+ *
+ * @param state The keyboard state.
+ * @param type  The component of the state against which to match the
+ * given modifiers.
+ * @param match The manner by which to match the state against the
+ * given modifiers.
+ * @param ...   The set of of modifier names to test, terminated by a NULL
+ * argument (sentinel).
+ *
+ * @returns 1 if the modifiers are active, 0 if they are not.  If any of
+ * the modifier names do not exist in the keymap, returns -1.
+ *
+ * @memberof xkb_state
+ */
+int
+xkb_state_mod_names_are_active(struct xkb_state *state,
+                               enum xkb_state_component type,
+                               enum xkb_state_match match,
+                               ...);
+
+/**
+ * Test whether a modifier is active in a given keyboard state by index.
+ *
+ * @returns 1 if the modifier is active, 0 if it is not.  If the modifier
+ * index is invalid in the keymap, returns -1.
+ *
+ * @memberof xkb_state
+ */
+int
+xkb_state_mod_index_is_active(struct xkb_state *state, xkb_mod_index_t idx,
+                              enum xkb_state_component type);
+
+/**
+ * Test whether a set of modifiers are active in a given keyboard state by
+ * index.
+ *
+ * @param state The keyboard state.
+ * @param type  The component of the state against which to match the
+ * given modifiers.
+ * @param match The manner by which to match the state against the
+ * given modifiers.
+ * @param ...   The set of of modifier indices to test, terminated by a
+ * XKB_MOD_INVALID argument (sentinel).
+ *
+ * @returns 1 if the modifiers are active, 0 if they are not.  If any of
+ * the modifier indices are invalid in the keymap, returns -1.
+ *
+ * @memberof xkb_state
+ */
+int
+xkb_state_mod_indices_are_active(struct xkb_state *state,
+                                 enum xkb_state_component type,
+                                 enum xkb_state_match match,
+                                 ...);
+
+/**
+ * @page consumed-modifiers Consumed Modifiers
+ * @parblock
+ *
+ * Some functions, like xkb_state_key_get_syms(), look at the state of
+ * the modifiers in the keymap and derive from it the correct shift level
+ * to use for the key.  For example, in a US layout, pressing the key
+ * labeled \<A\> while the Shift modifier is active, generates the keysym
+ * 'A'.  In this case, the Shift modifier is said to be "consumed".
+ * However, the Num Lock modifier does not affect this translation at all,
+ * even if it is active, so it is not consumed by this translation.
+ *
+ * It may be desirable for some application to not reuse consumed modifiers
+ * for further processing, e.g. for hotkeys or keyboard shortcuts.  To
+ * understand why, consider some requirements from a standard shortcut
+ * mechanism, and how they are implemented:
+ *
+ * 1. The shortcut's modifiers must match exactly to the state.  For
+ *    example, it is possible to bind separate actions to \<Alt\>\<Tab\>
+ *    and to \<Alt\>\<Shift\>\<Tab\>.  Further, if only \<Alt\>\<Tab\> is
+ *    bound to an action, pressing \<Alt\>\<Shift\>\<Tab\> should not
+ *    trigger the shortcut.
+ *    Effectively, this means that the modifiers are compared using the
+ *    equality operator (==).
+ *
+ * 2. Only relevant modifiers are considered for the matching.  For example,
+ *    Caps Lock and Num Lock should not generally affect the matching, e.g.
+ *    when matching \<Alt\>\<Tab\> against the state, it does not matter
+ *    whether Num Lock is active or not.  These relevant, or "significant",
+ *    modifiers usually include Alt, Control, Shift, Super and similar.
+ *    Effectively, this means that non-significant modifiers are masked out,
+ *    before doing the comparison as described above.
+ *
+ * 3. The matching must be independent of the layout/keymap.  For example,
+ *    the \<Plus\> (+) symbol is found on the first level on some layouts,
+ *    but requires holding Shift on others.  If you simply bind the action
+ *    to the \<Plus\> keysym, it would work for the unshifted kind, but
+ *    not for the others, because the match against Shift would fail.  If
+ *    you bind the action to \<Shift\>\<Plus\>, only the shifted kind would
+ *    work.  So what is needed is to recognize that Shift is used up in the
+ *    translation of the keysym itself, and therefore should not be included
+ *    in the matching.
+ *    Effectively, this means that consumed modifiers (Shift in this example)
+ *    are masked out as well, before doing the comparison.
+ *
+ * In summary, this is approximately how the matching would be performed:
+ * @code
+ *   (keysym == shortcut_keysym) &&
+ *   ((state_mods & ~consumed_mods & significant_mods) == shortcut_mods)
+ * @endcode
+ *
+ * @c state_mods are the modifiers reported by
+ * xkb_state_mod_index_is_active() and similar functions.
+ * @c consumed_mods are the modifiers reported by
+ * xkb_state_mod_index_is_consumed() and similar functions.
+ * @c significant_mods are decided upon by the application/toolkit/user;
+ * it is up to them to decide whether these are configurable or hard-coded.
+ *
+ * @endparblock
+ */
+
+/**
+ * Consumed modifiers mode.
+ *
+ * There are several possible methods for deciding which modifiers are
+ * consumed and which are not, each applicable for different systems or
+ * situations. The mode selects the method to use.
+ *
+ * Keep in mind that in all methods, the keymap may decide to "preserve"
+ * a modifier, meaning it is not reported as consumed even if it would
+ * have otherwise.
+ */
+enum xkb_consumed_mode {
+    /**
+     * This is the mode defined in the XKB specification and used by libX11.
+     *
+     * A modifier is consumed if and only if it *may affect* key translation.
+     *
+     * For example, if `Control+Alt+<Backspace>` produces some assigned keysym,
+     * then when pressing just `<Backspace>`, `Control` and `Alt` are consumed,
+     * even though they are not active, since if they *were* active they would
+     * have affected key translation.
+     */
+    XKB_CONSUMED_MODE_XKB,
+    /**
+     * This is the mode used by the GTK+ toolkit.
+     *
+     * The mode consists of the following two independent heuristics:
+     *
+     * - The currently active set of modifiers, excluding modifiers which do
+     *   not affect the key (as described for @ref XKB_CONSUMED_MODE_XKB), are
+     *   considered consumed, if the keysyms produced when all of them are
+     *   active are different from the keysyms produced when no modifiers are
+     *   active.
+     *
+     * - A single modifier is considered consumed if the keysyms produced for
+     *   the key when it is the only active modifier are different from the
+     *   keysyms produced when no modifiers are active.
+     */
+    XKB_CONSUMED_MODE_GTK
+};
+
+/**
+ * Get the mask of modifiers consumed by translating a given key.
+ *
+ * @param state The keyboard state.
+ * @param key   The keycode of the key.
+ * @param mode  The consumed modifiers mode to use; see enum description.
+ *
+ * @returns a mask of the consumed modifiers.
+ *
+ * @memberof xkb_state
+ * @since 0.7.0
+ */
+xkb_mod_mask_t
+xkb_state_key_get_consumed_mods2(struct xkb_state *state, xkb_keycode_t key,
+                                 enum xkb_consumed_mode mode);
+
+/**
+ * Same as xkb_state_key_get_consumed_mods2() with mode XKB_CONSUMED_MODE_XKB.
+ *
+ * @memberof xkb_state
+ * @since 0.4.1
+ */
+xkb_mod_mask_t
+xkb_state_key_get_consumed_mods(struct xkb_state *state, xkb_keycode_t key);
+
+/**
+ * Test whether a modifier is consumed by keyboard state translation for
+ * a key.
+ *
+ * @param state The keyboard state.
+ * @param key   The keycode of the key.
+ * @param idx   The index of the modifier to check.
+ * @param mode  The consumed modifiers mode to use; see enum description.
+ *
+ * @returns 1 if the modifier is consumed, 0 if it is not.  If the modifier
+ * index is not valid in the keymap, returns -1.
+ *
+ * @sa xkb_state_mod_mask_remove_consumed()
+ * @sa xkb_state_key_get_consumed_mods()
+ * @memberof xkb_state
+ * @since 0.7.0
+ */
+int
+xkb_state_mod_index_is_consumed2(struct xkb_state *state,
+                                 xkb_keycode_t key,
+                                 xkb_mod_index_t idx,
+                                 enum xkb_consumed_mode mode);
+
+/**
+ * Same as xkb_state_mod_index_is_consumed2() with mode XKB_CONSUMED_MOD_XKB.
+ *
+ * @memberof xkb_state
+ * @since 0.4.1
+ */
+int
+xkb_state_mod_index_is_consumed(struct xkb_state *state, xkb_keycode_t key,
+                                xkb_mod_index_t idx);
+
+/**
+ * Remove consumed modifiers from a modifier mask for a key.
+ *
+ * @deprecated Use xkb_state_key_get_consumed_mods2() instead.
+ *
+ * Takes the given modifier mask, and removes all modifiers which are
+ * consumed for that particular key (as in xkb_state_mod_index_is_consumed()).
+ *
+ * @sa xkb_state_mod_index_is_consumed()
+ * @memberof xkb_state
+ */
+xkb_mod_mask_t
+xkb_state_mod_mask_remove_consumed(struct xkb_state *state, xkb_keycode_t key,
+                                   xkb_mod_mask_t mask);
+
+/**
+ * Test whether a layout is active in a given keyboard state by name.
+ *
+ * @returns 1 if the layout is active, 0 if it is not.  If no layout with
+ * this name exists in the keymap, return -1.
+ *
+ * If multiple layouts in the keymap have this name, the one with the lowest
+ * index is tested.
+ *
+ * @sa xkb_layout_index_t
+ * @memberof xkb_state
+ */
+int
+xkb_state_layout_name_is_active(struct xkb_state *state, const char *name,
+                                enum xkb_state_component type);
+
+/**
+ * Test whether a layout is active in a given keyboard state by index.
+ *
+ * @returns 1 if the layout is active, 0 if it is not.  If the layout index
+ * is not valid in the keymap, returns -1.
+ *
+ * @sa xkb_layout_index_t
+ * @memberof xkb_state
+ */
+int
+xkb_state_layout_index_is_active(struct xkb_state *state,
+                                 xkb_layout_index_t idx,
+                                 enum xkb_state_component type);
+
+/**
+ * Test whether a LED is active in a given keyboard state by name.
+ *
+ * @returns 1 if the LED is active, 0 if it not.  If no LED with this name
+ * exists in the keymap, returns -1.
+ *
+ * @sa xkb_led_index_t
+ * @memberof xkb_state
+ */
+int
+xkb_state_led_name_is_active(struct xkb_state *state, const char *name);
+
+/**
+ * Test whether a LED is active in a given keyboard state by index.
+ *
+ * @returns 1 if the LED is active, 0 if it not.  If the LED index is not
+ * valid in the keymap, returns -1.
+ *
+ * @sa xkb_led_index_t
+ * @memberof xkb_state
+ */
+int
+xkb_state_led_index_is_active(struct xkb_state *state, xkb_led_index_t idx);
+
+/** @} */
+
+/* Leave this include last, so it can pick up our types, etc. */
+#include <xkbcommon/xkbcommon-compat.h>
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _XKBCOMMON_H_ */
diff --git a/include/xkbcommon/xkbregistry.h b/include/xkbcommon/xkbregistry.h
new file mode 100644
index 0000000..4e7e926
--- /dev/null
+++ b/include/xkbcommon/xkbregistry.h
@@ -0,0 +1,782 @@
+/*
+ * Copyright © 2020 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _XKBREGISTRY_H_
+#define _XKBREGISTRY_H_
+
+#include <stdarg.h>
+#include <stdbool.h>
+
+/**
+ * @file
+ * @brief Query for available RMLVO
+ *
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup registry Query for available RMLVO
+ *
+ * The libxkbregistry API to query for available rules, models, layouts,
+ * variants and options (RMLVO). libxkbregistry is a separate library to
+ * libxkbcommon.
+ *
+ * This library is the replacement for clients currently parsing evdev.xml
+ * directly. The library is intended to provide easy access to the set of
+ * **possible** MLVO configurations for a given ruleset. It is not a library to
+ * apply these configurations, merely to enumerate them. The intended users of
+ * this library are the configuration UIs that allow a user to select their
+ * keyboard layout of choice.
+ *
+ * @{
+ */
+
+/**
+ * @struct rxkb_context
+ *
+ * Opaque top level library context object.
+ *
+ * The context contains general library state, like include paths and parsed
+ * data. Objects are created in a specific context, and multiple contexts
+ * may coexist simultaneously. Objects from different contexts are
+ * completely separated and do not share any memory or state.
+ */
+struct rxkb_context;
+
+/**
+ * @struct rxkb_model
+ *
+ * Opaque struct representing an XKB model.
+ */
+struct rxkb_model;
+
+/**
+ * @struct rxkb_layout
+ *
+ * Opaque struct representing an XKB layout, including an optional variant.
+ * Where the variant is NULL, the layout is the base layout.
+ *
+ * For example, "us" is the base layout, "us(intl)" is the "intl" variant of the
+ * layout "us".
+ */
+struct rxkb_layout;
+
+/**
+ * @struct rxkb_option_group
+ *
+ * Opaque struct representing an option group. Option groups divide the
+ * individual options into logical groups. Their main purpose is to indicate
+ * whether some options are mutually exclusive or not.
+ */
+struct rxkb_option_group;
+
+/**
+ * @struct rxkb_option
+ *
+ * Opaque struct representing an XKB option. Options are grouped inside an @ref
+ * rxkb_option_group.
+ */
+struct rxkb_option;
+
+/**
+ *
+ * @struct rxkb_iso639_code
+ *
+ * Opaque struct representing an ISO 639-3 code (e.g. "eng", "fra"). There
+ * is no guarantee that two identical ISO codes share the same struct. You
+ * must not rely on the pointer value of this struct.
+ *
+ * See https://iso639-3.sil.org/code_tables/639/data for a list of codes.
+ */
+struct rxkb_iso639_code;
+
+/**
+ *
+ * @struct rxkb_iso3166_code
+ *
+ * Opaque struct representing an ISO 3166 Alpha 2 code (e.g. "US", "FR").
+ * There is no guarantee that two identical ISO codes share the same struct.
+ * You must not rely on the pointer value of this struct.
+ *
+ * See https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes for a list
+ * of codes.
+ */
+struct rxkb_iso3166_code;
+
+/**
+ * Describes the popularity of an item. Historically, some highly specialized or
+ * experimental definitions are excluded from the default list and shipped in
+ * separate files. If these extra definitions are loaded (see @ref
+ * RXKB_CONTEXT_LOAD_EXOTIC_RULES), the popularity of the item is set
+ * accordingly.
+ *
+ * If the exotic items are not loaded, all items will have the standard
+ * popularity.
+ */
+enum rxkb_popularity {
+    RXKB_POPULARITY_STANDARD = 1,
+    RXKB_POPULARITY_EXOTIC,
+};
+
+/**
+ * Flags for context creation.
+ */
+enum rxkb_context_flags {
+    RXKB_CONTEXT_NO_FLAGS = 0,
+    /**
+     * Skip the default include paths. This requires the caller to call
+     * rxkb_context_include_path_append() or
+     * rxkb_context_include_path_append_default().
+     */
+    RXKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0),
+    /**
+     * Load the extra items that are considered too exotic for the default list.
+     *
+     * For historical reasons, xkeyboard-config ships those exotic rules in a
+     * separate file (e.g. `evdev.extras.xml`). Where the exotic rules are
+     * requested, libxkbregistry will look for and load `$ruleset.extras.xml`
+     * in the include paths, see rxkb_context_include_path_append() for details
+     * on the lookup behavior.
+     */
+    RXKB_CONTEXT_LOAD_EXOTIC_RULES = (1 << 1),
+};
+
+/**
+ * Create a new xkb registry context.
+ *
+ * The context has an initial refcount of 1. Use rxkb_context_unref() to release
+ * memory associated with this context.
+ *
+ * Creating a context does not parse the files yet, use
+ * rxkb_context_parse().
+ *
+ * @param flags Flags affecting context behavior
+ * @return A new xkb registry context or NULL on failure
+ */
+struct rxkb_context *
+rxkb_context_new(enum rxkb_context_flags flags);
+
+/** Specifies a logging level. */
+enum rxkb_log_level {
+    RXKB_LOG_LEVEL_CRITICAL = 10, /**< Log critical internal errors only. */
+    RXKB_LOG_LEVEL_ERROR = 20,    /**< Log all errors. */
+    RXKB_LOG_LEVEL_WARNING = 30,  /**< Log warnings and errors. */
+    RXKB_LOG_LEVEL_INFO = 40,     /**< Log information, warnings, and errors. */
+    RXKB_LOG_LEVEL_DEBUG = 50     /**< Log everything. */
+};
+
+/**
+ * Set the current logging level.
+ *
+ * @param ctx     The context in which to set the logging level.
+ * @param level   The logging level to use.  Only messages from this level
+ * and below will be logged.
+ *
+ * The default level is RXKB_LOG_LEVEL_ERROR.  The environment variable
+ * RXKB_LOG_LEVEL, if set at the time the context was created, overrides the
+ * default value.  It may be specified as a level number or name.
+ */
+void
+rxkb_context_set_log_level(struct rxkb_context *ctx,
+                           enum rxkb_log_level level);
+
+/**
+ * Get the current logging level.
+ */
+enum rxkb_log_level
+rxkb_context_get_log_level(struct rxkb_context *ctx);
+
+/**
+ * Set a custom function to handle logging messages.
+ *
+ * @param ctx     The context in which to use the set logging function.
+ * @param log_fn  The function that will be called for logging messages.
+ * Passing NULL restores the default function, which logs to stderr.
+ *
+ * By default, log messages from this library are printed to stderr.  This
+ * function allows you to replace the default behavior with a custom
+ * handler.  The handler is only called with messages which match the
+ * current logging level and verbosity settings for the context.
+ * level is the logging level of the message.  @a format and @a args are
+ * the same as in the vprintf(3) function.
+ *
+ * You may use rxkb_context_set_user_data() on the context, and then call
+ * rxkb_context_get_user_data() from within the logging function to provide
+ * it with additional private context.
+ */
+void
+rxkb_context_set_log_fn(struct rxkb_context *ctx,
+                        void (*log_fn)(struct rxkb_context *ctx,
+                                       enum rxkb_log_level level,
+                                       const char *format, va_list args));
+
+
+/**
+ * Parse the given ruleset. This can only be called once per context and once
+ * parsed the data in the context is considered constant and will never
+ * change.
+ *
+ * This function parses all files with the given ruleset name. See
+ * rxkb_context_include_path_append() for details.
+ *
+ * If this function returns false, libxkbregistry failed to parse the xml files.
+ * This is usually caused by invalid files on the host and should be debugged by
+ * the host's administrator using external tools. Callers should reduce the
+ * include paths to known good paths and/or fall back to a default RMLVO set.
+ *
+ * If this function returns false, the context should be be considered dead and
+ * must be released with rxkb_context_unref().
+ *
+ * @param ctx The xkb registry context
+ * @param ruleset The ruleset to parse, e.g. "evdev"
+ * @return true on success or false on failure
+ */
+bool
+rxkb_context_parse(struct rxkb_context *ctx, const char *ruleset);
+
+/**
+ * Parse the default ruleset as configured at build time. See
+ * rxkb_context_parse() for details.
+ */
+bool
+rxkb_context_parse_default_ruleset(struct rxkb_context *ctx);
+
+/**
+ * Increases the refcount of this object by one and returns the object.
+ *
+ * @param ctx The xkb registry context
+ * @return The passed in object
+ */
+struct rxkb_context*
+rxkb_context_ref(struct rxkb_context *ctx);
+
+/**
+ * Decreases the refcount of this object by one. Where the refcount of an
+ * object hits zero, associated resources will be freed.
+ *
+ * @param ctx The xkb registry context
+ * @return always NULL
+ */
+struct rxkb_context*
+rxkb_context_unref(struct rxkb_context *ctx);
+
+/**
+ * Assign user-specific data. libxkbregistry will not look at or modify the
+ * data, it will merely return the same pointer in
+ * rxkb_context_get_user_data().
+ *
+ * @param ctx The xkb registry context
+ * @param user_data User-specific data pointer
+ */
+void
+rxkb_context_set_user_data(struct rxkb_context *ctx, void *user_data);
+
+/**
+ * Return the pointer passed into rxkb_context_get_user_data().
+ *
+ * @param ctx The xkb registry context
+ * @return User-specific data pointer
+ */
+void *
+rxkb_context_get_user_data(struct rxkb_context *ctx);
+
+/**
+ * Append a new entry to the context's include path.
+ *
+ * The include path handling is optimized for the most common use-case: a set of
+ * system files that provide a complete set of MLVO and some
+ * custom MLVO provided by a user **in addition** to the system set.
+ *
+ * The include paths should be given so that the least complete path is
+ * specified first and the most complete path is appended last. For example:
+ *
+ * @code
+ *    ctx = rxkb_context_new(RXKB_CONTEXT_NO_DEFAULT_INCLUDES);
+ *    rxkb_context_include_path_append(ctx, "/home/user/.config/xkb");
+ *    rxkb_context_include_path_append(ctx, "/usr/share/X11/xkb");
+ *    rxkb_context_parse(ctx, "evdev");
+ * @endcode
+ *
+ * The above example reflects the default behavior unless @ref
+ * RXKB_CONTEXT_NO_DEFAULT_INCLUDES is provided.
+ *
+ * Loading of the files is in **reverse order**, i.e. the last path appended is
+ * loaded first - in this case the ``/usr/share/X11/xkb`` path.
+ * Any models, layouts, variants and options defined in the "evdev" ruleset
+ * are loaded into the context. Then, any RMLVO found in the "evdev" ruleset of
+ * the user's path (``/home/user/.config/xkb`` in this example) are **appended**
+ * to the existing set.
+ *
+ * Note that data from previously loaded include paths is never overwritten,
+ * only appended to. It is not not possible to change the system-provided data,
+ * only to append new models, layouts, variants and options to it.
+ *
+ * In other words, to define a new variant of the "us" layout called "banana",
+ * the following XML is sufficient.
+ *
+ * @verbatim
+ * <xkbConfigRegistry version="1.1">
+ * <layoutList>
+ *   <layout>
+ *     <configItem>
+ *       <name>us</name>
+ *     </configItem>
+ *     <variantList>
+ *       <variant>
+ *         <configItem>
+ *          <name>banana</name>
+ *          <description>English (Banana)</description>
+ *        </configItem>
+ *      </variant>
+ *    </layout>
+ * </layoutList>
+ * </xkbConfigRegistry>
+ * @endverbatim
+ *
+ * The list of models, options and all other layouts (including "us" and its
+ * variants) is taken from the system files. The resulting list of layouts will
+ * thus have a "us" keyboard layout with the variant "banana" and all other
+ * system-provided variants (dvorak, colemak, intl, etc.)
+ *
+ * This function must be called before rxkb_context_parse() or
+ * rxkb_context_parse_default_ruleset().
+ *
+ * @returns true on success, or false if the include path could not be added
+ * or is inaccessible.
+ */
+bool
+rxkb_context_include_path_append(struct rxkb_context *ctx, const char *path);
+
+/**
+ * Append the default include paths to the context's include path.
+ * See rxkb_context_include_path_append() for details about the merge order.
+ *
+ * This function must be called before rxkb_context_parse() or
+ * rxkb_context_parse_default_ruleset().
+ *
+ * @returns true on success, or false if the include path could not be added
+ * or is inaccessible.
+ */
+bool
+rxkb_context_include_path_append_default(struct rxkb_context *ctx);
+
+/**
+ * Return the first model for this context. Use this to start iterating over
+ * the models, followed by calls to rxkb_model_next(). Models are not sorted.
+ *
+ * The refcount of the returned model is not increased. Use rxkb_model_ref() if
+ * you need to keep this struct outside the immediate scope.
+ *
+ * @return The first model in the model list.
+ */
+struct rxkb_model *
+rxkb_model_first(struct rxkb_context *ctx);
+
+/**
+ * Return the next model for this context. Returns NULL when no more models
+ * are available.
+ *
+ * The refcount of the returned model is not increased. Use rxkb_model_ref() if
+ * you need to keep this struct outside the immediate scope.
+ *
+ * @return the next model or NULL at the end of the list
+ */
+struct rxkb_model *
+rxkb_model_next(struct rxkb_model *m);
+
+/**
+ * Increase the refcount of the argument by one.
+ *
+ * @returns The argument passed in to this function.
+ */
+struct rxkb_model *
+rxkb_model_ref(struct rxkb_model *m);
+
+/**
+ * Decrease the refcount of the argument by one. When the refcount hits zero,
+ * all memory associated with this struct is freed.
+ *
+ * @returns always NULL
+ */
+struct rxkb_model *
+rxkb_model_unref(struct rxkb_model *m);
+
+/**
+ * Return the name of this model. This is the value for M in RMLVO, to be used
+ * with libxkbcommon.
+ */
+const char *
+rxkb_model_get_name(struct rxkb_model *m);
+
+/**
+ * Return a human-readable description of this model. This function may return
+ * NULL.
+ */
+const char *
+rxkb_model_get_description(struct rxkb_model *m);
+
+/**
+ * Return the vendor name for this model. This function may return NULL.
+ */
+const char *
+rxkb_model_get_vendor(struct rxkb_model *m);
+
+/**
+ * Return the popularity for this model.
+ */
+enum rxkb_popularity
+rxkb_model_get_popularity(struct rxkb_model *m);
+
+/**
+ * Return the first layout for this context. Use this to start iterating over
+ * the layouts, followed by calls to rxkb_layout_next(). Layouts are not sorted.
+ *
+ * The refcount of the returned layout is not increased. Use rxkb_layout_ref() if
+ * you need to keep this struct outside the immediate scope.
+ *
+ * @return The first layout in the layout list.
+ */
+struct rxkb_layout *
+rxkb_layout_first(struct rxkb_context *ctx);
+
+/**
+ * Return the next layout for this context. Returns NULL when no more layouts
+ * are available.
+ *
+ * The refcount of the returned layout is not increased. Use rxkb_layout_ref()
+ * if you need to keep this struct outside the immediate scope.
+ *
+ * @return the next layout or NULL at the end of the list
+ */
+struct rxkb_layout *
+rxkb_layout_next(struct rxkb_layout *l);
+
+/**
+ * Increase the refcount of the argument by one.
+ *
+ * @returns The argument passed in to this function.
+ */
+struct rxkb_layout *
+rxkb_layout_ref(struct rxkb_layout *l);
+
+/**
+ * Decrease the refcount of the argument by one. When the refcount hits zero,
+ * all memory associated with this struct is freed.
+ *
+ * @returns always NULL
+ */
+struct rxkb_layout *
+rxkb_layout_unref(struct rxkb_layout *l);
+
+/**
+ * Return the name of this layout. This is the value for L in RMLVO, to be used
+ * with libxkbcommon.
+ */
+const char *
+rxkb_layout_get_name(struct rxkb_layout *l);
+
+/**
+ * Return the variant of this layout. This is the value for V in RMLVO, to be
+ * used with libxkbcommon.
+ *
+ * A variant does not stand on its own, it always depends on the base layout.
+ * e.g. there may be multiple variants called "intl" but there is only one
+ * "us(intl)".
+ *
+ * Where the variant is NULL, the layout is the base layout (e.g. "us").
+ */
+const char *
+rxkb_layout_get_variant(struct rxkb_layout *l);
+
+/**
+ * Return a short (one-word) description of this layout. This function may
+ * return NULL.
+ */
+const char *
+rxkb_layout_get_brief(struct rxkb_layout *l);
+
+/**
+ * Return a human-readable description of this layout. This function may return
+ * NULL.
+ */
+const char *
+rxkb_layout_get_description(struct rxkb_layout *l);
+
+/**
+ * Return the popularity for this layout.
+ */
+enum rxkb_popularity
+rxkb_layout_get_popularity(struct rxkb_layout *l);
+
+/**
+ * Return the first option group for this context. Use this to start iterating
+ * over the option groups, followed by calls to rxkb_option_group_next().
+ * Option groups are not sorted.
+ *
+ * The refcount of the returned option group is not increased. Use
+ * rxkb_option_group_ref() if you need to keep this struct outside the immediate
+ * scope.
+ *
+ * @return The first option group in the option group list.
+ */
+struct rxkb_option_group *
+rxkb_option_group_first(struct rxkb_context *ctx);
+
+/**
+ * Return the next option group for this context. Returns NULL when no more
+ * option groups are available.
+ *
+ * The refcount of the returned option group is not increased. Use
+ * rxkb_option_group_ref() if you need to keep this struct outside the immediate
+ * scope.
+ *
+ * @return the next option group or NULL at the end of the list
+ */
+struct rxkb_option_group *
+rxkb_option_group_next(struct rxkb_option_group *g);
+
+/**
+ * Increase the refcount of the argument by one.
+ *
+ * @returns The argument passed in to this function.
+ */
+struct rxkb_option_group *
+rxkb_option_group_ref(struct rxkb_option_group *g);
+
+/**
+ * Decrease the refcount of the argument by one. When the refcount hits zero,
+ * all memory associated with this struct is freed.
+ *
+ * @returns always NULL
+ */
+struct rxkb_option_group *
+rxkb_option_group_unref(struct rxkb_option_group *g);
+
+/**
+ * Return the name of this option group. This is **not** the value for O in
+ * RMLVO, the name can be used for internal sorting in the caller. This function
+ * may return NULL.
+ */
+const char *
+rxkb_option_group_get_name(struct rxkb_option_group *m);
+
+/**
+ * Return a human-readable description of this option group. This function may
+ * return NULL.
+ */
+const char *
+rxkb_option_group_get_description(struct rxkb_option_group *m);
+
+/**
+ * @return true if multiple options within this option group can be selected
+ *              simultaneously, false if all options within this option group
+ *              are mutually exclusive.
+ */
+bool
+rxkb_option_group_allows_multiple(struct rxkb_option_group *g);
+
+/**
+ * Return the popularity for this option group.
+ */
+enum rxkb_popularity
+rxkb_option_group_get_popularity(struct rxkb_option_group *g);
+
+/**
+ * Return the first option for this option group. Use this to start iterating
+ * over the options, followed by calls to rxkb_option_next(). Options are not
+ * sorted.
+ *
+ * The refcount of the returned option is not increased. Use rxkb_option_ref()
+ * if you need to keep this struct outside the immediate scope.
+ *
+ * @return The first option in the option list.
+ */
+struct rxkb_option *
+rxkb_option_first(struct rxkb_option_group *group);
+
+/**
+ * Return the next option for this option group. Returns NULL when no more
+ * options are available.
+ *
+ * The refcount of the returned options is not increased. Use rxkb_option_ref()
+ * if you need to keep this struct outside the immediate scope.
+ *
+ * @returns The next option or NULL at the end of the list
+ */
+struct rxkb_option *
+rxkb_option_next(struct rxkb_option *o);
+
+/**
+ * Increase the refcount of the argument by one.
+ *
+ * @returns The argument passed in to this function.
+ */
+struct rxkb_option *
+rxkb_option_ref(struct rxkb_option *o);
+
+/**
+ * Decrease the refcount of the argument by one. When the refcount hits zero,
+ * all memory associated with this struct is freed.
+ *
+ * @returns always NULL
+ */
+struct rxkb_option *
+rxkb_option_unref(struct rxkb_option *o);
+
+/**
+ * Return the name of this option. This is the value for O in RMLVO, to be used
+ * with libxkbcommon.
+ */
+const char *
+rxkb_option_get_name(struct rxkb_option *o);
+
+/**
+ * Return a short (one-word) description of this option. This function may
+ * return NULL.
+ */
+const char *
+rxkb_option_get_brief(struct rxkb_option *o);
+
+/**
+ * Return a human-readable description of this option. This function may return
+ * NULL.
+ */
+const char *
+rxkb_option_get_description(struct rxkb_option *o);
+
+/**
+ * Return the popularity for this option.
+ */
+enum rxkb_popularity
+rxkb_option_get_popularity(struct rxkb_option *o);
+
+/**
+ * Increase the refcount of the argument by one.
+ *
+ * @returns The argument passed in to this function.
+ */
+struct rxkb_iso639_code *
+rxkb_iso639_code_ref(struct rxkb_iso639_code *iso639);
+
+/**
+ * Decrease the refcount of the argument by one. When the refcount hits zero,
+ * all memory associated with this struct is freed.
+ *
+ * @returns always NULL
+ */
+struct rxkb_iso639_code *
+rxkb_iso639_code_unref(struct rxkb_iso639_code *iso639);
+
+/**
+ * Return the ISO 639-3 code for this code (e.g. "eng", "fra").
+ */
+const char *
+rxkb_iso639_code_get_code(struct rxkb_iso639_code *iso639);
+
+/**
+ * Return the first ISO 639 for this layout. Use this to start iterating over
+ * the codes, followed by calls to rxkb_iso639_code_next(). Codes are not
+ * sorted.
+ *
+ * The refcount of the returned code is not increased. Use rxkb_iso639_code_ref()
+ * if you need to keep this struct outside the immediate scope.
+ *
+ * @return The first code in the code list.
+ */
+struct rxkb_iso639_code *
+rxkb_layout_get_iso639_first(struct rxkb_layout *layout);
+
+/**
+ * Return the next code in the list. Returns NULL when no more codes
+ * are available.
+ *
+ * The refcount of the returned codes is not increased. Use
+ * rxkb_iso639_code_ref() if you need to keep this struct outside the immediate
+ * scope.
+ *
+ * @returns The next code or NULL at the end of the list
+ */
+struct rxkb_iso639_code *
+rxkb_iso639_code_next(struct rxkb_iso639_code *iso639);
+
+/**
+ * Increase the refcount of the argument by one.
+ *
+ * @returns The argument passed in to this function.
+ */
+struct rxkb_iso3166_code *
+rxkb_iso3166_code_ref(struct rxkb_iso3166_code *iso3166);
+
+/**
+ * Decrease the refcount of the argument by one. When the refcount hits zero,
+ * all memory associated with this struct is freed.
+ *
+ * @returns always NULL
+ */
+struct rxkb_iso3166_code *
+rxkb_iso3166_code_unref(struct rxkb_iso3166_code *iso3166);
+
+/**
+ * Return the ISO 3166 Alpha 2 code for this code (e.g. "US", "FR").
+ */
+const char *
+rxkb_iso3166_code_get_code(struct rxkb_iso3166_code *iso3166);
+
+/**
+ * Return the first ISO 3166 for this layout. Use this to start iterating over
+ * the codes, followed by calls to rxkb_iso3166_code_next(). Codes are not
+ * sorted.
+ *
+ * The refcount of the returned code is not increased. Use
+ * rxkb_iso3166_code_ref() if you need to keep this struct outside the immediate
+ * scope.
+ *
+ * @return The first code in the code list.
+ */
+struct rxkb_iso3166_code *
+rxkb_layout_get_iso3166_first(struct rxkb_layout *layout);
+
+/**
+ * Return the next code in the list. Returns NULL when no more codes
+ * are available.
+ *
+ * The refcount of the returned codes is not increased. Use
+ * rxkb_iso3166_code_ref() if you need to keep this struct outside the immediate
+ * scope.
+ *
+ * @returns The next code or NULL at the end of the list
+ */
+struct rxkb_iso3166_code *
+rxkb_iso3166_code_next(struct rxkb_iso3166_code *iso3166);
+
+/** @} */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _XKBREGISTRY_H_ */
diff --git a/meson.build b/meson.build
index c04dc13..a714b82 100644
--- a/meson.build
+++ b/meson.build
@@ -247,7 +247,7 @@ elif cc.get_argument_syntax() == 'msvc'
 endif
 libxkbcommon = library(
     'xkbcommon',
-    'xkbcommon/xkbcommon.h',
+    'include/xkbcommon/xkbcommon.h',
     libxkbcommon_sources,
     link_args: libxkbcommon_link_args,
     link_depends: libxkbcommon_link_deps,
@@ -257,17 +257,17 @@ libxkbcommon = library(
     include_directories: include_directories('src'),
 )
 install_headers(
-    'xkbcommon/xkbcommon.h',
-    'xkbcommon/xkbcommon-compat.h',
-    'xkbcommon/xkbcommon-compose.h',
-    'xkbcommon/xkbcommon-keysyms.h',
-    'xkbcommon/xkbcommon-names.h',
+    'include/xkbcommon/xkbcommon.h',
+    'include/xkbcommon/xkbcommon-compat.h',
+    'include/xkbcommon/xkbcommon-compose.h',
+    'include/xkbcommon/xkbcommon-keysyms.h',
+    'include/xkbcommon/xkbcommon-names.h',
     subdir: 'xkbcommon',
 )
 
 dep_libxkbcommon = declare_dependency(
     link_with: libxkbcommon,
-    include_directories: include_directories('.'),
+    include_directories: include_directories('include'),
 )
 pkgconfig.generate(
     libxkbcommon,
@@ -315,7 +315,7 @@ You can disable X11 support with -Denable-x11=false.''')
     endif
     libxkbcommon_x11 = library(
         'xkbcommon-x11',
-        'xkbcommon/xkbcommon-x11.h',
+        'include/xkbcommon/xkbcommon-x11.h',
         libxkbcommon_x11_sources,
         link_args: libxkbcommon_x11_link_args,
         link_depends: libxkbcommon_x11_link_deps,
@@ -330,12 +330,12 @@ You can disable X11 support with -Denable-x11=false.''')
         ],
     )
     install_headers(
-        'xkbcommon/xkbcommon-x11.h',
+        'include/xkbcommon/xkbcommon-x11.h',
         subdir: 'xkbcommon',
     )
     dep_libxkbcommon_x11 = declare_dependency(
         link_with: libxkbcommon_x11,
-        include_directories: include_directories('.'),
+        include_directories: include_directories('include'),
     )
     pkgconfig.generate(
         libxkbcommon_x11,
@@ -375,7 +375,7 @@ if get_option('enable-xkbregistry')
     endif
     libxkbregistry = library(
         'xkbregistry',
-        'xkbcommon/xkbregistry.h',
+        'include/xkbcommon/xkbregistry.h',
         libxkbregistry_sources,
         link_args: libxkbregistry_link_args,
         link_depends: libxkbregistry_link_deps,
@@ -386,7 +386,7 @@ if get_option('enable-xkbregistry')
         include_directories: include_directories('src'),
     )
     install_headers(
-        'xkbcommon/xkbregistry.h',
+        'include/xkbcommon/xkbregistry.h',
         subdir: 'xkbcommon',
     )
     pkgconfig.generate(
@@ -398,9 +398,9 @@ if get_option('enable-xkbregistry')
     )
 
     dep_libxkbregistry = declare_dependency(
-                                include_directories: include_directories('.'),
-                                link_with: libxkbregistry
-                                )
+        link_with: libxkbregistry,
+        include_directories: include_directories('include'),
+    )
 endif
 
 man_pages = []
@@ -777,11 +777,11 @@ You can disable the documentation with -Denable-docs=false.''')
         'doc/user-configuration.md',
         'doc/rules-format.md',
         'doc/keymap-format-text-v1.md',
-        'xkbcommon/xkbcommon.h',
-        'xkbcommon/xkbcommon-names.h',
-        'xkbcommon/xkbcommon-x11.h',
-        'xkbcommon/xkbcommon-compose.h',
-        'xkbcommon/xkbregistry.h',
+        'include/xkbcommon/xkbcommon.h',
+        'include/xkbcommon/xkbcommon-names.h',
+        'include/xkbcommon/xkbcommon-x11.h',
+        'include/xkbcommon/xkbcommon-compose.h',
+        'include/xkbcommon/xkbregistry.h',
     ]
     doxygen_data = configuration_data()
     doxygen_data.set('PACKAGE_NAME', meson.project_name())
diff --git a/xkbcommon/xkbcommon-compat.h b/xkbcommon/xkbcommon-compat.h
deleted file mode 100644
index 299732f..0000000
--- a/xkbcommon/xkbcommon-compat.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright © 2012 Daniel Stone
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Daniel Stone <daniel@fooishbar.org>
- */
-
-#ifndef _XKBCOMMON_COMPAT_H
-#define _XKBCOMMON_COMPAT_H
-
-/**
- * Renamed keymap API.
- */
-#define xkb_group_index_t xkb_layout_index_t
-#define xkb_group_mask_t xkb_layout_mask_t
-#define xkb_map_compile_flags xkb_keymap_compile_flags
-#define XKB_GROUP_INVALID XKB_LAYOUT_INVALID
-
-#define XKB_STATE_DEPRESSED \
-    (XKB_STATE_MODS_DEPRESSED | XKB_STATE_LAYOUT_DEPRESSED)
-#define XKB_STATE_LATCHED \
-    (XKB_STATE_MODS_LATCHED | XKB_STATE_LAYOUT_LATCHED)
-#define XKB_STATE_LOCKED \
-    (XKB_STATE_MODS_LOCKED | XKB_STATE_LAYOUT_LOCKED)
-#define XKB_STATE_EFFECTIVE \
-    (XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED | \
-     XKB_STATE_MODS_EFFECTIVE | XKB_STATE_LAYOUT_EFFECTIVE)
-
-#define xkb_map_new_from_names(context, names, flags) \
-        xkb_keymap_new_from_names(context, names, flags)
-#define xkb_map_new_from_file(context, file, format, flags) \
-        xkb_keymap_new_from_file(context, file, format, flags)
-#define xkb_map_new_from_string(context, string, format, flags) \
-        xkb_keymap_new_from_string(context, string, format, flags)
-#define xkb_map_get_as_string(keymap) \
-        xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1)
-#define xkb_map_ref(keymap) xkb_keymap_ref(keymap)
-#define xkb_map_unref(keymap) xkb_keymap_unref(keymap)
-
-#define xkb_map_num_mods(keymap) xkb_keymap_num_mods(keymap)
-#define xkb_map_mod_get_name(keymap, idx) xkb_keymap_mod_get_name(keymap, idx)
-#define xkb_map_mod_get_index(keymap, str) xkb_keymap_mod_get_index(keymap, str)
-#define xkb_key_mod_index_is_consumed(state, key, mod) \
-        xkb_state_mod_index_is_consumed(state, key, mod)
-#define xkb_key_mod_mask_remove_consumed(state, key, modmask) \
-        xkb_state_mod_mask_remove_consumed(state, key, modmask)
-
-#define xkb_map_num_groups(keymap) xkb_keymap_num_layouts(keymap)
-#define xkb_key_num_groups(keymap, key) \
-        xkb_keymap_num_layouts_for_key(keymap, key)
-#define xkb_map_group_get_name(keymap, idx) \
-        xkb_keymap_layout_get_name(keymap, idx)
-#define xkb_map_group_get_index(keymap, str) \
-        xkb_keymap_layout_get_index(keymap, str)
-
-#define xkb_map_num_leds(keymap) xkb_keymap_num_leds(keymap)
-#define xkb_map_led_get_name(keymap, idx) xkb_keymap_led_get_name(keymap, idx)
-#define xkb_map_led_get_index(keymap, str) \
-        xkb_keymap_led_get_index(keymap, str)
-
-#define xkb_key_repeats(keymap, key) xkb_keymap_key_repeats(keymap, key)
-
-#define xkb_key_get_syms(state, key, syms_out) \
-        xkb_state_key_get_syms(state, key, syms_out)
-
-#define xkb_state_group_name_is_active(state, name, type) \
-        xkb_state_layout_name_is_active(state, name, type)
-#define xkb_state_group_index_is_active(state, idx, type) \
-        xkb_state_layout_index_is_active(state, idx, type)
-
-#define xkb_state_serialize_group(state, component) \
-        xkb_state_serialize_layout(state, component)
-
-#define xkb_state_get_map(state) xkb_state_get_keymap(state)
-
-/* Not needed anymore, since there's NO_FLAGS. */
-#define XKB_MAP_COMPILE_PLACEHOLDER XKB_KEYMAP_COMPILE_NO_FLAGS
-#define XKB_MAP_COMPILE_NO_FLAGS XKB_KEYMAP_COMPILE_NO_FLAGS
-
-#endif
diff --git a/xkbcommon/xkbcommon-compose.h b/xkbcommon/xkbcommon-compose.h
deleted file mode 100644
index 8b41b98..0000000
--- a/xkbcommon/xkbcommon-compose.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright © 2013 Ran Benita
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _XKBCOMMON_COMPOSE_H
-#define _XKBCOMMON_COMPOSE_H
-
-#include <xkbcommon/xkbcommon.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file
- * libxkbcommon Compose API - support for Compose and dead-keys.
- */
-
-/**
- * @defgroup compose Compose and dead-keys support
- * Support for Compose and dead-keys.
- * @since 0.5.0
- *
- * @{
- */
-
-/**
- * @page compose-overview Overview
- * @parblock
- *
- * Compose and dead-keys are a common feature of many keyboard input
- * systems.  They extend the range of the keysysm that can be produced
- * directly from a keyboard by using a sequence of key strokes, instead
- * of just one.
- *
- * Here are some example sequences, in the libX11 Compose file format:
- *
- *     <dead_acute> <a>         : "á"   aacute # LATIN SMALL LETTER A WITH ACUTE
- *     <Multi_key> <A> <T>      : "@"   at     # COMMERCIAL AT
- *
- * When the user presses a key which produces the `<dead_acute>` keysym,
- * nothing initially happens (thus the key is dubbed a "dead-key").  But
- * when the user enters `<a>`, "á" is "composed", in place of "a".  If
- * instead the user had entered a keysym which does not follow
- * `<dead_acute>` in any compose sequence, the sequence is said to be
- * "cancelled".
- *
- * Compose files define many such sequences.  For a description of the
- * common file format for Compose files, see the Compose(5) man page.
- *
- * A successfuly-composed sequence has two results: a keysym and a UTF-8
- * string.  At least one of the two is defined for each sequence.  If only
- * a keysym is given, the keysym's string representation is used for the
- * result string (using xkb_keysym_to_utf8()).
- *
- * This library provides low-level support for Compose file parsing and
- * processing.  Higher-level APIs (such as libX11's `Xutf8LookupString`(3))
- * may be built upon it, or it can be used directly.
- *
- * @endparblock
- */
-
-/**
- * @page compose-conflicting Conflicting Sequences
- * @parblock
- *
- * To avoid ambiguity, a sequence is not allowed to be a prefix of another.
- * In such a case, the conflict is resolved thus:
- *
- * 1. A longer sequence overrides a shorter one.
- * 2. An equal sequence overrides an existing one.
- * 3. A shorter sequence does not override a longer one.
- *
- * Sequences of length 1 are allowed.
- *
- * @endparblock
- */
-
-/**
- * @page compose-cancellation Cancellation Behavior
- * @parblock
- *
- * What should happen when a sequence is cancelled?  For example, consider
- * there are only the above sequences, and the input keysyms are
- * `<dead_acute> <b>`.  There are a few approaches:
- *
- * 1. Swallow the cancelling keysym; that is, no keysym is produced.
- *    This is the approach taken by libX11.
- * 2. Let the cancelling keysym through; that is, `<b>` is produced.
- * 3. Replay the entire sequence; that is, `<dead_acute> <b>` is produced.
- *    This is the approach taken by Microsoft Windows (approximately;
- *    instead of `<dead_acute>`, the underlying key is used.  This is
- *    difficult to simulate with XKB keymaps).
- *
- * You can program whichever approach best fits users' expectations.
- *
- * @endparblock
- */
-
-/**
- * @struct xkb_compose_table
- * Opaque Compose table object.
- *
- * The compose table holds the definitions of the Compose sequences, as
- * gathered from Compose files.  It is immutable.
- */
-struct xkb_compose_table;
-
-/**
- * @struct xkb_compose_state
- * Opaque Compose state object.
- *
- * The compose state maintains state for compose sequence matching, such
- * as which possible sequences are being matched, and the position within
- * these sequences.  It acts as a simple state machine wherein keysyms are
- * the input, and composed keysyms and strings are the output.
- *
- * The compose state is usually associated with a keyboard device.
- */
-struct xkb_compose_state;
-
-/** Flags affecting Compose file compilation. */
-enum xkb_compose_compile_flags {
-    /** Do not apply any flags. */
-    XKB_COMPOSE_COMPILE_NO_FLAGS = 0
-};
-
-/** The recognized Compose file formats. */
-enum xkb_compose_format {
-    /** The classic libX11 Compose text format, described in Compose(5). */
-    XKB_COMPOSE_FORMAT_TEXT_V1 = 1
-};
-
-/**
- * @page compose-locale Compose Locale
- * @parblock
- *
- * Compose files are locale dependent:
- * - Compose files are written for a locale, and the locale is used when
- *   searching for the appropriate file to use.
- * - Compose files may reference the locale internally, with directives
- *   such as \%L.
- *
- * As such, functions like xkb_compose_table_new_from_locale() require
- * a `locale` parameter.  This will usually be the current locale (see
- * locale(7) for more details).  You may also want to allow the user to
- * explicitly configure it, so he can use the Compose file of a given
- * locale, but not use that locale for other things.
- *
- * You may query the current locale as follows:
- * @code
- *     const char *locale;
- *     locale = setlocale(LC_CTYPE, NULL);
- * @endcode
- *
- * This will only give useful results if the program had previously set
- * the current locale using setlocale(3), with `LC_CTYPE` or `LC_ALL`
- * and a non-NULL argument.
- *
- * If you prefer not to use the locale system of the C runtime library,
- * you may nevertheless obtain the user's locale directly using
- * environment variables, as described in locale(7).  For example,
- * @code
- *     const char *locale;
- *     locale = getenv("LC_ALL");
- *     if (!locale || !*locale)
- *         locale = getenv("LC_CTYPE");
- *     if (!locale || !*locale)
- *         locale = getenv("LANG");
- *     if (!locale || !*locale)
- *         locale = "C";
- * @endcode
- *
- * Note that some locales supported by the C standard library may not
- * have a Compose file assigned.
- *
- * @endparblock
- */
-
-/**
- * Create a compose table for a given locale.
- *
- * The locale is used for searching the file-system for an appropriate
- * Compose file.  The search order is described in Compose(5).  It is
- * affected by the following environment variables:
- *
- * 1. `XCOMPOSEFILE` - see Compose(5).
- * 2. `XDG_CONFIG_HOME` - before `$HOME/.XCompose` is checked,
- *    `$XDG_CONFIG_HOME/XCompose` is checked (with a fall back to
- *    `$HOME/.config/XCompose` if `XDG_CONFIG_HOME` is not defined).
- *    This is a libxkbcommon extension to the search procedure in
- *    Compose(5) (since libxkbcommon 1.0.0). Note that other
- *    implementations, such as libX11, might not find a Compose file in
- *    this path.
- * 3. `HOME` - see Compose(5).
- * 4. `XLOCALEDIR` - if set, used as the base directory for the system's
- *    X locale files, e.g. `/usr/share/X11/locale`, instead of the
- *    preconfigured directory.
- *
- * @param context
- *     The library context in which to create the compose table.
- * @param locale
- *     The current locale.  See @ref compose-locale.
- *     \n
- *     The value is copied, so it is safe to pass the result of getenv(3)
- *     (or similar) without fear of it being invalidated by a subsequent
- *     setenv(3) (or similar).
- * @param flags
- *     Optional flags for the compose table, or 0.
- *
- * @returns A compose table for the given locale, or NULL if the
- * compilation failed or a Compose file was not found.
- *
- * @memberof xkb_compose_table
- */
-struct xkb_compose_table *
-xkb_compose_table_new_from_locale(struct xkb_context *context,
-                                  const char *locale,
-                                  enum xkb_compose_compile_flags flags);
-
-/**
- * Create a new compose table from a Compose file.
- *
- * @param context
- *     The library context in which to create the compose table.
- * @param file
- *     The Compose file to compile.
- * @param locale
- *     The current locale.  See @ref compose-locale.
- * @param format
- *     The text format of the Compose file to compile.
- * @param flags
- *     Optional flags for the compose table, or 0.
- *
- * @returns A compose table compiled from the given file, or NULL if
- * the compilation failed.
- *
- * @memberof xkb_compose_table
- */
-struct xkb_compose_table *
-xkb_compose_table_new_from_file(struct xkb_context *context,
-                                FILE *file,
-                                const char *locale,
-                                enum xkb_compose_format format,
-                                enum xkb_compose_compile_flags flags);
-
-/**
- * Create a new compose table from a memory buffer.
- *
- * This is just like xkb_compose_table_new_from_file(), but instead of
- * a file, gets the table as one enormous string.
- *
- * @see xkb_compose_table_new_from_file()
- * @memberof xkb_compose_table
- */
-struct xkb_compose_table *
-xkb_compose_table_new_from_buffer(struct xkb_context *context,
-                                  const char *buffer, size_t length,
-                                  const char *locale,
-                                  enum xkb_compose_format format,
-                                  enum xkb_compose_compile_flags flags);
-
-/**
- * Take a new reference on a compose table.
- *
- * @returns The passed in object.
- *
- * @memberof xkb_compose_table
- */
-struct xkb_compose_table *
-xkb_compose_table_ref(struct xkb_compose_table *table);
-
-/**
- * Release a reference on a compose table, and possibly free it.
- *
- * @param table The object.  If it is NULL, this function does nothing.
- *
- * @memberof xkb_compose_table
- */
-void
-xkb_compose_table_unref(struct xkb_compose_table *table);
-
-/** Flags for compose state creation. */
-enum xkb_compose_state_flags {
-    /** Do not apply any flags. */
-    XKB_COMPOSE_STATE_NO_FLAGS = 0
-};
-
-/**
- * Create a new compose state object.
- *
- * @param table
- *     The compose table the state will use.
- * @param flags
- *     Optional flags for the compose state, or 0.
- *
- * @returns A new compose state, or NULL on failure.
- *
- * @memberof xkb_compose_state
- */
-struct xkb_compose_state *
-xkb_compose_state_new(struct xkb_compose_table *table,
-                      enum xkb_compose_state_flags flags);
-
-/**
- * Take a new reference on a compose state object.
- *
- * @returns The passed in object.
- *
- * @memberof xkb_compose_state
- */
-struct xkb_compose_state *
-xkb_compose_state_ref(struct xkb_compose_state *state);
-
-/**
- * Release a reference on a compose state object, and possibly free it.
- *
- * @param state The object.  If NULL, do nothing.
- *
- * @memberof xkb_compose_state
- */
-void
-xkb_compose_state_unref(struct xkb_compose_state *state);
-
-/**
- * Get the compose table which a compose state object is using.
- *
- * @returns The compose table which was passed to xkb_compose_state_new()
- * when creating this state object.
- *
- * This function does not take a new reference on the compose table; you
- * must explicitly reference it yourself if you plan to use it beyond the
- * lifetime of the state.
- *
- * @memberof xkb_compose_state
- */
-struct xkb_compose_table *
-xkb_compose_state_get_compose_table(struct xkb_compose_state *state);
-
-/** Status of the Compose sequence state machine. */
-enum xkb_compose_status {
-    /** The initial state; no sequence has started yet. */
-    XKB_COMPOSE_NOTHING,
-    /** In the middle of a sequence. */
-    XKB_COMPOSE_COMPOSING,
-    /** A complete sequence has been matched. */
-    XKB_COMPOSE_COMPOSED,
-    /** The last sequence was cancelled due to an unmatched keysym. */
-    XKB_COMPOSE_CANCELLED
-};
-
-/** The effect of a keysym fed to xkb_compose_state_feed(). */
-enum xkb_compose_feed_result {
-    /** The keysym had no effect - it did not affect the status. */
-    XKB_COMPOSE_FEED_IGNORED,
-    /** The keysym started, advanced or cancelled a sequence. */
-    XKB_COMPOSE_FEED_ACCEPTED
-};
-
-/**
- * Feed one keysym to the Compose sequence state machine.
- *
- * This function can advance into a compose sequence, cancel a sequence,
- * start a new sequence, or do nothing in particular.  The resulting
- * status may be observed with xkb_compose_state_get_status().
- *
- * Some keysyms, such as keysyms for modifier keys, are ignored - they
- * have no effect on the status or otherwise.
- *
- * The following is a description of the possible status transitions, in
- * the format CURRENT STATUS => NEXT STATUS, given a non-ignored input
- * keysym `keysym`:
- *
-   @verbatim
-   NOTHING or CANCELLED or COMPOSED =>
-      NOTHING   if keysym does not start a sequence.
-      COMPOSING if keysym starts a sequence.
-      COMPOSED  if keysym starts and terminates a single-keysym sequence.
-
-   COMPOSING =>
-      COMPOSING if keysym advances any of the currently possible
-                sequences but does not terminate any of them.
-      COMPOSED  if keysym terminates one of the currently possible
-                sequences.
-      CANCELLED if keysym does not advance any of the currently
-                possible sequences.
-   @endverbatim
- *
- * The current Compose formats do not support multiple-keysyms.
- * Therefore, if you are using a function such as xkb_state_key_get_syms()
- * and it returns more than one keysym, consider feeding XKB_KEY_NoSymbol
- * instead.
- *
- * @param state
- *     The compose state object.
- * @param keysym
- *     A keysym, usually obtained after a key-press event, with a
- *     function such as xkb_state_key_get_one_sym().
- *
- * @returns Whether the keysym was ignored.  This is useful, for example,
- * if you want to keep a record of the sequence matched thus far.
- *
- * @memberof xkb_compose_state
- */
-enum xkb_compose_feed_result
-xkb_compose_state_feed(struct xkb_compose_state *state,
-                       xkb_keysym_t keysym);
-
-/**
- * Reset the Compose sequence state machine.
- *
- * The status is set to XKB_COMPOSE_NOTHING, and the current sequence
- * is discarded.
- *
- * @memberof xkb_compose_state
- */
-void
-xkb_compose_state_reset(struct xkb_compose_state *state);
-
-/**
- * Get the current status of the compose state machine.
- *
- * @see xkb_compose_status
- * @memberof xkb_compose_state
- **/
-enum xkb_compose_status
-xkb_compose_state_get_status(struct xkb_compose_state *state);
-
-/**
- * Get the result Unicode/UTF-8 string for a composed sequence.
- *
- * See @ref compose-overview for more details.  This function is only
- * useful when the status is XKB_COMPOSE_COMPOSED.
- *
- * @param[in] state
- *     The compose state.
- * @param[out] buffer
- *     A buffer to write the string into.
- * @param[in] size
- *     Size of the buffer.
- *
- * @warning If the buffer passed is too small, the string is truncated
- * (though still NUL-terminated).
- *
- * @returns
- *   The number of bytes required for the string, excluding the NUL byte.
- *   If the sequence is not complete, or does not have a viable result
- *   string, returns 0, and sets `buffer` to the empty string (if possible).
- * @returns
- *   You may check if truncation has occurred by comparing the return value
- *   with the size of `buffer`, similarly to the `snprintf`(3) function.
- *   You may safely pass NULL and 0 to `buffer` and `size` to find the
- *   required size (without the NUL-byte).
- *
- * @memberof xkb_compose_state
- **/
-int
-xkb_compose_state_get_utf8(struct xkb_compose_state *state,
-                           char *buffer, size_t size);
-
-/**
- * Get the result keysym for a composed sequence.
- *
- * See @ref compose-overview for more details.  This function is only
- * useful when the status is XKB_COMPOSE_COMPOSED.
- *
- * @returns The result keysym.  If the sequence is not complete, or does
- * not specify a result keysym, returns XKB_KEY_NoSymbol.
- *
- * @memberof xkb_compose_state
- **/
-xkb_keysym_t
-xkb_compose_state_get_one_sym(struct xkb_compose_state *state);
-
-/** @} */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* _XKBCOMMON_COMPOSE_H */
diff --git a/xkbcommon/xkbcommon-keysyms.h b/xkbcommon/xkbcommon-keysyms.h
deleted file mode 100644
index bb96efc..0000000
--- a/xkbcommon/xkbcommon-keysyms.h
+++ /dev/null
@@ -1,3248 +0,0 @@
-#ifndef _XKBCOMMON_KEYSYMS_H
-#define _XKBCOMMON_KEYSYMS_H
-
-/* This file is autogenerated; please do not commit directly. */
-
-#define XKB_KEY_NoSymbol                    0x000000  /* Special KeySym */
-
-/***********************************************************
-Copyright 1987, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * The "X11 Window System Protocol" standard defines in Appendix A the
- * keysym codes. These 29-bit integer values identify characters or
- * functions associated with each key (e.g., via the visible
- * engraving) of a keyboard layout. This file assigns mnemonic macro
- * names for these keysyms.
- *
- * This file is also compiled (by src/util/makekeys.c in libX11) into
- * hash tables that can be accessed with X11 library functions such as
- * XStringToKeysym() and XKeysymToString().
- *
- * Where a keysym corresponds one-to-one to an ISO 10646 / Unicode
- * character, this is noted in a comment that provides both the U+xxxx
- * Unicode position, as well as the official Unicode name of the
- * character.
- *
- * Where the correspondence is either not one-to-one or semantically
- * unclear, the Unicode position and name are enclosed in
- * parentheses. Such legacy keysyms should be considered deprecated
- * and are not recommended for use in future keyboard mappings.
- *
- * For any future extension of the keysyms with characters already
- * found in ISO 10646 / Unicode, the following algorithm shall be
- * used. The new keysym code position will simply be the character's
- * Unicode number plus 0x01000000. The keysym values in the range
- * 0x01000100 to 0x0110ffff are reserved to represent Unicode
- * characters in the range U+0100 to U+10FFFF.
- *
- * While most newer Unicode-based X11 clients do already accept
- * Unicode-mapped keysyms in the range 0x01000100 to 0x0110ffff, it
- * will remain necessary for clients -- in the interest of
- * compatibility with existing servers -- to also understand the
- * existing legacy keysym values in the range 0x0100 to 0x20ff.
- *
- * Where several mnemonic names are defined for the same keysym in this
- * file, all but the first one listed should be considered deprecated.
- *
- * Mnemonic names for keysyms are defined in this file with lines
- * that match one of these Perl regular expressions:
- *
- *    /^\#define XKB_KEY_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\* U\+([0-9A-F]{4,6}) (.*) \*\/\s*$/
- *    /^\#define XKB_KEY_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U\+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/
- *    /^\#define XKB_KEY_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/
- *
- * Before adding new keysyms, please do consider the following: In
- * addition to the keysym names defined in this file, the
- * XStringToKeysym() and XKeysymToString() functions will also handle
- * any keysym string of the form "U0020" to "U007E" and "U00A0" to
- * "U10FFFF" for all possible Unicode characters. In other words,
- * every possible Unicode character has already a keysym string
- * defined algorithmically, even if it is not listed here. Therefore,
- * defining an additional keysym macro is only necessary where a
- * non-hexadecimal mnemonic name is needed, or where the new keysym
- * does not represent any existing Unicode character.
- *
- * When adding new keysyms to this file, do not forget to also update the
- * following as needed:
- *
- *   - the mappings in src/KeyBind.c in the libX11 repo
- *     https://gitlab.freedesktop.org/xorg/lib/libx11
- *
- *   - the protocol specification in specs/keysyms.xml in this repo
- *     https://gitlab.freedesktop.org/xorg/proto/xorgproto
- *
- */
-
-#define XKB_KEY_VoidSymbol                  0xffffff  /* Void symbol */
-
-/*
- * TTY function keys, cleverly chosen to map to ASCII, for convenience of
- * programming, but could have been arbitrary (at the cost of lookup
- * tables in client code).
- */
-
-#define XKB_KEY_BackSpace                     0xff08  /* Back space, back char */
-#define XKB_KEY_Tab                           0xff09
-#define XKB_KEY_Linefeed                      0xff0a  /* Linefeed, LF */
-#define XKB_KEY_Clear                         0xff0b
-#define XKB_KEY_Return                        0xff0d  /* Return, enter */
-#define XKB_KEY_Pause                         0xff13  /* Pause, hold */
-#define XKB_KEY_Scroll_Lock                   0xff14
-#define XKB_KEY_Sys_Req                       0xff15
-#define XKB_KEY_Escape                        0xff1b
-#define XKB_KEY_Delete                        0xffff  /* Delete, rubout */
-
-
-
-/* International & multi-key character composition */
-
-#define XKB_KEY_Multi_key                     0xff20  /* Multi-key character compose */
-#define XKB_KEY_Codeinput                     0xff37
-#define XKB_KEY_SingleCandidate               0xff3c
-#define XKB_KEY_MultipleCandidate             0xff3d
-#define XKB_KEY_PreviousCandidate             0xff3e
-
-/* Japanese keyboard support */
-
-#define XKB_KEY_Kanji                         0xff21  /* Kanji, Kanji convert */
-#define XKB_KEY_Muhenkan                      0xff22  /* Cancel Conversion */
-#define XKB_KEY_Henkan_Mode                   0xff23  /* Start/Stop Conversion */
-#define XKB_KEY_Henkan                        0xff23  /* Alias for Henkan_Mode */
-#define XKB_KEY_Romaji                        0xff24  /* to Romaji */
-#define XKB_KEY_Hiragana                      0xff25  /* to Hiragana */
-#define XKB_KEY_Katakana                      0xff26  /* to Katakana */
-#define XKB_KEY_Hiragana_Katakana             0xff27  /* Hiragana/Katakana toggle */
-#define XKB_KEY_Zenkaku                       0xff28  /* to Zenkaku */
-#define XKB_KEY_Hankaku                       0xff29  /* to Hankaku */
-#define XKB_KEY_Zenkaku_Hankaku               0xff2a  /* Zenkaku/Hankaku toggle */
-#define XKB_KEY_Touroku                       0xff2b  /* Add to Dictionary */
-#define XKB_KEY_Massyo                        0xff2c  /* Delete from Dictionary */
-#define XKB_KEY_Kana_Lock                     0xff2d  /* Kana Lock */
-#define XKB_KEY_Kana_Shift                    0xff2e  /* Kana Shift */
-#define XKB_KEY_Eisu_Shift                    0xff2f  /* Alphanumeric Shift */
-#define XKB_KEY_Eisu_toggle                   0xff30  /* Alphanumeric toggle */
-#define XKB_KEY_Kanji_Bangou                  0xff37  /* Codeinput */
-#define XKB_KEY_Zen_Koho                      0xff3d  /* Multiple/All Candidate(s) */
-#define XKB_KEY_Mae_Koho                      0xff3e  /* Previous Candidate */
-
-/* 0xff31 thru 0xff3f are under XK_KOREAN */
-
-/* Cursor control & motion */
-
-#define XKB_KEY_Home                          0xff50
-#define XKB_KEY_Left                          0xff51  /* Move left, left arrow */
-#define XKB_KEY_Up                            0xff52  /* Move up, up arrow */
-#define XKB_KEY_Right                         0xff53  /* Move right, right arrow */
-#define XKB_KEY_Down                          0xff54  /* Move down, down arrow */
-#define XKB_KEY_Prior                         0xff55  /* Prior, previous */
-#define XKB_KEY_Page_Up                       0xff55
-#define XKB_KEY_Next                          0xff56  /* Next */
-#define XKB_KEY_Page_Down                     0xff56
-#define XKB_KEY_End                           0xff57  /* EOL */
-#define XKB_KEY_Begin                         0xff58  /* BOL */
-
-
-/* Misc functions */
-
-#define XKB_KEY_Select                        0xff60  /* Select, mark */
-#define XKB_KEY_Print                         0xff61
-#define XKB_KEY_Execute                       0xff62  /* Execute, run, do */
-#define XKB_KEY_Insert                        0xff63  /* Insert, insert here */
-#define XKB_KEY_Undo                          0xff65
-#define XKB_KEY_Redo                          0xff66  /* Redo, again */
-#define XKB_KEY_Menu                          0xff67
-#define XKB_KEY_Find                          0xff68  /* Find, search */
-#define XKB_KEY_Cancel                        0xff69  /* Cancel, stop, abort, exit */
-#define XKB_KEY_Help                          0xff6a  /* Help */
-#define XKB_KEY_Break                         0xff6b
-#define XKB_KEY_Mode_switch                   0xff7e  /* Character set switch */
-#define XKB_KEY_script_switch                 0xff7e  /* Alias for mode_switch */
-#define XKB_KEY_Num_Lock                      0xff7f
-
-/* Keypad functions, keypad numbers cleverly chosen to map to ASCII */
-
-#define XKB_KEY_KP_Space                      0xff80  /* Space */
-#define XKB_KEY_KP_Tab                        0xff89
-#define XKB_KEY_KP_Enter                      0xff8d  /* Enter */
-#define XKB_KEY_KP_F1                         0xff91  /* PF1, KP_A, ... */
-#define XKB_KEY_KP_F2                         0xff92
-#define XKB_KEY_KP_F3                         0xff93
-#define XKB_KEY_KP_F4                         0xff94
-#define XKB_KEY_KP_Home                       0xff95
-#define XKB_KEY_KP_Left                       0xff96
-#define XKB_KEY_KP_Up                         0xff97
-#define XKB_KEY_KP_Right                      0xff98
-#define XKB_KEY_KP_Down                       0xff99
-#define XKB_KEY_KP_Prior                      0xff9a
-#define XKB_KEY_KP_Page_Up                    0xff9a
-#define XKB_KEY_KP_Next                       0xff9b
-#define XKB_KEY_KP_Page_Down                  0xff9b
-#define XKB_KEY_KP_End                        0xff9c
-#define XKB_KEY_KP_Begin                      0xff9d
-#define XKB_KEY_KP_Insert                     0xff9e
-#define XKB_KEY_KP_Delete                     0xff9f
-#define XKB_KEY_KP_Equal                      0xffbd  /* Equals */
-#define XKB_KEY_KP_Multiply                   0xffaa
-#define XKB_KEY_KP_Add                        0xffab
-#define XKB_KEY_KP_Separator                  0xffac  /* Separator, often comma */
-#define XKB_KEY_KP_Subtract                   0xffad
-#define XKB_KEY_KP_Decimal                    0xffae
-#define XKB_KEY_KP_Divide                     0xffaf
-
-#define XKB_KEY_KP_0                          0xffb0
-#define XKB_KEY_KP_1                          0xffb1
-#define XKB_KEY_KP_2                          0xffb2
-#define XKB_KEY_KP_3                          0xffb3
-#define XKB_KEY_KP_4                          0xffb4
-#define XKB_KEY_KP_5                          0xffb5
-#define XKB_KEY_KP_6                          0xffb6
-#define XKB_KEY_KP_7                          0xffb7
-#define XKB_KEY_KP_8                          0xffb8
-#define XKB_KEY_KP_9                          0xffb9
-
-
-
-/*
- * Auxiliary functions; note the duplicate definitions for left and right
- * function keys;  Sun keyboards and a few other manufacturers have such
- * function key groups on the left and/or right sides of the keyboard.
- * We've not found a keyboard with more than 35 function keys total.
- */
-
-#define XKB_KEY_F1                            0xffbe
-#define XKB_KEY_F2                            0xffbf
-#define XKB_KEY_F3                            0xffc0
-#define XKB_KEY_F4                            0xffc1
-#define XKB_KEY_F5                            0xffc2
-#define XKB_KEY_F6                            0xffc3
-#define XKB_KEY_F7                            0xffc4
-#define XKB_KEY_F8                            0xffc5
-#define XKB_KEY_F9                            0xffc6
-#define XKB_KEY_F10                           0xffc7
-#define XKB_KEY_F11                           0xffc8
-#define XKB_KEY_L1                            0xffc8
-#define XKB_KEY_F12                           0xffc9
-#define XKB_KEY_L2                            0xffc9
-#define XKB_KEY_F13                           0xffca
-#define XKB_KEY_L3                            0xffca
-#define XKB_KEY_F14                           0xffcb
-#define XKB_KEY_L4                            0xffcb
-#define XKB_KEY_F15                           0xffcc
-#define XKB_KEY_L5                            0xffcc
-#define XKB_KEY_F16                           0xffcd
-#define XKB_KEY_L6                            0xffcd
-#define XKB_KEY_F17                           0xffce
-#define XKB_KEY_L7                            0xffce
-#define XKB_KEY_F18                           0xffcf
-#define XKB_KEY_L8                            0xffcf
-#define XKB_KEY_F19                           0xffd0
-#define XKB_KEY_L9                            0xffd0
-#define XKB_KEY_F20                           0xffd1
-#define XKB_KEY_L10                           0xffd1
-#define XKB_KEY_F21                           0xffd2
-#define XKB_KEY_R1                            0xffd2
-#define XKB_KEY_F22                           0xffd3
-#define XKB_KEY_R2                            0xffd3
-#define XKB_KEY_F23                           0xffd4
-#define XKB_KEY_R3                            0xffd4
-#define XKB_KEY_F24                           0xffd5
-#define XKB_KEY_R4                            0xffd5
-#define XKB_KEY_F25                           0xffd6
-#define XKB_KEY_R5                            0xffd6
-#define XKB_KEY_F26                           0xffd7
-#define XKB_KEY_R6                            0xffd7
-#define XKB_KEY_F27                           0xffd8
-#define XKB_KEY_R7                            0xffd8
-#define XKB_KEY_F28                           0xffd9
-#define XKB_KEY_R8                            0xffd9
-#define XKB_KEY_F29                           0xffda
-#define XKB_KEY_R9                            0xffda
-#define XKB_KEY_F30                           0xffdb
-#define XKB_KEY_R10                           0xffdb
-#define XKB_KEY_F31                           0xffdc
-#define XKB_KEY_R11                           0xffdc
-#define XKB_KEY_F32                           0xffdd
-#define XKB_KEY_R12                           0xffdd
-#define XKB_KEY_F33                           0xffde
-#define XKB_KEY_R13                           0xffde
-#define XKB_KEY_F34                           0xffdf
-#define XKB_KEY_R14                           0xffdf
-#define XKB_KEY_F35                           0xffe0
-#define XKB_KEY_R15                           0xffe0
-
-/* Modifiers */
-
-#define XKB_KEY_Shift_L                       0xffe1  /* Left shift */
-#define XKB_KEY_Shift_R                       0xffe2  /* Right shift */
-#define XKB_KEY_Control_L                     0xffe3  /* Left control */
-#define XKB_KEY_Control_R                     0xffe4  /* Right control */
-#define XKB_KEY_Caps_Lock                     0xffe5  /* Caps lock */
-#define XKB_KEY_Shift_Lock                    0xffe6  /* Shift lock */
-
-#define XKB_KEY_Meta_L                        0xffe7  /* Left meta */
-#define XKB_KEY_Meta_R                        0xffe8  /* Right meta */
-#define XKB_KEY_Alt_L                         0xffe9  /* Left alt */
-#define XKB_KEY_Alt_R                         0xffea  /* Right alt */
-#define XKB_KEY_Super_L                       0xffeb  /* Left super */
-#define XKB_KEY_Super_R                       0xffec  /* Right super */
-#define XKB_KEY_Hyper_L                       0xffed  /* Left hyper */
-#define XKB_KEY_Hyper_R                       0xffee  /* Right hyper */
-
-/*
- * Keyboard (XKB) Extension function and modifier keys
- * (from Appendix C of "The X Keyboard Extension: Protocol Specification")
- * Byte 3 = 0xfe
- */
-
-#define XKB_KEY_ISO_Lock                      0xfe01
-#define XKB_KEY_ISO_Level2_Latch              0xfe02
-#define XKB_KEY_ISO_Level3_Shift              0xfe03
-#define XKB_KEY_ISO_Level3_Latch              0xfe04
-#define XKB_KEY_ISO_Level3_Lock               0xfe05
-#define XKB_KEY_ISO_Level5_Shift              0xfe11
-#define XKB_KEY_ISO_Level5_Latch              0xfe12
-#define XKB_KEY_ISO_Level5_Lock               0xfe13
-#define XKB_KEY_ISO_Group_Shift               0xff7e  /* Alias for mode_switch */
-#define XKB_KEY_ISO_Group_Latch               0xfe06
-#define XKB_KEY_ISO_Group_Lock                0xfe07
-#define XKB_KEY_ISO_Next_Group                0xfe08
-#define XKB_KEY_ISO_Next_Group_Lock           0xfe09
-#define XKB_KEY_ISO_Prev_Group                0xfe0a
-#define XKB_KEY_ISO_Prev_Group_Lock           0xfe0b
-#define XKB_KEY_ISO_First_Group               0xfe0c
-#define XKB_KEY_ISO_First_Group_Lock          0xfe0d
-#define XKB_KEY_ISO_Last_Group                0xfe0e
-#define XKB_KEY_ISO_Last_Group_Lock           0xfe0f
-
-#define XKB_KEY_ISO_Left_Tab                  0xfe20
-#define XKB_KEY_ISO_Move_Line_Up              0xfe21
-#define XKB_KEY_ISO_Move_Line_Down            0xfe22
-#define XKB_KEY_ISO_Partial_Line_Up           0xfe23
-#define XKB_KEY_ISO_Partial_Line_Down         0xfe24
-#define XKB_KEY_ISO_Partial_Space_Left        0xfe25
-#define XKB_KEY_ISO_Partial_Space_Right       0xfe26
-#define XKB_KEY_ISO_Set_Margin_Left           0xfe27
-#define XKB_KEY_ISO_Set_Margin_Right          0xfe28
-#define XKB_KEY_ISO_Release_Margin_Left       0xfe29
-#define XKB_KEY_ISO_Release_Margin_Right      0xfe2a
-#define XKB_KEY_ISO_Release_Both_Margins      0xfe2b
-#define XKB_KEY_ISO_Fast_Cursor_Left          0xfe2c
-#define XKB_KEY_ISO_Fast_Cursor_Right         0xfe2d
-#define XKB_KEY_ISO_Fast_Cursor_Up            0xfe2e
-#define XKB_KEY_ISO_Fast_Cursor_Down          0xfe2f
-#define XKB_KEY_ISO_Continuous_Underline      0xfe30
-#define XKB_KEY_ISO_Discontinuous_Underline   0xfe31
-#define XKB_KEY_ISO_Emphasize                 0xfe32
-#define XKB_KEY_ISO_Center_Object             0xfe33
-#define XKB_KEY_ISO_Enter                     0xfe34
-
-#define XKB_KEY_dead_grave                    0xfe50
-#define XKB_KEY_dead_acute                    0xfe51
-#define XKB_KEY_dead_circumflex               0xfe52
-#define XKB_KEY_dead_tilde                    0xfe53
-#define XKB_KEY_dead_perispomeni              0xfe53  /* alias for dead_tilde */
-#define XKB_KEY_dead_macron                   0xfe54
-#define XKB_KEY_dead_breve                    0xfe55
-#define XKB_KEY_dead_abovedot                 0xfe56
-#define XKB_KEY_dead_diaeresis                0xfe57
-#define XKB_KEY_dead_abovering                0xfe58
-#define XKB_KEY_dead_doubleacute              0xfe59
-#define XKB_KEY_dead_caron                    0xfe5a
-#define XKB_KEY_dead_cedilla                  0xfe5b
-#define XKB_KEY_dead_ogonek                   0xfe5c
-#define XKB_KEY_dead_iota                     0xfe5d
-#define XKB_KEY_dead_voiced_sound             0xfe5e
-#define XKB_KEY_dead_semivoiced_sound         0xfe5f
-#define XKB_KEY_dead_belowdot                 0xfe60
-#define XKB_KEY_dead_hook                     0xfe61
-#define XKB_KEY_dead_horn                     0xfe62
-#define XKB_KEY_dead_stroke                   0xfe63
-#define XKB_KEY_dead_abovecomma               0xfe64
-#define XKB_KEY_dead_psili                    0xfe64  /* alias for dead_abovecomma */
-#define XKB_KEY_dead_abovereversedcomma       0xfe65
-#define XKB_KEY_dead_dasia                    0xfe65  /* alias for dead_abovereversedcomma */
-#define XKB_KEY_dead_doublegrave              0xfe66
-#define XKB_KEY_dead_belowring                0xfe67
-#define XKB_KEY_dead_belowmacron              0xfe68
-#define XKB_KEY_dead_belowcircumflex          0xfe69
-#define XKB_KEY_dead_belowtilde               0xfe6a
-#define XKB_KEY_dead_belowbreve               0xfe6b
-#define XKB_KEY_dead_belowdiaeresis           0xfe6c
-#define XKB_KEY_dead_invertedbreve            0xfe6d
-#define XKB_KEY_dead_belowcomma               0xfe6e
-#define XKB_KEY_dead_currency                 0xfe6f
-
-/* extra dead elements for German T3 layout */
-#define XKB_KEY_dead_lowline                  0xfe90
-#define XKB_KEY_dead_aboveverticalline        0xfe91
-#define XKB_KEY_dead_belowverticalline        0xfe92
-#define XKB_KEY_dead_longsolidusoverlay       0xfe93
-
-/* dead vowels for universal syllable entry */
-#define XKB_KEY_dead_a                        0xfe80
-#define XKB_KEY_dead_A                        0xfe81
-#define XKB_KEY_dead_e                        0xfe82
-#define XKB_KEY_dead_E                        0xfe83
-#define XKB_KEY_dead_i                        0xfe84
-#define XKB_KEY_dead_I                        0xfe85
-#define XKB_KEY_dead_o                        0xfe86
-#define XKB_KEY_dead_O                        0xfe87
-#define XKB_KEY_dead_u                        0xfe88
-#define XKB_KEY_dead_U                        0xfe89
-#define XKB_KEY_dead_small_schwa              0xfe8a
-#define XKB_KEY_dead_capital_schwa            0xfe8b
-
-#define XKB_KEY_dead_greek                    0xfe8c
-
-#define XKB_KEY_First_Virtual_Screen          0xfed0
-#define XKB_KEY_Prev_Virtual_Screen           0xfed1
-#define XKB_KEY_Next_Virtual_Screen           0xfed2
-#define XKB_KEY_Last_Virtual_Screen           0xfed4
-#define XKB_KEY_Terminate_Server              0xfed5
-
-#define XKB_KEY_AccessX_Enable                0xfe70
-#define XKB_KEY_AccessX_Feedback_Enable       0xfe71
-#define XKB_KEY_RepeatKeys_Enable             0xfe72
-#define XKB_KEY_SlowKeys_Enable               0xfe73
-#define XKB_KEY_BounceKeys_Enable             0xfe74
-#define XKB_KEY_StickyKeys_Enable             0xfe75
-#define XKB_KEY_MouseKeys_Enable              0xfe76
-#define XKB_KEY_MouseKeys_Accel_Enable        0xfe77
-#define XKB_KEY_Overlay1_Enable               0xfe78
-#define XKB_KEY_Overlay2_Enable               0xfe79
-#define XKB_KEY_AudibleBell_Enable            0xfe7a
-
-#define XKB_KEY_Pointer_Left                  0xfee0
-#define XKB_KEY_Pointer_Right                 0xfee1
-#define XKB_KEY_Pointer_Up                    0xfee2
-#define XKB_KEY_Pointer_Down                  0xfee3
-#define XKB_KEY_Pointer_UpLeft                0xfee4
-#define XKB_KEY_Pointer_UpRight               0xfee5
-#define XKB_KEY_Pointer_DownLeft              0xfee6
-#define XKB_KEY_Pointer_DownRight             0xfee7
-#define XKB_KEY_Pointer_Button_Dflt           0xfee8
-#define XKB_KEY_Pointer_Button1               0xfee9
-#define XKB_KEY_Pointer_Button2               0xfeea
-#define XKB_KEY_Pointer_Button3               0xfeeb
-#define XKB_KEY_Pointer_Button4               0xfeec
-#define XKB_KEY_Pointer_Button5               0xfeed
-#define XKB_KEY_Pointer_DblClick_Dflt         0xfeee
-#define XKB_KEY_Pointer_DblClick1             0xfeef
-#define XKB_KEY_Pointer_DblClick2             0xfef0
-#define XKB_KEY_Pointer_DblClick3             0xfef1
-#define XKB_KEY_Pointer_DblClick4             0xfef2
-#define XKB_KEY_Pointer_DblClick5             0xfef3
-#define XKB_KEY_Pointer_Drag_Dflt             0xfef4
-#define XKB_KEY_Pointer_Drag1                 0xfef5
-#define XKB_KEY_Pointer_Drag2                 0xfef6
-#define XKB_KEY_Pointer_Drag3                 0xfef7
-#define XKB_KEY_Pointer_Drag4                 0xfef8
-#define XKB_KEY_Pointer_Drag5                 0xfefd
-
-#define XKB_KEY_Pointer_EnableKeys            0xfef9
-#define XKB_KEY_Pointer_Accelerate            0xfefa
-#define XKB_KEY_Pointer_DfltBtnNext           0xfefb
-#define XKB_KEY_Pointer_DfltBtnPrev           0xfefc
-
-/* Single-Stroke Multiple-Character N-Graph Keysyms For The X Input Method */
-
-#define XKB_KEY_ch                            0xfea0
-#define XKB_KEY_Ch                            0xfea1
-#define XKB_KEY_CH                            0xfea2
-#define XKB_KEY_c_h                           0xfea3
-#define XKB_KEY_C_h                           0xfea4
-#define XKB_KEY_C_H                           0xfea5
-
-
-/*
- * 3270 Terminal Keys
- * Byte 3 = 0xfd
- */
-
-#define XKB_KEY_3270_Duplicate                0xfd01
-#define XKB_KEY_3270_FieldMark                0xfd02
-#define XKB_KEY_3270_Right2                   0xfd03
-#define XKB_KEY_3270_Left2                    0xfd04
-#define XKB_KEY_3270_BackTab                  0xfd05
-#define XKB_KEY_3270_EraseEOF                 0xfd06
-#define XKB_KEY_3270_EraseInput               0xfd07
-#define XKB_KEY_3270_Reset                    0xfd08
-#define XKB_KEY_3270_Quit                     0xfd09
-#define XKB_KEY_3270_PA1                      0xfd0a
-#define XKB_KEY_3270_PA2                      0xfd0b
-#define XKB_KEY_3270_PA3                      0xfd0c
-#define XKB_KEY_3270_Test                     0xfd0d
-#define XKB_KEY_3270_Attn                     0xfd0e
-#define XKB_KEY_3270_CursorBlink              0xfd0f
-#define XKB_KEY_3270_AltCursor                0xfd10
-#define XKB_KEY_3270_KeyClick                 0xfd11
-#define XKB_KEY_3270_Jump                     0xfd12
-#define XKB_KEY_3270_Ident                    0xfd13
-#define XKB_KEY_3270_Rule                     0xfd14
-#define XKB_KEY_3270_Copy                     0xfd15
-#define XKB_KEY_3270_Play                     0xfd16
-#define XKB_KEY_3270_Setup                    0xfd17
-#define XKB_KEY_3270_Record                   0xfd18
-#define XKB_KEY_3270_ChangeScreen             0xfd19
-#define XKB_KEY_3270_DeleteWord               0xfd1a
-#define XKB_KEY_3270_ExSelect                 0xfd1b
-#define XKB_KEY_3270_CursorSelect             0xfd1c
-#define XKB_KEY_3270_PrintScreen              0xfd1d
-#define XKB_KEY_3270_Enter                    0xfd1e
-
-/*
- * Latin 1
- * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF)
- * Byte 3 = 0
- */
-#define XKB_KEY_space                         0x0020  /* U+0020 SPACE */
-#define XKB_KEY_exclam                        0x0021  /* U+0021 EXCLAMATION MARK */
-#define XKB_KEY_quotedbl                      0x0022  /* U+0022 QUOTATION MARK */
-#define XKB_KEY_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
-#define XKB_KEY_dollar                        0x0024  /* U+0024 DOLLAR SIGN */
-#define XKB_KEY_percent                       0x0025  /* U+0025 PERCENT SIGN */
-#define XKB_KEY_ampersand                     0x0026  /* U+0026 AMPERSAND */
-#define XKB_KEY_apostrophe                    0x0027  /* U+0027 APOSTROPHE */
-#define XKB_KEY_quoteright                    0x0027  /* deprecated */
-#define XKB_KEY_parenleft                     0x0028  /* U+0028 LEFT PARENTHESIS */
-#define XKB_KEY_parenright                    0x0029  /* U+0029 RIGHT PARENTHESIS */
-#define XKB_KEY_asterisk                      0x002a  /* U+002A ASTERISK */
-#define XKB_KEY_plus                          0x002b  /* U+002B PLUS SIGN */
-#define XKB_KEY_comma                         0x002c  /* U+002C COMMA */
-#define XKB_KEY_minus                         0x002d  /* U+002D HYPHEN-MINUS */
-#define XKB_KEY_period                        0x002e  /* U+002E FULL STOP */
-#define XKB_KEY_slash                         0x002f  /* U+002F SOLIDUS */
-#define XKB_KEY_0                             0x0030  /* U+0030 DIGIT ZERO */
-#define XKB_KEY_1                             0x0031  /* U+0031 DIGIT ONE */
-#define XKB_KEY_2                             0x0032  /* U+0032 DIGIT TWO */
-#define XKB_KEY_3                             0x0033  /* U+0033 DIGIT THREE */
-#define XKB_KEY_4                             0x0034  /* U+0034 DIGIT FOUR */
-#define XKB_KEY_5                             0x0035  /* U+0035 DIGIT FIVE */
-#define XKB_KEY_6                             0x0036  /* U+0036 DIGIT SIX */
-#define XKB_KEY_7                             0x0037  /* U+0037 DIGIT SEVEN */
-#define XKB_KEY_8                             0x0038  /* U+0038 DIGIT EIGHT */
-#define XKB_KEY_9                             0x0039  /* U+0039 DIGIT NINE */
-#define XKB_KEY_colon                         0x003a  /* U+003A COLON */
-#define XKB_KEY_semicolon                     0x003b  /* U+003B SEMICOLON */
-#define XKB_KEY_less                          0x003c  /* U+003C LESS-THAN SIGN */
-#define XKB_KEY_equal                         0x003d  /* U+003D EQUALS SIGN */
-#define XKB_KEY_greater                       0x003e  /* U+003E GREATER-THAN SIGN */
-#define XKB_KEY_question                      0x003f  /* U+003F QUESTION MARK */
-#define XKB_KEY_at                            0x0040  /* U+0040 COMMERCIAL AT */
-#define XKB_KEY_A                             0x0041  /* U+0041 LATIN CAPITAL LETTER A */
-#define XKB_KEY_B                             0x0042  /* U+0042 LATIN CAPITAL LETTER B */
-#define XKB_KEY_C                             0x0043  /* U+0043 LATIN CAPITAL LETTER C */
-#define XKB_KEY_D                             0x0044  /* U+0044 LATIN CAPITAL LETTER D */
-#define XKB_KEY_E                             0x0045  /* U+0045 LATIN CAPITAL LETTER E */
-#define XKB_KEY_F                             0x0046  /* U+0046 LATIN CAPITAL LETTER F */
-#define XKB_KEY_G                             0x0047  /* U+0047 LATIN CAPITAL LETTER G */
-#define XKB_KEY_H                             0x0048  /* U+0048 LATIN CAPITAL LETTER H */
-#define XKB_KEY_I                             0x0049  /* U+0049 LATIN CAPITAL LETTER I */
-#define XKB_KEY_J                             0x004a  /* U+004A LATIN CAPITAL LETTER J */
-#define XKB_KEY_K                             0x004b  /* U+004B LATIN CAPITAL LETTER K */
-#define XKB_KEY_L                             0x004c  /* U+004C LATIN CAPITAL LETTER L */
-#define XKB_KEY_M                             0x004d  /* U+004D LATIN CAPITAL LETTER M */
-#define XKB_KEY_N                             0x004e  /* U+004E LATIN CAPITAL LETTER N */
-#define XKB_KEY_O                             0x004f  /* U+004F LATIN CAPITAL LETTER O */
-#define XKB_KEY_P                             0x0050  /* U+0050 LATIN CAPITAL LETTER P */
-#define XKB_KEY_Q                             0x0051  /* U+0051 LATIN CAPITAL LETTER Q */
-#define XKB_KEY_R                             0x0052  /* U+0052 LATIN CAPITAL LETTER R */
-#define XKB_KEY_S                             0x0053  /* U+0053 LATIN CAPITAL LETTER S */
-#define XKB_KEY_T                             0x0054  /* U+0054 LATIN CAPITAL LETTER T */
-#define XKB_KEY_U                             0x0055  /* U+0055 LATIN CAPITAL LETTER U */
-#define XKB_KEY_V                             0x0056  /* U+0056 LATIN CAPITAL LETTER V */
-#define XKB_KEY_W                             0x0057  /* U+0057 LATIN CAPITAL LETTER W */
-#define XKB_KEY_X                             0x0058  /* U+0058 LATIN CAPITAL LETTER X */
-#define XKB_KEY_Y                             0x0059  /* U+0059 LATIN CAPITAL LETTER Y */
-#define XKB_KEY_Z                             0x005a  /* U+005A LATIN CAPITAL LETTER Z */
-#define XKB_KEY_bracketleft                   0x005b  /* U+005B LEFT SQUARE BRACKET */
-#define XKB_KEY_backslash                     0x005c  /* U+005C REVERSE SOLIDUS */
-#define XKB_KEY_bracketright                  0x005d  /* U+005D RIGHT SQUARE BRACKET */
-#define XKB_KEY_asciicircum                   0x005e  /* U+005E CIRCUMFLEX ACCENT */
-#define XKB_KEY_underscore                    0x005f  /* U+005F LOW LINE */
-#define XKB_KEY_grave                         0x0060  /* U+0060 GRAVE ACCENT */
-#define XKB_KEY_quoteleft                     0x0060  /* deprecated */
-#define XKB_KEY_a                             0x0061  /* U+0061 LATIN SMALL LETTER A */
-#define XKB_KEY_b                             0x0062  /* U+0062 LATIN SMALL LETTER B */
-#define XKB_KEY_c                             0x0063  /* U+0063 LATIN SMALL LETTER C */
-#define XKB_KEY_d                             0x0064  /* U+0064 LATIN SMALL LETTER D */
-#define XKB_KEY_e                             0x0065  /* U+0065 LATIN SMALL LETTER E */
-#define XKB_KEY_f                             0x0066  /* U+0066 LATIN SMALL LETTER F */
-#define XKB_KEY_g                             0x0067  /* U+0067 LATIN SMALL LETTER G */
-#define XKB_KEY_h                             0x0068  /* U+0068 LATIN SMALL LETTER H */
-#define XKB_KEY_i                             0x0069  /* U+0069 LATIN SMALL LETTER I */
-#define XKB_KEY_j                             0x006a  /* U+006A LATIN SMALL LETTER J */
-#define XKB_KEY_k                             0x006b  /* U+006B LATIN SMALL LETTER K */
-#define XKB_KEY_l                             0x006c  /* U+006C LATIN SMALL LETTER L */
-#define XKB_KEY_m                             0x006d  /* U+006D LATIN SMALL LETTER M */
-#define XKB_KEY_n                             0x006e  /* U+006E LATIN SMALL LETTER N */
-#define XKB_KEY_o                             0x006f  /* U+006F LATIN SMALL LETTER O */
-#define XKB_KEY_p                             0x0070  /* U+0070 LATIN SMALL LETTER P */
-#define XKB_KEY_q                             0x0071  /* U+0071 LATIN SMALL LETTER Q */
-#define XKB_KEY_r                             0x0072  /* U+0072 LATIN SMALL LETTER R */
-#define XKB_KEY_s                             0x0073  /* U+0073 LATIN SMALL LETTER S */
-#define XKB_KEY_t                             0x0074  /* U+0074 LATIN SMALL LETTER T */
-#define XKB_KEY_u                             0x0075  /* U+0075 LATIN SMALL LETTER U */
-#define XKB_KEY_v                             0x0076  /* U+0076 LATIN SMALL LETTER V */
-#define XKB_KEY_w                             0x0077  /* U+0077 LATIN SMALL LETTER W */
-#define XKB_KEY_x                             0x0078  /* U+0078 LATIN SMALL LETTER X */
-#define XKB_KEY_y                             0x0079  /* U+0079 LATIN SMALL LETTER Y */
-#define XKB_KEY_z                             0x007a  /* U+007A LATIN SMALL LETTER Z */
-#define XKB_KEY_braceleft                     0x007b  /* U+007B LEFT CURLY BRACKET */
-#define XKB_KEY_bar                           0x007c  /* U+007C VERTICAL LINE */
-#define XKB_KEY_braceright                    0x007d  /* U+007D RIGHT CURLY BRACKET */
-#define XKB_KEY_asciitilde                    0x007e  /* U+007E TILDE */
-
-#define XKB_KEY_nobreakspace                  0x00a0  /* U+00A0 NO-BREAK SPACE */
-#define XKB_KEY_exclamdown                    0x00a1  /* U+00A1 INVERTED EXCLAMATION MARK */
-#define XKB_KEY_cent                          0x00a2  /* U+00A2 CENT SIGN */
-#define XKB_KEY_sterling                      0x00a3  /* U+00A3 POUND SIGN */
-#define XKB_KEY_currency                      0x00a4  /* U+00A4 CURRENCY SIGN */
-#define XKB_KEY_yen                           0x00a5  /* U+00A5 YEN SIGN */
-#define XKB_KEY_brokenbar                     0x00a6  /* U+00A6 BROKEN BAR */
-#define XKB_KEY_section                       0x00a7  /* U+00A7 SECTION SIGN */
-#define XKB_KEY_diaeresis                     0x00a8  /* U+00A8 DIAERESIS */
-#define XKB_KEY_copyright                     0x00a9  /* U+00A9 COPYRIGHT SIGN */
-#define XKB_KEY_ordfeminine                   0x00aa  /* U+00AA FEMININE ORDINAL INDICATOR */
-#define XKB_KEY_guillemotleft                 0x00ab  /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
-#define XKB_KEY_notsign                       0x00ac  /* U+00AC NOT SIGN */
-#define XKB_KEY_hyphen                        0x00ad  /* U+00AD SOFT HYPHEN */
-#define XKB_KEY_registered                    0x00ae  /* U+00AE REGISTERED SIGN */
-#define XKB_KEY_macron                        0x00af  /* U+00AF MACRON */
-#define XKB_KEY_degree                        0x00b0  /* U+00B0 DEGREE SIGN */
-#define XKB_KEY_plusminus                     0x00b1  /* U+00B1 PLUS-MINUS SIGN */
-#define XKB_KEY_twosuperior                   0x00b2  /* U+00B2 SUPERSCRIPT TWO */
-#define XKB_KEY_threesuperior                 0x00b3  /* U+00B3 SUPERSCRIPT THREE */
-#define XKB_KEY_acute                         0x00b4  /* U+00B4 ACUTE ACCENT */
-#define XKB_KEY_mu                            0x00b5  /* U+00B5 MICRO SIGN */
-#define XKB_KEY_paragraph                     0x00b6  /* U+00B6 PILCROW SIGN */
-#define XKB_KEY_periodcentered                0x00b7  /* U+00B7 MIDDLE DOT */
-#define XKB_KEY_cedilla                       0x00b8  /* U+00B8 CEDILLA */
-#define XKB_KEY_onesuperior                   0x00b9  /* U+00B9 SUPERSCRIPT ONE */
-#define XKB_KEY_masculine                     0x00ba  /* U+00BA MASCULINE ORDINAL INDICATOR */
-#define XKB_KEY_guillemotright                0x00bb  /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
-#define XKB_KEY_onequarter                    0x00bc  /* U+00BC VULGAR FRACTION ONE QUARTER */
-#define XKB_KEY_onehalf                       0x00bd  /* U+00BD VULGAR FRACTION ONE HALF */
-#define XKB_KEY_threequarters                 0x00be  /* U+00BE VULGAR FRACTION THREE QUARTERS */
-#define XKB_KEY_questiondown                  0x00bf  /* U+00BF INVERTED QUESTION MARK */
-#define XKB_KEY_Agrave                        0x00c0  /* U+00C0 LATIN CAPITAL LETTER A WITH GRAVE */
-#define XKB_KEY_Aacute                        0x00c1  /* U+00C1 LATIN CAPITAL LETTER A WITH ACUTE */
-#define XKB_KEY_Acircumflex                   0x00c2  /* U+00C2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-#define XKB_KEY_Atilde                        0x00c3  /* U+00C3 LATIN CAPITAL LETTER A WITH TILDE */
-#define XKB_KEY_Adiaeresis                    0x00c4  /* U+00C4 LATIN CAPITAL LETTER A WITH DIAERESIS */
-#define XKB_KEY_Aring                         0x00c5  /* U+00C5 LATIN CAPITAL LETTER A WITH RING ABOVE */
-#define XKB_KEY_AE                            0x00c6  /* U+00C6 LATIN CAPITAL LETTER AE */
-#define XKB_KEY_Ccedilla                      0x00c7  /* U+00C7 LATIN CAPITAL LETTER C WITH CEDILLA */
-#define XKB_KEY_Egrave                        0x00c8  /* U+00C8 LATIN CAPITAL LETTER E WITH GRAVE */
-#define XKB_KEY_Eacute                        0x00c9  /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */
-#define XKB_KEY_Ecircumflex                   0x00ca  /* U+00CA LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
-#define XKB_KEY_Ediaeresis                    0x00cb  /* U+00CB LATIN CAPITAL LETTER E WITH DIAERESIS */
-#define XKB_KEY_Igrave                        0x00cc  /* U+00CC LATIN CAPITAL LETTER I WITH GRAVE */
-#define XKB_KEY_Iacute                        0x00cd  /* U+00CD LATIN CAPITAL LETTER I WITH ACUTE */
-#define XKB_KEY_Icircumflex                   0x00ce  /* U+00CE LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-#define XKB_KEY_Idiaeresis                    0x00cf  /* U+00CF LATIN CAPITAL LETTER I WITH DIAERESIS */
-#define XKB_KEY_ETH                           0x00d0  /* U+00D0 LATIN CAPITAL LETTER ETH */
-#define XKB_KEY_Eth                           0x00d0  /* deprecated */
-#define XKB_KEY_Ntilde                        0x00d1  /* U+00D1 LATIN CAPITAL LETTER N WITH TILDE */
-#define XKB_KEY_Ograve                        0x00d2  /* U+00D2 LATIN CAPITAL LETTER O WITH GRAVE */
-#define XKB_KEY_Oacute                        0x00d3  /* U+00D3 LATIN CAPITAL LETTER O WITH ACUTE */
-#define XKB_KEY_Ocircumflex                   0x00d4  /* U+00D4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-#define XKB_KEY_Otilde                        0x00d5  /* U+00D5 LATIN CAPITAL LETTER O WITH TILDE */
-#define XKB_KEY_Odiaeresis                    0x00d6  /* U+00D6 LATIN CAPITAL LETTER O WITH DIAERESIS */
-#define XKB_KEY_multiply                      0x00d7  /* U+00D7 MULTIPLICATION SIGN */
-#define XKB_KEY_Oslash                        0x00d8  /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
-#define XKB_KEY_Ooblique                      0x00d8  /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
-#define XKB_KEY_Ugrave                        0x00d9  /* U+00D9 LATIN CAPITAL LETTER U WITH GRAVE */
-#define XKB_KEY_Uacute                        0x00da  /* U+00DA LATIN CAPITAL LETTER U WITH ACUTE */
-#define XKB_KEY_Ucircumflex                   0x00db  /* U+00DB LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
-#define XKB_KEY_Udiaeresis                    0x00dc  /* U+00DC LATIN CAPITAL LETTER U WITH DIAERESIS */
-#define XKB_KEY_Yacute                        0x00dd  /* U+00DD LATIN CAPITAL LETTER Y WITH ACUTE */
-#define XKB_KEY_THORN                         0x00de  /* U+00DE LATIN CAPITAL LETTER THORN */
-#define XKB_KEY_Thorn                         0x00de  /* deprecated */
-#define XKB_KEY_ssharp                        0x00df  /* U+00DF LATIN SMALL LETTER SHARP S */
-#define XKB_KEY_agrave                        0x00e0  /* U+00E0 LATIN SMALL LETTER A WITH GRAVE */
-#define XKB_KEY_aacute                        0x00e1  /* U+00E1 LATIN SMALL LETTER A WITH ACUTE */
-#define XKB_KEY_acircumflex                   0x00e2  /* U+00E2 LATIN SMALL LETTER A WITH CIRCUMFLEX */
-#define XKB_KEY_atilde                        0x00e3  /* U+00E3 LATIN SMALL LETTER A WITH TILDE */
-#define XKB_KEY_adiaeresis                    0x00e4  /* U+00E4 LATIN SMALL LETTER A WITH DIAERESIS */
-#define XKB_KEY_aring                         0x00e5  /* U+00E5 LATIN SMALL LETTER A WITH RING ABOVE */
-#define XKB_KEY_ae                            0x00e6  /* U+00E6 LATIN SMALL LETTER AE */
-#define XKB_KEY_ccedilla                      0x00e7  /* U+00E7 LATIN SMALL LETTER C WITH CEDILLA */
-#define XKB_KEY_egrave                        0x00e8  /* U+00E8 LATIN SMALL LETTER E WITH GRAVE */
-#define XKB_KEY_eacute                        0x00e9  /* U+00E9 LATIN SMALL LETTER E WITH ACUTE */
-#define XKB_KEY_ecircumflex                   0x00ea  /* U+00EA LATIN SMALL LETTER E WITH CIRCUMFLEX */
-#define XKB_KEY_ediaeresis                    0x00eb  /* U+00EB LATIN SMALL LETTER E WITH DIAERESIS */
-#define XKB_KEY_igrave                        0x00ec  /* U+00EC LATIN SMALL LETTER I WITH GRAVE */
-#define XKB_KEY_iacute                        0x00ed  /* U+00ED LATIN SMALL LETTER I WITH ACUTE */
-#define XKB_KEY_icircumflex                   0x00ee  /* U+00EE LATIN SMALL LETTER I WITH CIRCUMFLEX */
-#define XKB_KEY_idiaeresis                    0x00ef  /* U+00EF LATIN SMALL LETTER I WITH DIAERESIS */
-#define XKB_KEY_eth                           0x00f0  /* U+00F0 LATIN SMALL LETTER ETH */
-#define XKB_KEY_ntilde                        0x00f1  /* U+00F1 LATIN SMALL LETTER N WITH TILDE */
-#define XKB_KEY_ograve                        0x00f2  /* U+00F2 LATIN SMALL LETTER O WITH GRAVE */
-#define XKB_KEY_oacute                        0x00f3  /* U+00F3 LATIN SMALL LETTER O WITH ACUTE */
-#define XKB_KEY_ocircumflex                   0x00f4  /* U+00F4 LATIN SMALL LETTER O WITH CIRCUMFLEX */
-#define XKB_KEY_otilde                        0x00f5  /* U+00F5 LATIN SMALL LETTER O WITH TILDE */
-#define XKB_KEY_odiaeresis                    0x00f6  /* U+00F6 LATIN SMALL LETTER O WITH DIAERESIS */
-#define XKB_KEY_division                      0x00f7  /* U+00F7 DIVISION SIGN */
-#define XKB_KEY_oslash                        0x00f8  /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
-#define XKB_KEY_ooblique                      0x00f8  /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
-#define XKB_KEY_ugrave                        0x00f9  /* U+00F9 LATIN SMALL LETTER U WITH GRAVE */
-#define XKB_KEY_uacute                        0x00fa  /* U+00FA LATIN SMALL LETTER U WITH ACUTE */
-#define XKB_KEY_ucircumflex                   0x00fb  /* U+00FB LATIN SMALL LETTER U WITH CIRCUMFLEX */
-#define XKB_KEY_udiaeresis                    0x00fc  /* U+00FC LATIN SMALL LETTER U WITH DIAERESIS */
-#define XKB_KEY_yacute                        0x00fd  /* U+00FD LATIN SMALL LETTER Y WITH ACUTE */
-#define XKB_KEY_thorn                         0x00fe  /* U+00FE LATIN SMALL LETTER THORN */
-#define XKB_KEY_ydiaeresis                    0x00ff  /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
-
-/*
- * Latin 2
- * Byte 3 = 1
- */
-
-#define XKB_KEY_Aogonek                       0x01a1  /* U+0104 LATIN CAPITAL LETTER A WITH OGONEK */
-#define XKB_KEY_breve                         0x01a2  /* U+02D8 BREVE */
-#define XKB_KEY_Lstroke                       0x01a3  /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */
-#define XKB_KEY_Lcaron                        0x01a5  /* U+013D LATIN CAPITAL LETTER L WITH CARON */
-#define XKB_KEY_Sacute                        0x01a6  /* U+015A LATIN CAPITAL LETTER S WITH ACUTE */
-#define XKB_KEY_Scaron                        0x01a9  /* U+0160 LATIN CAPITAL LETTER S WITH CARON */
-#define XKB_KEY_Scedilla                      0x01aa  /* U+015E LATIN CAPITAL LETTER S WITH CEDILLA */
-#define XKB_KEY_Tcaron                        0x01ab  /* U+0164 LATIN CAPITAL LETTER T WITH CARON */
-#define XKB_KEY_Zacute                        0x01ac  /* U+0179 LATIN CAPITAL LETTER Z WITH ACUTE */
-#define XKB_KEY_Zcaron                        0x01ae  /* U+017D LATIN CAPITAL LETTER Z WITH CARON */
-#define XKB_KEY_Zabovedot                     0x01af  /* U+017B LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-#define XKB_KEY_aogonek                       0x01b1  /* U+0105 LATIN SMALL LETTER A WITH OGONEK */
-#define XKB_KEY_ogonek                        0x01b2  /* U+02DB OGONEK */
-#define XKB_KEY_lstroke                       0x01b3  /* U+0142 LATIN SMALL LETTER L WITH STROKE */
-#define XKB_KEY_lcaron                        0x01b5  /* U+013E LATIN SMALL LETTER L WITH CARON */
-#define XKB_KEY_sacute                        0x01b6  /* U+015B LATIN SMALL LETTER S WITH ACUTE */
-#define XKB_KEY_caron                         0x01b7  /* U+02C7 CARON */
-#define XKB_KEY_scaron                        0x01b9  /* U+0161 LATIN SMALL LETTER S WITH CARON */
-#define XKB_KEY_scedilla                      0x01ba  /* U+015F LATIN SMALL LETTER S WITH CEDILLA */
-#define XKB_KEY_tcaron                        0x01bb  /* U+0165 LATIN SMALL LETTER T WITH CARON */
-#define XKB_KEY_zacute                        0x01bc  /* U+017A LATIN SMALL LETTER Z WITH ACUTE */
-#define XKB_KEY_doubleacute                   0x01bd  /* U+02DD DOUBLE ACUTE ACCENT */
-#define XKB_KEY_zcaron                        0x01be  /* U+017E LATIN SMALL LETTER Z WITH CARON */
-#define XKB_KEY_zabovedot                     0x01bf  /* U+017C LATIN SMALL LETTER Z WITH DOT ABOVE */
-#define XKB_KEY_Racute                        0x01c0  /* U+0154 LATIN CAPITAL LETTER R WITH ACUTE */
-#define XKB_KEY_Abreve                        0x01c3  /* U+0102 LATIN CAPITAL LETTER A WITH BREVE */
-#define XKB_KEY_Lacute                        0x01c5  /* U+0139 LATIN CAPITAL LETTER L WITH ACUTE */
-#define XKB_KEY_Cacute                        0x01c6  /* U+0106 LATIN CAPITAL LETTER C WITH ACUTE */
-#define XKB_KEY_Ccaron                        0x01c8  /* U+010C LATIN CAPITAL LETTER C WITH CARON */
-#define XKB_KEY_Eogonek                       0x01ca  /* U+0118 LATIN CAPITAL LETTER E WITH OGONEK */
-#define XKB_KEY_Ecaron                        0x01cc  /* U+011A LATIN CAPITAL LETTER E WITH CARON */
-#define XKB_KEY_Dcaron                        0x01cf  /* U+010E LATIN CAPITAL LETTER D WITH CARON */
-#define XKB_KEY_Dstroke                       0x01d0  /* U+0110 LATIN CAPITAL LETTER D WITH STROKE */
-#define XKB_KEY_Nacute                        0x01d1  /* U+0143 LATIN CAPITAL LETTER N WITH ACUTE */
-#define XKB_KEY_Ncaron                        0x01d2  /* U+0147 LATIN CAPITAL LETTER N WITH CARON */
-#define XKB_KEY_Odoubleacute                  0x01d5  /* U+0150 LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-#define XKB_KEY_Rcaron                        0x01d8  /* U+0158 LATIN CAPITAL LETTER R WITH CARON */
-#define XKB_KEY_Uring                         0x01d9  /* U+016E LATIN CAPITAL LETTER U WITH RING ABOVE */
-#define XKB_KEY_Udoubleacute                  0x01db  /* U+0170 LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-#define XKB_KEY_Tcedilla                      0x01de  /* U+0162 LATIN CAPITAL LETTER T WITH CEDILLA */
-#define XKB_KEY_racute                        0x01e0  /* U+0155 LATIN SMALL LETTER R WITH ACUTE */
-#define XKB_KEY_abreve                        0x01e3  /* U+0103 LATIN SMALL LETTER A WITH BREVE */
-#define XKB_KEY_lacute                        0x01e5  /* U+013A LATIN SMALL LETTER L WITH ACUTE */
-#define XKB_KEY_cacute                        0x01e6  /* U+0107 LATIN SMALL LETTER C WITH ACUTE */
-#define XKB_KEY_ccaron                        0x01e8  /* U+010D LATIN SMALL LETTER C WITH CARON */
-#define XKB_KEY_eogonek                       0x01ea  /* U+0119 LATIN SMALL LETTER E WITH OGONEK */
-#define XKB_KEY_ecaron                        0x01ec  /* U+011B LATIN SMALL LETTER E WITH CARON */
-#define XKB_KEY_dcaron                        0x01ef  /* U+010F LATIN SMALL LETTER D WITH CARON */
-#define XKB_KEY_dstroke                       0x01f0  /* U+0111 LATIN SMALL LETTER D WITH STROKE */
-#define XKB_KEY_nacute                        0x01f1  /* U+0144 LATIN SMALL LETTER N WITH ACUTE */
-#define XKB_KEY_ncaron                        0x01f2  /* U+0148 LATIN SMALL LETTER N WITH CARON */
-#define XKB_KEY_odoubleacute                  0x01f5  /* U+0151 LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-#define XKB_KEY_rcaron                        0x01f8  /* U+0159 LATIN SMALL LETTER R WITH CARON */
-#define XKB_KEY_uring                         0x01f9  /* U+016F LATIN SMALL LETTER U WITH RING ABOVE */
-#define XKB_KEY_udoubleacute                  0x01fb  /* U+0171 LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-#define XKB_KEY_tcedilla                      0x01fe  /* U+0163 LATIN SMALL LETTER T WITH CEDILLA */
-#define XKB_KEY_abovedot                      0x01ff  /* U+02D9 DOT ABOVE */
-
-/*
- * Latin 3
- * Byte 3 = 2
- */
-
-#define XKB_KEY_Hstroke                       0x02a1  /* U+0126 LATIN CAPITAL LETTER H WITH STROKE */
-#define XKB_KEY_Hcircumflex                   0x02a6  /* U+0124 LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-#define XKB_KEY_Iabovedot                     0x02a9  /* U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE */
-#define XKB_KEY_Gbreve                        0x02ab  /* U+011E LATIN CAPITAL LETTER G WITH BREVE */
-#define XKB_KEY_Jcircumflex                   0x02ac  /* U+0134 LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-#define XKB_KEY_hstroke                       0x02b1  /* U+0127 LATIN SMALL LETTER H WITH STROKE */
-#define XKB_KEY_hcircumflex                   0x02b6  /* U+0125 LATIN SMALL LETTER H WITH CIRCUMFLEX */
-#define XKB_KEY_idotless                      0x02b9  /* U+0131 LATIN SMALL LETTER DOTLESS I */
-#define XKB_KEY_gbreve                        0x02bb  /* U+011F LATIN SMALL LETTER G WITH BREVE */
-#define XKB_KEY_jcircumflex                   0x02bc  /* U+0135 LATIN SMALL LETTER J WITH CIRCUMFLEX */
-#define XKB_KEY_Cabovedot                     0x02c5  /* U+010A LATIN CAPITAL LETTER C WITH DOT ABOVE */
-#define XKB_KEY_Ccircumflex                   0x02c6  /* U+0108 LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-#define XKB_KEY_Gabovedot                     0x02d5  /* U+0120 LATIN CAPITAL LETTER G WITH DOT ABOVE */
-#define XKB_KEY_Gcircumflex                   0x02d8  /* U+011C LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-#define XKB_KEY_Ubreve                        0x02dd  /* U+016C LATIN CAPITAL LETTER U WITH BREVE */
-#define XKB_KEY_Scircumflex                   0x02de  /* U+015C LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-#define XKB_KEY_cabovedot                     0x02e5  /* U+010B LATIN SMALL LETTER C WITH DOT ABOVE */
-#define XKB_KEY_ccircumflex                   0x02e6  /* U+0109 LATIN SMALL LETTER C WITH CIRCUMFLEX */
-#define XKB_KEY_gabovedot                     0x02f5  /* U+0121 LATIN SMALL LETTER G WITH DOT ABOVE */
-#define XKB_KEY_gcircumflex                   0x02f8  /* U+011D LATIN SMALL LETTER G WITH CIRCUMFLEX */
-#define XKB_KEY_ubreve                        0x02fd  /* U+016D LATIN SMALL LETTER U WITH BREVE */
-#define XKB_KEY_scircumflex                   0x02fe  /* U+015D LATIN SMALL LETTER S WITH CIRCUMFLEX */
-
-
-/*
- * Latin 4
- * Byte 3 = 3
- */
-
-#define XKB_KEY_kra                           0x03a2  /* U+0138 LATIN SMALL LETTER KRA */
-#define XKB_KEY_kappa                         0x03a2  /* deprecated */
-#define XKB_KEY_Rcedilla                      0x03a3  /* U+0156 LATIN CAPITAL LETTER R WITH CEDILLA */
-#define XKB_KEY_Itilde                        0x03a5  /* U+0128 LATIN CAPITAL LETTER I WITH TILDE */
-#define XKB_KEY_Lcedilla                      0x03a6  /* U+013B LATIN CAPITAL LETTER L WITH CEDILLA */
-#define XKB_KEY_Emacron                       0x03aa  /* U+0112 LATIN CAPITAL LETTER E WITH MACRON */
-#define XKB_KEY_Gcedilla                      0x03ab  /* U+0122 LATIN CAPITAL LETTER G WITH CEDILLA */
-#define XKB_KEY_Tslash                        0x03ac  /* U+0166 LATIN CAPITAL LETTER T WITH STROKE */
-#define XKB_KEY_rcedilla                      0x03b3  /* U+0157 LATIN SMALL LETTER R WITH CEDILLA */
-#define XKB_KEY_itilde                        0x03b5  /* U+0129 LATIN SMALL LETTER I WITH TILDE */
-#define XKB_KEY_lcedilla                      0x03b6  /* U+013C LATIN SMALL LETTER L WITH CEDILLA */
-#define XKB_KEY_emacron                       0x03ba  /* U+0113 LATIN SMALL LETTER E WITH MACRON */
-#define XKB_KEY_gcedilla                      0x03bb  /* U+0123 LATIN SMALL LETTER G WITH CEDILLA */
-#define XKB_KEY_tslash                        0x03bc  /* U+0167 LATIN SMALL LETTER T WITH STROKE */
-#define XKB_KEY_ENG                           0x03bd  /* U+014A LATIN CAPITAL LETTER ENG */
-#define XKB_KEY_eng                           0x03bf  /* U+014B LATIN SMALL LETTER ENG */
-#define XKB_KEY_Amacron                       0x03c0  /* U+0100 LATIN CAPITAL LETTER A WITH MACRON */
-#define XKB_KEY_Iogonek                       0x03c7  /* U+012E LATIN CAPITAL LETTER I WITH OGONEK */
-#define XKB_KEY_Eabovedot                     0x03cc  /* U+0116 LATIN CAPITAL LETTER E WITH DOT ABOVE */
-#define XKB_KEY_Imacron                       0x03cf  /* U+012A LATIN CAPITAL LETTER I WITH MACRON */
-#define XKB_KEY_Ncedilla                      0x03d1  /* U+0145 LATIN CAPITAL LETTER N WITH CEDILLA */
-#define XKB_KEY_Omacron                       0x03d2  /* U+014C LATIN CAPITAL LETTER O WITH MACRON */
-#define XKB_KEY_Kcedilla                      0x03d3  /* U+0136 LATIN CAPITAL LETTER K WITH CEDILLA */
-#define XKB_KEY_Uogonek                       0x03d9  /* U+0172 LATIN CAPITAL LETTER U WITH OGONEK */
-#define XKB_KEY_Utilde                        0x03dd  /* U+0168 LATIN CAPITAL LETTER U WITH TILDE */
-#define XKB_KEY_Umacron                       0x03de  /* U+016A LATIN CAPITAL LETTER U WITH MACRON */
-#define XKB_KEY_amacron                       0x03e0  /* U+0101 LATIN SMALL LETTER A WITH MACRON */
-#define XKB_KEY_iogonek                       0x03e7  /* U+012F LATIN SMALL LETTER I WITH OGONEK */
-#define XKB_KEY_eabovedot                     0x03ec  /* U+0117 LATIN SMALL LETTER E WITH DOT ABOVE */
-#define XKB_KEY_imacron                       0x03ef  /* U+012B LATIN SMALL LETTER I WITH MACRON */
-#define XKB_KEY_ncedilla                      0x03f1  /* U+0146 LATIN SMALL LETTER N WITH CEDILLA */
-#define XKB_KEY_omacron                       0x03f2  /* U+014D LATIN SMALL LETTER O WITH MACRON */
-#define XKB_KEY_kcedilla                      0x03f3  /* U+0137 LATIN SMALL LETTER K WITH CEDILLA */
-#define XKB_KEY_uogonek                       0x03f9  /* U+0173 LATIN SMALL LETTER U WITH OGONEK */
-#define XKB_KEY_utilde                        0x03fd  /* U+0169 LATIN SMALL LETTER U WITH TILDE */
-#define XKB_KEY_umacron                       0x03fe  /* U+016B LATIN SMALL LETTER U WITH MACRON */
-
-/*
- * Latin 8
- */
-#define XKB_KEY_Wcircumflex                0x1000174  /* U+0174 LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
-#define XKB_KEY_wcircumflex                0x1000175  /* U+0175 LATIN SMALL LETTER W WITH CIRCUMFLEX */
-#define XKB_KEY_Ycircumflex                0x1000176  /* U+0176 LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
-#define XKB_KEY_ycircumflex                0x1000177  /* U+0177 LATIN SMALL LETTER Y WITH CIRCUMFLEX */
-#define XKB_KEY_Babovedot                  0x1001e02  /* U+1E02 LATIN CAPITAL LETTER B WITH DOT ABOVE */
-#define XKB_KEY_babovedot                  0x1001e03  /* U+1E03 LATIN SMALL LETTER B WITH DOT ABOVE */
-#define XKB_KEY_Dabovedot                  0x1001e0a  /* U+1E0A LATIN CAPITAL LETTER D WITH DOT ABOVE */
-#define XKB_KEY_dabovedot                  0x1001e0b  /* U+1E0B LATIN SMALL LETTER D WITH DOT ABOVE */
-#define XKB_KEY_Fabovedot                  0x1001e1e  /* U+1E1E LATIN CAPITAL LETTER F WITH DOT ABOVE */
-#define XKB_KEY_fabovedot                  0x1001e1f  /* U+1E1F LATIN SMALL LETTER F WITH DOT ABOVE */
-#define XKB_KEY_Mabovedot                  0x1001e40  /* U+1E40 LATIN CAPITAL LETTER M WITH DOT ABOVE */
-#define XKB_KEY_mabovedot                  0x1001e41  /* U+1E41 LATIN SMALL LETTER M WITH DOT ABOVE */
-#define XKB_KEY_Pabovedot                  0x1001e56  /* U+1E56 LATIN CAPITAL LETTER P WITH DOT ABOVE */
-#define XKB_KEY_pabovedot                  0x1001e57  /* U+1E57 LATIN SMALL LETTER P WITH DOT ABOVE */
-#define XKB_KEY_Sabovedot                  0x1001e60  /* U+1E60 LATIN CAPITAL LETTER S WITH DOT ABOVE */
-#define XKB_KEY_sabovedot                  0x1001e61  /* U+1E61 LATIN SMALL LETTER S WITH DOT ABOVE */
-#define XKB_KEY_Tabovedot                  0x1001e6a  /* U+1E6A LATIN CAPITAL LETTER T WITH DOT ABOVE */
-#define XKB_KEY_tabovedot                  0x1001e6b  /* U+1E6B LATIN SMALL LETTER T WITH DOT ABOVE */
-#define XKB_KEY_Wgrave                     0x1001e80  /* U+1E80 LATIN CAPITAL LETTER W WITH GRAVE */
-#define XKB_KEY_wgrave                     0x1001e81  /* U+1E81 LATIN SMALL LETTER W WITH GRAVE */
-#define XKB_KEY_Wacute                     0x1001e82  /* U+1E82 LATIN CAPITAL LETTER W WITH ACUTE */
-#define XKB_KEY_wacute                     0x1001e83  /* U+1E83 LATIN SMALL LETTER W WITH ACUTE */
-#define XKB_KEY_Wdiaeresis                 0x1001e84  /* U+1E84 LATIN CAPITAL LETTER W WITH DIAERESIS */
-#define XKB_KEY_wdiaeresis                 0x1001e85  /* U+1E85 LATIN SMALL LETTER W WITH DIAERESIS */
-#define XKB_KEY_Ygrave                     0x1001ef2  /* U+1EF2 LATIN CAPITAL LETTER Y WITH GRAVE */
-#define XKB_KEY_ygrave                     0x1001ef3  /* U+1EF3 LATIN SMALL LETTER Y WITH GRAVE */
-
-/*
- * Latin 9
- * Byte 3 = 0x13
- */
-
-#define XKB_KEY_OE                            0x13bc  /* U+0152 LATIN CAPITAL LIGATURE OE */
-#define XKB_KEY_oe                            0x13bd  /* U+0153 LATIN SMALL LIGATURE OE */
-#define XKB_KEY_Ydiaeresis                    0x13be  /* U+0178 LATIN CAPITAL LETTER Y WITH DIAERESIS */
-
-/*
- * Katakana
- * Byte 3 = 4
- */
-
-#define XKB_KEY_overline                      0x047e  /* U+203E OVERLINE */
-#define XKB_KEY_kana_fullstop                 0x04a1  /* U+3002 IDEOGRAPHIC FULL STOP */
-#define XKB_KEY_kana_openingbracket           0x04a2  /* U+300C LEFT CORNER BRACKET */
-#define XKB_KEY_kana_closingbracket           0x04a3  /* U+300D RIGHT CORNER BRACKET */
-#define XKB_KEY_kana_comma                    0x04a4  /* U+3001 IDEOGRAPHIC COMMA */
-#define XKB_KEY_kana_conjunctive              0x04a5  /* U+30FB KATAKANA MIDDLE DOT */
-#define XKB_KEY_kana_middledot                0x04a5  /* deprecated */
-#define XKB_KEY_kana_WO                       0x04a6  /* U+30F2 KATAKANA LETTER WO */
-#define XKB_KEY_kana_a                        0x04a7  /* U+30A1 KATAKANA LETTER SMALL A */
-#define XKB_KEY_kana_i                        0x04a8  /* U+30A3 KATAKANA LETTER SMALL I */
-#define XKB_KEY_kana_u                        0x04a9  /* U+30A5 KATAKANA LETTER SMALL U */
-#define XKB_KEY_kana_e                        0x04aa  /* U+30A7 KATAKANA LETTER SMALL E */
-#define XKB_KEY_kana_o                        0x04ab  /* U+30A9 KATAKANA LETTER SMALL O */
-#define XKB_KEY_kana_ya                       0x04ac  /* U+30E3 KATAKANA LETTER SMALL YA */
-#define XKB_KEY_kana_yu                       0x04ad  /* U+30E5 KATAKANA LETTER SMALL YU */
-#define XKB_KEY_kana_yo                       0x04ae  /* U+30E7 KATAKANA LETTER SMALL YO */
-#define XKB_KEY_kana_tsu                      0x04af  /* U+30C3 KATAKANA LETTER SMALL TU */
-#define XKB_KEY_kana_tu                       0x04af  /* deprecated */
-#define XKB_KEY_prolongedsound                0x04b0  /* U+30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-#define XKB_KEY_kana_A                        0x04b1  /* U+30A2 KATAKANA LETTER A */
-#define XKB_KEY_kana_I                        0x04b2  /* U+30A4 KATAKANA LETTER I */
-#define XKB_KEY_kana_U                        0x04b3  /* U+30A6 KATAKANA LETTER U */
-#define XKB_KEY_kana_E                        0x04b4  /* U+30A8 KATAKANA LETTER E */
-#define XKB_KEY_kana_O                        0x04b5  /* U+30AA KATAKANA LETTER O */
-#define XKB_KEY_kana_KA                       0x04b6  /* U+30AB KATAKANA LETTER KA */
-#define XKB_KEY_kana_KI                       0x04b7  /* U+30AD KATAKANA LETTER KI */
-#define XKB_KEY_kana_KU                       0x04b8  /* U+30AF KATAKANA LETTER KU */
-#define XKB_KEY_kana_KE                       0x04b9  /* U+30B1 KATAKANA LETTER KE */
-#define XKB_KEY_kana_KO                       0x04ba  /* U+30B3 KATAKANA LETTER KO */
-#define XKB_KEY_kana_SA                       0x04bb  /* U+30B5 KATAKANA LETTER SA */
-#define XKB_KEY_kana_SHI                      0x04bc  /* U+30B7 KATAKANA LETTER SI */
-#define XKB_KEY_kana_SU                       0x04bd  /* U+30B9 KATAKANA LETTER SU */
-#define XKB_KEY_kana_SE                       0x04be  /* U+30BB KATAKANA LETTER SE */
-#define XKB_KEY_kana_SO                       0x04bf  /* U+30BD KATAKANA LETTER SO */
-#define XKB_KEY_kana_TA                       0x04c0  /* U+30BF KATAKANA LETTER TA */
-#define XKB_KEY_kana_CHI                      0x04c1  /* U+30C1 KATAKANA LETTER TI */
-#define XKB_KEY_kana_TI                       0x04c1  /* deprecated */
-#define XKB_KEY_kana_TSU                      0x04c2  /* U+30C4 KATAKANA LETTER TU */
-#define XKB_KEY_kana_TU                       0x04c2  /* deprecated */
-#define XKB_KEY_kana_TE                       0x04c3  /* U+30C6 KATAKANA LETTER TE */
-#define XKB_KEY_kana_TO                       0x04c4  /* U+30C8 KATAKANA LETTER TO */
-#define XKB_KEY_kana_NA                       0x04c5  /* U+30CA KATAKANA LETTER NA */
-#define XKB_KEY_kana_NI                       0x04c6  /* U+30CB KATAKANA LETTER NI */
-#define XKB_KEY_kana_NU                       0x04c7  /* U+30CC KATAKANA LETTER NU */
-#define XKB_KEY_kana_NE                       0x04c8  /* U+30CD KATAKANA LETTER NE */
-#define XKB_KEY_kana_NO                       0x04c9  /* U+30CE KATAKANA LETTER NO */
-#define XKB_KEY_kana_HA                       0x04ca  /* U+30CF KATAKANA LETTER HA */
-#define XKB_KEY_kana_HI                       0x04cb  /* U+30D2 KATAKANA LETTER HI */
-#define XKB_KEY_kana_FU                       0x04cc  /* U+30D5 KATAKANA LETTER HU */
-#define XKB_KEY_kana_HU                       0x04cc  /* deprecated */
-#define XKB_KEY_kana_HE                       0x04cd  /* U+30D8 KATAKANA LETTER HE */
-#define XKB_KEY_kana_HO                       0x04ce  /* U+30DB KATAKANA LETTER HO */
-#define XKB_KEY_kana_MA                       0x04cf  /* U+30DE KATAKANA LETTER MA */
-#define XKB_KEY_kana_MI                       0x04d0  /* U+30DF KATAKANA LETTER MI */
-#define XKB_KEY_kana_MU                       0x04d1  /* U+30E0 KATAKANA LETTER MU */
-#define XKB_KEY_kana_ME                       0x04d2  /* U+30E1 KATAKANA LETTER ME */
-#define XKB_KEY_kana_MO                       0x04d3  /* U+30E2 KATAKANA LETTER MO */
-#define XKB_KEY_kana_YA                       0x04d4  /* U+30E4 KATAKANA LETTER YA */
-#define XKB_KEY_kana_YU                       0x04d5  /* U+30E6 KATAKANA LETTER YU */
-#define XKB_KEY_kana_YO                       0x04d6  /* U+30E8 KATAKANA LETTER YO */
-#define XKB_KEY_kana_RA                       0x04d7  /* U+30E9 KATAKANA LETTER RA */
-#define XKB_KEY_kana_RI                       0x04d8  /* U+30EA KATAKANA LETTER RI */
-#define XKB_KEY_kana_RU                       0x04d9  /* U+30EB KATAKANA LETTER RU */
-#define XKB_KEY_kana_RE                       0x04da  /* U+30EC KATAKANA LETTER RE */
-#define XKB_KEY_kana_RO                       0x04db  /* U+30ED KATAKANA LETTER RO */
-#define XKB_KEY_kana_WA                       0x04dc  /* U+30EF KATAKANA LETTER WA */
-#define XKB_KEY_kana_N                        0x04dd  /* U+30F3 KATAKANA LETTER N */
-#define XKB_KEY_voicedsound                   0x04de  /* U+309B KATAKANA-HIRAGANA VOICED SOUND MARK */
-#define XKB_KEY_semivoicedsound               0x04df  /* U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
-#define XKB_KEY_kana_switch                   0xff7e  /* Alias for mode_switch */
-
-/*
- * Arabic
- * Byte 3 = 5
- */
-
-#define XKB_KEY_Farsi_0                    0x10006f0  /* U+06F0 EXTENDED ARABIC-INDIC DIGIT ZERO */
-#define XKB_KEY_Farsi_1                    0x10006f1  /* U+06F1 EXTENDED ARABIC-INDIC DIGIT ONE */
-#define XKB_KEY_Farsi_2                    0x10006f2  /* U+06F2 EXTENDED ARABIC-INDIC DIGIT TWO */
-#define XKB_KEY_Farsi_3                    0x10006f3  /* U+06F3 EXTENDED ARABIC-INDIC DIGIT THREE */
-#define XKB_KEY_Farsi_4                    0x10006f4  /* U+06F4 EXTENDED ARABIC-INDIC DIGIT FOUR */
-#define XKB_KEY_Farsi_5                    0x10006f5  /* U+06F5 EXTENDED ARABIC-INDIC DIGIT FIVE */
-#define XKB_KEY_Farsi_6                    0x10006f6  /* U+06F6 EXTENDED ARABIC-INDIC DIGIT SIX */
-#define XKB_KEY_Farsi_7                    0x10006f7  /* U+06F7 EXTENDED ARABIC-INDIC DIGIT SEVEN */
-#define XKB_KEY_Farsi_8                    0x10006f8  /* U+06F8 EXTENDED ARABIC-INDIC DIGIT EIGHT */
-#define XKB_KEY_Farsi_9                    0x10006f9  /* U+06F9 EXTENDED ARABIC-INDIC DIGIT NINE */
-#define XKB_KEY_Arabic_percent             0x100066a  /* U+066A ARABIC PERCENT SIGN */
-#define XKB_KEY_Arabic_superscript_alef    0x1000670  /* U+0670 ARABIC LETTER SUPERSCRIPT ALEF */
-#define XKB_KEY_Arabic_tteh                0x1000679  /* U+0679 ARABIC LETTER TTEH */
-#define XKB_KEY_Arabic_peh                 0x100067e  /* U+067E ARABIC LETTER PEH */
-#define XKB_KEY_Arabic_tcheh               0x1000686  /* U+0686 ARABIC LETTER TCHEH */
-#define XKB_KEY_Arabic_ddal                0x1000688  /* U+0688 ARABIC LETTER DDAL */
-#define XKB_KEY_Arabic_rreh                0x1000691  /* U+0691 ARABIC LETTER RREH */
-#define XKB_KEY_Arabic_comma                  0x05ac  /* U+060C ARABIC COMMA */
-#define XKB_KEY_Arabic_fullstop            0x10006d4  /* U+06D4 ARABIC FULL STOP */
-#define XKB_KEY_Arabic_0                   0x1000660  /* U+0660 ARABIC-INDIC DIGIT ZERO */
-#define XKB_KEY_Arabic_1                   0x1000661  /* U+0661 ARABIC-INDIC DIGIT ONE */
-#define XKB_KEY_Arabic_2                   0x1000662  /* U+0662 ARABIC-INDIC DIGIT TWO */
-#define XKB_KEY_Arabic_3                   0x1000663  /* U+0663 ARABIC-INDIC DIGIT THREE */
-#define XKB_KEY_Arabic_4                   0x1000664  /* U+0664 ARABIC-INDIC DIGIT FOUR */
-#define XKB_KEY_Arabic_5                   0x1000665  /* U+0665 ARABIC-INDIC DIGIT FIVE */
-#define XKB_KEY_Arabic_6                   0x1000666  /* U+0666 ARABIC-INDIC DIGIT SIX */
-#define XKB_KEY_Arabic_7                   0x1000667  /* U+0667 ARABIC-INDIC DIGIT SEVEN */
-#define XKB_KEY_Arabic_8                   0x1000668  /* U+0668 ARABIC-INDIC DIGIT EIGHT */
-#define XKB_KEY_Arabic_9                   0x1000669  /* U+0669 ARABIC-INDIC DIGIT NINE */
-#define XKB_KEY_Arabic_semicolon              0x05bb  /* U+061B ARABIC SEMICOLON */
-#define XKB_KEY_Arabic_question_mark          0x05bf  /* U+061F ARABIC QUESTION MARK */
-#define XKB_KEY_Arabic_hamza                  0x05c1  /* U+0621 ARABIC LETTER HAMZA */
-#define XKB_KEY_Arabic_maddaonalef            0x05c2  /* U+0622 ARABIC LETTER ALEF WITH MADDA ABOVE */
-#define XKB_KEY_Arabic_hamzaonalef            0x05c3  /* U+0623 ARABIC LETTER ALEF WITH HAMZA ABOVE */
-#define XKB_KEY_Arabic_hamzaonwaw             0x05c4  /* U+0624 ARABIC LETTER WAW WITH HAMZA ABOVE */
-#define XKB_KEY_Arabic_hamzaunderalef         0x05c5  /* U+0625 ARABIC LETTER ALEF WITH HAMZA BELOW */
-#define XKB_KEY_Arabic_hamzaonyeh             0x05c6  /* U+0626 ARABIC LETTER YEH WITH HAMZA ABOVE */
-#define XKB_KEY_Arabic_alef                   0x05c7  /* U+0627 ARABIC LETTER ALEF */
-#define XKB_KEY_Arabic_beh                    0x05c8  /* U+0628 ARABIC LETTER BEH */
-#define XKB_KEY_Arabic_tehmarbuta             0x05c9  /* U+0629 ARABIC LETTER TEH MARBUTA */
-#define XKB_KEY_Arabic_teh                    0x05ca  /* U+062A ARABIC LETTER TEH */
-#define XKB_KEY_Arabic_theh                   0x05cb  /* U+062B ARABIC LETTER THEH */
-#define XKB_KEY_Arabic_jeem                   0x05cc  /* U+062C ARABIC LETTER JEEM */
-#define XKB_KEY_Arabic_hah                    0x05cd  /* U+062D ARABIC LETTER HAH */
-#define XKB_KEY_Arabic_khah                   0x05ce  /* U+062E ARABIC LETTER KHAH */
-#define XKB_KEY_Arabic_dal                    0x05cf  /* U+062F ARABIC LETTER DAL */
-#define XKB_KEY_Arabic_thal                   0x05d0  /* U+0630 ARABIC LETTER THAL */
-#define XKB_KEY_Arabic_ra                     0x05d1  /* U+0631 ARABIC LETTER REH */
-#define XKB_KEY_Arabic_zain                   0x05d2  /* U+0632 ARABIC LETTER ZAIN */
-#define XKB_KEY_Arabic_seen                   0x05d3  /* U+0633 ARABIC LETTER SEEN */
-#define XKB_KEY_Arabic_sheen                  0x05d4  /* U+0634 ARABIC LETTER SHEEN */
-#define XKB_KEY_Arabic_sad                    0x05d5  /* U+0635 ARABIC LETTER SAD */
-#define XKB_KEY_Arabic_dad                    0x05d6  /* U+0636 ARABIC LETTER DAD */
-#define XKB_KEY_Arabic_tah                    0x05d7  /* U+0637 ARABIC LETTER TAH */
-#define XKB_KEY_Arabic_zah                    0x05d8  /* U+0638 ARABIC LETTER ZAH */
-#define XKB_KEY_Arabic_ain                    0x05d9  /* U+0639 ARABIC LETTER AIN */
-#define XKB_KEY_Arabic_ghain                  0x05da  /* U+063A ARABIC LETTER GHAIN */
-#define XKB_KEY_Arabic_tatweel                0x05e0  /* U+0640 ARABIC TATWEEL */
-#define XKB_KEY_Arabic_feh                    0x05e1  /* U+0641 ARABIC LETTER FEH */
-#define XKB_KEY_Arabic_qaf                    0x05e2  /* U+0642 ARABIC LETTER QAF */
-#define XKB_KEY_Arabic_kaf                    0x05e3  /* U+0643 ARABIC LETTER KAF */
-#define XKB_KEY_Arabic_lam                    0x05e4  /* U+0644 ARABIC LETTER LAM */
-#define XKB_KEY_Arabic_meem                   0x05e5  /* U+0645 ARABIC LETTER MEEM */
-#define XKB_KEY_Arabic_noon                   0x05e6  /* U+0646 ARABIC LETTER NOON */
-#define XKB_KEY_Arabic_ha                     0x05e7  /* U+0647 ARABIC LETTER HEH */
-#define XKB_KEY_Arabic_heh                    0x05e7  /* deprecated */
-#define XKB_KEY_Arabic_waw                    0x05e8  /* U+0648 ARABIC LETTER WAW */
-#define XKB_KEY_Arabic_alefmaksura            0x05e9  /* U+0649 ARABIC LETTER ALEF MAKSURA */
-#define XKB_KEY_Arabic_yeh                    0x05ea  /* U+064A ARABIC LETTER YEH */
-#define XKB_KEY_Arabic_fathatan               0x05eb  /* U+064B ARABIC FATHATAN */
-#define XKB_KEY_Arabic_dammatan               0x05ec  /* U+064C ARABIC DAMMATAN */
-#define XKB_KEY_Arabic_kasratan               0x05ed  /* U+064D ARABIC KASRATAN */
-#define XKB_KEY_Arabic_fatha                  0x05ee  /* U+064E ARABIC FATHA */
-#define XKB_KEY_Arabic_damma                  0x05ef  /* U+064F ARABIC DAMMA */
-#define XKB_KEY_Arabic_kasra                  0x05f0  /* U+0650 ARABIC KASRA */
-#define XKB_KEY_Arabic_shadda                 0x05f1  /* U+0651 ARABIC SHADDA */
-#define XKB_KEY_Arabic_sukun                  0x05f2  /* U+0652 ARABIC SUKUN */
-#define XKB_KEY_Arabic_madda_above         0x1000653  /* U+0653 ARABIC MADDAH ABOVE */
-#define XKB_KEY_Arabic_hamza_above         0x1000654  /* U+0654 ARABIC HAMZA ABOVE */
-#define XKB_KEY_Arabic_hamza_below         0x1000655  /* U+0655 ARABIC HAMZA BELOW */
-#define XKB_KEY_Arabic_jeh                 0x1000698  /* U+0698 ARABIC LETTER JEH */
-#define XKB_KEY_Arabic_veh                 0x10006a4  /* U+06A4 ARABIC LETTER VEH */
-#define XKB_KEY_Arabic_keheh               0x10006a9  /* U+06A9 ARABIC LETTER KEHEH */
-#define XKB_KEY_Arabic_gaf                 0x10006af  /* U+06AF ARABIC LETTER GAF */
-#define XKB_KEY_Arabic_noon_ghunna         0x10006ba  /* U+06BA ARABIC LETTER NOON GHUNNA */
-#define XKB_KEY_Arabic_heh_doachashmee     0x10006be  /* U+06BE ARABIC LETTER HEH DOACHASHMEE */
-#define XKB_KEY_Farsi_yeh                  0x10006cc  /* U+06CC ARABIC LETTER FARSI YEH */
-#define XKB_KEY_Arabic_farsi_yeh           0x10006cc  /* U+06CC ARABIC LETTER FARSI YEH */
-#define XKB_KEY_Arabic_yeh_baree           0x10006d2  /* U+06D2 ARABIC LETTER YEH BARREE */
-#define XKB_KEY_Arabic_heh_goal            0x10006c1  /* U+06C1 ARABIC LETTER HEH GOAL */
-#define XKB_KEY_Arabic_switch                 0xff7e  /* Alias for mode_switch */
-
-/*
- * Cyrillic
- * Byte 3 = 6
- */
-#define XKB_KEY_Cyrillic_GHE_bar           0x1000492  /* U+0492 CYRILLIC CAPITAL LETTER GHE WITH STROKE */
-#define XKB_KEY_Cyrillic_ghe_bar           0x1000493  /* U+0493 CYRILLIC SMALL LETTER GHE WITH STROKE */
-#define XKB_KEY_Cyrillic_ZHE_descender     0x1000496  /* U+0496 CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER */
-#define XKB_KEY_Cyrillic_zhe_descender     0x1000497  /* U+0497 CYRILLIC SMALL LETTER ZHE WITH DESCENDER */
-#define XKB_KEY_Cyrillic_KA_descender      0x100049a  /* U+049A CYRILLIC CAPITAL LETTER KA WITH DESCENDER */
-#define XKB_KEY_Cyrillic_ka_descender      0x100049b  /* U+049B CYRILLIC SMALL LETTER KA WITH DESCENDER */
-#define XKB_KEY_Cyrillic_KA_vertstroke     0x100049c  /* U+049C CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE */
-#define XKB_KEY_Cyrillic_ka_vertstroke     0x100049d  /* U+049D CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE */
-#define XKB_KEY_Cyrillic_EN_descender      0x10004a2  /* U+04A2 CYRILLIC CAPITAL LETTER EN WITH DESCENDER */
-#define XKB_KEY_Cyrillic_en_descender      0x10004a3  /* U+04A3 CYRILLIC SMALL LETTER EN WITH DESCENDER */
-#define XKB_KEY_Cyrillic_U_straight        0x10004ae  /* U+04AE CYRILLIC CAPITAL LETTER STRAIGHT U */
-#define XKB_KEY_Cyrillic_u_straight        0x10004af  /* U+04AF CYRILLIC SMALL LETTER STRAIGHT U */
-#define XKB_KEY_Cyrillic_U_straight_bar    0x10004b0  /* U+04B0 CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE */
-#define XKB_KEY_Cyrillic_u_straight_bar    0x10004b1  /* U+04B1 CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE */
-#define XKB_KEY_Cyrillic_HA_descender      0x10004b2  /* U+04B2 CYRILLIC CAPITAL LETTER HA WITH DESCENDER */
-#define XKB_KEY_Cyrillic_ha_descender      0x10004b3  /* U+04B3 CYRILLIC SMALL LETTER HA WITH DESCENDER */
-#define XKB_KEY_Cyrillic_CHE_descender     0x10004b6  /* U+04B6 CYRILLIC CAPITAL LETTER CHE WITH DESCENDER */
-#define XKB_KEY_Cyrillic_che_descender     0x10004b7  /* U+04B7 CYRILLIC SMALL LETTER CHE WITH DESCENDER */
-#define XKB_KEY_Cyrillic_CHE_vertstroke    0x10004b8  /* U+04B8 CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE */
-#define XKB_KEY_Cyrillic_che_vertstroke    0x10004b9  /* U+04B9 CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE */
-#define XKB_KEY_Cyrillic_SHHA              0x10004ba  /* U+04BA CYRILLIC CAPITAL LETTER SHHA */
-#define XKB_KEY_Cyrillic_shha              0x10004bb  /* U+04BB CYRILLIC SMALL LETTER SHHA */
-
-#define XKB_KEY_Cyrillic_SCHWA             0x10004d8  /* U+04D8 CYRILLIC CAPITAL LETTER SCHWA */
-#define XKB_KEY_Cyrillic_schwa             0x10004d9  /* U+04D9 CYRILLIC SMALL LETTER SCHWA */
-#define XKB_KEY_Cyrillic_I_macron          0x10004e2  /* U+04E2 CYRILLIC CAPITAL LETTER I WITH MACRON */
-#define XKB_KEY_Cyrillic_i_macron          0x10004e3  /* U+04E3 CYRILLIC SMALL LETTER I WITH MACRON */
-#define XKB_KEY_Cyrillic_O_bar             0x10004e8  /* U+04E8 CYRILLIC CAPITAL LETTER BARRED O */
-#define XKB_KEY_Cyrillic_o_bar             0x10004e9  /* U+04E9 CYRILLIC SMALL LETTER BARRED O */
-#define XKB_KEY_Cyrillic_U_macron          0x10004ee  /* U+04EE CYRILLIC CAPITAL LETTER U WITH MACRON */
-#define XKB_KEY_Cyrillic_u_macron          0x10004ef  /* U+04EF CYRILLIC SMALL LETTER U WITH MACRON */
-
-#define XKB_KEY_Serbian_dje                   0x06a1  /* U+0452 CYRILLIC SMALL LETTER DJE */
-#define XKB_KEY_Macedonia_gje                 0x06a2  /* U+0453 CYRILLIC SMALL LETTER GJE */
-#define XKB_KEY_Cyrillic_io                   0x06a3  /* U+0451 CYRILLIC SMALL LETTER IO */
-#define XKB_KEY_Ukrainian_ie                  0x06a4  /* U+0454 CYRILLIC SMALL LETTER UKRAINIAN IE */
-#define XKB_KEY_Ukranian_je                   0x06a4  /* deprecated */
-#define XKB_KEY_Macedonia_dse                 0x06a5  /* U+0455 CYRILLIC SMALL LETTER DZE */
-#define XKB_KEY_Ukrainian_i                   0x06a6  /* U+0456 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
-#define XKB_KEY_Ukranian_i                    0x06a6  /* deprecated */
-#define XKB_KEY_Ukrainian_yi                  0x06a7  /* U+0457 CYRILLIC SMALL LETTER YI */
-#define XKB_KEY_Ukranian_yi                   0x06a7  /* deprecated */
-#define XKB_KEY_Cyrillic_je                   0x06a8  /* U+0458 CYRILLIC SMALL LETTER JE */
-#define XKB_KEY_Serbian_je                    0x06a8  /* deprecated */
-#define XKB_KEY_Cyrillic_lje                  0x06a9  /* U+0459 CYRILLIC SMALL LETTER LJE */
-#define XKB_KEY_Serbian_lje                   0x06a9  /* deprecated */
-#define XKB_KEY_Cyrillic_nje                  0x06aa  /* U+045A CYRILLIC SMALL LETTER NJE */
-#define XKB_KEY_Serbian_nje                   0x06aa  /* deprecated */
-#define XKB_KEY_Serbian_tshe                  0x06ab  /* U+045B CYRILLIC SMALL LETTER TSHE */
-#define XKB_KEY_Macedonia_kje                 0x06ac  /* U+045C CYRILLIC SMALL LETTER KJE */
-#define XKB_KEY_Ukrainian_ghe_with_upturn     0x06ad  /* U+0491 CYRILLIC SMALL LETTER GHE WITH UPTURN */
-#define XKB_KEY_Byelorussian_shortu           0x06ae  /* U+045E CYRILLIC SMALL LETTER SHORT U */
-#define XKB_KEY_Cyrillic_dzhe                 0x06af  /* U+045F CYRILLIC SMALL LETTER DZHE */
-#define XKB_KEY_Serbian_dze                   0x06af  /* deprecated */
-#define XKB_KEY_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */
-#define XKB_KEY_Serbian_DJE                   0x06b1  /* U+0402 CYRILLIC CAPITAL LETTER DJE */
-#define XKB_KEY_Macedonia_GJE                 0x06b2  /* U+0403 CYRILLIC CAPITAL LETTER GJE */
-#define XKB_KEY_Cyrillic_IO                   0x06b3  /* U+0401 CYRILLIC CAPITAL LETTER IO */
-#define XKB_KEY_Ukrainian_IE                  0x06b4  /* U+0404 CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-#define XKB_KEY_Ukranian_JE                   0x06b4  /* deprecated */
-#define XKB_KEY_Macedonia_DSE                 0x06b5  /* U+0405 CYRILLIC CAPITAL LETTER DZE */
-#define XKB_KEY_Ukrainian_I                   0x06b6  /* U+0406 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-#define XKB_KEY_Ukranian_I                    0x06b6  /* deprecated */
-#define XKB_KEY_Ukrainian_YI                  0x06b7  /* U+0407 CYRILLIC CAPITAL LETTER YI */
-#define XKB_KEY_Ukranian_YI                   0x06b7  /* deprecated */
-#define XKB_KEY_Cyrillic_JE                   0x06b8  /* U+0408 CYRILLIC CAPITAL LETTER JE */
-#define XKB_KEY_Serbian_JE                    0x06b8  /* deprecated */
-#define XKB_KEY_Cyrillic_LJE                  0x06b9  /* U+0409 CYRILLIC CAPITAL LETTER LJE */
-#define XKB_KEY_Serbian_LJE                   0x06b9  /* deprecated */
-#define XKB_KEY_Cyrillic_NJE                  0x06ba  /* U+040A CYRILLIC CAPITAL LETTER NJE */
-#define XKB_KEY_Serbian_NJE                   0x06ba  /* deprecated */
-#define XKB_KEY_Serbian_TSHE                  0x06bb  /* U+040B CYRILLIC CAPITAL LETTER TSHE */
-#define XKB_KEY_Macedonia_KJE                 0x06bc  /* U+040C CYRILLIC CAPITAL LETTER KJE */
-#define XKB_KEY_Ukrainian_GHE_WITH_UPTURN     0x06bd  /* U+0490 CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
-#define XKB_KEY_Byelorussian_SHORTU           0x06be  /* U+040E CYRILLIC CAPITAL LETTER SHORT U */
-#define XKB_KEY_Cyrillic_DZHE                 0x06bf  /* U+040F CYRILLIC CAPITAL LETTER DZHE */
-#define XKB_KEY_Serbian_DZE                   0x06bf  /* deprecated */
-#define XKB_KEY_Cyrillic_yu                   0x06c0  /* U+044E CYRILLIC SMALL LETTER YU */
-#define XKB_KEY_Cyrillic_a                    0x06c1  /* U+0430 CYRILLIC SMALL LETTER A */
-#define XKB_KEY_Cyrillic_be                   0x06c2  /* U+0431 CYRILLIC SMALL LETTER BE */
-#define XKB_KEY_Cyrillic_tse                  0x06c3  /* U+0446 CYRILLIC SMALL LETTER TSE */
-#define XKB_KEY_Cyrillic_de                   0x06c4  /* U+0434 CYRILLIC SMALL LETTER DE */
-#define XKB_KEY_Cyrillic_ie                   0x06c5  /* U+0435 CYRILLIC SMALL LETTER IE */
-#define XKB_KEY_Cyrillic_ef                   0x06c6  /* U+0444 CYRILLIC SMALL LETTER EF */
-#define XKB_KEY_Cyrillic_ghe                  0x06c7  /* U+0433 CYRILLIC SMALL LETTER GHE */
-#define XKB_KEY_Cyrillic_ha                   0x06c8  /* U+0445 CYRILLIC SMALL LETTER HA */
-#define XKB_KEY_Cyrillic_i                    0x06c9  /* U+0438 CYRILLIC SMALL LETTER I */
-#define XKB_KEY_Cyrillic_shorti               0x06ca  /* U+0439 CYRILLIC SMALL LETTER SHORT I */
-#define XKB_KEY_Cyrillic_ka                   0x06cb  /* U+043A CYRILLIC SMALL LETTER KA */
-#define XKB_KEY_Cyrillic_el                   0x06cc  /* U+043B CYRILLIC SMALL LETTER EL */
-#define XKB_KEY_Cyrillic_em                   0x06cd  /* U+043C CYRILLIC SMALL LETTER EM */
-#define XKB_KEY_Cyrillic_en                   0x06ce  /* U+043D CYRILLIC SMALL LETTER EN */
-#define XKB_KEY_Cyrillic_o                    0x06cf  /* U+043E CYRILLIC SMALL LETTER O */
-#define XKB_KEY_Cyrillic_pe                   0x06d0  /* U+043F CYRILLIC SMALL LETTER PE */
-#define XKB_KEY_Cyrillic_ya                   0x06d1  /* U+044F CYRILLIC SMALL LETTER YA */
-#define XKB_KEY_Cyrillic_er                   0x06d2  /* U+0440 CYRILLIC SMALL LETTER ER */
-#define XKB_KEY_Cyrillic_es                   0x06d3  /* U+0441 CYRILLIC SMALL LETTER ES */
-#define XKB_KEY_Cyrillic_te                   0x06d4  /* U+0442 CYRILLIC SMALL LETTER TE */
-#define XKB_KEY_Cyrillic_u                    0x06d5  /* U+0443 CYRILLIC SMALL LETTER U */
-#define XKB_KEY_Cyrillic_zhe                  0x06d6  /* U+0436 CYRILLIC SMALL LETTER ZHE */
-#define XKB_KEY_Cyrillic_ve                   0x06d7  /* U+0432 CYRILLIC SMALL LETTER VE */
-#define XKB_KEY_Cyrillic_softsign             0x06d8  /* U+044C CYRILLIC SMALL LETTER SOFT SIGN */
-#define XKB_KEY_Cyrillic_yeru                 0x06d9  /* U+044B CYRILLIC SMALL LETTER YERU */
-#define XKB_KEY_Cyrillic_ze                   0x06da  /* U+0437 CYRILLIC SMALL LETTER ZE */
-#define XKB_KEY_Cyrillic_sha                  0x06db  /* U+0448 CYRILLIC SMALL LETTER SHA */
-#define XKB_KEY_Cyrillic_e                    0x06dc  /* U+044D CYRILLIC SMALL LETTER E */
-#define XKB_KEY_Cyrillic_shcha                0x06dd  /* U+0449 CYRILLIC SMALL LETTER SHCHA */
-#define XKB_KEY_Cyrillic_che                  0x06de  /* U+0447 CYRILLIC SMALL LETTER CHE */
-#define XKB_KEY_Cyrillic_hardsign             0x06df  /* U+044A CYRILLIC SMALL LETTER HARD SIGN */
-#define XKB_KEY_Cyrillic_YU                   0x06e0  /* U+042E CYRILLIC CAPITAL LETTER YU */
-#define XKB_KEY_Cyrillic_A                    0x06e1  /* U+0410 CYRILLIC CAPITAL LETTER A */
-#define XKB_KEY_Cyrillic_BE                   0x06e2  /* U+0411 CYRILLIC CAPITAL LETTER BE */
-#define XKB_KEY_Cyrillic_TSE                  0x06e3  /* U+0426 CYRILLIC CAPITAL LETTER TSE */
-#define XKB_KEY_Cyrillic_DE                   0x06e4  /* U+0414 CYRILLIC CAPITAL LETTER DE */
-#define XKB_KEY_Cyrillic_IE                   0x06e5  /* U+0415 CYRILLIC CAPITAL LETTER IE */
-#define XKB_KEY_Cyrillic_EF                   0x06e6  /* U+0424 CYRILLIC CAPITAL LETTER EF */
-#define XKB_KEY_Cyrillic_GHE                  0x06e7  /* U+0413 CYRILLIC CAPITAL LETTER GHE */
-#define XKB_KEY_Cyrillic_HA                   0x06e8  /* U+0425 CYRILLIC CAPITAL LETTER HA */
-#define XKB_KEY_Cyrillic_I                    0x06e9  /* U+0418 CYRILLIC CAPITAL LETTER I */
-#define XKB_KEY_Cyrillic_SHORTI               0x06ea  /* U+0419 CYRILLIC CAPITAL LETTER SHORT I */
-#define XKB_KEY_Cyrillic_KA                   0x06eb  /* U+041A CYRILLIC CAPITAL LETTER KA */
-#define XKB_KEY_Cyrillic_EL                   0x06ec  /* U+041B CYRILLIC CAPITAL LETTER EL */
-#define XKB_KEY_Cyrillic_EM                   0x06ed  /* U+041C CYRILLIC CAPITAL LETTER EM */
-#define XKB_KEY_Cyrillic_EN                   0x06ee  /* U+041D CYRILLIC CAPITAL LETTER EN */
-#define XKB_KEY_Cyrillic_O                    0x06ef  /* U+041E CYRILLIC CAPITAL LETTER O */
-#define XKB_KEY_Cyrillic_PE                   0x06f0  /* U+041F CYRILLIC CAPITAL LETTER PE */
-#define XKB_KEY_Cyrillic_YA                   0x06f1  /* U+042F CYRILLIC CAPITAL LETTER YA */
-#define XKB_KEY_Cyrillic_ER                   0x06f2  /* U+0420 CYRILLIC CAPITAL LETTER ER */
-#define XKB_KEY_Cyrillic_ES                   0x06f3  /* U+0421 CYRILLIC CAPITAL LETTER ES */
-#define XKB_KEY_Cyrillic_TE                   0x06f4  /* U+0422 CYRILLIC CAPITAL LETTER TE */
-#define XKB_KEY_Cyrillic_U                    0x06f5  /* U+0423 CYRILLIC CAPITAL LETTER U */
-#define XKB_KEY_Cyrillic_ZHE                  0x06f6  /* U+0416 CYRILLIC CAPITAL LETTER ZHE */
-#define XKB_KEY_Cyrillic_VE                   0x06f7  /* U+0412 CYRILLIC CAPITAL LETTER VE */
-#define XKB_KEY_Cyrillic_SOFTSIGN             0x06f8  /* U+042C CYRILLIC CAPITAL LETTER SOFT SIGN */
-#define XKB_KEY_Cyrillic_YERU                 0x06f9  /* U+042B CYRILLIC CAPITAL LETTER YERU */
-#define XKB_KEY_Cyrillic_ZE                   0x06fa  /* U+0417 CYRILLIC CAPITAL LETTER ZE */
-#define XKB_KEY_Cyrillic_SHA                  0x06fb  /* U+0428 CYRILLIC CAPITAL LETTER SHA */
-#define XKB_KEY_Cyrillic_E                    0x06fc  /* U+042D CYRILLIC CAPITAL LETTER E */
-#define XKB_KEY_Cyrillic_SHCHA                0x06fd  /* U+0429 CYRILLIC CAPITAL LETTER SHCHA */
-#define XKB_KEY_Cyrillic_CHE                  0x06fe  /* U+0427 CYRILLIC CAPITAL LETTER CHE */
-#define XKB_KEY_Cyrillic_HARDSIGN             0x06ff  /* U+042A CYRILLIC CAPITAL LETTER HARD SIGN */
-
-/*
- * Greek
- * (based on an early draft of, and not quite identical to, ISO/IEC 8859-7)
- * Byte 3 = 7
- */
-
-#define XKB_KEY_Greek_ALPHAaccent             0x07a1  /* U+0386 GREEK CAPITAL LETTER ALPHA WITH TONOS */
-#define XKB_KEY_Greek_EPSILONaccent           0x07a2  /* U+0388 GREEK CAPITAL LETTER EPSILON WITH TONOS */
-#define XKB_KEY_Greek_ETAaccent               0x07a3  /* U+0389 GREEK CAPITAL LETTER ETA WITH TONOS */
-#define XKB_KEY_Greek_IOTAaccent              0x07a4  /* U+038A GREEK CAPITAL LETTER IOTA WITH TONOS */
-#define XKB_KEY_Greek_IOTAdieresis            0x07a5  /* U+03AA GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-#define XKB_KEY_Greek_IOTAdiaeresis           0x07a5  /* old typo */
-#define XKB_KEY_Greek_OMICRONaccent           0x07a7  /* U+038C GREEK CAPITAL LETTER OMICRON WITH TONOS */
-#define XKB_KEY_Greek_UPSILONaccent           0x07a8  /* U+038E GREEK CAPITAL LETTER UPSILON WITH TONOS */
-#define XKB_KEY_Greek_UPSILONdieresis         0x07a9  /* U+03AB GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-#define XKB_KEY_Greek_OMEGAaccent             0x07ab  /* U+038F GREEK CAPITAL LETTER OMEGA WITH TONOS */
-#define XKB_KEY_Greek_accentdieresis          0x07ae  /* U+0385 GREEK DIALYTIKA TONOS */
-#define XKB_KEY_Greek_horizbar                0x07af  /* U+2015 HORIZONTAL BAR */
-#define XKB_KEY_Greek_alphaaccent             0x07b1  /* U+03AC GREEK SMALL LETTER ALPHA WITH TONOS */
-#define XKB_KEY_Greek_epsilonaccent           0x07b2  /* U+03AD GREEK SMALL LETTER EPSILON WITH TONOS */
-#define XKB_KEY_Greek_etaaccent               0x07b3  /* U+03AE GREEK SMALL LETTER ETA WITH TONOS */
-#define XKB_KEY_Greek_iotaaccent              0x07b4  /* U+03AF GREEK SMALL LETTER IOTA WITH TONOS */
-#define XKB_KEY_Greek_iotadieresis            0x07b5  /* U+03CA GREEK SMALL LETTER IOTA WITH DIALYTIKA */
-#define XKB_KEY_Greek_iotaaccentdieresis      0x07b6  /* U+0390 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-#define XKB_KEY_Greek_omicronaccent           0x07b7  /* U+03CC GREEK SMALL LETTER OMICRON WITH TONOS */
-#define XKB_KEY_Greek_upsilonaccent           0x07b8  /* U+03CD GREEK SMALL LETTER UPSILON WITH TONOS */
-#define XKB_KEY_Greek_upsilondieresis         0x07b9  /* U+03CB GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
-#define XKB_KEY_Greek_upsilonaccentdieresis   0x07ba  /* U+03B0 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-#define XKB_KEY_Greek_omegaaccent             0x07bb  /* U+03CE GREEK SMALL LETTER OMEGA WITH TONOS */
-#define XKB_KEY_Greek_ALPHA                   0x07c1  /* U+0391 GREEK CAPITAL LETTER ALPHA */
-#define XKB_KEY_Greek_BETA                    0x07c2  /* U+0392 GREEK CAPITAL LETTER BETA */
-#define XKB_KEY_Greek_GAMMA                   0x07c3  /* U+0393 GREEK CAPITAL LETTER GAMMA */
-#define XKB_KEY_Greek_DELTA                   0x07c4  /* U+0394 GREEK CAPITAL LETTER DELTA */
-#define XKB_KEY_Greek_EPSILON                 0x07c5  /* U+0395 GREEK CAPITAL LETTER EPSILON */
-#define XKB_KEY_Greek_ZETA                    0x07c6  /* U+0396 GREEK CAPITAL LETTER ZETA */
-#define XKB_KEY_Greek_ETA                     0x07c7  /* U+0397 GREEK CAPITAL LETTER ETA */
-#define XKB_KEY_Greek_THETA                   0x07c8  /* U+0398 GREEK CAPITAL LETTER THETA */
-#define XKB_KEY_Greek_IOTA                    0x07c9  /* U+0399 GREEK CAPITAL LETTER IOTA */
-#define XKB_KEY_Greek_KAPPA                   0x07ca  /* U+039A GREEK CAPITAL LETTER KAPPA */
-#define XKB_KEY_Greek_LAMDA                   0x07cb  /* U+039B GREEK CAPITAL LETTER LAMDA */
-#define XKB_KEY_Greek_LAMBDA                  0x07cb  /* U+039B GREEK CAPITAL LETTER LAMDA */
-#define XKB_KEY_Greek_MU                      0x07cc  /* U+039C GREEK CAPITAL LETTER MU */
-#define XKB_KEY_Greek_NU                      0x07cd  /* U+039D GREEK CAPITAL LETTER NU */
-#define XKB_KEY_Greek_XI                      0x07ce  /* U+039E GREEK CAPITAL LETTER XI */
-#define XKB_KEY_Greek_OMICRON                 0x07cf  /* U+039F GREEK CAPITAL LETTER OMICRON */
-#define XKB_KEY_Greek_PI                      0x07d0  /* U+03A0 GREEK CAPITAL LETTER PI */
-#define XKB_KEY_Greek_RHO                     0x07d1  /* U+03A1 GREEK CAPITAL LETTER RHO */
-#define XKB_KEY_Greek_SIGMA                   0x07d2  /* U+03A3 GREEK CAPITAL LETTER SIGMA */
-#define XKB_KEY_Greek_TAU                     0x07d4  /* U+03A4 GREEK CAPITAL LETTER TAU */
-#define XKB_KEY_Greek_UPSILON                 0x07d5  /* U+03A5 GREEK CAPITAL LETTER UPSILON */
-#define XKB_KEY_Greek_PHI                     0x07d6  /* U+03A6 GREEK CAPITAL LETTER PHI */
-#define XKB_KEY_Greek_CHI                     0x07d7  /* U+03A7 GREEK CAPITAL LETTER CHI */
-#define XKB_KEY_Greek_PSI                     0x07d8  /* U+03A8 GREEK CAPITAL LETTER PSI */
-#define XKB_KEY_Greek_OMEGA                   0x07d9  /* U+03A9 GREEK CAPITAL LETTER OMEGA */
-#define XKB_KEY_Greek_alpha                   0x07e1  /* U+03B1 GREEK SMALL LETTER ALPHA */
-#define XKB_KEY_Greek_beta                    0x07e2  /* U+03B2 GREEK SMALL LETTER BETA */
-#define XKB_KEY_Greek_gamma                   0x07e3  /* U+03B3 GREEK SMALL LETTER GAMMA */
-#define XKB_KEY_Greek_delta                   0x07e4  /* U+03B4 GREEK SMALL LETTER DELTA */
-#define XKB_KEY_Greek_epsilon                 0x07e5  /* U+03B5 GREEK SMALL LETTER EPSILON */
-#define XKB_KEY_Greek_zeta                    0x07e6  /* U+03B6 GREEK SMALL LETTER ZETA */
-#define XKB_KEY_Greek_eta                     0x07e7  /* U+03B7 GREEK SMALL LETTER ETA */
-#define XKB_KEY_Greek_theta                   0x07e8  /* U+03B8 GREEK SMALL LETTER THETA */
-#define XKB_KEY_Greek_iota                    0x07e9  /* U+03B9 GREEK SMALL LETTER IOTA */
-#define XKB_KEY_Greek_kappa                   0x07ea  /* U+03BA GREEK SMALL LETTER KAPPA */
-#define XKB_KEY_Greek_lamda                   0x07eb  /* U+03BB GREEK SMALL LETTER LAMDA */
-#define XKB_KEY_Greek_lambda                  0x07eb  /* U+03BB GREEK SMALL LETTER LAMDA */
-#define XKB_KEY_Greek_mu                      0x07ec  /* U+03BC GREEK SMALL LETTER MU */
-#define XKB_KEY_Greek_nu                      0x07ed  /* U+03BD GREEK SMALL LETTER NU */
-#define XKB_KEY_Greek_xi                      0x07ee  /* U+03BE GREEK SMALL LETTER XI */
-#define XKB_KEY_Greek_omicron                 0x07ef  /* U+03BF GREEK SMALL LETTER OMICRON */
-#define XKB_KEY_Greek_pi                      0x07f0  /* U+03C0 GREEK SMALL LETTER PI */
-#define XKB_KEY_Greek_rho                     0x07f1  /* U+03C1 GREEK SMALL LETTER RHO */
-#define XKB_KEY_Greek_sigma                   0x07f2  /* U+03C3 GREEK SMALL LETTER SIGMA */
-#define XKB_KEY_Greek_finalsmallsigma         0x07f3  /* U+03C2 GREEK SMALL LETTER FINAL SIGMA */
-#define XKB_KEY_Greek_tau                     0x07f4  /* U+03C4 GREEK SMALL LETTER TAU */
-#define XKB_KEY_Greek_upsilon                 0x07f5  /* U+03C5 GREEK SMALL LETTER UPSILON */
-#define XKB_KEY_Greek_phi                     0x07f6  /* U+03C6 GREEK SMALL LETTER PHI */
-#define XKB_KEY_Greek_chi                     0x07f7  /* U+03C7 GREEK SMALL LETTER CHI */
-#define XKB_KEY_Greek_psi                     0x07f8  /* U+03C8 GREEK SMALL LETTER PSI */
-#define XKB_KEY_Greek_omega                   0x07f9  /* U+03C9 GREEK SMALL LETTER OMEGA */
-#define XKB_KEY_Greek_switch                  0xff7e  /* Alias for mode_switch */
-
-/*
- * Technical
- * (from the DEC VT330/VT420 Technical Character Set, http://vt100.net/charsets/technical.html)
- * Byte 3 = 8
- */
-
-#define XKB_KEY_leftradical                   0x08a1  /* U+23B7 RADICAL SYMBOL BOTTOM */
-#define XKB_KEY_topleftradical                0x08a2  /*(U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT)*/
-#define XKB_KEY_horizconnector                0x08a3  /*(U+2500 BOX DRAWINGS LIGHT HORIZONTAL)*/
-#define XKB_KEY_topintegral                   0x08a4  /* U+2320 TOP HALF INTEGRAL */
-#define XKB_KEY_botintegral                   0x08a5  /* U+2321 BOTTOM HALF INTEGRAL */
-#define XKB_KEY_vertconnector                 0x08a6  /*(U+2502 BOX DRAWINGS LIGHT VERTICAL)*/
-#define XKB_KEY_topleftsqbracket              0x08a7  /* U+23A1 LEFT SQUARE BRACKET UPPER CORNER */
-#define XKB_KEY_botleftsqbracket              0x08a8  /* U+23A3 LEFT SQUARE BRACKET LOWER CORNER */
-#define XKB_KEY_toprightsqbracket             0x08a9  /* U+23A4 RIGHT SQUARE BRACKET UPPER CORNER */
-#define XKB_KEY_botrightsqbracket             0x08aa  /* U+23A6 RIGHT SQUARE BRACKET LOWER CORNER */
-#define XKB_KEY_topleftparens                 0x08ab  /* U+239B LEFT PARENTHESIS UPPER HOOK */
-#define XKB_KEY_botleftparens                 0x08ac  /* U+239D LEFT PARENTHESIS LOWER HOOK */
-#define XKB_KEY_toprightparens                0x08ad  /* U+239E RIGHT PARENTHESIS UPPER HOOK */
-#define XKB_KEY_botrightparens                0x08ae  /* U+23A0 RIGHT PARENTHESIS LOWER HOOK */
-#define XKB_KEY_leftmiddlecurlybrace          0x08af  /* U+23A8 LEFT CURLY BRACKET MIDDLE PIECE */
-#define XKB_KEY_rightmiddlecurlybrace         0x08b0  /* U+23AC RIGHT CURLY BRACKET MIDDLE PIECE */
-#define XKB_KEY_topleftsummation              0x08b1
-#define XKB_KEY_botleftsummation              0x08b2
-#define XKB_KEY_topvertsummationconnector     0x08b3
-#define XKB_KEY_botvertsummationconnector     0x08b4
-#define XKB_KEY_toprightsummation             0x08b5
-#define XKB_KEY_botrightsummation             0x08b6
-#define XKB_KEY_rightmiddlesummation          0x08b7
-#define XKB_KEY_lessthanequal                 0x08bc  /* U+2264 LESS-THAN OR EQUAL TO */
-#define XKB_KEY_notequal                      0x08bd  /* U+2260 NOT EQUAL TO */
-#define XKB_KEY_greaterthanequal              0x08be  /* U+2265 GREATER-THAN OR EQUAL TO */
-#define XKB_KEY_integral                      0x08bf  /* U+222B INTEGRAL */
-#define XKB_KEY_therefore                     0x08c0  /* U+2234 THEREFORE */
-#define XKB_KEY_variation                     0x08c1  /* U+221D PROPORTIONAL TO */
-#define XKB_KEY_infinity                      0x08c2  /* U+221E INFINITY */
-#define XKB_KEY_nabla                         0x08c5  /* U+2207 NABLA */
-#define XKB_KEY_approximate                   0x08c8  /* U+223C TILDE OPERATOR */
-#define XKB_KEY_similarequal                  0x08c9  /* U+2243 ASYMPTOTICALLY EQUAL TO */
-#define XKB_KEY_ifonlyif                      0x08cd  /* U+21D4 LEFT RIGHT DOUBLE ARROW */
-#define XKB_KEY_implies                       0x08ce  /* U+21D2 RIGHTWARDS DOUBLE ARROW */
-#define XKB_KEY_identical                     0x08cf  /* U+2261 IDENTICAL TO */
-#define XKB_KEY_radical                       0x08d6  /* U+221A SQUARE ROOT */
-#define XKB_KEY_includedin                    0x08da  /* U+2282 SUBSET OF */
-#define XKB_KEY_includes                      0x08db  /* U+2283 SUPERSET OF */
-#define XKB_KEY_intersection                  0x08dc  /* U+2229 INTERSECTION */
-#define XKB_KEY_union                         0x08dd  /* U+222A UNION */
-#define XKB_KEY_logicaland                    0x08de  /* U+2227 LOGICAL AND */
-#define XKB_KEY_logicalor                     0x08df  /* U+2228 LOGICAL OR */
-#define XKB_KEY_partialderivative             0x08ef  /* U+2202 PARTIAL DIFFERENTIAL */
-#define XKB_KEY_function                      0x08f6  /* U+0192 LATIN SMALL LETTER F WITH HOOK */
-#define XKB_KEY_leftarrow                     0x08fb  /* U+2190 LEFTWARDS ARROW */
-#define XKB_KEY_uparrow                       0x08fc  /* U+2191 UPWARDS ARROW */
-#define XKB_KEY_rightarrow                    0x08fd  /* U+2192 RIGHTWARDS ARROW */
-#define XKB_KEY_downarrow                     0x08fe  /* U+2193 DOWNWARDS ARROW */
-
-/*
- * Special
- * (from the DEC VT100 Special Graphics Character Set)
- * Byte 3 = 9
- */
-
-#define XKB_KEY_blank                         0x09df
-#define XKB_KEY_soliddiamond                  0x09e0  /* U+25C6 BLACK DIAMOND */
-#define XKB_KEY_checkerboard                  0x09e1  /* U+2592 MEDIUM SHADE */
-#define XKB_KEY_ht                            0x09e2  /* U+2409 SYMBOL FOR HORIZONTAL TABULATION */
-#define XKB_KEY_ff                            0x09e3  /* U+240C SYMBOL FOR FORM FEED */
-#define XKB_KEY_cr                            0x09e4  /* U+240D SYMBOL FOR CARRIAGE RETURN */
-#define XKB_KEY_lf                            0x09e5  /* U+240A SYMBOL FOR LINE FEED */
-#define XKB_KEY_nl                            0x09e8  /* U+2424 SYMBOL FOR NEWLINE */
-#define XKB_KEY_vt                            0x09e9  /* U+240B SYMBOL FOR VERTICAL TABULATION */
-#define XKB_KEY_lowrightcorner                0x09ea  /* U+2518 BOX DRAWINGS LIGHT UP AND LEFT */
-#define XKB_KEY_uprightcorner                 0x09eb  /* U+2510 BOX DRAWINGS LIGHT DOWN AND LEFT */
-#define XKB_KEY_upleftcorner                  0x09ec  /* U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT */
-#define XKB_KEY_lowleftcorner                 0x09ed  /* U+2514 BOX DRAWINGS LIGHT UP AND RIGHT */
-#define XKB_KEY_crossinglines                 0x09ee  /* U+253C BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-#define XKB_KEY_horizlinescan1                0x09ef  /* U+23BA HORIZONTAL SCAN LINE-1 */
-#define XKB_KEY_horizlinescan3                0x09f0  /* U+23BB HORIZONTAL SCAN LINE-3 */
-#define XKB_KEY_horizlinescan5                0x09f1  /* U+2500 BOX DRAWINGS LIGHT HORIZONTAL */
-#define XKB_KEY_horizlinescan7                0x09f2  /* U+23BC HORIZONTAL SCAN LINE-7 */
-#define XKB_KEY_horizlinescan9                0x09f3  /* U+23BD HORIZONTAL SCAN LINE-9 */
-#define XKB_KEY_leftt                         0x09f4  /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-#define XKB_KEY_rightt                        0x09f5  /* U+2524 BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-#define XKB_KEY_bott                          0x09f6  /* U+2534 BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-#define XKB_KEY_topt                          0x09f7  /* U+252C BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-#define XKB_KEY_vertbar                       0x09f8  /* U+2502 BOX DRAWINGS LIGHT VERTICAL */
-
-/*
- * Publishing
- * (these are probably from a long forgotten DEC Publishing
- * font that once shipped with DECwrite)
- * Byte 3 = 0x0a
- */
-
-#define XKB_KEY_emspace                       0x0aa1  /* U+2003 EM SPACE */
-#define XKB_KEY_enspace                       0x0aa2  /* U+2002 EN SPACE */
-#define XKB_KEY_em3space                      0x0aa3  /* U+2004 THREE-PER-EM SPACE */
-#define XKB_KEY_em4space                      0x0aa4  /* U+2005 FOUR-PER-EM SPACE */
-#define XKB_KEY_digitspace                    0x0aa5  /* U+2007 FIGURE SPACE */
-#define XKB_KEY_punctspace                    0x0aa6  /* U+2008 PUNCTUATION SPACE */
-#define XKB_KEY_thinspace                     0x0aa7  /* U+2009 THIN SPACE */
-#define XKB_KEY_hairspace                     0x0aa8  /* U+200A HAIR SPACE */
-#define XKB_KEY_emdash                        0x0aa9  /* U+2014 EM DASH */
-#define XKB_KEY_endash                        0x0aaa  /* U+2013 EN DASH */
-#define XKB_KEY_signifblank                   0x0aac  /*(U+2423 OPEN BOX)*/
-#define XKB_KEY_ellipsis                      0x0aae  /* U+2026 HORIZONTAL ELLIPSIS */
-#define XKB_KEY_doubbaselinedot               0x0aaf  /* U+2025 TWO DOT LEADER */
-#define XKB_KEY_onethird                      0x0ab0  /* U+2153 VULGAR FRACTION ONE THIRD */
-#define XKB_KEY_twothirds                     0x0ab1  /* U+2154 VULGAR FRACTION TWO THIRDS */
-#define XKB_KEY_onefifth                      0x0ab2  /* U+2155 VULGAR FRACTION ONE FIFTH */
-#define XKB_KEY_twofifths                     0x0ab3  /* U+2156 VULGAR FRACTION TWO FIFTHS */
-#define XKB_KEY_threefifths                   0x0ab4  /* U+2157 VULGAR FRACTION THREE FIFTHS */
-#define XKB_KEY_fourfifths                    0x0ab5  /* U+2158 VULGAR FRACTION FOUR FIFTHS */
-#define XKB_KEY_onesixth                      0x0ab6  /* U+2159 VULGAR FRACTION ONE SIXTH */
-#define XKB_KEY_fivesixths                    0x0ab7  /* U+215A VULGAR FRACTION FIVE SIXTHS */
-#define XKB_KEY_careof                        0x0ab8  /* U+2105 CARE OF */
-#define XKB_KEY_figdash                       0x0abb  /* U+2012 FIGURE DASH */
-#define XKB_KEY_leftanglebracket              0x0abc  /*(U+2329 LEFT-POINTING ANGLE BRACKET)*/
-#define XKB_KEY_decimalpoint                  0x0abd  /*(U+002E FULL STOP)*/
-#define XKB_KEY_rightanglebracket             0x0abe  /*(U+232A RIGHT-POINTING ANGLE BRACKET)*/
-#define XKB_KEY_marker                        0x0abf
-#define XKB_KEY_oneeighth                     0x0ac3  /* U+215B VULGAR FRACTION ONE EIGHTH */
-#define XKB_KEY_threeeighths                  0x0ac4  /* U+215C VULGAR FRACTION THREE EIGHTHS */
-#define XKB_KEY_fiveeighths                   0x0ac5  /* U+215D VULGAR FRACTION FIVE EIGHTHS */
-#define XKB_KEY_seveneighths                  0x0ac6  /* U+215E VULGAR FRACTION SEVEN EIGHTHS */
-#define XKB_KEY_trademark                     0x0ac9  /* U+2122 TRADE MARK SIGN */
-#define XKB_KEY_signaturemark                 0x0aca  /*(U+2613 SALTIRE)*/
-#define XKB_KEY_trademarkincircle             0x0acb
-#define XKB_KEY_leftopentriangle              0x0acc  /*(U+25C1 WHITE LEFT-POINTING TRIANGLE)*/
-#define XKB_KEY_rightopentriangle             0x0acd  /*(U+25B7 WHITE RIGHT-POINTING TRIANGLE)*/
-#define XKB_KEY_emopencircle                  0x0ace  /*(U+25CB WHITE CIRCLE)*/
-#define XKB_KEY_emopenrectangle               0x0acf  /*(U+25AF WHITE VERTICAL RECTANGLE)*/
-#define XKB_KEY_leftsinglequotemark           0x0ad0  /* U+2018 LEFT SINGLE QUOTATION MARK */
-#define XKB_KEY_rightsinglequotemark          0x0ad1  /* U+2019 RIGHT SINGLE QUOTATION MARK */
-#define XKB_KEY_leftdoublequotemark           0x0ad2  /* U+201C LEFT DOUBLE QUOTATION MARK */
-#define XKB_KEY_rightdoublequotemark          0x0ad3  /* U+201D RIGHT DOUBLE QUOTATION MARK */
-#define XKB_KEY_prescription                  0x0ad4  /* U+211E PRESCRIPTION TAKE */
-#define XKB_KEY_permille                      0x0ad5  /* U+2030 PER MILLE SIGN */
-#define XKB_KEY_minutes                       0x0ad6  /* U+2032 PRIME */
-#define XKB_KEY_seconds                       0x0ad7  /* U+2033 DOUBLE PRIME */
-#define XKB_KEY_latincross                    0x0ad9  /* U+271D LATIN CROSS */
-#define XKB_KEY_hexagram                      0x0ada
-#define XKB_KEY_filledrectbullet              0x0adb  /*(U+25AC BLACK RECTANGLE)*/
-#define XKB_KEY_filledlefttribullet           0x0adc  /*(U+25C0 BLACK LEFT-POINTING TRIANGLE)*/
-#define XKB_KEY_filledrighttribullet          0x0add  /*(U+25B6 BLACK RIGHT-POINTING TRIANGLE)*/
-#define XKB_KEY_emfilledcircle                0x0ade  /*(U+25CF BLACK CIRCLE)*/
-#define XKB_KEY_emfilledrect                  0x0adf  /*(U+25AE BLACK VERTICAL RECTANGLE)*/
-#define XKB_KEY_enopencircbullet              0x0ae0  /*(U+25E6 WHITE BULLET)*/
-#define XKB_KEY_enopensquarebullet            0x0ae1  /*(U+25AB WHITE SMALL SQUARE)*/
-#define XKB_KEY_openrectbullet                0x0ae2  /*(U+25AD WHITE RECTANGLE)*/
-#define XKB_KEY_opentribulletup               0x0ae3  /*(U+25B3 WHITE UP-POINTING TRIANGLE)*/
-#define XKB_KEY_opentribulletdown             0x0ae4  /*(U+25BD WHITE DOWN-POINTING TRIANGLE)*/
-#define XKB_KEY_openstar                      0x0ae5  /*(U+2606 WHITE STAR)*/
-#define XKB_KEY_enfilledcircbullet            0x0ae6  /*(U+2022 BULLET)*/
-#define XKB_KEY_enfilledsqbullet              0x0ae7  /*(U+25AA BLACK SMALL SQUARE)*/
-#define XKB_KEY_filledtribulletup             0x0ae8  /*(U+25B2 BLACK UP-POINTING TRIANGLE)*/
-#define XKB_KEY_filledtribulletdown           0x0ae9  /*(U+25BC BLACK DOWN-POINTING TRIANGLE)*/
-#define XKB_KEY_leftpointer                   0x0aea  /*(U+261C WHITE LEFT POINTING INDEX)*/
-#define XKB_KEY_rightpointer                  0x0aeb  /*(U+261E WHITE RIGHT POINTING INDEX)*/
-#define XKB_KEY_club                          0x0aec  /* U+2663 BLACK CLUB SUIT */
-#define XKB_KEY_diamond                       0x0aed  /* U+2666 BLACK DIAMOND SUIT */
-#define XKB_KEY_heart                         0x0aee  /* U+2665 BLACK HEART SUIT */
-#define XKB_KEY_maltesecross                  0x0af0  /* U+2720 MALTESE CROSS */
-#define XKB_KEY_dagger                        0x0af1  /* U+2020 DAGGER */
-#define XKB_KEY_doubledagger                  0x0af2  /* U+2021 DOUBLE DAGGER */
-#define XKB_KEY_checkmark                     0x0af3  /* U+2713 CHECK MARK */
-#define XKB_KEY_ballotcross                   0x0af4  /* U+2717 BALLOT X */
-#define XKB_KEY_musicalsharp                  0x0af5  /* U+266F MUSIC SHARP SIGN */
-#define XKB_KEY_musicalflat                   0x0af6  /* U+266D MUSIC FLAT SIGN */
-#define XKB_KEY_malesymbol                    0x0af7  /* U+2642 MALE SIGN */
-#define XKB_KEY_femalesymbol                  0x0af8  /* U+2640 FEMALE SIGN */
-#define XKB_KEY_telephone                     0x0af9  /* U+260E BLACK TELEPHONE */
-#define XKB_KEY_telephonerecorder             0x0afa  /* U+2315 TELEPHONE RECORDER */
-#define XKB_KEY_phonographcopyright           0x0afb  /* U+2117 SOUND RECORDING COPYRIGHT */
-#define XKB_KEY_caret                         0x0afc  /* U+2038 CARET */
-#define XKB_KEY_singlelowquotemark            0x0afd  /* U+201A SINGLE LOW-9 QUOTATION MARK */
-#define XKB_KEY_doublelowquotemark            0x0afe  /* U+201E DOUBLE LOW-9 QUOTATION MARK */
-#define XKB_KEY_cursor                        0x0aff
-
-/*
- * APL
- * Byte 3 = 0x0b
- */
-
-#define XKB_KEY_leftcaret                     0x0ba3  /*(U+003C LESS-THAN SIGN)*/
-#define XKB_KEY_rightcaret                    0x0ba6  /*(U+003E GREATER-THAN SIGN)*/
-#define XKB_KEY_downcaret                     0x0ba8  /*(U+2228 LOGICAL OR)*/
-#define XKB_KEY_upcaret                       0x0ba9  /*(U+2227 LOGICAL AND)*/
-#define XKB_KEY_overbar                       0x0bc0  /*(U+00AF MACRON)*/
-#define XKB_KEY_downtack                      0x0bc2  /* U+22A4 DOWN TACK */
-#define XKB_KEY_upshoe                        0x0bc3  /*(U+2229 INTERSECTION)*/
-#define XKB_KEY_downstile                     0x0bc4  /* U+230A LEFT FLOOR */
-#define XKB_KEY_underbar                      0x0bc6  /*(U+005F LOW LINE)*/
-#define XKB_KEY_jot                           0x0bca  /* U+2218 RING OPERATOR */
-#define XKB_KEY_quad                          0x0bcc  /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
-#define XKB_KEY_uptack                        0x0bce  /* U+22A5 UP TACK */
-#define XKB_KEY_circle                        0x0bcf  /* U+25CB WHITE CIRCLE */
-#define XKB_KEY_upstile                       0x0bd3  /* U+2308 LEFT CEILING */
-#define XKB_KEY_downshoe                      0x0bd6  /*(U+222A UNION)*/
-#define XKB_KEY_rightshoe                     0x0bd8  /*(U+2283 SUPERSET OF)*/
-#define XKB_KEY_leftshoe                      0x0bda  /*(U+2282 SUBSET OF)*/
-#define XKB_KEY_lefttack                      0x0bdc  /* U+22A3 LEFT TACK */
-#define XKB_KEY_righttack                     0x0bfc  /* U+22A2 RIGHT TACK */
-
-/*
- * Hebrew
- * Byte 3 = 0x0c
- */
-
-#define XKB_KEY_hebrew_doublelowline          0x0cdf  /* U+2017 DOUBLE LOW LINE */
-#define XKB_KEY_hebrew_aleph                  0x0ce0  /* U+05D0 HEBREW LETTER ALEF */
-#define XKB_KEY_hebrew_bet                    0x0ce1  /* U+05D1 HEBREW LETTER BET */
-#define XKB_KEY_hebrew_beth                   0x0ce1  /* deprecated */
-#define XKB_KEY_hebrew_gimel                  0x0ce2  /* U+05D2 HEBREW LETTER GIMEL */
-#define XKB_KEY_hebrew_gimmel                 0x0ce2  /* deprecated */
-#define XKB_KEY_hebrew_dalet                  0x0ce3  /* U+05D3 HEBREW LETTER DALET */
-#define XKB_KEY_hebrew_daleth                 0x0ce3  /* deprecated */
-#define XKB_KEY_hebrew_he                     0x0ce4  /* U+05D4 HEBREW LETTER HE */
-#define XKB_KEY_hebrew_waw                    0x0ce5  /* U+05D5 HEBREW LETTER VAV */
-#define XKB_KEY_hebrew_zain                   0x0ce6  /* U+05D6 HEBREW LETTER ZAYIN */
-#define XKB_KEY_hebrew_zayin                  0x0ce6  /* deprecated */
-#define XKB_KEY_hebrew_chet                   0x0ce7  /* U+05D7 HEBREW LETTER HET */
-#define XKB_KEY_hebrew_het                    0x0ce7  /* deprecated */
-#define XKB_KEY_hebrew_tet                    0x0ce8  /* U+05D8 HEBREW LETTER TET */
-#define XKB_KEY_hebrew_teth                   0x0ce8  /* deprecated */
-#define XKB_KEY_hebrew_yod                    0x0ce9  /* U+05D9 HEBREW LETTER YOD */
-#define XKB_KEY_hebrew_finalkaph              0x0cea  /* U+05DA HEBREW LETTER FINAL KAF */
-#define XKB_KEY_hebrew_kaph                   0x0ceb  /* U+05DB HEBREW LETTER KAF */
-#define XKB_KEY_hebrew_lamed                  0x0cec  /* U+05DC HEBREW LETTER LAMED */
-#define XKB_KEY_hebrew_finalmem               0x0ced  /* U+05DD HEBREW LETTER FINAL MEM */
-#define XKB_KEY_hebrew_mem                    0x0cee  /* U+05DE HEBREW LETTER MEM */
-#define XKB_KEY_hebrew_finalnun               0x0cef  /* U+05DF HEBREW LETTER FINAL NUN */
-#define XKB_KEY_hebrew_nun                    0x0cf0  /* U+05E0 HEBREW LETTER NUN */
-#define XKB_KEY_hebrew_samech                 0x0cf1  /* U+05E1 HEBREW LETTER SAMEKH */
-#define XKB_KEY_hebrew_samekh                 0x0cf1  /* deprecated */
-#define XKB_KEY_hebrew_ayin                   0x0cf2  /* U+05E2 HEBREW LETTER AYIN */
-#define XKB_KEY_hebrew_finalpe                0x0cf3  /* U+05E3 HEBREW LETTER FINAL PE */
-#define XKB_KEY_hebrew_pe                     0x0cf4  /* U+05E4 HEBREW LETTER PE */
-#define XKB_KEY_hebrew_finalzade              0x0cf5  /* U+05E5 HEBREW LETTER FINAL TSADI */
-#define XKB_KEY_hebrew_finalzadi              0x0cf5  /* deprecated */
-#define XKB_KEY_hebrew_zade                   0x0cf6  /* U+05E6 HEBREW LETTER TSADI */
-#define XKB_KEY_hebrew_zadi                   0x0cf6  /* deprecated */
-#define XKB_KEY_hebrew_qoph                   0x0cf7  /* U+05E7 HEBREW LETTER QOF */
-#define XKB_KEY_hebrew_kuf                    0x0cf7  /* deprecated */
-#define XKB_KEY_hebrew_resh                   0x0cf8  /* U+05E8 HEBREW LETTER RESH */
-#define XKB_KEY_hebrew_shin                   0x0cf9  /* U+05E9 HEBREW LETTER SHIN */
-#define XKB_KEY_hebrew_taw                    0x0cfa  /* U+05EA HEBREW LETTER TAV */
-#define XKB_KEY_hebrew_taf                    0x0cfa  /* deprecated */
-#define XKB_KEY_Hebrew_switch                 0xff7e  /* Alias for mode_switch */
-
-/*
- * Thai
- * Byte 3 = 0x0d
- */
-
-#define XKB_KEY_Thai_kokai                    0x0da1  /* U+0E01 THAI CHARACTER KO KAI */
-#define XKB_KEY_Thai_khokhai                  0x0da2  /* U+0E02 THAI CHARACTER KHO KHAI */
-#define XKB_KEY_Thai_khokhuat                 0x0da3  /* U+0E03 THAI CHARACTER KHO KHUAT */
-#define XKB_KEY_Thai_khokhwai                 0x0da4  /* U+0E04 THAI CHARACTER KHO KHWAI */
-#define XKB_KEY_Thai_khokhon                  0x0da5  /* U+0E05 THAI CHARACTER KHO KHON */
-#define XKB_KEY_Thai_khorakhang               0x0da6  /* U+0E06 THAI CHARACTER KHO RAKHANG */
-#define XKB_KEY_Thai_ngongu                   0x0da7  /* U+0E07 THAI CHARACTER NGO NGU */
-#define XKB_KEY_Thai_chochan                  0x0da8  /* U+0E08 THAI CHARACTER CHO CHAN */
-#define XKB_KEY_Thai_choching                 0x0da9  /* U+0E09 THAI CHARACTER CHO CHING */
-#define XKB_KEY_Thai_chochang                 0x0daa  /* U+0E0A THAI CHARACTER CHO CHANG */
-#define XKB_KEY_Thai_soso                     0x0dab  /* U+0E0B THAI CHARACTER SO SO */
-#define XKB_KEY_Thai_chochoe                  0x0dac  /* U+0E0C THAI CHARACTER CHO CHOE */
-#define XKB_KEY_Thai_yoying                   0x0dad  /* U+0E0D THAI CHARACTER YO YING */
-#define XKB_KEY_Thai_dochada                  0x0dae  /* U+0E0E THAI CHARACTER DO CHADA */
-#define XKB_KEY_Thai_topatak                  0x0daf  /* U+0E0F THAI CHARACTER TO PATAK */
-#define XKB_KEY_Thai_thothan                  0x0db0  /* U+0E10 THAI CHARACTER THO THAN */
-#define XKB_KEY_Thai_thonangmontho            0x0db1  /* U+0E11 THAI CHARACTER THO NANGMONTHO */
-#define XKB_KEY_Thai_thophuthao               0x0db2  /* U+0E12 THAI CHARACTER THO PHUTHAO */
-#define XKB_KEY_Thai_nonen                    0x0db3  /* U+0E13 THAI CHARACTER NO NEN */
-#define XKB_KEY_Thai_dodek                    0x0db4  /* U+0E14 THAI CHARACTER DO DEK */
-#define XKB_KEY_Thai_totao                    0x0db5  /* U+0E15 THAI CHARACTER TO TAO */
-#define XKB_KEY_Thai_thothung                 0x0db6  /* U+0E16 THAI CHARACTER THO THUNG */
-#define XKB_KEY_Thai_thothahan                0x0db7  /* U+0E17 THAI CHARACTER THO THAHAN */
-#define XKB_KEY_Thai_thothong                 0x0db8  /* U+0E18 THAI CHARACTER THO THONG */
-#define XKB_KEY_Thai_nonu                     0x0db9  /* U+0E19 THAI CHARACTER NO NU */
-#define XKB_KEY_Thai_bobaimai                 0x0dba  /* U+0E1A THAI CHARACTER BO BAIMAI */
-#define XKB_KEY_Thai_popla                    0x0dbb  /* U+0E1B THAI CHARACTER PO PLA */
-#define XKB_KEY_Thai_phophung                 0x0dbc  /* U+0E1C THAI CHARACTER PHO PHUNG */
-#define XKB_KEY_Thai_fofa                     0x0dbd  /* U+0E1D THAI CHARACTER FO FA */
-#define XKB_KEY_Thai_phophan                  0x0dbe  /* U+0E1E THAI CHARACTER PHO PHAN */
-#define XKB_KEY_Thai_fofan                    0x0dbf  /* U+0E1F THAI CHARACTER FO FAN */
-#define XKB_KEY_Thai_phosamphao               0x0dc0  /* U+0E20 THAI CHARACTER PHO SAMPHAO */
-#define XKB_KEY_Thai_moma                     0x0dc1  /* U+0E21 THAI CHARACTER MO MA */
-#define XKB_KEY_Thai_yoyak                    0x0dc2  /* U+0E22 THAI CHARACTER YO YAK */
-#define XKB_KEY_Thai_rorua                    0x0dc3  /* U+0E23 THAI CHARACTER RO RUA */
-#define XKB_KEY_Thai_ru                       0x0dc4  /* U+0E24 THAI CHARACTER RU */
-#define XKB_KEY_Thai_loling                   0x0dc5  /* U+0E25 THAI CHARACTER LO LING */
-#define XKB_KEY_Thai_lu                       0x0dc6  /* U+0E26 THAI CHARACTER LU */
-#define XKB_KEY_Thai_wowaen                   0x0dc7  /* U+0E27 THAI CHARACTER WO WAEN */
-#define XKB_KEY_Thai_sosala                   0x0dc8  /* U+0E28 THAI CHARACTER SO SALA */
-#define XKB_KEY_Thai_sorusi                   0x0dc9  /* U+0E29 THAI CHARACTER SO RUSI */
-#define XKB_KEY_Thai_sosua                    0x0dca  /* U+0E2A THAI CHARACTER SO SUA */
-#define XKB_KEY_Thai_hohip                    0x0dcb  /* U+0E2B THAI CHARACTER HO HIP */
-#define XKB_KEY_Thai_lochula                  0x0dcc  /* U+0E2C THAI CHARACTER LO CHULA */
-#define XKB_KEY_Thai_oang                     0x0dcd  /* U+0E2D THAI CHARACTER O ANG */
-#define XKB_KEY_Thai_honokhuk                 0x0dce  /* U+0E2E THAI CHARACTER HO NOKHUK */
-#define XKB_KEY_Thai_paiyannoi                0x0dcf  /* U+0E2F THAI CHARACTER PAIYANNOI */
-#define XKB_KEY_Thai_saraa                    0x0dd0  /* U+0E30 THAI CHARACTER SARA A */
-#define XKB_KEY_Thai_maihanakat               0x0dd1  /* U+0E31 THAI CHARACTER MAI HAN-AKAT */
-#define XKB_KEY_Thai_saraaa                   0x0dd2  /* U+0E32 THAI CHARACTER SARA AA */
-#define XKB_KEY_Thai_saraam                   0x0dd3  /* U+0E33 THAI CHARACTER SARA AM */
-#define XKB_KEY_Thai_sarai                    0x0dd4  /* U+0E34 THAI CHARACTER SARA I */
-#define XKB_KEY_Thai_saraii                   0x0dd5  /* U+0E35 THAI CHARACTER SARA II */
-#define XKB_KEY_Thai_saraue                   0x0dd6  /* U+0E36 THAI CHARACTER SARA UE */
-#define XKB_KEY_Thai_sarauee                  0x0dd7  /* U+0E37 THAI CHARACTER SARA UEE */
-#define XKB_KEY_Thai_sarau                    0x0dd8  /* U+0E38 THAI CHARACTER SARA U */
-#define XKB_KEY_Thai_sarauu                   0x0dd9  /* U+0E39 THAI CHARACTER SARA UU */
-#define XKB_KEY_Thai_phinthu                  0x0dda  /* U+0E3A THAI CHARACTER PHINTHU */
-#define XKB_KEY_Thai_maihanakat_maitho        0x0dde
-#define XKB_KEY_Thai_baht                     0x0ddf  /* U+0E3F THAI CURRENCY SYMBOL BAHT */
-#define XKB_KEY_Thai_sarae                    0x0de0  /* U+0E40 THAI CHARACTER SARA E */
-#define XKB_KEY_Thai_saraae                   0x0de1  /* U+0E41 THAI CHARACTER SARA AE */
-#define XKB_KEY_Thai_sarao                    0x0de2  /* U+0E42 THAI CHARACTER SARA O */
-#define XKB_KEY_Thai_saraaimaimuan            0x0de3  /* U+0E43 THAI CHARACTER SARA AI MAIMUAN */
-#define XKB_KEY_Thai_saraaimaimalai           0x0de4  /* U+0E44 THAI CHARACTER SARA AI MAIMALAI */
-#define XKB_KEY_Thai_lakkhangyao              0x0de5  /* U+0E45 THAI CHARACTER LAKKHANGYAO */
-#define XKB_KEY_Thai_maiyamok                 0x0de6  /* U+0E46 THAI CHARACTER MAIYAMOK */
-#define XKB_KEY_Thai_maitaikhu                0x0de7  /* U+0E47 THAI CHARACTER MAITAIKHU */
-#define XKB_KEY_Thai_maiek                    0x0de8  /* U+0E48 THAI CHARACTER MAI EK */
-#define XKB_KEY_Thai_maitho                   0x0de9  /* U+0E49 THAI CHARACTER MAI THO */
-#define XKB_KEY_Thai_maitri                   0x0dea  /* U+0E4A THAI CHARACTER MAI TRI */
-#define XKB_KEY_Thai_maichattawa              0x0deb  /* U+0E4B THAI CHARACTER MAI CHATTAWA */
-#define XKB_KEY_Thai_thanthakhat              0x0dec  /* U+0E4C THAI CHARACTER THANTHAKHAT */
-#define XKB_KEY_Thai_nikhahit                 0x0ded  /* U+0E4D THAI CHARACTER NIKHAHIT */
-#define XKB_KEY_Thai_leksun                   0x0df0  /* U+0E50 THAI DIGIT ZERO */
-#define XKB_KEY_Thai_leknung                  0x0df1  /* U+0E51 THAI DIGIT ONE */
-#define XKB_KEY_Thai_leksong                  0x0df2  /* U+0E52 THAI DIGIT TWO */
-#define XKB_KEY_Thai_leksam                   0x0df3  /* U+0E53 THAI DIGIT THREE */
-#define XKB_KEY_Thai_leksi                    0x0df4  /* U+0E54 THAI DIGIT FOUR */
-#define XKB_KEY_Thai_lekha                    0x0df5  /* U+0E55 THAI DIGIT FIVE */
-#define XKB_KEY_Thai_lekhok                   0x0df6  /* U+0E56 THAI DIGIT SIX */
-#define XKB_KEY_Thai_lekchet                  0x0df7  /* U+0E57 THAI DIGIT SEVEN */
-#define XKB_KEY_Thai_lekpaet                  0x0df8  /* U+0E58 THAI DIGIT EIGHT */
-#define XKB_KEY_Thai_lekkao                   0x0df9  /* U+0E59 THAI DIGIT NINE */
-
-/*
- * Korean
- * Byte 3 = 0x0e
- */
-
-
-#define XKB_KEY_Hangul                        0xff31  /* Hangul start/stop(toggle) */
-#define XKB_KEY_Hangul_Start                  0xff32  /* Hangul start */
-#define XKB_KEY_Hangul_End                    0xff33  /* Hangul end, English start */
-#define XKB_KEY_Hangul_Hanja                  0xff34  /* Start Hangul->Hanja Conversion */
-#define XKB_KEY_Hangul_Jamo                   0xff35  /* Hangul Jamo mode */
-#define XKB_KEY_Hangul_Romaja                 0xff36  /* Hangul Romaja mode */
-#define XKB_KEY_Hangul_Codeinput              0xff37  /* Hangul code input mode */
-#define XKB_KEY_Hangul_Jeonja                 0xff38  /* Jeonja mode */
-#define XKB_KEY_Hangul_Banja                  0xff39  /* Banja mode */
-#define XKB_KEY_Hangul_PreHanja               0xff3a  /* Pre Hanja conversion */
-#define XKB_KEY_Hangul_PostHanja              0xff3b  /* Post Hanja conversion */
-#define XKB_KEY_Hangul_SingleCandidate        0xff3c  /* Single candidate */
-#define XKB_KEY_Hangul_MultipleCandidate      0xff3d  /* Multiple candidate */
-#define XKB_KEY_Hangul_PreviousCandidate      0xff3e  /* Previous candidate */
-#define XKB_KEY_Hangul_Special                0xff3f  /* Special symbols */
-#define XKB_KEY_Hangul_switch                 0xff7e  /* Alias for mode_switch */
-
-/* Hangul Consonant Characters */
-#define XKB_KEY_Hangul_Kiyeog                 0x0ea1  /* U+3131 HANGUL LETTER KIYEOK */
-#define XKB_KEY_Hangul_SsangKiyeog            0x0ea2  /* U+3132 HANGUL LETTER SSANGKIYEOK */
-#define XKB_KEY_Hangul_KiyeogSios             0x0ea3  /* U+3133 HANGUL LETTER KIYEOK-SIOS */
-#define XKB_KEY_Hangul_Nieun                  0x0ea4  /* U+3134 HANGUL LETTER NIEUN */
-#define XKB_KEY_Hangul_NieunJieuj             0x0ea5  /* U+3135 HANGUL LETTER NIEUN-CIEUC */
-#define XKB_KEY_Hangul_NieunHieuh             0x0ea6  /* U+3136 HANGUL LETTER NIEUN-HIEUH */
-#define XKB_KEY_Hangul_Dikeud                 0x0ea7  /* U+3137 HANGUL LETTER TIKEUT */
-#define XKB_KEY_Hangul_SsangDikeud            0x0ea8  /* U+3138 HANGUL LETTER SSANGTIKEUT */
-#define XKB_KEY_Hangul_Rieul                  0x0ea9  /* U+3139 HANGUL LETTER RIEUL */
-#define XKB_KEY_Hangul_RieulKiyeog            0x0eaa  /* U+313A HANGUL LETTER RIEUL-KIYEOK */
-#define XKB_KEY_Hangul_RieulMieum             0x0eab  /* U+313B HANGUL LETTER RIEUL-MIEUM */
-#define XKB_KEY_Hangul_RieulPieub             0x0eac  /* U+313C HANGUL LETTER RIEUL-PIEUP */
-#define XKB_KEY_Hangul_RieulSios              0x0ead  /* U+313D HANGUL LETTER RIEUL-SIOS */
-#define XKB_KEY_Hangul_RieulTieut             0x0eae  /* U+313E HANGUL LETTER RIEUL-THIEUTH */
-#define XKB_KEY_Hangul_RieulPhieuf            0x0eaf  /* U+313F HANGUL LETTER RIEUL-PHIEUPH */
-#define XKB_KEY_Hangul_RieulHieuh             0x0eb0  /* U+3140 HANGUL LETTER RIEUL-HIEUH */
-#define XKB_KEY_Hangul_Mieum                  0x0eb1  /* U+3141 HANGUL LETTER MIEUM */
-#define XKB_KEY_Hangul_Pieub                  0x0eb2  /* U+3142 HANGUL LETTER PIEUP */
-#define XKB_KEY_Hangul_SsangPieub             0x0eb3  /* U+3143 HANGUL LETTER SSANGPIEUP */
-#define XKB_KEY_Hangul_PieubSios              0x0eb4  /* U+3144 HANGUL LETTER PIEUP-SIOS */
-#define XKB_KEY_Hangul_Sios                   0x0eb5  /* U+3145 HANGUL LETTER SIOS */
-#define XKB_KEY_Hangul_SsangSios              0x0eb6  /* U+3146 HANGUL LETTER SSANGSIOS */
-#define XKB_KEY_Hangul_Ieung                  0x0eb7  /* U+3147 HANGUL LETTER IEUNG */
-#define XKB_KEY_Hangul_Jieuj                  0x0eb8  /* U+3148 HANGUL LETTER CIEUC */
-#define XKB_KEY_Hangul_SsangJieuj             0x0eb9  /* U+3149 HANGUL LETTER SSANGCIEUC */
-#define XKB_KEY_Hangul_Cieuc                  0x0eba  /* U+314A HANGUL LETTER CHIEUCH */
-#define XKB_KEY_Hangul_Khieuq                 0x0ebb  /* U+314B HANGUL LETTER KHIEUKH */
-#define XKB_KEY_Hangul_Tieut                  0x0ebc  /* U+314C HANGUL LETTER THIEUTH */
-#define XKB_KEY_Hangul_Phieuf                 0x0ebd  /* U+314D HANGUL LETTER PHIEUPH */
-#define XKB_KEY_Hangul_Hieuh                  0x0ebe  /* U+314E HANGUL LETTER HIEUH */
-
-/* Hangul Vowel Characters */
-#define XKB_KEY_Hangul_A                      0x0ebf  /* U+314F HANGUL LETTER A */
-#define XKB_KEY_Hangul_AE                     0x0ec0  /* U+3150 HANGUL LETTER AE */
-#define XKB_KEY_Hangul_YA                     0x0ec1  /* U+3151 HANGUL LETTER YA */
-#define XKB_KEY_Hangul_YAE                    0x0ec2  /* U+3152 HANGUL LETTER YAE */
-#define XKB_KEY_Hangul_EO                     0x0ec3  /* U+3153 HANGUL LETTER EO */
-#define XKB_KEY_Hangul_E                      0x0ec4  /* U+3154 HANGUL LETTER E */
-#define XKB_KEY_Hangul_YEO                    0x0ec5  /* U+3155 HANGUL LETTER YEO */
-#define XKB_KEY_Hangul_YE                     0x0ec6  /* U+3156 HANGUL LETTER YE */
-#define XKB_KEY_Hangul_O                      0x0ec7  /* U+3157 HANGUL LETTER O */
-#define XKB_KEY_Hangul_WA                     0x0ec8  /* U+3158 HANGUL LETTER WA */
-#define XKB_KEY_Hangul_WAE                    0x0ec9  /* U+3159 HANGUL LETTER WAE */
-#define XKB_KEY_Hangul_OE                     0x0eca  /* U+315A HANGUL LETTER OE */
-#define XKB_KEY_Hangul_YO                     0x0ecb  /* U+315B HANGUL LETTER YO */
-#define XKB_KEY_Hangul_U                      0x0ecc  /* U+315C HANGUL LETTER U */
-#define XKB_KEY_Hangul_WEO                    0x0ecd  /* U+315D HANGUL LETTER WEO */
-#define XKB_KEY_Hangul_WE                     0x0ece  /* U+315E HANGUL LETTER WE */
-#define XKB_KEY_Hangul_WI                     0x0ecf  /* U+315F HANGUL LETTER WI */
-#define XKB_KEY_Hangul_YU                     0x0ed0  /* U+3160 HANGUL LETTER YU */
-#define XKB_KEY_Hangul_EU                     0x0ed1  /* U+3161 HANGUL LETTER EU */
-#define XKB_KEY_Hangul_YI                     0x0ed2  /* U+3162 HANGUL LETTER YI */
-#define XKB_KEY_Hangul_I                      0x0ed3  /* U+3163 HANGUL LETTER I */
-
-/* Hangul syllable-final (JongSeong) Characters */
-#define XKB_KEY_Hangul_J_Kiyeog               0x0ed4  /* U+11A8 HANGUL JONGSEONG KIYEOK */
-#define XKB_KEY_Hangul_J_SsangKiyeog          0x0ed5  /* U+11A9 HANGUL JONGSEONG SSANGKIYEOK */
-#define XKB_KEY_Hangul_J_KiyeogSios           0x0ed6  /* U+11AA HANGUL JONGSEONG KIYEOK-SIOS */
-#define XKB_KEY_Hangul_J_Nieun                0x0ed7  /* U+11AB HANGUL JONGSEONG NIEUN */
-#define XKB_KEY_Hangul_J_NieunJieuj           0x0ed8  /* U+11AC HANGUL JONGSEONG NIEUN-CIEUC */
-#define XKB_KEY_Hangul_J_NieunHieuh           0x0ed9  /* U+11AD HANGUL JONGSEONG NIEUN-HIEUH */
-#define XKB_KEY_Hangul_J_Dikeud               0x0eda  /* U+11AE HANGUL JONGSEONG TIKEUT */
-#define XKB_KEY_Hangul_J_Rieul                0x0edb  /* U+11AF HANGUL JONGSEONG RIEUL */
-#define XKB_KEY_Hangul_J_RieulKiyeog          0x0edc  /* U+11B0 HANGUL JONGSEONG RIEUL-KIYEOK */
-#define XKB_KEY_Hangul_J_RieulMieum           0x0edd  /* U+11B1 HANGUL JONGSEONG RIEUL-MIEUM */
-#define XKB_KEY_Hangul_J_RieulPieub           0x0ede  /* U+11B2 HANGUL JONGSEONG RIEUL-PIEUP */
-#define XKB_KEY_Hangul_J_RieulSios            0x0edf  /* U+11B3 HANGUL JONGSEONG RIEUL-SIOS */
-#define XKB_KEY_Hangul_J_RieulTieut           0x0ee0  /* U+11B4 HANGUL JONGSEONG RIEUL-THIEUTH */
-#define XKB_KEY_Hangul_J_RieulPhieuf          0x0ee1  /* U+11B5 HANGUL JONGSEONG RIEUL-PHIEUPH */
-#define XKB_KEY_Hangul_J_RieulHieuh           0x0ee2  /* U+11B6 HANGUL JONGSEONG RIEUL-HIEUH */
-#define XKB_KEY_Hangul_J_Mieum                0x0ee3  /* U+11B7 HANGUL JONGSEONG MIEUM */
-#define XKB_KEY_Hangul_J_Pieub                0x0ee4  /* U+11B8 HANGUL JONGSEONG PIEUP */
-#define XKB_KEY_Hangul_J_PieubSios            0x0ee5  /* U+11B9 HANGUL JONGSEONG PIEUP-SIOS */
-#define XKB_KEY_Hangul_J_Sios                 0x0ee6  /* U+11BA HANGUL JONGSEONG SIOS */
-#define XKB_KEY_Hangul_J_SsangSios            0x0ee7  /* U+11BB HANGUL JONGSEONG SSANGSIOS */
-#define XKB_KEY_Hangul_J_Ieung                0x0ee8  /* U+11BC HANGUL JONGSEONG IEUNG */
-#define XKB_KEY_Hangul_J_Jieuj                0x0ee9  /* U+11BD HANGUL JONGSEONG CIEUC */
-#define XKB_KEY_Hangul_J_Cieuc                0x0eea  /* U+11BE HANGUL JONGSEONG CHIEUCH */
-#define XKB_KEY_Hangul_J_Khieuq               0x0eeb  /* U+11BF HANGUL JONGSEONG KHIEUKH */
-#define XKB_KEY_Hangul_J_Tieut                0x0eec  /* U+11C0 HANGUL JONGSEONG THIEUTH */
-#define XKB_KEY_Hangul_J_Phieuf               0x0eed  /* U+11C1 HANGUL JONGSEONG PHIEUPH */
-#define XKB_KEY_Hangul_J_Hieuh                0x0eee  /* U+11C2 HANGUL JONGSEONG HIEUH */
-
-/* Ancient Hangul Consonant Characters */
-#define XKB_KEY_Hangul_RieulYeorinHieuh       0x0eef  /* U+316D HANGUL LETTER RIEUL-YEORINHIEUH */
-#define XKB_KEY_Hangul_SunkyeongeumMieum      0x0ef0  /* U+3171 HANGUL LETTER KAPYEOUNMIEUM */
-#define XKB_KEY_Hangul_SunkyeongeumPieub      0x0ef1  /* U+3178 HANGUL LETTER KAPYEOUNPIEUP */
-#define XKB_KEY_Hangul_PanSios                0x0ef2  /* U+317F HANGUL LETTER PANSIOS */
-#define XKB_KEY_Hangul_KkogjiDalrinIeung      0x0ef3  /* U+3181 HANGUL LETTER YESIEUNG */
-#define XKB_KEY_Hangul_SunkyeongeumPhieuf     0x0ef4  /* U+3184 HANGUL LETTER KAPYEOUNPHIEUPH */
-#define XKB_KEY_Hangul_YeorinHieuh            0x0ef5  /* U+3186 HANGUL LETTER YEORINHIEUH */
-
-/* Ancient Hangul Vowel Characters */
-#define XKB_KEY_Hangul_AraeA                  0x0ef6  /* U+318D HANGUL LETTER ARAEA */
-#define XKB_KEY_Hangul_AraeAE                 0x0ef7  /* U+318E HANGUL LETTER ARAEAE */
-
-/* Ancient Hangul syllable-final (JongSeong) Characters */
-#define XKB_KEY_Hangul_J_PanSios              0x0ef8  /* U+11EB HANGUL JONGSEONG PANSIOS */
-#define XKB_KEY_Hangul_J_KkogjiDalrinIeung    0x0ef9  /* U+11F0 HANGUL JONGSEONG YESIEUNG */
-#define XKB_KEY_Hangul_J_YeorinHieuh          0x0efa  /* U+11F9 HANGUL JONGSEONG YEORINHIEUH */
-
-/* Korean currency symbol */
-#define XKB_KEY_Korean_Won                    0x0eff  /*(U+20A9 WON SIGN)*/
-
-
-/*
- * Armenian
- */
-
-#define XKB_KEY_Armenian_ligature_ew       0x1000587  /* U+0587 ARMENIAN SMALL LIGATURE ECH YIWN */
-#define XKB_KEY_Armenian_full_stop         0x1000589  /* U+0589 ARMENIAN FULL STOP */
-#define XKB_KEY_Armenian_verjaket          0x1000589  /* U+0589 ARMENIAN FULL STOP */
-#define XKB_KEY_Armenian_separation_mark   0x100055d  /* U+055D ARMENIAN COMMA */
-#define XKB_KEY_Armenian_but               0x100055d  /* U+055D ARMENIAN COMMA */
-#define XKB_KEY_Armenian_hyphen            0x100058a  /* U+058A ARMENIAN HYPHEN */
-#define XKB_KEY_Armenian_yentamna          0x100058a  /* U+058A ARMENIAN HYPHEN */
-#define XKB_KEY_Armenian_exclam            0x100055c  /* U+055C ARMENIAN EXCLAMATION MARK */
-#define XKB_KEY_Armenian_amanak            0x100055c  /* U+055C ARMENIAN EXCLAMATION MARK */
-#define XKB_KEY_Armenian_accent            0x100055b  /* U+055B ARMENIAN EMPHASIS MARK */
-#define XKB_KEY_Armenian_shesht            0x100055b  /* U+055B ARMENIAN EMPHASIS MARK */
-#define XKB_KEY_Armenian_question          0x100055e  /* U+055E ARMENIAN QUESTION MARK */
-#define XKB_KEY_Armenian_paruyk            0x100055e  /* U+055E ARMENIAN QUESTION MARK */
-#define XKB_KEY_Armenian_AYB               0x1000531  /* U+0531 ARMENIAN CAPITAL LETTER AYB */
-#define XKB_KEY_Armenian_ayb               0x1000561  /* U+0561 ARMENIAN SMALL LETTER AYB */
-#define XKB_KEY_Armenian_BEN               0x1000532  /* U+0532 ARMENIAN CAPITAL LETTER BEN */
-#define XKB_KEY_Armenian_ben               0x1000562  /* U+0562 ARMENIAN SMALL LETTER BEN */
-#define XKB_KEY_Armenian_GIM               0x1000533  /* U+0533 ARMENIAN CAPITAL LETTER GIM */
-#define XKB_KEY_Armenian_gim               0x1000563  /* U+0563 ARMENIAN SMALL LETTER GIM */
-#define XKB_KEY_Armenian_DA                0x1000534  /* U+0534 ARMENIAN CAPITAL LETTER DA */
-#define XKB_KEY_Armenian_da                0x1000564  /* U+0564 ARMENIAN SMALL LETTER DA */
-#define XKB_KEY_Armenian_YECH              0x1000535  /* U+0535 ARMENIAN CAPITAL LETTER ECH */
-#define XKB_KEY_Armenian_yech              0x1000565  /* U+0565 ARMENIAN SMALL LETTER ECH */
-#define XKB_KEY_Armenian_ZA                0x1000536  /* U+0536 ARMENIAN CAPITAL LETTER ZA */
-#define XKB_KEY_Armenian_za                0x1000566  /* U+0566 ARMENIAN SMALL LETTER ZA */
-#define XKB_KEY_Armenian_E                 0x1000537  /* U+0537 ARMENIAN CAPITAL LETTER EH */
-#define XKB_KEY_Armenian_e                 0x1000567  /* U+0567 ARMENIAN SMALL LETTER EH */
-#define XKB_KEY_Armenian_AT                0x1000538  /* U+0538 ARMENIAN CAPITAL LETTER ET */
-#define XKB_KEY_Armenian_at                0x1000568  /* U+0568 ARMENIAN SMALL LETTER ET */
-#define XKB_KEY_Armenian_TO                0x1000539  /* U+0539 ARMENIAN CAPITAL LETTER TO */
-#define XKB_KEY_Armenian_to                0x1000569  /* U+0569 ARMENIAN SMALL LETTER TO */
-#define XKB_KEY_Armenian_ZHE               0x100053a  /* U+053A ARMENIAN CAPITAL LETTER ZHE */
-#define XKB_KEY_Armenian_zhe               0x100056a  /* U+056A ARMENIAN SMALL LETTER ZHE */
-#define XKB_KEY_Armenian_INI               0x100053b  /* U+053B ARMENIAN CAPITAL LETTER INI */
-#define XKB_KEY_Armenian_ini               0x100056b  /* U+056B ARMENIAN SMALL LETTER INI */
-#define XKB_KEY_Armenian_LYUN              0x100053c  /* U+053C ARMENIAN CAPITAL LETTER LIWN */
-#define XKB_KEY_Armenian_lyun              0x100056c  /* U+056C ARMENIAN SMALL LETTER LIWN */
-#define XKB_KEY_Armenian_KHE               0x100053d  /* U+053D ARMENIAN CAPITAL LETTER XEH */
-#define XKB_KEY_Armenian_khe               0x100056d  /* U+056D ARMENIAN SMALL LETTER XEH */
-#define XKB_KEY_Armenian_TSA               0x100053e  /* U+053E ARMENIAN CAPITAL LETTER CA */
-#define XKB_KEY_Armenian_tsa               0x100056e  /* U+056E ARMENIAN SMALL LETTER CA */
-#define XKB_KEY_Armenian_KEN               0x100053f  /* U+053F ARMENIAN CAPITAL LETTER KEN */
-#define XKB_KEY_Armenian_ken               0x100056f  /* U+056F ARMENIAN SMALL LETTER KEN */
-#define XKB_KEY_Armenian_HO                0x1000540  /* U+0540 ARMENIAN CAPITAL LETTER HO */
-#define XKB_KEY_Armenian_ho                0x1000570  /* U+0570 ARMENIAN SMALL LETTER HO */
-#define XKB_KEY_Armenian_DZA               0x1000541  /* U+0541 ARMENIAN CAPITAL LETTER JA */
-#define XKB_KEY_Armenian_dza               0x1000571  /* U+0571 ARMENIAN SMALL LETTER JA */
-#define XKB_KEY_Armenian_GHAT              0x1000542  /* U+0542 ARMENIAN CAPITAL LETTER GHAD */
-#define XKB_KEY_Armenian_ghat              0x1000572  /* U+0572 ARMENIAN SMALL LETTER GHAD */
-#define XKB_KEY_Armenian_TCHE              0x1000543  /* U+0543 ARMENIAN CAPITAL LETTER CHEH */
-#define XKB_KEY_Armenian_tche              0x1000573  /* U+0573 ARMENIAN SMALL LETTER CHEH */
-#define XKB_KEY_Armenian_MEN               0x1000544  /* U+0544 ARMENIAN CAPITAL LETTER MEN */
-#define XKB_KEY_Armenian_men               0x1000574  /* U+0574 ARMENIAN SMALL LETTER MEN */
-#define XKB_KEY_Armenian_HI                0x1000545  /* U+0545 ARMENIAN CAPITAL LETTER YI */
-#define XKB_KEY_Armenian_hi                0x1000575  /* U+0575 ARMENIAN SMALL LETTER YI */
-#define XKB_KEY_Armenian_NU                0x1000546  /* U+0546 ARMENIAN CAPITAL LETTER NOW */
-#define XKB_KEY_Armenian_nu                0x1000576  /* U+0576 ARMENIAN SMALL LETTER NOW */
-#define XKB_KEY_Armenian_SHA               0x1000547  /* U+0547 ARMENIAN CAPITAL LETTER SHA */
-#define XKB_KEY_Armenian_sha               0x1000577  /* U+0577 ARMENIAN SMALL LETTER SHA */
-#define XKB_KEY_Armenian_VO                0x1000548  /* U+0548 ARMENIAN CAPITAL LETTER VO */
-#define XKB_KEY_Armenian_vo                0x1000578  /* U+0578 ARMENIAN SMALL LETTER VO */
-#define XKB_KEY_Armenian_CHA               0x1000549  /* U+0549 ARMENIAN CAPITAL LETTER CHA */
-#define XKB_KEY_Armenian_cha               0x1000579  /* U+0579 ARMENIAN SMALL LETTER CHA */
-#define XKB_KEY_Armenian_PE                0x100054a  /* U+054A ARMENIAN CAPITAL LETTER PEH */
-#define XKB_KEY_Armenian_pe                0x100057a  /* U+057A ARMENIAN SMALL LETTER PEH */
-#define XKB_KEY_Armenian_JE                0x100054b  /* U+054B ARMENIAN CAPITAL LETTER JHEH */
-#define XKB_KEY_Armenian_je                0x100057b  /* U+057B ARMENIAN SMALL LETTER JHEH */
-#define XKB_KEY_Armenian_RA                0x100054c  /* U+054C ARMENIAN CAPITAL LETTER RA */
-#define XKB_KEY_Armenian_ra                0x100057c  /* U+057C ARMENIAN SMALL LETTER RA */
-#define XKB_KEY_Armenian_SE                0x100054d  /* U+054D ARMENIAN CAPITAL LETTER SEH */
-#define XKB_KEY_Armenian_se                0x100057d  /* U+057D ARMENIAN SMALL LETTER SEH */
-#define XKB_KEY_Armenian_VEV               0x100054e  /* U+054E ARMENIAN CAPITAL LETTER VEW */
-#define XKB_KEY_Armenian_vev               0x100057e  /* U+057E ARMENIAN SMALL LETTER VEW */
-#define XKB_KEY_Armenian_TYUN              0x100054f  /* U+054F ARMENIAN CAPITAL LETTER TIWN */
-#define XKB_KEY_Armenian_tyun              0x100057f  /* U+057F ARMENIAN SMALL LETTER TIWN */
-#define XKB_KEY_Armenian_RE                0x1000550  /* U+0550 ARMENIAN CAPITAL LETTER REH */
-#define XKB_KEY_Armenian_re                0x1000580  /* U+0580 ARMENIAN SMALL LETTER REH */
-#define XKB_KEY_Armenian_TSO               0x1000551  /* U+0551 ARMENIAN CAPITAL LETTER CO */
-#define XKB_KEY_Armenian_tso               0x1000581  /* U+0581 ARMENIAN SMALL LETTER CO */
-#define XKB_KEY_Armenian_VYUN              0x1000552  /* U+0552 ARMENIAN CAPITAL LETTER YIWN */
-#define XKB_KEY_Armenian_vyun              0x1000582  /* U+0582 ARMENIAN SMALL LETTER YIWN */
-#define XKB_KEY_Armenian_PYUR              0x1000553  /* U+0553 ARMENIAN CAPITAL LETTER PIWR */
-#define XKB_KEY_Armenian_pyur              0x1000583  /* U+0583 ARMENIAN SMALL LETTER PIWR */
-#define XKB_KEY_Armenian_KE                0x1000554  /* U+0554 ARMENIAN CAPITAL LETTER KEH */
-#define XKB_KEY_Armenian_ke                0x1000584  /* U+0584 ARMENIAN SMALL LETTER KEH */
-#define XKB_KEY_Armenian_O                 0x1000555  /* U+0555 ARMENIAN CAPITAL LETTER OH */
-#define XKB_KEY_Armenian_o                 0x1000585  /* U+0585 ARMENIAN SMALL LETTER OH */
-#define XKB_KEY_Armenian_FE                0x1000556  /* U+0556 ARMENIAN CAPITAL LETTER FEH */
-#define XKB_KEY_Armenian_fe                0x1000586  /* U+0586 ARMENIAN SMALL LETTER FEH */
-#define XKB_KEY_Armenian_apostrophe        0x100055a  /* U+055A ARMENIAN APOSTROPHE */
-
-/*
- * Georgian
- */
-
-#define XKB_KEY_Georgian_an                0x10010d0  /* U+10D0 GEORGIAN LETTER AN */
-#define XKB_KEY_Georgian_ban               0x10010d1  /* U+10D1 GEORGIAN LETTER BAN */
-#define XKB_KEY_Georgian_gan               0x10010d2  /* U+10D2 GEORGIAN LETTER GAN */
-#define XKB_KEY_Georgian_don               0x10010d3  /* U+10D3 GEORGIAN LETTER DON */
-#define XKB_KEY_Georgian_en                0x10010d4  /* U+10D4 GEORGIAN LETTER EN */
-#define XKB_KEY_Georgian_vin               0x10010d5  /* U+10D5 GEORGIAN LETTER VIN */
-#define XKB_KEY_Georgian_zen               0x10010d6  /* U+10D6 GEORGIAN LETTER ZEN */
-#define XKB_KEY_Georgian_tan               0x10010d7  /* U+10D7 GEORGIAN LETTER TAN */
-#define XKB_KEY_Georgian_in                0x10010d8  /* U+10D8 GEORGIAN LETTER IN */
-#define XKB_KEY_Georgian_kan               0x10010d9  /* U+10D9 GEORGIAN LETTER KAN */
-#define XKB_KEY_Georgian_las               0x10010da  /* U+10DA GEORGIAN LETTER LAS */
-#define XKB_KEY_Georgian_man               0x10010db  /* U+10DB GEORGIAN LETTER MAN */
-#define XKB_KEY_Georgian_nar               0x10010dc  /* U+10DC GEORGIAN LETTER NAR */
-#define XKB_KEY_Georgian_on                0x10010dd  /* U+10DD GEORGIAN LETTER ON */
-#define XKB_KEY_Georgian_par               0x10010de  /* U+10DE GEORGIAN LETTER PAR */
-#define XKB_KEY_Georgian_zhar              0x10010df  /* U+10DF GEORGIAN LETTER ZHAR */
-#define XKB_KEY_Georgian_rae               0x10010e0  /* U+10E0 GEORGIAN LETTER RAE */
-#define XKB_KEY_Georgian_san               0x10010e1  /* U+10E1 GEORGIAN LETTER SAN */
-#define XKB_KEY_Georgian_tar               0x10010e2  /* U+10E2 GEORGIAN LETTER TAR */
-#define XKB_KEY_Georgian_un                0x10010e3  /* U+10E3 GEORGIAN LETTER UN */
-#define XKB_KEY_Georgian_phar              0x10010e4  /* U+10E4 GEORGIAN LETTER PHAR */
-#define XKB_KEY_Georgian_khar              0x10010e5  /* U+10E5 GEORGIAN LETTER KHAR */
-#define XKB_KEY_Georgian_ghan              0x10010e6  /* U+10E6 GEORGIAN LETTER GHAN */
-#define XKB_KEY_Georgian_qar               0x10010e7  /* U+10E7 GEORGIAN LETTER QAR */
-#define XKB_KEY_Georgian_shin              0x10010e8  /* U+10E8 GEORGIAN LETTER SHIN */
-#define XKB_KEY_Georgian_chin              0x10010e9  /* U+10E9 GEORGIAN LETTER CHIN */
-#define XKB_KEY_Georgian_can               0x10010ea  /* U+10EA GEORGIAN LETTER CAN */
-#define XKB_KEY_Georgian_jil               0x10010eb  /* U+10EB GEORGIAN LETTER JIL */
-#define XKB_KEY_Georgian_cil               0x10010ec  /* U+10EC GEORGIAN LETTER CIL */
-#define XKB_KEY_Georgian_char              0x10010ed  /* U+10ED GEORGIAN LETTER CHAR */
-#define XKB_KEY_Georgian_xan               0x10010ee  /* U+10EE GEORGIAN LETTER XAN */
-#define XKB_KEY_Georgian_jhan              0x10010ef  /* U+10EF GEORGIAN LETTER JHAN */
-#define XKB_KEY_Georgian_hae               0x10010f0  /* U+10F0 GEORGIAN LETTER HAE */
-#define XKB_KEY_Georgian_he                0x10010f1  /* U+10F1 GEORGIAN LETTER HE */
-#define XKB_KEY_Georgian_hie               0x10010f2  /* U+10F2 GEORGIAN LETTER HIE */
-#define XKB_KEY_Georgian_we                0x10010f3  /* U+10F3 GEORGIAN LETTER WE */
-#define XKB_KEY_Georgian_har               0x10010f4  /* U+10F4 GEORGIAN LETTER HAR */
-#define XKB_KEY_Georgian_hoe               0x10010f5  /* U+10F5 GEORGIAN LETTER HOE */
-#define XKB_KEY_Georgian_fi                0x10010f6  /* U+10F6 GEORGIAN LETTER FI */
-
-/*
- * Azeri (and other Turkic or Caucasian languages)
- */
-
-/* latin */
-#define XKB_KEY_Xabovedot                  0x1001e8a  /* U+1E8A LATIN CAPITAL LETTER X WITH DOT ABOVE */
-#define XKB_KEY_Ibreve                     0x100012c  /* U+012C LATIN CAPITAL LETTER I WITH BREVE */
-#define XKB_KEY_Zstroke                    0x10001b5  /* U+01B5 LATIN CAPITAL LETTER Z WITH STROKE */
-#define XKB_KEY_Gcaron                     0x10001e6  /* U+01E6 LATIN CAPITAL LETTER G WITH CARON */
-#define XKB_KEY_Ocaron                     0x10001d1  /* U+01D1 LATIN CAPITAL LETTER O WITH CARON */
-#define XKB_KEY_Obarred                    0x100019f  /* U+019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE */
-#define XKB_KEY_xabovedot                  0x1001e8b  /* U+1E8B LATIN SMALL LETTER X WITH DOT ABOVE */
-#define XKB_KEY_ibreve                     0x100012d  /* U+012D LATIN SMALL LETTER I WITH BREVE */
-#define XKB_KEY_zstroke                    0x10001b6  /* U+01B6 LATIN SMALL LETTER Z WITH STROKE */
-#define XKB_KEY_gcaron                     0x10001e7  /* U+01E7 LATIN SMALL LETTER G WITH CARON */
-#define XKB_KEY_ocaron                     0x10001d2  /* U+01D2 LATIN SMALL LETTER O WITH CARON */
-#define XKB_KEY_obarred                    0x1000275  /* U+0275 LATIN SMALL LETTER BARRED O */
-#define XKB_KEY_SCHWA                      0x100018f  /* U+018F LATIN CAPITAL LETTER SCHWA */
-#define XKB_KEY_schwa                      0x1000259  /* U+0259 LATIN SMALL LETTER SCHWA */
-#define XKB_KEY_EZH                        0x10001b7  /* U+01B7 LATIN CAPITAL LETTER EZH */
-#define XKB_KEY_ezh                        0x1000292  /* U+0292 LATIN SMALL LETTER EZH */
-/* those are not really Caucasus */
-/* For Inupiak */
-#define XKB_KEY_Lbelowdot                  0x1001e36  /* U+1E36 LATIN CAPITAL LETTER L WITH DOT BELOW */
-#define XKB_KEY_lbelowdot                  0x1001e37  /* U+1E37 LATIN SMALL LETTER L WITH DOT BELOW */
-
-/*
- * Vietnamese
- */
-
-#define XKB_KEY_Abelowdot                  0x1001ea0  /* U+1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW */
-#define XKB_KEY_abelowdot                  0x1001ea1  /* U+1EA1 LATIN SMALL LETTER A WITH DOT BELOW */
-#define XKB_KEY_Ahook                      0x1001ea2  /* U+1EA2 LATIN CAPITAL LETTER A WITH HOOK ABOVE */
-#define XKB_KEY_ahook                      0x1001ea3  /* U+1EA3 LATIN SMALL LETTER A WITH HOOK ABOVE */
-#define XKB_KEY_Acircumflexacute           0x1001ea4  /* U+1EA4 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
-#define XKB_KEY_acircumflexacute           0x1001ea5  /* U+1EA5 LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */
-#define XKB_KEY_Acircumflexgrave           0x1001ea6  /* U+1EA6 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
-#define XKB_KEY_acircumflexgrave           0x1001ea7  /* U+1EA7 LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */
-#define XKB_KEY_Acircumflexhook            0x1001ea8  /* U+1EA8 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XKB_KEY_acircumflexhook            0x1001ea9  /* U+1EA9 LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XKB_KEY_Acircumflextilde           0x1001eaa  /* U+1EAA LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */
-#define XKB_KEY_acircumflextilde           0x1001eab  /* U+1EAB LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */
-#define XKB_KEY_Acircumflexbelowdot        0x1001eac  /* U+1EAC LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
-#define XKB_KEY_acircumflexbelowdot        0x1001ead  /* U+1EAD LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
-#define XKB_KEY_Abreveacute                0x1001eae  /* U+1EAE LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
-#define XKB_KEY_abreveacute                0x1001eaf  /* U+1EAF LATIN SMALL LETTER A WITH BREVE AND ACUTE */
-#define XKB_KEY_Abrevegrave                0x1001eb0  /* U+1EB0 LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
-#define XKB_KEY_abrevegrave                0x1001eb1  /* U+1EB1 LATIN SMALL LETTER A WITH BREVE AND GRAVE */
-#define XKB_KEY_Abrevehook                 0x1001eb2  /* U+1EB2 LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */
-#define XKB_KEY_abrevehook                 0x1001eb3  /* U+1EB3 LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */
-#define XKB_KEY_Abrevetilde                0x1001eb4  /* U+1EB4 LATIN CAPITAL LETTER A WITH BREVE AND TILDE */
-#define XKB_KEY_abrevetilde                0x1001eb5  /* U+1EB5 LATIN SMALL LETTER A WITH BREVE AND TILDE */
-#define XKB_KEY_Abrevebelowdot             0x1001eb6  /* U+1EB6 LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
-#define XKB_KEY_abrevebelowdot             0x1001eb7  /* U+1EB7 LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */
-#define XKB_KEY_Ebelowdot                  0x1001eb8  /* U+1EB8 LATIN CAPITAL LETTER E WITH DOT BELOW */
-#define XKB_KEY_ebelowdot                  0x1001eb9  /* U+1EB9 LATIN SMALL LETTER E WITH DOT BELOW */
-#define XKB_KEY_Ehook                      0x1001eba  /* U+1EBA LATIN CAPITAL LETTER E WITH HOOK ABOVE */
-#define XKB_KEY_ehook                      0x1001ebb  /* U+1EBB LATIN SMALL LETTER E WITH HOOK ABOVE */
-#define XKB_KEY_Etilde                     0x1001ebc  /* U+1EBC LATIN CAPITAL LETTER E WITH TILDE */
-#define XKB_KEY_etilde                     0x1001ebd  /* U+1EBD LATIN SMALL LETTER E WITH TILDE */
-#define XKB_KEY_Ecircumflexacute           0x1001ebe  /* U+1EBE LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
-#define XKB_KEY_ecircumflexacute           0x1001ebf  /* U+1EBF LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */
-#define XKB_KEY_Ecircumflexgrave           0x1001ec0  /* U+1EC0 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
-#define XKB_KEY_ecircumflexgrave           0x1001ec1  /* U+1EC1 LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */
-#define XKB_KEY_Ecircumflexhook            0x1001ec2  /* U+1EC2 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XKB_KEY_ecircumflexhook            0x1001ec3  /* U+1EC3 LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XKB_KEY_Ecircumflextilde           0x1001ec4  /* U+1EC4 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
-#define XKB_KEY_ecircumflextilde           0x1001ec5  /* U+1EC5 LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */
-#define XKB_KEY_Ecircumflexbelowdot        0x1001ec6  /* U+1EC6 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
-#define XKB_KEY_ecircumflexbelowdot        0x1001ec7  /* U+1EC7 LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
-#define XKB_KEY_Ihook                      0x1001ec8  /* U+1EC8 LATIN CAPITAL LETTER I WITH HOOK ABOVE */
-#define XKB_KEY_ihook                      0x1001ec9  /* U+1EC9 LATIN SMALL LETTER I WITH HOOK ABOVE */
-#define XKB_KEY_Ibelowdot                  0x1001eca  /* U+1ECA LATIN CAPITAL LETTER I WITH DOT BELOW */
-#define XKB_KEY_ibelowdot                  0x1001ecb  /* U+1ECB LATIN SMALL LETTER I WITH DOT BELOW */
-#define XKB_KEY_Obelowdot                  0x1001ecc  /* U+1ECC LATIN CAPITAL LETTER O WITH DOT BELOW */
-#define XKB_KEY_obelowdot                  0x1001ecd  /* U+1ECD LATIN SMALL LETTER O WITH DOT BELOW */
-#define XKB_KEY_Ohook                      0x1001ece  /* U+1ECE LATIN CAPITAL LETTER O WITH HOOK ABOVE */
-#define XKB_KEY_ohook                      0x1001ecf  /* U+1ECF LATIN SMALL LETTER O WITH HOOK ABOVE */
-#define XKB_KEY_Ocircumflexacute           0x1001ed0  /* U+1ED0 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
-#define XKB_KEY_ocircumflexacute           0x1001ed1  /* U+1ED1 LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */
-#define XKB_KEY_Ocircumflexgrave           0x1001ed2  /* U+1ED2 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
-#define XKB_KEY_ocircumflexgrave           0x1001ed3  /* U+1ED3 LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */
-#define XKB_KEY_Ocircumflexhook            0x1001ed4  /* U+1ED4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XKB_KEY_ocircumflexhook            0x1001ed5  /* U+1ED5 LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XKB_KEY_Ocircumflextilde           0x1001ed6  /* U+1ED6 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
-#define XKB_KEY_ocircumflextilde           0x1001ed7  /* U+1ED7 LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */
-#define XKB_KEY_Ocircumflexbelowdot        0x1001ed8  /* U+1ED8 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
-#define XKB_KEY_ocircumflexbelowdot        0x1001ed9  /* U+1ED9 LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
-#define XKB_KEY_Ohornacute                 0x1001eda  /* U+1EDA LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
-#define XKB_KEY_ohornacute                 0x1001edb  /* U+1EDB LATIN SMALL LETTER O WITH HORN AND ACUTE */
-#define XKB_KEY_Ohorngrave                 0x1001edc  /* U+1EDC LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
-#define XKB_KEY_ohorngrave                 0x1001edd  /* U+1EDD LATIN SMALL LETTER O WITH HORN AND GRAVE */
-#define XKB_KEY_Ohornhook                  0x1001ede  /* U+1EDE LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
-#define XKB_KEY_ohornhook                  0x1001edf  /* U+1EDF LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
-#define XKB_KEY_Ohorntilde                 0x1001ee0  /* U+1EE0 LATIN CAPITAL LETTER O WITH HORN AND TILDE */
-#define XKB_KEY_ohorntilde                 0x1001ee1  /* U+1EE1 LATIN SMALL LETTER O WITH HORN AND TILDE */
-#define XKB_KEY_Ohornbelowdot              0x1001ee2  /* U+1EE2 LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
-#define XKB_KEY_ohornbelowdot              0x1001ee3  /* U+1EE3 LATIN SMALL LETTER O WITH HORN AND DOT BELOW */
-#define XKB_KEY_Ubelowdot                  0x1001ee4  /* U+1EE4 LATIN CAPITAL LETTER U WITH DOT BELOW */
-#define XKB_KEY_ubelowdot                  0x1001ee5  /* U+1EE5 LATIN SMALL LETTER U WITH DOT BELOW */
-#define XKB_KEY_Uhook                      0x1001ee6  /* U+1EE6 LATIN CAPITAL LETTER U WITH HOOK ABOVE */
-#define XKB_KEY_uhook                      0x1001ee7  /* U+1EE7 LATIN SMALL LETTER U WITH HOOK ABOVE */
-#define XKB_KEY_Uhornacute                 0x1001ee8  /* U+1EE8 LATIN CAPITAL LETTER U WITH HORN AND ACUTE */
-#define XKB_KEY_uhornacute                 0x1001ee9  /* U+1EE9 LATIN SMALL LETTER U WITH HORN AND ACUTE */
-#define XKB_KEY_Uhorngrave                 0x1001eea  /* U+1EEA LATIN CAPITAL LETTER U WITH HORN AND GRAVE */
-#define XKB_KEY_uhorngrave                 0x1001eeb  /* U+1EEB LATIN SMALL LETTER U WITH HORN AND GRAVE */
-#define XKB_KEY_Uhornhook                  0x1001eec  /* U+1EEC LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */
-#define XKB_KEY_uhornhook                  0x1001eed  /* U+1EED LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */
-#define XKB_KEY_Uhorntilde                 0x1001eee  /* U+1EEE LATIN CAPITAL LETTER U WITH HORN AND TILDE */
-#define XKB_KEY_uhorntilde                 0x1001eef  /* U+1EEF LATIN SMALL LETTER U WITH HORN AND TILDE */
-#define XKB_KEY_Uhornbelowdot              0x1001ef0  /* U+1EF0 LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */
-#define XKB_KEY_uhornbelowdot              0x1001ef1  /* U+1EF1 LATIN SMALL LETTER U WITH HORN AND DOT BELOW */
-#define XKB_KEY_Ybelowdot                  0x1001ef4  /* U+1EF4 LATIN CAPITAL LETTER Y WITH DOT BELOW */
-#define XKB_KEY_ybelowdot                  0x1001ef5  /* U+1EF5 LATIN SMALL LETTER Y WITH DOT BELOW */
-#define XKB_KEY_Yhook                      0x1001ef6  /* U+1EF6 LATIN CAPITAL LETTER Y WITH HOOK ABOVE */
-#define XKB_KEY_yhook                      0x1001ef7  /* U+1EF7 LATIN SMALL LETTER Y WITH HOOK ABOVE */
-#define XKB_KEY_Ytilde                     0x1001ef8  /* U+1EF8 LATIN CAPITAL LETTER Y WITH TILDE */
-#define XKB_KEY_ytilde                     0x1001ef9  /* U+1EF9 LATIN SMALL LETTER Y WITH TILDE */
-#define XKB_KEY_Ohorn                      0x10001a0  /* U+01A0 LATIN CAPITAL LETTER O WITH HORN */
-#define XKB_KEY_ohorn                      0x10001a1  /* U+01A1 LATIN SMALL LETTER O WITH HORN */
-#define XKB_KEY_Uhorn                      0x10001af  /* U+01AF LATIN CAPITAL LETTER U WITH HORN */
-#define XKB_KEY_uhorn                      0x10001b0  /* U+01B0 LATIN SMALL LETTER U WITH HORN */
-#define XKB_KEY_combining_tilde            0x1000303  /* U+0303 COMBINING TILDE */
-#define XKB_KEY_combining_grave            0x1000300  /* U+0300 COMBINING GRAVE ACCENT */
-#define XKB_KEY_combining_acute            0x1000301  /* U+0301 COMBINING ACUTE ACCENT */
-#define XKB_KEY_combining_hook             0x1000309  /* U+0309 COMBINING HOOK ABOVE */
-#define XKB_KEY_combining_belowdot         0x1000323  /* U+0323 COMBINING DOT BELOW */
-
-
-#define XKB_KEY_EcuSign                    0x10020a0  /* U+20A0 EURO-CURRENCY SIGN */
-#define XKB_KEY_ColonSign                  0x10020a1  /* U+20A1 COLON SIGN */
-#define XKB_KEY_CruzeiroSign               0x10020a2  /* U+20A2 CRUZEIRO SIGN */
-#define XKB_KEY_FFrancSign                 0x10020a3  /* U+20A3 FRENCH FRANC SIGN */
-#define XKB_KEY_LiraSign                   0x10020a4  /* U+20A4 LIRA SIGN */
-#define XKB_KEY_MillSign                   0x10020a5  /* U+20A5 MILL SIGN */
-#define XKB_KEY_NairaSign                  0x10020a6  /* U+20A6 NAIRA SIGN */
-#define XKB_KEY_PesetaSign                 0x10020a7  /* U+20A7 PESETA SIGN */
-#define XKB_KEY_RupeeSign                  0x10020a8  /* U+20A8 RUPEE SIGN */
-#define XKB_KEY_WonSign                    0x10020a9  /* U+20A9 WON SIGN */
-#define XKB_KEY_NewSheqelSign              0x10020aa  /* U+20AA NEW SHEQEL SIGN */
-#define XKB_KEY_DongSign                   0x10020ab  /* U+20AB DONG SIGN */
-#define XKB_KEY_EuroSign                      0x20ac  /* U+20AC EURO SIGN */
-
-/* one, two and three are defined above. */
-#define XKB_KEY_zerosuperior               0x1002070  /* U+2070 SUPERSCRIPT ZERO */
-#define XKB_KEY_foursuperior               0x1002074  /* U+2074 SUPERSCRIPT FOUR */
-#define XKB_KEY_fivesuperior               0x1002075  /* U+2075 SUPERSCRIPT FIVE */
-#define XKB_KEY_sixsuperior                0x1002076  /* U+2076 SUPERSCRIPT SIX */
-#define XKB_KEY_sevensuperior              0x1002077  /* U+2077 SUPERSCRIPT SEVEN */
-#define XKB_KEY_eightsuperior              0x1002078  /* U+2078 SUPERSCRIPT EIGHT */
-#define XKB_KEY_ninesuperior               0x1002079  /* U+2079 SUPERSCRIPT NINE */
-#define XKB_KEY_zerosubscript              0x1002080  /* U+2080 SUBSCRIPT ZERO */
-#define XKB_KEY_onesubscript               0x1002081  /* U+2081 SUBSCRIPT ONE */
-#define XKB_KEY_twosubscript               0x1002082  /* U+2082 SUBSCRIPT TWO */
-#define XKB_KEY_threesubscript             0x1002083  /* U+2083 SUBSCRIPT THREE */
-#define XKB_KEY_foursubscript              0x1002084  /* U+2084 SUBSCRIPT FOUR */
-#define XKB_KEY_fivesubscript              0x1002085  /* U+2085 SUBSCRIPT FIVE */
-#define XKB_KEY_sixsubscript               0x1002086  /* U+2086 SUBSCRIPT SIX */
-#define XKB_KEY_sevensubscript             0x1002087  /* U+2087 SUBSCRIPT SEVEN */
-#define XKB_KEY_eightsubscript             0x1002088  /* U+2088 SUBSCRIPT EIGHT */
-#define XKB_KEY_ninesubscript              0x1002089  /* U+2089 SUBSCRIPT NINE */
-#define XKB_KEY_partdifferential           0x1002202  /* U+2202 PARTIAL DIFFERENTIAL */
-#define XKB_KEY_emptyset                   0x1002205  /* U+2205 NULL SET */
-#define XKB_KEY_elementof                  0x1002208  /* U+2208 ELEMENT OF */
-#define XKB_KEY_notelementof               0x1002209  /* U+2209 NOT AN ELEMENT OF */
-#define XKB_KEY_containsas                 0x100220B  /* U+220B CONTAINS AS MEMBER */
-#define XKB_KEY_squareroot                 0x100221A  /* U+221A SQUARE ROOT */
-#define XKB_KEY_cuberoot                   0x100221B  /* U+221B CUBE ROOT */
-#define XKB_KEY_fourthroot                 0x100221C  /* U+221C FOURTH ROOT */
-#define XKB_KEY_dintegral                  0x100222C  /* U+222C DOUBLE INTEGRAL */
-#define XKB_KEY_tintegral                  0x100222D  /* U+222D TRIPLE INTEGRAL */
-#define XKB_KEY_because                    0x1002235  /* U+2235 BECAUSE */
-#define XKB_KEY_approxeq                   0x1002248  /* U+2245 ALMOST EQUAL TO */
-#define XKB_KEY_notapproxeq                0x1002247  /* U+2247 NOT ALMOST EQUAL TO */
-#define XKB_KEY_notidentical               0x1002262  /* U+2262 NOT IDENTICAL TO */
-#define XKB_KEY_stricteq                   0x1002263  /* U+2263 STRICTLY EQUIVALENT TO */
-
-#define XKB_KEY_braille_dot_1                 0xfff1
-#define XKB_KEY_braille_dot_2                 0xfff2
-#define XKB_KEY_braille_dot_3                 0xfff3
-#define XKB_KEY_braille_dot_4                 0xfff4
-#define XKB_KEY_braille_dot_5                 0xfff5
-#define XKB_KEY_braille_dot_6                 0xfff6
-#define XKB_KEY_braille_dot_7                 0xfff7
-#define XKB_KEY_braille_dot_8                 0xfff8
-#define XKB_KEY_braille_dot_9                 0xfff9
-#define XKB_KEY_braille_dot_10                0xfffa
-#define XKB_KEY_braille_blank              0x1002800  /* U+2800 BRAILLE PATTERN BLANK */
-#define XKB_KEY_braille_dots_1             0x1002801  /* U+2801 BRAILLE PATTERN DOTS-1 */
-#define XKB_KEY_braille_dots_2             0x1002802  /* U+2802 BRAILLE PATTERN DOTS-2 */
-#define XKB_KEY_braille_dots_12            0x1002803  /* U+2803 BRAILLE PATTERN DOTS-12 */
-#define XKB_KEY_braille_dots_3             0x1002804  /* U+2804 BRAILLE PATTERN DOTS-3 */
-#define XKB_KEY_braille_dots_13            0x1002805  /* U+2805 BRAILLE PATTERN DOTS-13 */
-#define XKB_KEY_braille_dots_23            0x1002806  /* U+2806 BRAILLE PATTERN DOTS-23 */
-#define XKB_KEY_braille_dots_123           0x1002807  /* U+2807 BRAILLE PATTERN DOTS-123 */
-#define XKB_KEY_braille_dots_4             0x1002808  /* U+2808 BRAILLE PATTERN DOTS-4 */
-#define XKB_KEY_braille_dots_14            0x1002809  /* U+2809 BRAILLE PATTERN DOTS-14 */
-#define XKB_KEY_braille_dots_24            0x100280a  /* U+280a BRAILLE PATTERN DOTS-24 */
-#define XKB_KEY_braille_dots_124           0x100280b  /* U+280b BRAILLE PATTERN DOTS-124 */
-#define XKB_KEY_braille_dots_34            0x100280c  /* U+280c BRAILLE PATTERN DOTS-34 */
-#define XKB_KEY_braille_dots_134           0x100280d  /* U+280d BRAILLE PATTERN DOTS-134 */
-#define XKB_KEY_braille_dots_234           0x100280e  /* U+280e BRAILLE PATTERN DOTS-234 */
-#define XKB_KEY_braille_dots_1234          0x100280f  /* U+280f BRAILLE PATTERN DOTS-1234 */
-#define XKB_KEY_braille_dots_5             0x1002810  /* U+2810 BRAILLE PATTERN DOTS-5 */
-#define XKB_KEY_braille_dots_15            0x1002811  /* U+2811 BRAILLE PATTERN DOTS-15 */
-#define XKB_KEY_braille_dots_25            0x1002812  /* U+2812 BRAILLE PATTERN DOTS-25 */
-#define XKB_KEY_braille_dots_125           0x1002813  /* U+2813 BRAILLE PATTERN DOTS-125 */
-#define XKB_KEY_braille_dots_35            0x1002814  /* U+2814 BRAILLE PATTERN DOTS-35 */
-#define XKB_KEY_braille_dots_135           0x1002815  /* U+2815 BRAILLE PATTERN DOTS-135 */
-#define XKB_KEY_braille_dots_235           0x1002816  /* U+2816 BRAILLE PATTERN DOTS-235 */
-#define XKB_KEY_braille_dots_1235          0x1002817  /* U+2817 BRAILLE PATTERN DOTS-1235 */
-#define XKB_KEY_braille_dots_45            0x1002818  /* U+2818 BRAILLE PATTERN DOTS-45 */
-#define XKB_KEY_braille_dots_145           0x1002819  /* U+2819 BRAILLE PATTERN DOTS-145 */
-#define XKB_KEY_braille_dots_245           0x100281a  /* U+281a BRAILLE PATTERN DOTS-245 */
-#define XKB_KEY_braille_dots_1245          0x100281b  /* U+281b BRAILLE PATTERN DOTS-1245 */
-#define XKB_KEY_braille_dots_345           0x100281c  /* U+281c BRAILLE PATTERN DOTS-345 */
-#define XKB_KEY_braille_dots_1345          0x100281d  /* U+281d BRAILLE PATTERN DOTS-1345 */
-#define XKB_KEY_braille_dots_2345          0x100281e  /* U+281e BRAILLE PATTERN DOTS-2345 */
-#define XKB_KEY_braille_dots_12345         0x100281f  /* U+281f BRAILLE PATTERN DOTS-12345 */
-#define XKB_KEY_braille_dots_6             0x1002820  /* U+2820 BRAILLE PATTERN DOTS-6 */
-#define XKB_KEY_braille_dots_16            0x1002821  /* U+2821 BRAILLE PATTERN DOTS-16 */
-#define XKB_KEY_braille_dots_26            0x1002822  /* U+2822 BRAILLE PATTERN DOTS-26 */
-#define XKB_KEY_braille_dots_126           0x1002823  /* U+2823 BRAILLE PATTERN DOTS-126 */
-#define XKB_KEY_braille_dots_36            0x1002824  /* U+2824 BRAILLE PATTERN DOTS-36 */
-#define XKB_KEY_braille_dots_136           0x1002825  /* U+2825 BRAILLE PATTERN DOTS-136 */
-#define XKB_KEY_braille_dots_236           0x1002826  /* U+2826 BRAILLE PATTERN DOTS-236 */
-#define XKB_KEY_braille_dots_1236          0x1002827  /* U+2827 BRAILLE PATTERN DOTS-1236 */
-#define XKB_KEY_braille_dots_46            0x1002828  /* U+2828 BRAILLE PATTERN DOTS-46 */
-#define XKB_KEY_braille_dots_146           0x1002829  /* U+2829 BRAILLE PATTERN DOTS-146 */
-#define XKB_KEY_braille_dots_246           0x100282a  /* U+282a BRAILLE PATTERN DOTS-246 */
-#define XKB_KEY_braille_dots_1246          0x100282b  /* U+282b BRAILLE PATTERN DOTS-1246 */
-#define XKB_KEY_braille_dots_346           0x100282c  /* U+282c BRAILLE PATTERN DOTS-346 */
-#define XKB_KEY_braille_dots_1346          0x100282d  /* U+282d BRAILLE PATTERN DOTS-1346 */
-#define XKB_KEY_braille_dots_2346          0x100282e  /* U+282e BRAILLE PATTERN DOTS-2346 */
-#define XKB_KEY_braille_dots_12346         0x100282f  /* U+282f BRAILLE PATTERN DOTS-12346 */
-#define XKB_KEY_braille_dots_56            0x1002830  /* U+2830 BRAILLE PATTERN DOTS-56 */
-#define XKB_KEY_braille_dots_156           0x1002831  /* U+2831 BRAILLE PATTERN DOTS-156 */
-#define XKB_KEY_braille_dots_256           0x1002832  /* U+2832 BRAILLE PATTERN DOTS-256 */
-#define XKB_KEY_braille_dots_1256          0x1002833  /* U+2833 BRAILLE PATTERN DOTS-1256 */
-#define XKB_KEY_braille_dots_356           0x1002834  /* U+2834 BRAILLE PATTERN DOTS-356 */
-#define XKB_KEY_braille_dots_1356          0x1002835  /* U+2835 BRAILLE PATTERN DOTS-1356 */
-#define XKB_KEY_braille_dots_2356          0x1002836  /* U+2836 BRAILLE PATTERN DOTS-2356 */
-#define XKB_KEY_braille_dots_12356         0x1002837  /* U+2837 BRAILLE PATTERN DOTS-12356 */
-#define XKB_KEY_braille_dots_456           0x1002838  /* U+2838 BRAILLE PATTERN DOTS-456 */
-#define XKB_KEY_braille_dots_1456          0x1002839  /* U+2839 BRAILLE PATTERN DOTS-1456 */
-#define XKB_KEY_braille_dots_2456          0x100283a  /* U+283a BRAILLE PATTERN DOTS-2456 */
-#define XKB_KEY_braille_dots_12456         0x100283b  /* U+283b BRAILLE PATTERN DOTS-12456 */
-#define XKB_KEY_braille_dots_3456          0x100283c  /* U+283c BRAILLE PATTERN DOTS-3456 */
-#define XKB_KEY_braille_dots_13456         0x100283d  /* U+283d BRAILLE PATTERN DOTS-13456 */
-#define XKB_KEY_braille_dots_23456         0x100283e  /* U+283e BRAILLE PATTERN DOTS-23456 */
-#define XKB_KEY_braille_dots_123456        0x100283f  /* U+283f BRAILLE PATTERN DOTS-123456 */
-#define XKB_KEY_braille_dots_7             0x1002840  /* U+2840 BRAILLE PATTERN DOTS-7 */
-#define XKB_KEY_braille_dots_17            0x1002841  /* U+2841 BRAILLE PATTERN DOTS-17 */
-#define XKB_KEY_braille_dots_27            0x1002842  /* U+2842 BRAILLE PATTERN DOTS-27 */
-#define XKB_KEY_braille_dots_127           0x1002843  /* U+2843 BRAILLE PATTERN DOTS-127 */
-#define XKB_KEY_braille_dots_37            0x1002844  /* U+2844 BRAILLE PATTERN DOTS-37 */
-#define XKB_KEY_braille_dots_137           0x1002845  /* U+2845 BRAILLE PATTERN DOTS-137 */
-#define XKB_KEY_braille_dots_237           0x1002846  /* U+2846 BRAILLE PATTERN DOTS-237 */
-#define XKB_KEY_braille_dots_1237          0x1002847  /* U+2847 BRAILLE PATTERN DOTS-1237 */
-#define XKB_KEY_braille_dots_47            0x1002848  /* U+2848 BRAILLE PATTERN DOTS-47 */
-#define XKB_KEY_braille_dots_147           0x1002849  /* U+2849 BRAILLE PATTERN DOTS-147 */
-#define XKB_KEY_braille_dots_247           0x100284a  /* U+284a BRAILLE PATTERN DOTS-247 */
-#define XKB_KEY_braille_dots_1247          0x100284b  /* U+284b BRAILLE PATTERN DOTS-1247 */
-#define XKB_KEY_braille_dots_347           0x100284c  /* U+284c BRAILLE PATTERN DOTS-347 */
-#define XKB_KEY_braille_dots_1347          0x100284d  /* U+284d BRAILLE PATTERN DOTS-1347 */
-#define XKB_KEY_braille_dots_2347          0x100284e  /* U+284e BRAILLE PATTERN DOTS-2347 */
-#define XKB_KEY_braille_dots_12347         0x100284f  /* U+284f BRAILLE PATTERN DOTS-12347 */
-#define XKB_KEY_braille_dots_57            0x1002850  /* U+2850 BRAILLE PATTERN DOTS-57 */
-#define XKB_KEY_braille_dots_157           0x1002851  /* U+2851 BRAILLE PATTERN DOTS-157 */
-#define XKB_KEY_braille_dots_257           0x1002852  /* U+2852 BRAILLE PATTERN DOTS-257 */
-#define XKB_KEY_braille_dots_1257          0x1002853  /* U+2853 BRAILLE PATTERN DOTS-1257 */
-#define XKB_KEY_braille_dots_357           0x1002854  /* U+2854 BRAILLE PATTERN DOTS-357 */
-#define XKB_KEY_braille_dots_1357          0x1002855  /* U+2855 BRAILLE PATTERN DOTS-1357 */
-#define XKB_KEY_braille_dots_2357          0x1002856  /* U+2856 BRAILLE PATTERN DOTS-2357 */
-#define XKB_KEY_braille_dots_12357         0x1002857  /* U+2857 BRAILLE PATTERN DOTS-12357 */
-#define XKB_KEY_braille_dots_457           0x1002858  /* U+2858 BRAILLE PATTERN DOTS-457 */
-#define XKB_KEY_braille_dots_1457          0x1002859  /* U+2859 BRAILLE PATTERN DOTS-1457 */
-#define XKB_KEY_braille_dots_2457          0x100285a  /* U+285a BRAILLE PATTERN DOTS-2457 */
-#define XKB_KEY_braille_dots_12457         0x100285b  /* U+285b BRAILLE PATTERN DOTS-12457 */
-#define XKB_KEY_braille_dots_3457          0x100285c  /* U+285c BRAILLE PATTERN DOTS-3457 */
-#define XKB_KEY_braille_dots_13457         0x100285d  /* U+285d BRAILLE PATTERN DOTS-13457 */
-#define XKB_KEY_braille_dots_23457         0x100285e  /* U+285e BRAILLE PATTERN DOTS-23457 */
-#define XKB_KEY_braille_dots_123457        0x100285f  /* U+285f BRAILLE PATTERN DOTS-123457 */
-#define XKB_KEY_braille_dots_67            0x1002860  /* U+2860 BRAILLE PATTERN DOTS-67 */
-#define XKB_KEY_braille_dots_167           0x1002861  /* U+2861 BRAILLE PATTERN DOTS-167 */
-#define XKB_KEY_braille_dots_267           0x1002862  /* U+2862 BRAILLE PATTERN DOTS-267 */
-#define XKB_KEY_braille_dots_1267          0x1002863  /* U+2863 BRAILLE PATTERN DOTS-1267 */
-#define XKB_KEY_braille_dots_367           0x1002864  /* U+2864 BRAILLE PATTERN DOTS-367 */
-#define XKB_KEY_braille_dots_1367          0x1002865  /* U+2865 BRAILLE PATTERN DOTS-1367 */
-#define XKB_KEY_braille_dots_2367          0x1002866  /* U+2866 BRAILLE PATTERN DOTS-2367 */
-#define XKB_KEY_braille_dots_12367         0x1002867  /* U+2867 BRAILLE PATTERN DOTS-12367 */
-#define XKB_KEY_braille_dots_467           0x1002868  /* U+2868 BRAILLE PATTERN DOTS-467 */
-#define XKB_KEY_braille_dots_1467          0x1002869  /* U+2869 BRAILLE PATTERN DOTS-1467 */
-#define XKB_KEY_braille_dots_2467          0x100286a  /* U+286a BRAILLE PATTERN DOTS-2467 */
-#define XKB_KEY_braille_dots_12467         0x100286b  /* U+286b BRAILLE PATTERN DOTS-12467 */
-#define XKB_KEY_braille_dots_3467          0x100286c  /* U+286c BRAILLE PATTERN DOTS-3467 */
-#define XKB_KEY_braille_dots_13467         0x100286d  /* U+286d BRAILLE PATTERN DOTS-13467 */
-#define XKB_KEY_braille_dots_23467         0x100286e  /* U+286e BRAILLE PATTERN DOTS-23467 */
-#define XKB_KEY_braille_dots_123467        0x100286f  /* U+286f BRAILLE PATTERN DOTS-123467 */
-#define XKB_KEY_braille_dots_567           0x1002870  /* U+2870 BRAILLE PATTERN DOTS-567 */
-#define XKB_KEY_braille_dots_1567          0x1002871  /* U+2871 BRAILLE PATTERN DOTS-1567 */
-#define XKB_KEY_braille_dots_2567          0x1002872  /* U+2872 BRAILLE PATTERN DOTS-2567 */
-#define XKB_KEY_braille_dots_12567         0x1002873  /* U+2873 BRAILLE PATTERN DOTS-12567 */
-#define XKB_KEY_braille_dots_3567          0x1002874  /* U+2874 BRAILLE PATTERN DOTS-3567 */
-#define XKB_KEY_braille_dots_13567         0x1002875  /* U+2875 BRAILLE PATTERN DOTS-13567 */
-#define XKB_KEY_braille_dots_23567         0x1002876  /* U+2876 BRAILLE PATTERN DOTS-23567 */
-#define XKB_KEY_braille_dots_123567        0x1002877  /* U+2877 BRAILLE PATTERN DOTS-123567 */
-#define XKB_KEY_braille_dots_4567          0x1002878  /* U+2878 BRAILLE PATTERN DOTS-4567 */
-#define XKB_KEY_braille_dots_14567         0x1002879  /* U+2879 BRAILLE PATTERN DOTS-14567 */
-#define XKB_KEY_braille_dots_24567         0x100287a  /* U+287a BRAILLE PATTERN DOTS-24567 */
-#define XKB_KEY_braille_dots_124567        0x100287b  /* U+287b BRAILLE PATTERN DOTS-124567 */
-#define XKB_KEY_braille_dots_34567         0x100287c  /* U+287c BRAILLE PATTERN DOTS-34567 */
-#define XKB_KEY_braille_dots_134567        0x100287d  /* U+287d BRAILLE PATTERN DOTS-134567 */
-#define XKB_KEY_braille_dots_234567        0x100287e  /* U+287e BRAILLE PATTERN DOTS-234567 */
-#define XKB_KEY_braille_dots_1234567       0x100287f  /* U+287f BRAILLE PATTERN DOTS-1234567 */
-#define XKB_KEY_braille_dots_8             0x1002880  /* U+2880 BRAILLE PATTERN DOTS-8 */
-#define XKB_KEY_braille_dots_18            0x1002881  /* U+2881 BRAILLE PATTERN DOTS-18 */
-#define XKB_KEY_braille_dots_28            0x1002882  /* U+2882 BRAILLE PATTERN DOTS-28 */
-#define XKB_KEY_braille_dots_128           0x1002883  /* U+2883 BRAILLE PATTERN DOTS-128 */
-#define XKB_KEY_braille_dots_38            0x1002884  /* U+2884 BRAILLE PATTERN DOTS-38 */
-#define XKB_KEY_braille_dots_138           0x1002885  /* U+2885 BRAILLE PATTERN DOTS-138 */
-#define XKB_KEY_braille_dots_238           0x1002886  /* U+2886 BRAILLE PATTERN DOTS-238 */
-#define XKB_KEY_braille_dots_1238          0x1002887  /* U+2887 BRAILLE PATTERN DOTS-1238 */
-#define XKB_KEY_braille_dots_48            0x1002888  /* U+2888 BRAILLE PATTERN DOTS-48 */
-#define XKB_KEY_braille_dots_148           0x1002889  /* U+2889 BRAILLE PATTERN DOTS-148 */
-#define XKB_KEY_braille_dots_248           0x100288a  /* U+288a BRAILLE PATTERN DOTS-248 */
-#define XKB_KEY_braille_dots_1248          0x100288b  /* U+288b BRAILLE PATTERN DOTS-1248 */
-#define XKB_KEY_braille_dots_348           0x100288c  /* U+288c BRAILLE PATTERN DOTS-348 */
-#define XKB_KEY_braille_dots_1348          0x100288d  /* U+288d BRAILLE PATTERN DOTS-1348 */
-#define XKB_KEY_braille_dots_2348          0x100288e  /* U+288e BRAILLE PATTERN DOTS-2348 */
-#define XKB_KEY_braille_dots_12348         0x100288f  /* U+288f BRAILLE PATTERN DOTS-12348 */
-#define XKB_KEY_braille_dots_58            0x1002890  /* U+2890 BRAILLE PATTERN DOTS-58 */
-#define XKB_KEY_braille_dots_158           0x1002891  /* U+2891 BRAILLE PATTERN DOTS-158 */
-#define XKB_KEY_braille_dots_258           0x1002892  /* U+2892 BRAILLE PATTERN DOTS-258 */
-#define XKB_KEY_braille_dots_1258          0x1002893  /* U+2893 BRAILLE PATTERN DOTS-1258 */
-#define XKB_KEY_braille_dots_358           0x1002894  /* U+2894 BRAILLE PATTERN DOTS-358 */
-#define XKB_KEY_braille_dots_1358          0x1002895  /* U+2895 BRAILLE PATTERN DOTS-1358 */
-#define XKB_KEY_braille_dots_2358          0x1002896  /* U+2896 BRAILLE PATTERN DOTS-2358 */
-#define XKB_KEY_braille_dots_12358         0x1002897  /* U+2897 BRAILLE PATTERN DOTS-12358 */
-#define XKB_KEY_braille_dots_458           0x1002898  /* U+2898 BRAILLE PATTERN DOTS-458 */
-#define XKB_KEY_braille_dots_1458          0x1002899  /* U+2899 BRAILLE PATTERN DOTS-1458 */
-#define XKB_KEY_braille_dots_2458          0x100289a  /* U+289a BRAILLE PATTERN DOTS-2458 */
-#define XKB_KEY_braille_dots_12458         0x100289b  /* U+289b BRAILLE PATTERN DOTS-12458 */
-#define XKB_KEY_braille_dots_3458          0x100289c  /* U+289c BRAILLE PATTERN DOTS-3458 */
-#define XKB_KEY_braille_dots_13458         0x100289d  /* U+289d BRAILLE PATTERN DOTS-13458 */
-#define XKB_KEY_braille_dots_23458         0x100289e  /* U+289e BRAILLE PATTERN DOTS-23458 */
-#define XKB_KEY_braille_dots_123458        0x100289f  /* U+289f BRAILLE PATTERN DOTS-123458 */
-#define XKB_KEY_braille_dots_68            0x10028a0  /* U+28a0 BRAILLE PATTERN DOTS-68 */
-#define XKB_KEY_braille_dots_168           0x10028a1  /* U+28a1 BRAILLE PATTERN DOTS-168 */
-#define XKB_KEY_braille_dots_268           0x10028a2  /* U+28a2 BRAILLE PATTERN DOTS-268 */
-#define XKB_KEY_braille_dots_1268          0x10028a3  /* U+28a3 BRAILLE PATTERN DOTS-1268 */
-#define XKB_KEY_braille_dots_368           0x10028a4  /* U+28a4 BRAILLE PATTERN DOTS-368 */
-#define XKB_KEY_braille_dots_1368          0x10028a5  /* U+28a5 BRAILLE PATTERN DOTS-1368 */
-#define XKB_KEY_braille_dots_2368          0x10028a6  /* U+28a6 BRAILLE PATTERN DOTS-2368 */
-#define XKB_KEY_braille_dots_12368         0x10028a7  /* U+28a7 BRAILLE PATTERN DOTS-12368 */
-#define XKB_KEY_braille_dots_468           0x10028a8  /* U+28a8 BRAILLE PATTERN DOTS-468 */
-#define XKB_KEY_braille_dots_1468          0x10028a9  /* U+28a9 BRAILLE PATTERN DOTS-1468 */
-#define XKB_KEY_braille_dots_2468          0x10028aa  /* U+28aa BRAILLE PATTERN DOTS-2468 */
-#define XKB_KEY_braille_dots_12468         0x10028ab  /* U+28ab BRAILLE PATTERN DOTS-12468 */
-#define XKB_KEY_braille_dots_3468          0x10028ac  /* U+28ac BRAILLE PATTERN DOTS-3468 */
-#define XKB_KEY_braille_dots_13468         0x10028ad  /* U+28ad BRAILLE PATTERN DOTS-13468 */
-#define XKB_KEY_braille_dots_23468         0x10028ae  /* U+28ae BRAILLE PATTERN DOTS-23468 */
-#define XKB_KEY_braille_dots_123468        0x10028af  /* U+28af BRAILLE PATTERN DOTS-123468 */
-#define XKB_KEY_braille_dots_568           0x10028b0  /* U+28b0 BRAILLE PATTERN DOTS-568 */
-#define XKB_KEY_braille_dots_1568          0x10028b1  /* U+28b1 BRAILLE PATTERN DOTS-1568 */
-#define XKB_KEY_braille_dots_2568          0x10028b2  /* U+28b2 BRAILLE PATTERN DOTS-2568 */
-#define XKB_KEY_braille_dots_12568         0x10028b3  /* U+28b3 BRAILLE PATTERN DOTS-12568 */
-#define XKB_KEY_braille_dots_3568          0x10028b4  /* U+28b4 BRAILLE PATTERN DOTS-3568 */
-#define XKB_KEY_braille_dots_13568         0x10028b5  /* U+28b5 BRAILLE PATTERN DOTS-13568 */
-#define XKB_KEY_braille_dots_23568         0x10028b6  /* U+28b6 BRAILLE PATTERN DOTS-23568 */
-#define XKB_KEY_braille_dots_123568        0x10028b7  /* U+28b7 BRAILLE PATTERN DOTS-123568 */
-#define XKB_KEY_braille_dots_4568          0x10028b8  /* U+28b8 BRAILLE PATTERN DOTS-4568 */
-#define XKB_KEY_braille_dots_14568         0x10028b9  /* U+28b9 BRAILLE PATTERN DOTS-14568 */
-#define XKB_KEY_braille_dots_24568         0x10028ba  /* U+28ba BRAILLE PATTERN DOTS-24568 */
-#define XKB_KEY_braille_dots_124568        0x10028bb  /* U+28bb BRAILLE PATTERN DOTS-124568 */
-#define XKB_KEY_braille_dots_34568         0x10028bc  /* U+28bc BRAILLE PATTERN DOTS-34568 */
-#define XKB_KEY_braille_dots_134568        0x10028bd  /* U+28bd BRAILLE PATTERN DOTS-134568 */
-#define XKB_KEY_braille_dots_234568        0x10028be  /* U+28be BRAILLE PATTERN DOTS-234568 */
-#define XKB_KEY_braille_dots_1234568       0x10028bf  /* U+28bf BRAILLE PATTERN DOTS-1234568 */
-#define XKB_KEY_braille_dots_78            0x10028c0  /* U+28c0 BRAILLE PATTERN DOTS-78 */
-#define XKB_KEY_braille_dots_178           0x10028c1  /* U+28c1 BRAILLE PATTERN DOTS-178 */
-#define XKB_KEY_braille_dots_278           0x10028c2  /* U+28c2 BRAILLE PATTERN DOTS-278 */
-#define XKB_KEY_braille_dots_1278          0x10028c3  /* U+28c3 BRAILLE PATTERN DOTS-1278 */
-#define XKB_KEY_braille_dots_378           0x10028c4  /* U+28c4 BRAILLE PATTERN DOTS-378 */
-#define XKB_KEY_braille_dots_1378          0x10028c5  /* U+28c5 BRAILLE PATTERN DOTS-1378 */
-#define XKB_KEY_braille_dots_2378          0x10028c6  /* U+28c6 BRAILLE PATTERN DOTS-2378 */
-#define XKB_KEY_braille_dots_12378         0x10028c7  /* U+28c7 BRAILLE PATTERN DOTS-12378 */
-#define XKB_KEY_braille_dots_478           0x10028c8  /* U+28c8 BRAILLE PATTERN DOTS-478 */
-#define XKB_KEY_braille_dots_1478          0x10028c9  /* U+28c9 BRAILLE PATTERN DOTS-1478 */
-#define XKB_KEY_braille_dots_2478          0x10028ca  /* U+28ca BRAILLE PATTERN DOTS-2478 */
-#define XKB_KEY_braille_dots_12478         0x10028cb  /* U+28cb BRAILLE PATTERN DOTS-12478 */
-#define XKB_KEY_braille_dots_3478          0x10028cc  /* U+28cc BRAILLE PATTERN DOTS-3478 */
-#define XKB_KEY_braille_dots_13478         0x10028cd  /* U+28cd BRAILLE PATTERN DOTS-13478 */
-#define XKB_KEY_braille_dots_23478         0x10028ce  /* U+28ce BRAILLE PATTERN DOTS-23478 */
-#define XKB_KEY_braille_dots_123478        0x10028cf  /* U+28cf BRAILLE PATTERN DOTS-123478 */
-#define XKB_KEY_braille_dots_578           0x10028d0  /* U+28d0 BRAILLE PATTERN DOTS-578 */
-#define XKB_KEY_braille_dots_1578          0x10028d1  /* U+28d1 BRAILLE PATTERN DOTS-1578 */
-#define XKB_KEY_braille_dots_2578          0x10028d2  /* U+28d2 BRAILLE PATTERN DOTS-2578 */
-#define XKB_KEY_braille_dots_12578         0x10028d3  /* U+28d3 BRAILLE PATTERN DOTS-12578 */
-#define XKB_KEY_braille_dots_3578          0x10028d4  /* U+28d4 BRAILLE PATTERN DOTS-3578 */
-#define XKB_KEY_braille_dots_13578         0x10028d5  /* U+28d5 BRAILLE PATTERN DOTS-13578 */
-#define XKB_KEY_braille_dots_23578         0x10028d6  /* U+28d6 BRAILLE PATTERN DOTS-23578 */
-#define XKB_KEY_braille_dots_123578        0x10028d7  /* U+28d7 BRAILLE PATTERN DOTS-123578 */
-#define XKB_KEY_braille_dots_4578          0x10028d8  /* U+28d8 BRAILLE PATTERN DOTS-4578 */
-#define XKB_KEY_braille_dots_14578         0x10028d9  /* U+28d9 BRAILLE PATTERN DOTS-14578 */
-#define XKB_KEY_braille_dots_24578         0x10028da  /* U+28da BRAILLE PATTERN DOTS-24578 */
-#define XKB_KEY_braille_dots_124578        0x10028db  /* U+28db BRAILLE PATTERN DOTS-124578 */
-#define XKB_KEY_braille_dots_34578         0x10028dc  /* U+28dc BRAILLE PATTERN DOTS-34578 */
-#define XKB_KEY_braille_dots_134578        0x10028dd  /* U+28dd BRAILLE PATTERN DOTS-134578 */
-#define XKB_KEY_braille_dots_234578        0x10028de  /* U+28de BRAILLE PATTERN DOTS-234578 */
-#define XKB_KEY_braille_dots_1234578       0x10028df  /* U+28df BRAILLE PATTERN DOTS-1234578 */
-#define XKB_KEY_braille_dots_678           0x10028e0  /* U+28e0 BRAILLE PATTERN DOTS-678 */
-#define XKB_KEY_braille_dots_1678          0x10028e1  /* U+28e1 BRAILLE PATTERN DOTS-1678 */
-#define XKB_KEY_braille_dots_2678          0x10028e2  /* U+28e2 BRAILLE PATTERN DOTS-2678 */
-#define XKB_KEY_braille_dots_12678         0x10028e3  /* U+28e3 BRAILLE PATTERN DOTS-12678 */
-#define XKB_KEY_braille_dots_3678          0x10028e4  /* U+28e4 BRAILLE PATTERN DOTS-3678 */
-#define XKB_KEY_braille_dots_13678         0x10028e5  /* U+28e5 BRAILLE PATTERN DOTS-13678 */
-#define XKB_KEY_braille_dots_23678         0x10028e6  /* U+28e6 BRAILLE PATTERN DOTS-23678 */
-#define XKB_KEY_braille_dots_123678        0x10028e7  /* U+28e7 BRAILLE PATTERN DOTS-123678 */
-#define XKB_KEY_braille_dots_4678          0x10028e8  /* U+28e8 BRAILLE PATTERN DOTS-4678 */
-#define XKB_KEY_braille_dots_14678         0x10028e9  /* U+28e9 BRAILLE PATTERN DOTS-14678 */
-#define XKB_KEY_braille_dots_24678         0x10028ea  /* U+28ea BRAILLE PATTERN DOTS-24678 */
-#define XKB_KEY_braille_dots_124678        0x10028eb  /* U+28eb BRAILLE PATTERN DOTS-124678 */
-#define XKB_KEY_braille_dots_34678         0x10028ec  /* U+28ec BRAILLE PATTERN DOTS-34678 */
-#define XKB_KEY_braille_dots_134678        0x10028ed  /* U+28ed BRAILLE PATTERN DOTS-134678 */
-#define XKB_KEY_braille_dots_234678        0x10028ee  /* U+28ee BRAILLE PATTERN DOTS-234678 */
-#define XKB_KEY_braille_dots_1234678       0x10028ef  /* U+28ef BRAILLE PATTERN DOTS-1234678 */
-#define XKB_KEY_braille_dots_5678          0x10028f0  /* U+28f0 BRAILLE PATTERN DOTS-5678 */
-#define XKB_KEY_braille_dots_15678         0x10028f1  /* U+28f1 BRAILLE PATTERN DOTS-15678 */
-#define XKB_KEY_braille_dots_25678         0x10028f2  /* U+28f2 BRAILLE PATTERN DOTS-25678 */
-#define XKB_KEY_braille_dots_125678        0x10028f3  /* U+28f3 BRAILLE PATTERN DOTS-125678 */
-#define XKB_KEY_braille_dots_35678         0x10028f4  /* U+28f4 BRAILLE PATTERN DOTS-35678 */
-#define XKB_KEY_braille_dots_135678        0x10028f5  /* U+28f5 BRAILLE PATTERN DOTS-135678 */
-#define XKB_KEY_braille_dots_235678        0x10028f6  /* U+28f6 BRAILLE PATTERN DOTS-235678 */
-#define XKB_KEY_braille_dots_1235678       0x10028f7  /* U+28f7 BRAILLE PATTERN DOTS-1235678 */
-#define XKB_KEY_braille_dots_45678         0x10028f8  /* U+28f8 BRAILLE PATTERN DOTS-45678 */
-#define XKB_KEY_braille_dots_145678        0x10028f9  /* U+28f9 BRAILLE PATTERN DOTS-145678 */
-#define XKB_KEY_braille_dots_245678        0x10028fa  /* U+28fa BRAILLE PATTERN DOTS-245678 */
-#define XKB_KEY_braille_dots_1245678       0x10028fb  /* U+28fb BRAILLE PATTERN DOTS-1245678 */
-#define XKB_KEY_braille_dots_345678        0x10028fc  /* U+28fc BRAILLE PATTERN DOTS-345678 */
-#define XKB_KEY_braille_dots_1345678       0x10028fd  /* U+28fd BRAILLE PATTERN DOTS-1345678 */
-#define XKB_KEY_braille_dots_2345678       0x10028fe  /* U+28fe BRAILLE PATTERN DOTS-2345678 */
-#define XKB_KEY_braille_dots_12345678      0x10028ff  /* U+28ff BRAILLE PATTERN DOTS-12345678 */
-
-/*
- * Sinhala (http://unicode.org/charts/PDF/U0D80.pdf)
- * http://www.nongnu.org/sinhala/doc/transliteration/sinhala-transliteration_6.html
- */
-
-#define XKB_KEY_Sinh_ng            0x1000d82  /* U+0D82 SINHALA ANUSVARAYA */
-#define XKB_KEY_Sinh_h2            0x1000d83  /* U+0D83 SINHALA VISARGAYA */
-#define XKB_KEY_Sinh_a             0x1000d85  /* U+0D85 SINHALA AYANNA */
-#define XKB_KEY_Sinh_aa            0x1000d86  /* U+0D86 SINHALA AAYANNA */
-#define XKB_KEY_Sinh_ae            0x1000d87  /* U+0D87 SINHALA AEYANNA */
-#define XKB_KEY_Sinh_aee           0x1000d88  /* U+0D88 SINHALA AEEYANNA */
-#define XKB_KEY_Sinh_i             0x1000d89  /* U+0D89 SINHALA IYANNA */
-#define XKB_KEY_Sinh_ii            0x1000d8a  /* U+0D8A SINHALA IIYANNA */
-#define XKB_KEY_Sinh_u             0x1000d8b  /* U+0D8B SINHALA UYANNA */
-#define XKB_KEY_Sinh_uu            0x1000d8c  /* U+0D8C SINHALA UUYANNA */
-#define XKB_KEY_Sinh_ri            0x1000d8d  /* U+0D8D SINHALA IRUYANNA */
-#define XKB_KEY_Sinh_rii           0x1000d8e  /* U+0D8E SINHALA IRUUYANNA */
-#define XKB_KEY_Sinh_lu            0x1000d8f  /* U+0D8F SINHALA ILUYANNA */
-#define XKB_KEY_Sinh_luu           0x1000d90  /* U+0D90 SINHALA ILUUYANNA */
-#define XKB_KEY_Sinh_e             0x1000d91  /* U+0D91 SINHALA EYANNA */
-#define XKB_KEY_Sinh_ee            0x1000d92  /* U+0D92 SINHALA EEYANNA */
-#define XKB_KEY_Sinh_ai            0x1000d93  /* U+0D93 SINHALA AIYANNA */
-#define XKB_KEY_Sinh_o             0x1000d94  /* U+0D94 SINHALA OYANNA */
-#define XKB_KEY_Sinh_oo            0x1000d95  /* U+0D95 SINHALA OOYANNA */
-#define XKB_KEY_Sinh_au            0x1000d96  /* U+0D96 SINHALA AUYANNA */
-#define XKB_KEY_Sinh_ka            0x1000d9a  /* U+0D9A SINHALA KAYANNA */
-#define XKB_KEY_Sinh_kha           0x1000d9b  /* U+0D9B SINHALA MAHA. KAYANNA */
-#define XKB_KEY_Sinh_ga            0x1000d9c  /* U+0D9C SINHALA GAYANNA */
-#define XKB_KEY_Sinh_gha           0x1000d9d  /* U+0D9D SINHALA MAHA. GAYANNA */
-#define XKB_KEY_Sinh_ng2           0x1000d9e  /* U+0D9E SINHALA KANTAJA NAASIKYAYA */
-#define XKB_KEY_Sinh_nga           0x1000d9f  /* U+0D9F SINHALA SANYAKA GAYANNA */
-#define XKB_KEY_Sinh_ca            0x1000da0  /* U+0DA0 SINHALA CAYANNA */
-#define XKB_KEY_Sinh_cha           0x1000da1  /* U+0DA1 SINHALA MAHA. CAYANNA */
-#define XKB_KEY_Sinh_ja            0x1000da2  /* U+0DA2 SINHALA JAYANNA */
-#define XKB_KEY_Sinh_jha           0x1000da3  /* U+0DA3 SINHALA MAHA. JAYANNA */
-#define XKB_KEY_Sinh_nya           0x1000da4  /* U+0DA4 SINHALA TAALUJA NAASIKYAYA */
-#define XKB_KEY_Sinh_jnya          0x1000da5  /* U+0DA5 SINHALA TAALUJA SANYOOGA NAASIKYAYA */
-#define XKB_KEY_Sinh_nja           0x1000da6  /* U+0DA6 SINHALA SANYAKA JAYANNA */
-#define XKB_KEY_Sinh_tta           0x1000da7  /* U+0DA7 SINHALA TTAYANNA */
-#define XKB_KEY_Sinh_ttha          0x1000da8  /* U+0DA8 SINHALA MAHA. TTAYANNA */
-#define XKB_KEY_Sinh_dda           0x1000da9  /* U+0DA9 SINHALA DDAYANNA */
-#define XKB_KEY_Sinh_ddha          0x1000daa  /* U+0DAA SINHALA MAHA. DDAYANNA */
-#define XKB_KEY_Sinh_nna           0x1000dab  /* U+0DAB SINHALA MUURDHAJA NAYANNA */
-#define XKB_KEY_Sinh_ndda          0x1000dac  /* U+0DAC SINHALA SANYAKA DDAYANNA */
-#define XKB_KEY_Sinh_tha           0x1000dad  /* U+0DAD SINHALA TAYANNA */
-#define XKB_KEY_Sinh_thha          0x1000dae  /* U+0DAE SINHALA MAHA. TAYANNA */
-#define XKB_KEY_Sinh_dha           0x1000daf  /* U+0DAF SINHALA DAYANNA */
-#define XKB_KEY_Sinh_dhha          0x1000db0  /* U+0DB0 SINHALA MAHA. DAYANNA */
-#define XKB_KEY_Sinh_na            0x1000db1  /* U+0DB1 SINHALA DANTAJA NAYANNA */
-#define XKB_KEY_Sinh_ndha          0x1000db3  /* U+0DB3 SINHALA SANYAKA DAYANNA */
-#define XKB_KEY_Sinh_pa            0x1000db4  /* U+0DB4 SINHALA PAYANNA */
-#define XKB_KEY_Sinh_pha           0x1000db5  /* U+0DB5 SINHALA MAHA. PAYANNA */
-#define XKB_KEY_Sinh_ba            0x1000db6  /* U+0DB6 SINHALA BAYANNA */
-#define XKB_KEY_Sinh_bha           0x1000db7  /* U+0DB7 SINHALA MAHA. BAYANNA */
-#define XKB_KEY_Sinh_ma            0x1000db8  /* U+0DB8 SINHALA MAYANNA */
-#define XKB_KEY_Sinh_mba           0x1000db9  /* U+0DB9 SINHALA AMBA BAYANNA */
-#define XKB_KEY_Sinh_ya            0x1000dba  /* U+0DBA SINHALA YAYANNA */
-#define XKB_KEY_Sinh_ra            0x1000dbb  /* U+0DBB SINHALA RAYANNA */
-#define XKB_KEY_Sinh_la            0x1000dbd  /* U+0DBD SINHALA DANTAJA LAYANNA */
-#define XKB_KEY_Sinh_va            0x1000dc0  /* U+0DC0 SINHALA VAYANNA */
-#define XKB_KEY_Sinh_sha           0x1000dc1  /* U+0DC1 SINHALA TAALUJA SAYANNA */
-#define XKB_KEY_Sinh_ssha          0x1000dc2  /* U+0DC2 SINHALA MUURDHAJA SAYANNA */
-#define XKB_KEY_Sinh_sa            0x1000dc3  /* U+0DC3 SINHALA DANTAJA SAYANNA */
-#define XKB_KEY_Sinh_ha            0x1000dc4  /* U+0DC4 SINHALA HAYANNA */
-#define XKB_KEY_Sinh_lla           0x1000dc5  /* U+0DC5 SINHALA MUURDHAJA LAYANNA */
-#define XKB_KEY_Sinh_fa            0x1000dc6  /* U+0DC6 SINHALA FAYANNA */
-#define XKB_KEY_Sinh_al            0x1000dca  /* U+0DCA SINHALA AL-LAKUNA */
-#define XKB_KEY_Sinh_aa2           0x1000dcf  /* U+0DCF SINHALA AELA-PILLA */
-#define XKB_KEY_Sinh_ae2           0x1000dd0  /* U+0DD0 SINHALA AEDA-PILLA */
-#define XKB_KEY_Sinh_aee2          0x1000dd1  /* U+0DD1 SINHALA DIGA AEDA-PILLA */
-#define XKB_KEY_Sinh_i2            0x1000dd2  /* U+0DD2 SINHALA IS-PILLA */
-#define XKB_KEY_Sinh_ii2           0x1000dd3  /* U+0DD3 SINHALA DIGA IS-PILLA */
-#define XKB_KEY_Sinh_u2            0x1000dd4  /* U+0DD4 SINHALA PAA-PILLA */
-#define XKB_KEY_Sinh_uu2           0x1000dd6  /* U+0DD6 SINHALA DIGA PAA-PILLA */
-#define XKB_KEY_Sinh_ru2           0x1000dd8  /* U+0DD8 SINHALA GAETTA-PILLA */
-#define XKB_KEY_Sinh_e2            0x1000dd9  /* U+0DD9 SINHALA KOMBUVA */
-#define XKB_KEY_Sinh_ee2           0x1000dda  /* U+0DDA SINHALA DIGA KOMBUVA */
-#define XKB_KEY_Sinh_ai2           0x1000ddb  /* U+0DDB SINHALA KOMBU DEKA */
-#define XKB_KEY_Sinh_o2            0x1000ddc  /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA*/
-#define XKB_KEY_Sinh_oo2           0x1000ddd  /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA*/
-#define XKB_KEY_Sinh_au2           0x1000dde  /* U+0DDE SINHALA KOMBUVA HAA GAYANUKITTA */
-#define XKB_KEY_Sinh_lu2           0x1000ddf  /* U+0DDF SINHALA GAYANUKITTA */
-#define XKB_KEY_Sinh_ruu2          0x1000df2  /* U+0DF2 SINHALA DIGA GAETTA-PILLA */
-#define XKB_KEY_Sinh_luu2          0x1000df3  /* U+0DF3 SINHALA DIGA GAYANUKITTA */
-#define XKB_KEY_Sinh_kunddaliya    0x1000df4  /* U+0DF4 SINHALA KUNDDALIYA */
-/*
- * XFree86 vendor specific keysyms.
- *
- * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
- *
- * The XF86 set of keysyms is a catch-all set of defines for keysyms found
- * on various multimedia keyboards. Originally specific to XFree86 they have
- * been been adopted over time and are considered a "standard" part of X
- * keysym definitions.
- * XFree86 never properly commented these keysyms, so we have done our
- * best to explain the semantic meaning of these keys.
- *
- * XFree86 has removed their mail archives of the period, that might have
- * shed more light on some of these definitions. Until/unless we resurrect
- * these archives, these are from memory and usage.
- */
-
-/*
- * ModeLock
- *
- * This one is old, and not really used any more since XKB offers this
- * functionality.
- */
-
-#define XKB_KEY_XF86ModeLock		0x1008FF01	/* Mode Switch Lock */
-
-/* Backlight controls. */
-#define XKB_KEY_XF86MonBrightnessUp    0x1008FF02  /* Monitor/panel brightness */
-#define XKB_KEY_XF86MonBrightnessDown  0x1008FF03  /* Monitor/panel brightness */
-#define XKB_KEY_XF86KbdLightOnOff      0x1008FF04  /* Keyboards may be lit     */
-#define XKB_KEY_XF86KbdBrightnessUp    0x1008FF05  /* Keyboards may be lit     */
-#define XKB_KEY_XF86KbdBrightnessDown  0x1008FF06  /* Keyboards may be lit     */
-#define XKB_KEY_XF86MonBrightnessCycle 0x1008FF07  /* Monitor/panel brightness */
-
-/*
- * Keys found on some "Internet" keyboards.
- */
-#define XKB_KEY_XF86Standby		0x1008FF10   /* System into standby mode   */
-#define XKB_KEY_XF86AudioLowerVolume	0x1008FF11   /* Volume control down        */
-#define XKB_KEY_XF86AudioMute	0x1008FF12   /* Mute sound from the system */
-#define XKB_KEY_XF86AudioRaiseVolume	0x1008FF13   /* Volume control up          */
-#define XKB_KEY_XF86AudioPlay	0x1008FF14   /* Start playing of audio >   */
-#define XKB_KEY_XF86AudioStop	0x1008FF15   /* Stop playing audio         */
-#define XKB_KEY_XF86AudioPrev	0x1008FF16   /* Previous track             */
-#define XKB_KEY_XF86AudioNext	0x1008FF17   /* Next track                 */
-#define XKB_KEY_XF86HomePage		0x1008FF18   /* Display user's home page   */
-#define XKB_KEY_XF86Mail		0x1008FF19   /* Invoke user's mail program */
-#define XKB_KEY_XF86Start		0x1008FF1A   /* Start application          */
-#define XKB_KEY_XF86Search		0x1008FF1B   /* Search                     */
-#define XKB_KEY_XF86AudioRecord	0x1008FF1C   /* Record audio application   */
-
-/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere)   */
-#define XKB_KEY_XF86Calculator	0x1008FF1D   /* Invoke calculator program  */
-#define XKB_KEY_XF86Memo		0x1008FF1E   /* Invoke Memo taking program */
-#define XKB_KEY_XF86ToDoList		0x1008FF1F   /* Invoke To Do List program  */
-#define XKB_KEY_XF86Calendar		0x1008FF20   /* Invoke Calendar program    */
-#define XKB_KEY_XF86PowerDown	0x1008FF21   /* Deep sleep the system      */
-#define XKB_KEY_XF86ContrastAdjust	0x1008FF22   /* Adjust screen contrast     */
-#define XKB_KEY_XF86RockerUp		0x1008FF23   /* Rocker switches exist up   */
-#define XKB_KEY_XF86RockerDown	0x1008FF24   /* and down                   */
-#define XKB_KEY_XF86RockerEnter	0x1008FF25   /* and let you press them     */
-
-/* Some more "Internet" keyboard symbols */
-#define XKB_KEY_XF86Back		0x1008FF26   /* Like back on a browser     */
-#define XKB_KEY_XF86Forward		0x1008FF27   /* Like forward on a browser  */
-#define XKB_KEY_XF86Stop		0x1008FF28   /* Stop current operation     */
-#define XKB_KEY_XF86Refresh		0x1008FF29   /* Refresh the page           */
-#define XKB_KEY_XF86PowerOff		0x1008FF2A   /* Power off system entirely  */
-#define XKB_KEY_XF86WakeUp		0x1008FF2B   /* Wake up system from sleep  */
-#define XKB_KEY_XF86Eject            0x1008FF2C   /* Eject device (e.g. DVD)    */
-#define XKB_KEY_XF86ScreenSaver      0x1008FF2D   /* Invoke screensaver         */
-#define XKB_KEY_XF86WWW              0x1008FF2E   /* Invoke web browser         */
-#define XKB_KEY_XF86Sleep            0x1008FF2F   /* Put system to sleep        */
-#define XKB_KEY_XF86Favorites	0x1008FF30   /* Show favorite locations    */
-#define XKB_KEY_XF86AudioPause	0x1008FF31   /* Pause audio playing        */
-#define XKB_KEY_XF86AudioMedia	0x1008FF32   /* Launch media collection app */
-#define XKB_KEY_XF86MyComputer	0x1008FF33   /* Display "My Computer" window */
-#define XKB_KEY_XF86VendorHome	0x1008FF34   /* Display vendor home web site */
-#define XKB_KEY_XF86LightBulb	0x1008FF35   /* Light bulb keys exist       */
-#define XKB_KEY_XF86Shop		0x1008FF36   /* Display shopping web site   */
-#define XKB_KEY_XF86History		0x1008FF37   /* Show history of web surfing */
-#define XKB_KEY_XF86OpenURL		0x1008FF38   /* Open selected URL           */
-#define XKB_KEY_XF86AddFavorite	0x1008FF39   /* Add URL to favorites list   */
-#define XKB_KEY_XF86HotLinks		0x1008FF3A   /* Show "hot" links            */
-#define XKB_KEY_XF86BrightnessAdjust	0x1008FF3B   /* Invoke brightness adj. UI   */
-#define XKB_KEY_XF86Finance		0x1008FF3C   /* Display financial site      */
-#define XKB_KEY_XF86Community	0x1008FF3D   /* Display user's community    */
-#define XKB_KEY_XF86AudioRewind	0x1008FF3E   /* "rewind" audio track        */
-#define XKB_KEY_XF86BackForward	0x1008FF3F   /* ??? */
-#define XKB_KEY_XF86Launch0		0x1008FF40   /* Launch Application          */
-#define XKB_KEY_XF86Launch1		0x1008FF41   /* Launch Application          */
-#define XKB_KEY_XF86Launch2		0x1008FF42   /* Launch Application          */
-#define XKB_KEY_XF86Launch3		0x1008FF43   /* Launch Application          */
-#define XKB_KEY_XF86Launch4		0x1008FF44   /* Launch Application          */
-#define XKB_KEY_XF86Launch5		0x1008FF45   /* Launch Application          */
-#define XKB_KEY_XF86Launch6		0x1008FF46   /* Launch Application          */
-#define XKB_KEY_XF86Launch7		0x1008FF47   /* Launch Application          */
-#define XKB_KEY_XF86Launch8		0x1008FF48   /* Launch Application          */
-#define XKB_KEY_XF86Launch9		0x1008FF49   /* Launch Application          */
-#define XKB_KEY_XF86LaunchA		0x1008FF4A   /* Launch Application          */
-#define XKB_KEY_XF86LaunchB		0x1008FF4B   /* Launch Application          */
-#define XKB_KEY_XF86LaunchC		0x1008FF4C   /* Launch Application          */
-#define XKB_KEY_XF86LaunchD		0x1008FF4D   /* Launch Application          */
-#define XKB_KEY_XF86LaunchE		0x1008FF4E   /* Launch Application          */
-#define XKB_KEY_XF86LaunchF		0x1008FF4F   /* Launch Application          */
-
-#define XKB_KEY_XF86ApplicationLeft	0x1008FF50   /* switch to application, left */
-#define XKB_KEY_XF86ApplicationRight	0x1008FF51   /* switch to application, right*/
-#define XKB_KEY_XF86Book		0x1008FF52   /* Launch bookreader           */
-#define XKB_KEY_XF86CD		0x1008FF53   /* Launch CD/DVD player        */
-#define XKB_KEY_XF86Calculater	0x1008FF54   /* Launch Calculater           */
-#define XKB_KEY_XF86Clear		0x1008FF55   /* Clear window, screen        */
-#define XKB_KEY_XF86Close		0x1008FF56   /* Close window                */
-#define XKB_KEY_XF86Copy		0x1008FF57   /* Copy selection              */
-#define XKB_KEY_XF86Cut		0x1008FF58   /* Cut selection               */
-#define XKB_KEY_XF86Display		0x1008FF59   /* Output switch key           */
-#define XKB_KEY_XF86DOS		0x1008FF5A   /* Launch DOS (emulation)      */
-#define XKB_KEY_XF86Documents	0x1008FF5B   /* Open documents window       */
-#define XKB_KEY_XF86Excel		0x1008FF5C   /* Launch spread sheet         */
-#define XKB_KEY_XF86Explorer		0x1008FF5D   /* Launch file explorer        */
-#define XKB_KEY_XF86Game		0x1008FF5E   /* Launch game                 */
-#define XKB_KEY_XF86Go		0x1008FF5F   /* Go to URL                   */
-#define XKB_KEY_XF86iTouch		0x1008FF60   /* Logitech iTouch- don't use  */
-#define XKB_KEY_XF86LogOff		0x1008FF61   /* Log off system              */
-#define XKB_KEY_XF86Market		0x1008FF62   /* ??                          */
-#define XKB_KEY_XF86Meeting		0x1008FF63   /* enter meeting in calendar   */
-#define XKB_KEY_XF86MenuKB		0x1008FF65   /* distinguish keyboard from PB */
-#define XKB_KEY_XF86MenuPB		0x1008FF66   /* distinguish PB from keyboard */
-#define XKB_KEY_XF86MySites		0x1008FF67   /* Favourites                  */
-#define XKB_KEY_XF86New		0x1008FF68   /* New (folder, document...    */
-#define XKB_KEY_XF86News		0x1008FF69   /* News                        */
-#define XKB_KEY_XF86OfficeHome	0x1008FF6A   /* Office home (old Staroffice)*/
-#define XKB_KEY_XF86Open		0x1008FF6B   /* Open                        */
-#define XKB_KEY_XF86Option		0x1008FF6C   /* ?? */
-#define XKB_KEY_XF86Paste		0x1008FF6D   /* Paste                       */
-#define XKB_KEY_XF86Phone		0x1008FF6E   /* Launch phone; dial number   */
-#define XKB_KEY_XF86Q		0x1008FF70   /* Compaq's Q - don't use      */
-#define XKB_KEY_XF86Reply		0x1008FF72   /* Reply e.g., mail            */
-#define XKB_KEY_XF86Reload		0x1008FF73   /* Reload web page, file, etc. */
-#define XKB_KEY_XF86RotateWindows	0x1008FF74   /* Rotate windows e.g. xrandr  */
-#define XKB_KEY_XF86RotationPB	0x1008FF75   /* don't use                   */
-#define XKB_KEY_XF86RotationKB	0x1008FF76   /* don't use                   */
-#define XKB_KEY_XF86Save		0x1008FF77   /* Save (file, document, state */
-#define XKB_KEY_XF86ScrollUp		0x1008FF78   /* Scroll window/contents up   */
-#define XKB_KEY_XF86ScrollDown	0x1008FF79   /* Scrool window/contentd down */
-#define XKB_KEY_XF86ScrollClick	0x1008FF7A   /* Use XKB mousekeys instead   */
-#define XKB_KEY_XF86Send		0x1008FF7B   /* Send mail, file, object     */
-#define XKB_KEY_XF86Spell		0x1008FF7C   /* Spell checker               */
-#define XKB_KEY_XF86SplitScreen	0x1008FF7D   /* Split window or screen      */
-#define XKB_KEY_XF86Support		0x1008FF7E   /* Get support (??)            */
-#define XKB_KEY_XF86TaskPane		0x1008FF7F   /* Show tasks */
-#define XKB_KEY_XF86Terminal		0x1008FF80   /* Launch terminal emulator    */
-#define XKB_KEY_XF86Tools		0x1008FF81   /* toolbox of desktop/app.     */
-#define XKB_KEY_XF86Travel		0x1008FF82   /* ?? */
-#define XKB_KEY_XF86UserPB		0x1008FF84   /* ?? */
-#define XKB_KEY_XF86User1KB		0x1008FF85   /* ?? */
-#define XKB_KEY_XF86User2KB		0x1008FF86   /* ?? */
-#define XKB_KEY_XF86Video		0x1008FF87   /* Launch video player       */
-#define XKB_KEY_XF86WheelButton	0x1008FF88   /* button from a mouse wheel */
-#define XKB_KEY_XF86Word		0x1008FF89   /* Launch word processor     */
-#define XKB_KEY_XF86Xfer		0x1008FF8A
-#define XKB_KEY_XF86ZoomIn		0x1008FF8B   /* zoom in view, map, etc.   */
-#define XKB_KEY_XF86ZoomOut		0x1008FF8C   /* zoom out view, map, etc.  */
-
-#define XKB_KEY_XF86Away		0x1008FF8D   /* mark yourself as away     */
-#define XKB_KEY_XF86Messenger	0x1008FF8E   /* as in instant messaging   */
-#define XKB_KEY_XF86WebCam		0x1008FF8F   /* Launch web camera app.    */
-#define XKB_KEY_XF86MailForward	0x1008FF90   /* Forward in mail           */
-#define XKB_KEY_XF86Pictures		0x1008FF91   /* Show pictures             */
-#define XKB_KEY_XF86Music		0x1008FF92   /* Launch music application  */
-
-#define XKB_KEY_XF86Battery		0x1008FF93   /* Display battery information */
-#define XKB_KEY_XF86Bluetooth	0x1008FF94   /* Enable/disable Bluetooth    */
-#define XKB_KEY_XF86WLAN		0x1008FF95   /* Enable/disable WLAN         */
-#define XKB_KEY_XF86UWB		0x1008FF96   /* Enable/disable UWB	    */
-
-#define XKB_KEY_XF86AudioForward	0x1008FF97   /* fast-forward audio track    */
-#define XKB_KEY_XF86AudioRepeat	0x1008FF98   /* toggle repeat mode          */
-#define XKB_KEY_XF86AudioRandomPlay	0x1008FF99   /* toggle shuffle mode         */
-#define XKB_KEY_XF86Subtitle		0x1008FF9A   /* cycle through subtitle      */
-#define XKB_KEY_XF86AudioCycleTrack	0x1008FF9B   /* cycle through audio tracks  */
-#define XKB_KEY_XF86CycleAngle	0x1008FF9C   /* cycle through angles        */
-#define XKB_KEY_XF86FrameBack	0x1008FF9D   /* video: go one frame back    */
-#define XKB_KEY_XF86FrameForward	0x1008FF9E   /* video: go one frame forward */
-#define XKB_KEY_XF86Time		0x1008FF9F   /* display, or shows an entry for time seeking */
-#define XKB_KEY_XF86Select		0x1008FFA0   /* Select button on joypads and remotes */
-#define XKB_KEY_XF86View		0x1008FFA1   /* Show a view options/properties */
-#define XKB_KEY_XF86TopMenu		0x1008FFA2   /* Go to a top-level menu in a video */
-
-#define XKB_KEY_XF86Red		0x1008FFA3   /* Red button                  */
-#define XKB_KEY_XF86Green		0x1008FFA4   /* Green button                */
-#define XKB_KEY_XF86Yellow		0x1008FFA5   /* Yellow button               */
-#define XKB_KEY_XF86Blue             0x1008FFA6   /* Blue button                 */
-
-#define XKB_KEY_XF86Suspend		0x1008FFA7   /* Sleep to RAM                */
-#define XKB_KEY_XF86Hibernate	0x1008FFA8   /* Sleep to disk               */
-#define XKB_KEY_XF86TouchpadToggle	0x1008FFA9   /* Toggle between touchpad/trackstick */
-#define XKB_KEY_XF86TouchpadOn	0x1008FFB0   /* The touchpad got switched on */
-#define XKB_KEY_XF86TouchpadOff	0x1008FFB1   /* The touchpad got switched off */
-
-#define XKB_KEY_XF86AudioMicMute	0x1008FFB2   /* Mute the Mic from the system */
-
-#define XKB_KEY_XF86Keyboard		0x1008FFB3   /* User defined keyboard related action */
-
-#define XKB_KEY_XF86WWAN		0x1008FFB4   /* Toggle WWAN (LTE, UMTS, etc.) radio */
-#define XKB_KEY_XF86RFKill		0x1008FFB5   /* Toggle radios on/off */
-
-#define XKB_KEY_XF86AudioPreset	0x1008FFB6   /* Select equalizer preset, e.g. theatre-mode */
-
-#define XKB_KEY_XF86RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */
-
-#define XKB_KEY_XF86FullScreen	0x1008FFB8   /* Toggle fullscreen */
-
-/* Keys for special action keys (hot keys) */
-/* Virtual terminals on some operating systems */
-#define XKB_KEY_XF86Switch_VT_1	0x1008FE01
-#define XKB_KEY_XF86Switch_VT_2	0x1008FE02
-#define XKB_KEY_XF86Switch_VT_3	0x1008FE03
-#define XKB_KEY_XF86Switch_VT_4	0x1008FE04
-#define XKB_KEY_XF86Switch_VT_5	0x1008FE05
-#define XKB_KEY_XF86Switch_VT_6	0x1008FE06
-#define XKB_KEY_XF86Switch_VT_7	0x1008FE07
-#define XKB_KEY_XF86Switch_VT_8	0x1008FE08
-#define XKB_KEY_XF86Switch_VT_9	0x1008FE09
-#define XKB_KEY_XF86Switch_VT_10	0x1008FE0A
-#define XKB_KEY_XF86Switch_VT_11	0x1008FE0B
-#define XKB_KEY_XF86Switch_VT_12	0x1008FE0C
-
-#define XKB_KEY_XF86Ungrab		0x1008FE20   /* force ungrab               */
-#define XKB_KEY_XF86ClearGrab	0x1008FE21   /* kill application with grab */
-#define XKB_KEY_XF86Next_VMode	0x1008FE22   /* next video mode available  */
-#define XKB_KEY_XF86Prev_VMode	0x1008FE23   /* prev. video mode available */
-#define XKB_KEY_XF86LogWindowTree	0x1008FE24   /* print window tree to log   */
-#define XKB_KEY_XF86LogGrabInfo	0x1008FE25   /* print all active grabs to log */
-
-
-/*
- * Reserved range for evdev symbols: 0x10081000-0x10081FFF
- *
- * Key syms within this range must match the Linux kernel
- * input-event-codes.h file in the format:
- *     XF86XK_CamelCaseKernelName	_EVDEVK(kernel value)
- * For example, the kernel
- *   #define KEY_MACRO_RECORD_START	0x2b0
- * effectively ends up as:
- *   #define XKB_KEY_XF86MacroRecordStart	0x100812b0
- *
- * For historical reasons, some keysyms within the reserved range will be
- * missing, most notably all "normal" keys that are mapped through default
- * XKB layouts (e.g. KEY_Q).
- *
- * CamelCasing is done with a human control as last authority, e.g. see VOD
- * instead of Vod for the Video on Demand key.
- *
- * The format for #defines is strict:
- *
- * #define XKB_KEY_XF86FOO<tab...>_EVDEVK(0xABC)<tab><tab> |* kver KEY_FOO *|
- *
- * Where
- * - alignment by tabs
- * - the _EVDEVK macro must be used
- * - the hex code must be in uppercase hex
- * - the kernel version (kver) is in the form v5.10
- * - kver and key name are within a slash-star comment (a pipe is used in
- *   this example for technical reasons)
- * These #defines are parsed by scripts. Do not stray from the given format.
- *
- * Where the evdev keycode is mapped to a different symbol, please add a
- * comment line starting with Use: but otherwise the same format, e.g.
- *  Use: XF86XK_RotationLockToggle	_EVDEVK(0x231)		   v4.16 KEY_ROTATE_LOCK_TOGGLE
- *
- */
-/* Use: XF86XK_Eject			_EVDEVK(0x0A2)		         KEY_EJECTCLOSECD */
-/* Use: XF86XK_New			_EVDEVK(0x0B5)		   v2.6.14 KEY_NEW */
-/* Use: XK_Redo				_EVDEVK(0x0B6)		   v2.6.14 KEY_REDO */
-/* KEY_DASHBOARD has been mapped to LaunchB in xkeyboard-config since 2011 */
-/* Use: XF86XK_LaunchB			_EVDEVK(0x0CC)		   v2.6.28 KEY_DASHBOARD */
-/* Use: XF86XK_Display			_EVDEVK(0x0E3)		   v2.6.12 KEY_SWITCHVIDEOMODE */
-/* Use: XF86XK_KbdLightOnOff		_EVDEVK(0x0E4)		   v2.6.12 KEY_KBDILLUMTOGGLE */
-/* Use: XF86XK_KbdBrightnessDown	_EVDEVK(0x0E5)		   v2.6.12 KEY_KBDILLUMDOWN */
-/* Use: XF86XK_KbdBrightnessUp		_EVDEVK(0x0E6)		   v2.6.12 KEY_KBDILLUMUP */
-/* Use: XF86XK_Send			_EVDEVK(0x0E7)		   v2.6.14 KEY_SEND */
-/* Use: XF86XK_Reply			_EVDEVK(0x0E8)		   v2.6.14 KEY_REPLY */
-/* Use: XF86XK_MailForward		_EVDEVK(0x0E9)		   v2.6.14 KEY_FORWARDMAIL */
-/* Use: XF86XK_Save			_EVDEVK(0x0EA)		   v2.6.14 KEY_SAVE */
-/* Use: XF86XK_Documents		_EVDEVK(0x0EB)		   v2.6.14 KEY_DOCUMENTS */
-/* Use: XF86XK_Battery			_EVDEVK(0x0EC)		   v2.6.17 KEY_BATTERY */
-/* Use: XF86XK_Bluetooth		_EVDEVK(0x0ED)		   v2.6.19 KEY_BLUETOOTH */
-/* Use: XF86XK_WLAN			_EVDEVK(0x0EE)		   v2.6.19 KEY_WLAN */
-/* Use: XF86XK_UWB			_EVDEVK(0x0EF)		   v2.6.24 KEY_UWB */
-/* Use: XF86XK_Next_VMode		_EVDEVK(0x0F1)		   v2.6.23 KEY_VIDEO_NEXT */
-/* Use: XF86XK_Prev_VMode		_EVDEVK(0x0F2)		   v2.6.23 KEY_VIDEO_PREV */
-/* Use: XF86XK_MonBrightnessCycle	_EVDEVK(0x0F3)		   v2.6.23 KEY_BRIGHTNESS_CYCLE */
-#define XKB_KEY_XF86BrightnessAuto		0x100810f4		/* v3.16 KEY_BRIGHTNESS_AUTO */
-#define XKB_KEY_XF86DisplayOff		0x100810f5		/* v2.6.23 KEY_DISPLAY_OFF */
-/* Use: XF86XK_WWAN			_EVDEVK(0x0F6)		   v3.13 KEY_WWAN */
-/* Use: XF86XK_RFKill			_EVDEVK(0x0F7)		   v2.6.33 KEY_RFKILL */
-/* Use: XF86XK_AudioMicMute		_EVDEVK(0x0F8)		   v3.1  KEY_MICMUTE */
-#define XKB_KEY_XF86Info			0x10081166		/*       KEY_INFO */
-/* Use: XF86XK_CycleAngle		_EVDEVK(0x173)		         KEY_ANGLE */
-/* Use: XF86XK_FullScreen		_EVDEVK(0x174)		   v5.1  KEY_FULL_SCREEN */
-#define XKB_KEY_XF86AspectRatio		0x10081177		/* v5.1  KEY_ASPECT_RATIO */
-#define XKB_KEY_XF86DVD			0x10081185		/*       KEY_DVD */
-#define XKB_KEY_XF86Audio			0x10081188		/*       KEY_AUDIO */
-/* Use: XF86XK_Video			_EVDEVK(0x189)		         KEY_VIDEO */
-/* Use: XF86XK_Calendar			_EVDEVK(0x18D)		         KEY_CALENDAR */
-#define XKB_KEY_XF86ChannelUp		0x10081192		/*       KEY_CHANNELUP */
-#define XKB_KEY_XF86ChannelDown		0x10081193		/*       KEY_CHANNELDOWN */
-/* Use: XF86XK_AudioRandomPlay		_EVDEVK(0x19A)		         KEY_SHUFFLE */
-#define XKB_KEY_XF86Break			0x1008119b		/*       KEY_BREAK */
-#define XKB_KEY_XF86VideoPhone		0x100811a0		/* v2.6.20 KEY_VIDEOPHONE */
-/* Use: XF86XK_Game			_EVDEVK(0x1A1)		   v2.6.20 KEY_GAMES */
-/* Use: XF86XK_ZoomIn			_EVDEVK(0x1A2)		   v2.6.20 KEY_ZOOMIN */
-/* Use: XF86XK_ZoomOut			_EVDEVK(0x1A3)		   v2.6.20 KEY_ZOOMOUT */
-#define XKB_KEY_XF86ZoomReset		0x100811a4		/* v2.6.20 KEY_ZOOMRESET */
-/* Use: XF86XK_Word			_EVDEVK(0x1A5)		   v2.6.20 KEY_WORDPROCESSOR */
-#define XKB_KEY_XF86Editor			0x100811a6		/* v2.6.20 KEY_EDITOR */
-/* Use: XF86XK_Excel			_EVDEVK(0x1A7)		   v2.6.20 KEY_SPREADSHEET */
-#define XKB_KEY_XF86GraphicsEditor		0x100811a8		/* v2.6.20 KEY_GRAPHICSEDITOR */
-#define XKB_KEY_XF86Presentation		0x100811a9		/* v2.6.20 KEY_PRESENTATION */
-#define XKB_KEY_XF86Database			0x100811aa		/* v2.6.20 KEY_DATABASE */
-/* Use: XF86XK_News			_EVDEVK(0x1AB)		   v2.6.20 KEY_NEWS */
-#define XKB_KEY_XF86Voicemail		0x100811ac		/* v2.6.20 KEY_VOICEMAIL */
-#define XKB_KEY_XF86Addressbook		0x100811ad		/* v2.6.20 KEY_ADDRESSBOOK */
-/* Use: XF86XK_Messenger		_EVDEVK(0x1AE)		   v2.6.20 KEY_MESSENGER */
-#define XKB_KEY_XF86DisplayToggle		0x100811af		/* v2.6.20 KEY_DISPLAYTOGGLE */
-#define XKB_KEY_XF86SpellCheck		0x100811b0		/* v2.6.24 KEY_SPELLCHECK */
-/* Use: XF86XK_LogOff			_EVDEVK(0x1B1)		   v2.6.24 KEY_LOGOFF */
-/* Use: XK_dollar			_EVDEVK(0x1B2)		   v2.6.24 KEY_DOLLAR */
-/* Use: XK_EuroSign			_EVDEVK(0x1B3)		   v2.6.24 KEY_EURO */
-/* Use: XF86XK_FrameBack		_EVDEVK(0x1B4)		   v2.6.24 KEY_FRAMEBACK */
-/* Use: XF86XK_FrameForward		_EVDEVK(0x1B5)		   v2.6.24 KEY_FRAMEFORWARD */
-#define XKB_KEY_XF86ContextMenu		0x100811b6		/* v2.6.24 KEY_CONTEXT_MENU */
-#define XKB_KEY_XF86MediaRepeat		0x100811b7		/* v2.6.26 KEY_MEDIA_REPEAT */
-#define XKB_KEY_XF8610ChannelsUp		0x100811b8		/* v2.6.38 KEY_10CHANNELSUP */
-#define XKB_KEY_XF8610ChannelsDown		0x100811b9		/* v2.6.38 KEY_10CHANNELSDOWN */
-#define XKB_KEY_XF86Images			0x100811ba		/* v2.6.39 KEY_IMAGES */
-#define XKB_KEY_XF86NotificationCenter	0x100811bc		/* v5.10 KEY_NOTIFICATION_CENTER */
-#define XKB_KEY_XF86PickupPhone		0x100811bd		/* v5.10 KEY_PICKUP_PHONE */
-#define XKB_KEY_XF86HangupPhone		0x100811be		/* v5.10 KEY_HANGUP_PHONE */
-#define XKB_KEY_XF86Fn			0x100811d0		/*       KEY_FN */
-#define XKB_KEY_XF86Fn_Esc			0x100811d1		/*       KEY_FN_ESC */
-#define XKB_KEY_XF86FnRightShift		0x100811e5		/* v5.10 KEY_FN_RIGHT_SHIFT */
-/* Use: XK_braille_dot_1		_EVDEVK(0x1F1)		   v2.6.17 KEY_BRL_DOT1 */
-/* Use: XK_braille_dot_2		_EVDEVK(0x1F2)		   v2.6.17 KEY_BRL_DOT2 */
-/* Use: XK_braille_dot_3		_EVDEVK(0x1F3)		   v2.6.17 KEY_BRL_DOT3 */
-/* Use: XK_braille_dot_4		_EVDEVK(0x1F4)		   v2.6.17 KEY_BRL_DOT4 */
-/* Use: XK_braille_dot_5		_EVDEVK(0x1F5)		   v2.6.17 KEY_BRL_DOT5 */
-/* Use: XK_braille_dot_6		_EVDEVK(0x1F6)		   v2.6.17 KEY_BRL_DOT6 */
-/* Use: XK_braille_dot_7		_EVDEVK(0x1F7)		   v2.6.17 KEY_BRL_DOT7 */
-/* Use: XK_braille_dot_8		_EVDEVK(0x1F8)		   v2.6.17 KEY_BRL_DOT8 */
-/* Use: XK_braille_dot_9		_EVDEVK(0x1F9)		   v2.6.23 KEY_BRL_DOT9 */
-/* Use: XK_braille_dot_1		_EVDEVK(0x1FA)		   v2.6.23 KEY_BRL_DOT10 */
-#define XKB_KEY_XF86Numeric0			0x10081200		/* v2.6.28 KEY_NUMERIC_0 */
-#define XKB_KEY_XF86Numeric1			0x10081201		/* v2.6.28 KEY_NUMERIC_1 */
-#define XKB_KEY_XF86Numeric2			0x10081202		/* v2.6.28 KEY_NUMERIC_2 */
-#define XKB_KEY_XF86Numeric3			0x10081203		/* v2.6.28 KEY_NUMERIC_3 */
-#define XKB_KEY_XF86Numeric4			0x10081204		/* v2.6.28 KEY_NUMERIC_4 */
-#define XKB_KEY_XF86Numeric5			0x10081205		/* v2.6.28 KEY_NUMERIC_5 */
-#define XKB_KEY_XF86Numeric6			0x10081206		/* v2.6.28 KEY_NUMERIC_6 */
-#define XKB_KEY_XF86Numeric7			0x10081207		/* v2.6.28 KEY_NUMERIC_7 */
-#define XKB_KEY_XF86Numeric8			0x10081208		/* v2.6.28 KEY_NUMERIC_8 */
-#define XKB_KEY_XF86Numeric9			0x10081209		/* v2.6.28 KEY_NUMERIC_9 */
-#define XKB_KEY_XF86NumericStar		0x1008120a		/* v2.6.28 KEY_NUMERIC_STAR */
-#define XKB_KEY_XF86NumericPound		0x1008120b		/* v2.6.28 KEY_NUMERIC_POUND */
-#define XKB_KEY_XF86NumericA			0x1008120c		/* v4.1  KEY_NUMERIC_A */
-#define XKB_KEY_XF86NumericB			0x1008120d		/* v4.1  KEY_NUMERIC_B */
-#define XKB_KEY_XF86NumericC			0x1008120e		/* v4.1  KEY_NUMERIC_C */
-#define XKB_KEY_XF86NumericD			0x1008120f		/* v4.1  KEY_NUMERIC_D */
-#define XKB_KEY_XF86CameraFocus		0x10081210		/* v2.6.33 KEY_CAMERA_FOCUS */
-#define XKB_KEY_XF86WPSButton		0x10081211		/* v2.6.34 KEY_WPS_BUTTON */
-/* Use: XF86XK_TouchpadToggle		_EVDEVK(0x212)		   v2.6.37 KEY_TOUCHPAD_TOGGLE */
-/* Use: XF86XK_TouchpadOn		_EVDEVK(0x213)		   v2.6.37 KEY_TOUCHPAD_ON */
-/* Use: XF86XK_TouchpadOff		_EVDEVK(0x214)		   v2.6.37 KEY_TOUCHPAD_OFF */
-#define XKB_KEY_XF86CameraZoomIn		0x10081215		/* v2.6.39 KEY_CAMERA_ZOOMIN */
-#define XKB_KEY_XF86CameraZoomOut		0x10081216		/* v2.6.39 KEY_CAMERA_ZOOMOUT */
-#define XKB_KEY_XF86CameraUp			0x10081217		/* v2.6.39 KEY_CAMERA_UP */
-#define XKB_KEY_XF86CameraDown		0x10081218		/* v2.6.39 KEY_CAMERA_DOWN */
-#define XKB_KEY_XF86CameraLeft		0x10081219		/* v2.6.39 KEY_CAMERA_LEFT */
-#define XKB_KEY_XF86CameraRight		0x1008121a		/* v2.6.39 KEY_CAMERA_RIGHT */
-#define XKB_KEY_XF86AttendantOn		0x1008121b		/* v3.10 KEY_ATTENDANT_ON */
-#define XKB_KEY_XF86AttendantOff		0x1008121c		/* v3.10 KEY_ATTENDANT_OFF */
-#define XKB_KEY_XF86AttendantToggle		0x1008121d		/* v3.10 KEY_ATTENDANT_TOGGLE */
-#define XKB_KEY_XF86LightsToggle		0x1008121e		/* v3.10 KEY_LIGHTS_TOGGLE */
-#define XKB_KEY_XF86ALSToggle		0x10081230		/* v3.13 KEY_ALS_TOGGLE */
-/* Use: XF86XK_RotationLockToggle	_EVDEVK(0x231)		   v4.16 KEY_ROTATE_LOCK_TOGGLE */
-#define XKB_KEY_XF86Buttonconfig		0x10081240		/* v3.16 KEY_BUTTONCONFIG */
-#define XKB_KEY_XF86Taskmanager		0x10081241		/* v3.16 KEY_TASKMANAGER */
-#define XKB_KEY_XF86Journal			0x10081242		/* v3.16 KEY_JOURNAL */
-#define XKB_KEY_XF86ControlPanel		0x10081243		/* v3.16 KEY_CONTROLPANEL */
-#define XKB_KEY_XF86AppSelect		0x10081244		/* v3.16 KEY_APPSELECT */
-#define XKB_KEY_XF86Screensaver		0x10081245		/* v3.16 KEY_SCREENSAVER */
-#define XKB_KEY_XF86VoiceCommand		0x10081246		/* v3.16 KEY_VOICECOMMAND */
-#define XKB_KEY_XF86Assistant		0x10081247		/* v4.13 KEY_ASSISTANT */
-/* Use: XK_ISO_Next_Group		_EVDEVK(0x248)		   v5.2  KEY_KBD_LAYOUT_NEXT */
-#define XKB_KEY_XF86BrightnessMin		0x10081250		/* v3.16 KEY_BRIGHTNESS_MIN */
-#define XKB_KEY_XF86BrightnessMax		0x10081251		/* v3.16 KEY_BRIGHTNESS_MAX */
-#define XKB_KEY_XF86KbdInputAssistPrev	0x10081260		/* v3.18 KEY_KBDINPUTASSIST_PREV */
-#define XKB_KEY_XF86KbdInputAssistNext	0x10081261		/* v3.18 KEY_KBDINPUTASSIST_NEXT */
-#define XKB_KEY_XF86KbdInputAssistPrevgroup	0x10081262		/* v3.18 KEY_KBDINPUTASSIST_PREVGROUP */
-#define XKB_KEY_XF86KbdInputAssistNextgroup	0x10081263		/* v3.18 KEY_KBDINPUTASSIST_NEXTGROUP */
-#define XKB_KEY_XF86KbdInputAssistAccept	0x10081264		/* v3.18 KEY_KBDINPUTASSIST_ACCEPT */
-#define XKB_KEY_XF86KbdInputAssistCancel	0x10081265		/* v3.18 KEY_KBDINPUTASSIST_CANCEL */
-#define XKB_KEY_XF86RightUp			0x10081266		/* v4.7  KEY_RIGHT_UP */
-#define XKB_KEY_XF86RightDown		0x10081267		/* v4.7  KEY_RIGHT_DOWN */
-#define XKB_KEY_XF86LeftUp			0x10081268		/* v4.7  KEY_LEFT_UP */
-#define XKB_KEY_XF86LeftDown			0x10081269		/* v4.7  KEY_LEFT_DOWN */
-#define XKB_KEY_XF86RootMenu			0x1008126a		/* v4.7  KEY_ROOT_MENU */
-#define XKB_KEY_XF86MediaTopMenu		0x1008126b		/* v4.7  KEY_MEDIA_TOP_MENU */
-#define XKB_KEY_XF86Numeric11		0x1008126c		/* v4.7  KEY_NUMERIC_11 */
-#define XKB_KEY_XF86Numeric12		0x1008126d		/* v4.7  KEY_NUMERIC_12 */
-#define XKB_KEY_XF86AudioDesc		0x1008126e		/* v4.7  KEY_AUDIO_DESC */
-#define XKB_KEY_XF863DMode			0x1008126f		/* v4.7  KEY_3D_MODE */
-#define XKB_KEY_XF86NextFavorite		0x10081270		/* v4.7  KEY_NEXT_FAVORITE */
-#define XKB_KEY_XF86StopRecord		0x10081271		/* v4.7  KEY_STOP_RECORD */
-#define XKB_KEY_XF86PauseRecord		0x10081272		/* v4.7  KEY_PAUSE_RECORD */
-#define XKB_KEY_XF86VOD			0x10081273		/* v4.7  KEY_VOD */
-#define XKB_KEY_XF86Unmute			0x10081274		/* v4.7  KEY_UNMUTE */
-#define XKB_KEY_XF86FastReverse		0x10081275		/* v4.7  KEY_FASTREVERSE */
-#define XKB_KEY_XF86SlowReverse		0x10081276		/* v4.7  KEY_SLOWREVERSE */
-#define XKB_KEY_XF86Data			0x10081277		/* v4.7  KEY_DATA */
-#define XKB_KEY_XF86OnScreenKeyboard		0x10081278		/* v4.12 KEY_ONSCREEN_KEYBOARD */
-#define XKB_KEY_XF86PrivacyScreenToggle	0x10081279		/* v5.5  KEY_PRIVACY_SCREEN_TOGGLE */
-#define XKB_KEY_XF86SelectiveScreenshot	0x1008127a		/* v5.6  KEY_SELECTIVE_SCREENSHOT */
-#define XKB_KEY_XF86Macro1			0x10081290		/* v5.5  KEY_MACRO1 */
-#define XKB_KEY_XF86Macro2			0x10081291		/* v5.5  KEY_MACRO2 */
-#define XKB_KEY_XF86Macro3			0x10081292		/* v5.5  KEY_MACRO3 */
-#define XKB_KEY_XF86Macro4			0x10081293		/* v5.5  KEY_MACRO4 */
-#define XKB_KEY_XF86Macro5			0x10081294		/* v5.5  KEY_MACRO5 */
-#define XKB_KEY_XF86Macro6			0x10081295		/* v5.5  KEY_MACRO6 */
-#define XKB_KEY_XF86Macro7			0x10081296		/* v5.5  KEY_MACRO7 */
-#define XKB_KEY_XF86Macro8			0x10081297		/* v5.5  KEY_MACRO8 */
-#define XKB_KEY_XF86Macro9			0x10081298		/* v5.5  KEY_MACRO9 */
-#define XKB_KEY_XF86Macro10			0x10081299		/* v5.5  KEY_MACRO10 */
-#define XKB_KEY_XF86Macro11			0x1008129a		/* v5.5  KEY_MACRO11 */
-#define XKB_KEY_XF86Macro12			0x1008129b		/* v5.5  KEY_MACRO12 */
-#define XKB_KEY_XF86Macro13			0x1008129c		/* v5.5  KEY_MACRO13 */
-#define XKB_KEY_XF86Macro14			0x1008129d		/* v5.5  KEY_MACRO14 */
-#define XKB_KEY_XF86Macro15			0x1008129e		/* v5.5  KEY_MACRO15 */
-#define XKB_KEY_XF86Macro16			0x1008129f		/* v5.5  KEY_MACRO16 */
-#define XKB_KEY_XF86Macro17			0x100812a0		/* v5.5  KEY_MACRO17 */
-#define XKB_KEY_XF86Macro18			0x100812a1		/* v5.5  KEY_MACRO18 */
-#define XKB_KEY_XF86Macro19			0x100812a2		/* v5.5  KEY_MACRO19 */
-#define XKB_KEY_XF86Macro20			0x100812a3		/* v5.5  KEY_MACRO20 */
-#define XKB_KEY_XF86Macro21			0x100812a4		/* v5.5  KEY_MACRO21 */
-#define XKB_KEY_XF86Macro22			0x100812a5		/* v5.5  KEY_MACRO22 */
-#define XKB_KEY_XF86Macro23			0x100812a6		/* v5.5  KEY_MACRO23 */
-#define XKB_KEY_XF86Macro24			0x100812a7		/* v5.5  KEY_MACRO24 */
-#define XKB_KEY_XF86Macro25			0x100812a8		/* v5.5  KEY_MACRO25 */
-#define XKB_KEY_XF86Macro26			0x100812a9		/* v5.5  KEY_MACRO26 */
-#define XKB_KEY_XF86Macro27			0x100812aa		/* v5.5  KEY_MACRO27 */
-#define XKB_KEY_XF86Macro28			0x100812ab		/* v5.5  KEY_MACRO28 */
-#define XKB_KEY_XF86Macro29			0x100812ac		/* v5.5  KEY_MACRO29 */
-#define XKB_KEY_XF86Macro30			0x100812ad		/* v5.5  KEY_MACRO30 */
-#define XKB_KEY_XF86MacroRecordStart		0x100812b0		/* v5.5  KEY_MACRO_RECORD_START */
-#define XKB_KEY_XF86MacroRecordStop		0x100812b1		/* v5.5  KEY_MACRO_RECORD_STOP */
-#define XKB_KEY_XF86MacroPresetCycle		0x100812b2		/* v5.5  KEY_MACRO_PRESET_CYCLE */
-#define XKB_KEY_XF86MacroPreset1		0x100812b3		/* v5.5  KEY_MACRO_PRESET1 */
-#define XKB_KEY_XF86MacroPreset2		0x100812b4		/* v5.5  KEY_MACRO_PRESET2 */
-#define XKB_KEY_XF86MacroPreset3		0x100812b5		/* v5.5  KEY_MACRO_PRESET3 */
-#define XKB_KEY_XF86KbdLcdMenu1		0x100812b8		/* v5.5  KEY_KBD_LCD_MENU1 */
-#define XKB_KEY_XF86KbdLcdMenu2		0x100812b9		/* v5.5  KEY_KBD_LCD_MENU2 */
-#define XKB_KEY_XF86KbdLcdMenu3		0x100812ba		/* v5.5  KEY_KBD_LCD_MENU3 */
-#define XKB_KEY_XF86KbdLcdMenu4		0x100812bb		/* v5.5  KEY_KBD_LCD_MENU4 */
-#define XKB_KEY_XF86KbdLcdMenu5		0x100812bc		/* v5.5  KEY_KBD_LCD_MENU5 */
-#undef _EVDEVK
-/*
- * Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-/************************************************************
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-***********************************************************/
-
-/*
- * Floating Accent
- */
-
-#define XKB_KEY_SunFA_Grave		0x1005FF00
-#define XKB_KEY_SunFA_Circum		0x1005FF01
-#define XKB_KEY_SunFA_Tilde		0x1005FF02
-#define XKB_KEY_SunFA_Acute		0x1005FF03
-#define XKB_KEY_SunFA_Diaeresis	0x1005FF04
-#define XKB_KEY_SunFA_Cedilla	0x1005FF05
-
-/*
- * Miscellaneous Functions
- */
-
-#define XKB_KEY_SunF36		0x1005FF10	/* Labeled F11 */
-#define XKB_KEY_SunF37		0x1005FF11	/* Labeled F12 */
-
-#define XKB_KEY_SunSys_Req   	0x1005FF60
-#define XKB_KEY_SunPrint_Screen	0x0000FF61	/* Same as XK_Print */
-
-/*
- * International & Multi-Key Character Composition
- */
-
-#define XKB_KEY_SunCompose		0x0000FF20	/* Same as XK_Multi_key */
-#define XKB_KEY_SunAltGraph		0x0000FF7E	/* Same as XK_Mode_switch */
-
-/*
- * Cursor Control
- */
-
-#define XKB_KEY_SunPageUp		0x0000FF55 	/* Same as XK_Prior */
-#define XKB_KEY_SunPageDown		0x0000FF56	/* Same as XK_Next */
-
-/*
- * Open Look Functions
- */
-
-#define XKB_KEY_SunUndo		0x0000FF65	/* Same as XK_Undo */
-#define XKB_KEY_SunAgain		0x0000FF66	/* Same as XK_Redo */
-#define XKB_KEY_SunFind		0x0000FF68	/* Same as XK_Find */
-#define XKB_KEY_SunStop		0x0000FF69	/* Same as XK_Cancel */
-#define XKB_KEY_SunProps		0x1005FF70
-#define XKB_KEY_SunFront		0x1005FF71
-#define XKB_KEY_SunCopy		0x1005FF72
-#define XKB_KEY_SunOpen		0x1005FF73
-#define XKB_KEY_SunPaste		0x1005FF74
-#define XKB_KEY_SunCut		0x1005FF75
-
-#define XKB_KEY_SunPowerSwitch		0x1005FF76
-#define XKB_KEY_SunAudioLowerVolume		0x1005FF77
-#define XKB_KEY_SunAudioMute			0x1005FF78
-#define XKB_KEY_SunAudioRaiseVolume		0x1005FF79
-#define XKB_KEY_SunVideoDegauss		0x1005FF7A
-#define XKB_KEY_SunVideoLowerBrightness	0x1005FF7B
-#define XKB_KEY_SunVideoRaiseBrightness	0x1005FF7C
-#define XKB_KEY_SunPowerSwitchShift		0x1005FF7D
-/***********************************************************
-
-Copyright 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * DEC private keysyms
- * (29th bit set)
- */
-
-/* two-key compose sequence initiators, chosen to map to Latin1 characters */
-
-#define XKB_KEY_Dring_accent         0x1000FEB0
-#define XKB_KEY_Dcircumflex_accent   0x1000FE5E
-#define XKB_KEY_Dcedilla_accent      0x1000FE2C
-#define XKB_KEY_Dacute_accent        0x1000FE27
-#define XKB_KEY_Dgrave_accent        0x1000FE60
-#define XKB_KEY_Dtilde               0x1000FE7E
-#define XKB_KEY_Ddiaeresis           0x1000FE22
-
-/* special keysym for LK2** "Remove" key on editing keypad */
-
-#define XKB_KEY_DRemove	0x1000FF00   /* Remove */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFTWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-*/
-
-
-
-#define XKB_KEY_hpClearLine		0x1000FF6F
-#define XKB_KEY_hpInsertLine		0x1000FF70
-#define XKB_KEY_hpDeleteLine		0x1000FF71
-#define XKB_KEY_hpInsertChar		0x1000FF72
-#define XKB_KEY_hpDeleteChar		0x1000FF73
-#define XKB_KEY_hpBackTab		0x1000FF74
-#define XKB_KEY_hpKP_BackTab		0x1000FF75
-#define XKB_KEY_hpModelock1		0x1000FF48
-#define XKB_KEY_hpModelock2		0x1000FF49
-#define XKB_KEY_hpReset		0x1000FF6C
-#define XKB_KEY_hpSystem		0x1000FF6D
-#define XKB_KEY_hpUser		0x1000FF6E
-#define XKB_KEY_hpmute_acute		0x100000A8
-#define XKB_KEY_hpmute_grave		0x100000A9
-#define XKB_KEY_hpmute_asciicircum	0x100000AA
-#define XKB_KEY_hpmute_diaeresis	0x100000AB
-#define XKB_KEY_hpmute_asciitilde	0x100000AC
-#define XKB_KEY_hplira		0x100000AF
-#define XKB_KEY_hpguilder		0x100000BE
-#define XKB_KEY_hpYdiaeresis		0x100000EE
-#define XKB_KEY_hpIO			0x100000EE
-#define XKB_KEY_hplongminus		0x100000F6
-#define XKB_KEY_hpblock		0x100000FC
-
-
-
-#define XKB_KEY_osfCopy		0x1004FF02
-#define XKB_KEY_osfCut		0x1004FF03
-#define XKB_KEY_osfPaste		0x1004FF04
-#define XKB_KEY_osfBackTab		0x1004FF07
-#define XKB_KEY_osfBackSpace		0x1004FF08
-#define XKB_KEY_osfClear		0x1004FF0B
-#define XKB_KEY_osfEscape		0x1004FF1B
-#define XKB_KEY_osfAddMode		0x1004FF31
-#define XKB_KEY_osfPrimaryPaste	0x1004FF32
-#define XKB_KEY_osfQuickPaste	0x1004FF33
-#define XKB_KEY_osfPageLeft		0x1004FF40
-#define XKB_KEY_osfPageUp		0x1004FF41
-#define XKB_KEY_osfPageDown		0x1004FF42
-#define XKB_KEY_osfPageRight		0x1004FF43
-#define XKB_KEY_osfActivate		0x1004FF44
-#define XKB_KEY_osfMenuBar		0x1004FF45
-#define XKB_KEY_osfLeft		0x1004FF51
-#define XKB_KEY_osfUp		0x1004FF52
-#define XKB_KEY_osfRight		0x1004FF53
-#define XKB_KEY_osfDown		0x1004FF54
-#define XKB_KEY_osfEndLine		0x1004FF57
-#define XKB_KEY_osfBeginLine		0x1004FF58
-#define XKB_KEY_osfEndData		0x1004FF59
-#define XKB_KEY_osfBeginData		0x1004FF5A
-#define XKB_KEY_osfPrevMenu		0x1004FF5B
-#define XKB_KEY_osfNextMenu		0x1004FF5C
-#define XKB_KEY_osfPrevField		0x1004FF5D
-#define XKB_KEY_osfNextField		0x1004FF5E
-#define XKB_KEY_osfSelect		0x1004FF60
-#define XKB_KEY_osfInsert		0x1004FF63
-#define XKB_KEY_osfUndo		0x1004FF65
-#define XKB_KEY_osfMenu		0x1004FF67
-#define XKB_KEY_osfCancel		0x1004FF69
-#define XKB_KEY_osfHelp		0x1004FF6A
-#define XKB_KEY_osfSelectAll		0x1004FF71
-#define XKB_KEY_osfDeselectAll	0x1004FF72
-#define XKB_KEY_osfReselect		0x1004FF73
-#define XKB_KEY_osfExtend		0x1004FF74
-#define XKB_KEY_osfRestore		0x1004FF78
-#define XKB_KEY_osfDelete		0x1004FFFF
-
-
-
-/**************************************************************
- * The use of the following macros is deprecated.
- * They are listed below only for backwards compatibility.
- */
-#define XKB_KEY_Reset                0x1000FF6C
-#define XKB_KEY_System               0x1000FF6D
-#define XKB_KEY_User                 0x1000FF6E
-#define XKB_KEY_ClearLine            0x1000FF6F
-#define XKB_KEY_InsertLine           0x1000FF70
-#define XKB_KEY_DeleteLine           0x1000FF71
-#define XKB_KEY_InsertChar           0x1000FF72
-#define XKB_KEY_DeleteChar           0x1000FF73
-#define XKB_KEY_BackTab              0x1000FF74
-#define XKB_KEY_KP_BackTab           0x1000FF75
-#define XKB_KEY_Ext16bit_L           0x1000FF76
-#define XKB_KEY_Ext16bit_R           0x1000FF77
-#define XKB_KEY_mute_acute           0x100000a8
-#define XKB_KEY_mute_grave           0x100000a9
-#define XKB_KEY_mute_asciicircum     0x100000aa
-#define XKB_KEY_mute_diaeresis       0x100000ab
-#define XKB_KEY_mute_asciitilde      0x100000ac
-#define XKB_KEY_lira                 0x100000af
-#define XKB_KEY_guilder              0x100000be
-#define XKB_KEY_IO                   0x100000ee
-#define XKB_KEY_longminus            0x100000f6
-#define XKB_KEY_block                0x100000fc
-
-
-
-#endif
diff --git a/xkbcommon/xkbcommon-names.h b/xkbcommon/xkbcommon-names.h
deleted file mode 100644
index ecb551f..0000000
--- a/xkbcommon/xkbcommon-names.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Daniel Stone <daniel@fooishbar.org>
- */
-
-#ifndef _XKBCOMMON_NAMES_H
-#define _XKBCOMMON_NAMES_H
-
-/**
- * @file
- * @brief Predefined names for common modifiers and LEDs.
- */
-
-#define XKB_MOD_NAME_SHIFT      "Shift"
-#define XKB_MOD_NAME_CAPS       "Lock"
-#define XKB_MOD_NAME_CTRL       "Control"
-#define XKB_MOD_NAME_ALT        "Mod1"
-#define XKB_MOD_NAME_NUM        "Mod2"
-#define XKB_MOD_NAME_LOGO       "Mod4"
-
-#define XKB_LED_NAME_CAPS       "Caps Lock"
-#define XKB_LED_NAME_NUM        "Num Lock"
-#define XKB_LED_NAME_SCROLL     "Scroll Lock"
-
-#endif
diff --git a/xkbcommon/xkbcommon-x11.h b/xkbcommon/xkbcommon-x11.h
deleted file mode 100644
index 4eb716a..0000000
--- a/xkbcommon/xkbcommon-x11.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright © 2013 Ran Benita
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _XKBCOMMON_X11_H
-#define _XKBCOMMON_X11_H
-
-#include <xcb/xcb.h>
-#include <xkbcommon/xkbcommon.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file
- * libxkbcommon-x11 API - Additional X11 support for xkbcommon.
- */
-
-/**
- * @defgroup x11 X11 support
- * Additional X11 support for xkbcommon.
- * @since 0.4.0
- *
- * @{
- */
-
-/**
- * @page x11-overview Overview
- * @parblock
- *
- * The xkbcommon-x11 module provides a means for creating an xkb_keymap
- * corresponding to the currently active keymap on the X server.  To do
- * so, it queries the XKB X11 extension using the xcb-xkb library.  It
- * can be used as a replacement for Xlib's keyboard handling.
- *
- * Following is an example workflow using xkbcommon-x11.  A complete
- * example may be found in the tools/interactive-x11.c file in the
- * xkbcommon source repository.  On startup:
- *
- * 1. Connect to the X server using xcb_connect().
- * 2. Setup the XKB X11 extension.  You can do this either by using the
- *    xcb_xkb_use_extension() request directly, or by using the
- *    xkb_x11_setup_xkb_extension() helper function.
- *
- * The XKB extension supports using separate keymaps and states for
- * different keyboard devices.  The devices are identified by an integer
- * device ID and are managed by another X11 extension, XInput. The
- * original X11 protocol only had one keyboard device, called the "core
- * keyboard", which is still supported as a "virtual device".
- *
- * 3. We will use the core keyboard as an example.  To get its device ID,
- *    use either the xcb_xkb_get_device_info() request directly, or the
- *    xkb_x11_get_core_keyboard_device_id() helper function.
- * 4. Create an initial xkb_keymap for this device, using the
- *    xkb_x11_keymap_new_from_device() function.
- * 5. Create an initial xkb_state for this device, using the
- *    xkb_x11_state_new_from_device() function.
- *
- * @note At this point, you may consider setting various XKB controls and
- * XKB per-client flags.  For example, enabling detectable autorepeat: \n
- * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Detectable_Autorepeat
- *
- * Next, you need to react to state changes (e.g. a modifier was pressed,
- * the layout was changed) and to keymap changes (e.g. a tool like xkbcomp,
- * setxkbmap or xmodmap was used):
- *
- * 6. Select to listen to at least the following XKB events:
- *    NewKeyboardNotify, MapNotify, StateNotify; using the
- *    xcb_xkb_select_events_aux() request.
- * 7. When NewKeyboardNotify or MapNotify are received, recreate the
- *    xkb_keymap and xkb_state as described above.
- * 8. When StateNotify is received, update the xkb_state accordingly
- *    using the xkb_state_update_mask() function.
- *
- * @note It is also possible to use the KeyPress/KeyRelease @p state
- * field to find the effective modifier and layout state, instead of
- * using XkbStateNotify: \n
- * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Computing_A_State_Field_from_an_XKB_State
- * \n However, XkbStateNotify is more accurate.
- *
- * @note There is no need to call xkb_state_update_key(); the state is
- * already synchronized.
- *
- * Finally, when a key event is received, you can use ordinary xkbcommon
- * functions, like xkb_state_key_get_one_sym() and xkb_state_key_get_utf8(),
- * as you normally would.
- *
- * @endparblock
- */
-
-/**
- * The minimal compatible major version of the XKB X11 extension which
- * this library can use.
- */
-#define XKB_X11_MIN_MAJOR_XKB_VERSION 1
-/**
- * The minimal compatible minor version of the XKB X11 extension which
- * this library can use (for the minimal major version).
- */
-#define XKB_X11_MIN_MINOR_XKB_VERSION 0
-
-/** Flags for the xkb_x11_setup_xkb_extension() function. */
-enum xkb_x11_setup_xkb_extension_flags {
-    /** Do not apply any flags. */
-    XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS = 0
-};
-
-/**
- * Setup the XKB X11 extension for this X client.
- *
- * The xkbcommon-x11 library uses various XKB requests.  Before doing so,
- * an X client must notify the server that it will be using the extension.
- * This function (or an XCB equivalent) must be called before any other
- * function in this library is used.
- *
- * Some X servers may not support or disable the XKB extension.  If you
- * want to support such servers, you need to use a different fallback.
- *
- * You may call this function several times; it is idempotent.
- *
- * @param connection
- *     An XCB connection to the X server.
- * @param major_xkb_version
- *     See @p minor_xkb_version.
- * @param minor_xkb_version
- *     The XKB extension version to request.  To operate correctly, you
- *     must have (major_xkb_version, minor_xkb_version) >=
- *     (XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION),
- *     though this is not enforced.
- * @param flags
- *     Optional flags, or 0.
- * @param[out] major_xkb_version_out
- *     See @p minor_xkb_version_out.
- * @param[out] minor_xkb_version_out
- *     Backfilled with the compatible XKB extension version numbers picked
- *     by the server.  Can be NULL.
- * @param[out] base_event_out
- *     Backfilled with the XKB base (also known as first) event code, needed
- *     to distinguish XKB events.  Can be NULL.
- * @param[out] base_error_out
- *     Backfilled with the XKB base (also known as first) error code, needed
- *     to distinguish XKB errors.  Can be NULL.
- *
- * @returns 1 on success, or 0 on failure.
- */
-int
-xkb_x11_setup_xkb_extension(xcb_connection_t *connection,
-                            uint16_t major_xkb_version,
-                            uint16_t minor_xkb_version,
-                            enum xkb_x11_setup_xkb_extension_flags flags,
-                            uint16_t *major_xkb_version_out,
-                            uint16_t *minor_xkb_version_out,
-                            uint8_t *base_event_out,
-                            uint8_t *base_error_out);
-
-/**
- * Get the keyboard device ID of the core X11 keyboard.
- *
- * @param connection An XCB connection to the X server.
- *
- * @returns A device ID which may be used with other xkb_x11_* functions,
- *          or -1 on failure.
- */
-int32_t
-xkb_x11_get_core_keyboard_device_id(xcb_connection_t *connection);
-
-/**
- * Create a keymap from an X11 keyboard device.
- *
- * This function queries the X server with various requests, fetches the
- * details of the active keymap on a keyboard device, and creates an
- * xkb_keymap from these details.
- *
- * @param context
- *     The context in which to create the keymap.
- * @param connection
- *     An XCB connection to the X server.
- * @param device_id
- *     An XInput device ID (in the range 0-127) with input class KEY.
- *     Passing values outside of this range is an error (the XKB protocol
- *     predates the XInput2 protocol, which first allowed IDs > 127).
- * @param flags
- *     Optional flags for the keymap, or 0.
- *
- * @returns A keymap retrieved from the X server, or NULL on failure.
- *
- * @memberof xkb_keymap
- */
-struct xkb_keymap *
-xkb_x11_keymap_new_from_device(struct xkb_context *context,
-                               xcb_connection_t *connection,
-                               int32_t device_id,
-                               enum xkb_keymap_compile_flags flags);
-
-/**
- * Create a new keyboard state object from an X11 keyboard device.
- *
- * This function is the same as xkb_state_new(), only pre-initialized
- * with the state of the device at the time this function is called.
- *
- * @param keymap
- *     The keymap for which to create the state.
- * @param connection
- *     An XCB connection to the X server.
- * @param device_id
- *     An XInput 1 device ID (in the range 0-255) with input class KEY.
- *     Passing values outside of this range is an error.
- *
- * @returns A new keyboard state object, or NULL on failure.
- *
- * @memberof xkb_state
- */
-struct xkb_state *
-xkb_x11_state_new_from_device(struct xkb_keymap *keymap,
-                              xcb_connection_t *connection,
-                              int32_t device_id);
-
-/** @} */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* _XKBCOMMON_X11_H */
diff --git a/xkbcommon/xkbcommon.h b/xkbcommon/xkbcommon.h
deleted file mode 100644
index f52dcfa..0000000
--- a/xkbcommon/xkbcommon.h
+++ /dev/null
@@ -1,1954 +0,0 @@
-/*
- * Copyright 1985, 1987, 1990, 1998  The Open Group
- * Copyright 2008  Dan Nicholson
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the names of the authors or their
- * institutions shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from the authors.
- */
-
-/************************************************************
- * Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of Silicon Graphics not be
- * used in advertising or publicity pertaining to distribution
- * of the software without specific prior written permission.
- * Silicon Graphics makes no representation about the suitability
- * of this software for any purpose. It is provided "as is"
- * without any express or implied warranty.
- *
- * SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
- * THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- ********************************************************/
-
-/*
- * Copyright © 2009-2012 Daniel Stone
- * Copyright © 2012 Intel Corporation
- * Copyright © 2012 Ran Benita
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Daniel Stone <daniel@fooishbar.org>
- */
-
-#ifndef _XKBCOMMON_H_
-#define _XKBCOMMON_H_
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include <xkbcommon/xkbcommon-names.h>
-#include <xkbcommon/xkbcommon-keysyms.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file
- * Main libxkbcommon API.
- */
-
-/**
- * @struct xkb_context
- * Opaque top level library context object.
- *
- * The context contains various general library data and state, like
- * logging level and include paths.
- *
- * Objects are created in a specific context, and multiple contexts may
- * coexist simultaneously.  Objects from different contexts are completely
- * separated and do not share any memory or state.
- */
-struct xkb_context;
-
-/**
- * @struct xkb_keymap
- * Opaque compiled keymap object.
- *
- * The keymap object holds all of the static keyboard information obtained
- * from compiling XKB files.
- *
- * A keymap is immutable after it is created (besides reference counts, etc.);
- * if you need to change it, you must create a new one.
- */
-struct xkb_keymap;
-
-/**
- * @struct xkb_state
- * Opaque keyboard state object.
- *
- * State objects contain the active state of a keyboard (or keyboards), such
- * as the currently effective layout and the active modifiers.  It acts as a
- * simple state machine, wherein key presses and releases are the input, and
- * key symbols (keysyms) are the output.
- */
-struct xkb_state;
-
-/**
- * A number used to represent a physical key on a keyboard.
- *
- * A standard PC-compatible keyboard might have 102 keys.  An appropriate
- * keymap would assign each of them a keycode, by which the user should
- * refer to the key throughout the library.
- *
- * Historically, the X11 protocol, and consequentially the XKB protocol,
- * assign only 8 bits for keycodes.  This limits the number of different
- * keys that can be used simultaneously in a single keymap to 256
- * (disregarding other limitations).  This library does not share this limit;
- * keycodes beyond 255 ('extended keycodes') are not treated specially.
- * Keymaps and applications which are compatible with X11 should not use
- * these keycodes.
- *
- * The values of specific keycodes are determined by the keymap and the
- * underlying input system.  For example, with an X11-compatible keymap
- * and Linux evdev scan codes (see linux/input.h), a fixed offset is used:
- *
- * The keymap defines a canonical name for each key, plus possible aliases.
- * Historically, the XKB protocol restricts these names to at most 4 (ASCII)
- * characters, but this library does not share this limit.
- *
- * @code
- * xkb_keycode_t keycode_A = KEY_A + 8;
- * @endcode
- *
- * @sa xkb_keycode_is_legal_ext() xkb_keycode_is_legal_x11()
- */
-typedef uint32_t xkb_keycode_t;
-
-/**
- * A number used to represent the symbols generated from a key on a keyboard.
- *
- * A key, represented by a keycode, may generate different symbols according
- * to keyboard state.  For example, on a QWERTY keyboard, pressing the key
- * labled \<A\> generates the symbol 'a'.  If the Shift key is held, it
- * generates the symbol 'A'.  If a different layout is used, say Greek,
- * it generates the symbol 'α'.  And so on.
- *
- * Each such symbol is represented by a keysym.  Note that keysyms are
- * somewhat more general, in that they can also represent some "function",
- * such as "Left" or "Right" for the arrow keys.  For more information,
- * see:
- * https://www.x.org/releases/current/doc/xproto/x11protocol.html#keysym_encoding
- *
- * Specifically named keysyms can be found in the
- * xkbcommon/xkbcommon-keysyms.h header file.  Their name does not include
- * the XKB_KEY_ prefix.
- *
- * Besides those, any Unicode/ISO 10646 character in the range U0100 to
- * U10FFFF can be represented by a keysym value in the range 0x01000100 to
- * 0x0110FFFF.  The name of Unicode keysyms is "U<codepoint>", e.g. "UA1B2".
- *
- * The name of other unnamed keysyms is the hexadecimal representation of
- * their value, e.g. "0xabcd1234".
- *
- * Keysym names are case-sensitive.
- */
-typedef uint32_t xkb_keysym_t;
-
-/**
- * Index of a keyboard layout.
- *
- * The layout index is a state component which detemines which <em>keyboard
- * layout</em> is active.  These may be different alphabets, different key
- * arrangements, etc.
- *
- * Layout indices are consecutive.  The first layout has index 0.
- *
- * Each layout is not required to have a name, and the names are not
- * guaranteed to be unique (though they are usually provided and unique).
- * Therefore, it is not safe to use the name as a unique identifier for a
- * layout.  Layout names are case-sensitive.
- *
- * Layout names are specified in the layout's definition, for example
- * "English (US)".  These are different from the (conventionally) short names
- * which are used to locate the layout, for example "us" or "us(intl)".  These
- * names are not present in a compiled keymap.
- *
- * If the user selects layouts from a list generated from the XKB registry
- * (using libxkbregistry or directly), and this metadata is needed later on, it
- * is recommended to store it along with the keymap.
- *
- * Layouts are also called "groups" by XKB.
- *
- * @sa xkb_keymap_num_layouts() xkb_keymap_num_layouts_for_key()
- */
-typedef uint32_t xkb_layout_index_t;
-/** A mask of layout indices. */
-typedef uint32_t xkb_layout_mask_t;
-
-/**
- * Index of a shift level.
- *
- * Any key, in any layout, can have several <em>shift levels</em>.  Each
- * shift level can assign different keysyms to the key.  The shift level
- * to use is chosen according to the current keyboard state; for example,
- * if no keys are pressed, the first level may be used; if the Left Shift
- * key is pressed, the second; if Num Lock is pressed, the third; and
- * many such combinations are possible (see xkb_mod_index_t).
- *
- * Level indices are consecutive.  The first level has index 0.
- */
-typedef uint32_t xkb_level_index_t;
-
-/**
- * Index of a modifier.
- *
- * A @e modifier is a state component which changes the way keys are
- * interpreted.  A keymap defines a set of modifiers, such as Alt, Shift,
- * Num Lock or Meta, and specifies which keys may @e activate which
- * modifiers (in a many-to-many relationship, i.e. a key can activate
- * several modifiers, and a modifier may be activated by several keys.
- * Different keymaps do this differently).
- *
- * When retrieving the keysyms for a key, the active modifier set is
- * consulted; this detemines the correct shift level to use within the
- * currently active layout (see xkb_level_index_t).
- *
- * Modifier indices are consecutive.  The first modifier has index 0.
- *
- * Each modifier must have a name, and the names are unique.  Therefore, it
- * is safe to use the name as a unique identifier for a modifier.  The names
- * of some common modifiers are provided in the xkbcommon/xkbcommon-names.h
- * header file.  Modifier names are case-sensitive.
- *
- * @sa xkb_keymap_num_mods()
- */
-typedef uint32_t xkb_mod_index_t;
-/** A mask of modifier indices. */
-typedef uint32_t xkb_mod_mask_t;
-
-/**
- * Index of a keyboard LED.
- *
- * LEDs are logical objects which may be @e active or @e inactive.  They
- * typically correspond to the lights on the keyboard. Their state is
- * determined by the current keyboard state.
- *
- * LED indices are non-consecutive.  The first LED has index 0.
- *
- * Each LED must have a name, and the names are unique. Therefore,
- * it is safe to use the name as a unique identifier for a LED.  The names
- * of some common LEDs are provided in the xkbcommon/xkbcommon-names.h
- * header file.  LED names are case-sensitive.
- *
- * @warning A given keymap may specify an exact index for a given LED.
- * Therefore, LED indexing is not necessarily sequential, as opposed to
- * modifiers and layouts.  This means that when iterating over the LEDs
- * in a keymap using e.g. xkb_keymap_num_leds(), some indices might be
- * invalid.  Given such an index, functions like xkb_keymap_led_get_name()
- * will return NULL, and xkb_state_led_index_is_active() will return -1.
- *
- * LEDs are also called "indicators" by XKB.
- *
- * @sa xkb_keymap_num_leds()
- */
-typedef uint32_t xkb_led_index_t;
-/** A mask of LED indices. */
-typedef uint32_t xkb_led_mask_t;
-
-#define XKB_KEYCODE_INVALID (0xffffffff)
-#define XKB_LAYOUT_INVALID  (0xffffffff)
-#define XKB_LEVEL_INVALID   (0xffffffff)
-#define XKB_MOD_INVALID     (0xffffffff)
-#define XKB_LED_INVALID     (0xffffffff)
-
-#define XKB_KEYCODE_MAX     (0xffffffff - 1)
-
-/**
- * Test whether a value is a valid extended keycode.
- * @sa xkb_keycode_t
- **/
-#define xkb_keycode_is_legal_ext(key) (key <= XKB_KEYCODE_MAX)
-
-/**
- * Test whether a value is a valid X11 keycode.
- * @sa xkb_keycode_t
- */
-#define xkb_keycode_is_legal_x11(key) (key >= 8 && key <= 255)
-
-/**
- * Names to compile a keymap with, also known as RMLVO.
- *
- * The names are the common configuration values by which a user picks
- * a keymap.
- *
- * If the entire struct is NULL, then each field is taken to be NULL.
- * You should prefer passing NULL instead of choosing your own defaults.
- */
-struct xkb_rule_names {
-    /**
-     * The rules file to use. The rules file describes how to interpret
-     * the values of the model, layout, variant and options fields.
-     *
-     * If NULL or the empty string "", a default value is used.
-     * If the XKB_DEFAULT_RULES environment variable is set, it is used
-     * as the default.  Otherwise the system default is used.
-     */
-    const char *rules;
-    /**
-     * The keyboard model by which to interpret keycodes and LEDs.
-     *
-     * If NULL or the empty string "", a default value is used.
-     * If the XKB_DEFAULT_MODEL environment variable is set, it is used
-     * as the default.  Otherwise the system default is used.
-     */
-    const char *model;
-    /**
-     * A comma separated list of layouts (languages) to include in the
-     * keymap.
-     *
-     * If NULL or the empty string "", a default value is used.
-     * If the XKB_DEFAULT_LAYOUT environment variable is set, it is used
-     * as the default.  Otherwise the system default is used.
-     */
-    const char *layout;
-    /**
-     * A comma separated list of variants, one per layout, which may
-     * modify or augment the respective layout in various ways.
-     *
-     * Generally, should either be empty or have the same number of values
-     * as the number of layouts. You may use empty values as in "intl,,neo".
-     *
-     * If NULL or the empty string "", and a default value is also used
-     * for the layout, a default value is used.  Otherwise no variant is
-     * used.
-     * If the XKB_DEFAULT_VARIANT environment variable is set, it is used
-     * as the default.  Otherwise the system default is used.
-     */
-    const char *variant;
-    /**
-     * A comma separated list of options, through which the user specifies
-     * non-layout related preferences, like which key combinations are used
-     * for switching layouts, or which key is the Compose key.
-     *
-     * If NULL, a default value is used.  If the empty string "", no
-     * options are used.
-     * If the XKB_DEFAULT_OPTIONS environment variable is set, it is used
-     * as the default.  Otherwise the system default is used.
-     */
-    const char *options;
-};
-
-/**
- * @defgroup keysyms Keysyms
- * Utility functions related to keysyms.
- *
- * @{
- */
-
-/**
- * @page keysym-transformations Keysym Transformations
- *
- * Keysym translation is subject to several "keysym transformations",
- * as described in the XKB specification.  These are:
- *
- * - Capitalization transformation.  If the Caps Lock modifier is
- *   active and was not consumed by the translation process, a single
- *   keysym is transformed to its upper-case form (if applicable).
- *   Similarly, the UTF-8/UTF-32 string produced is capitalized.
- *
- *   This is described in:
- *   https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
- *
- * - Control transformation.  If the Control modifier is active and
- *   was not consumed by the translation process, the string produced
- *   is transformed to its matching ASCII control character (if
- *   applicable).  Keysyms are not affected.
- *
- *   This is described in:
- *   https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
- *
- * Each relevant function discusses which transformations it performs.
- *
- * These transformations are not applicable when a key produces multiple
- * keysyms.
- */
-
-
-/**
- * Get the name of a keysym.
- *
- * For a description of how keysyms are named, see @ref xkb_keysym_t.
- *
- * @param[in]  keysym The keysym.
- * @param[out] buffer A string buffer to write the name into.
- * @param[in]  size   Size of the buffer.
- *
- * @warning If the buffer passed is too small, the string is truncated
- * (though still NUL-terminated); a size of at least 64 bytes is recommended.
- *
- * @returns The number of bytes in the name, excluding the NUL byte. If
- * the keysym is invalid, returns -1.
- *
- * You may check if truncation has occurred by comparing the return value
- * with the length of buffer, similarly to the snprintf(3) function.
- *
- * @sa xkb_keysym_t
- */
-int
-xkb_keysym_get_name(xkb_keysym_t keysym, char *buffer, size_t size);
-
-/** Flags for xkb_keysym_from_name(). */
-enum xkb_keysym_flags {
-    /** Do not apply any flags. */
-    XKB_KEYSYM_NO_FLAGS = 0,
-    /** Find keysym by case-insensitive search. */
-    XKB_KEYSYM_CASE_INSENSITIVE = (1 << 0)
-};
-
-/**
- * Get a keysym from its name.
- *
- * @param name The name of a keysym. See remarks in xkb_keysym_get_name();
- * this function will accept any name returned by that function.
- * @param flags A set of flags controlling how the search is done. If
- * invalid flags are passed, this will fail with XKB_KEY_NoSymbol.
- *
- * If you use the XKB_KEYSYM_CASE_INSENSITIVE flag and two keysym names
- * differ only by case, then the lower-case keysym is returned.  For
- * instance, for KEY_a and KEY_A, this function would return KEY_a for the
- * case-insensitive search.  If this functionality is needed, it is
- * recommended to first call this function without this flag; and if that
- * fails, only then to try with this flag, while possibly warning the user
- * he had misspelled the name, and might get wrong results.
- *
- * Case folding is done according to the C locale; the current locale is not
- * consulted.
- *
- * @returns The keysym. If the name is invalid, returns XKB_KEY_NoSymbol.
- *
- * @sa xkb_keysym_t
- */
-xkb_keysym_t
-xkb_keysym_from_name(const char *name, enum xkb_keysym_flags flags);
-
-/**
- * Get the Unicode/UTF-8 representation of a keysym.
- *
- * @param[in]  keysym The keysym.
- * @param[out] buffer A buffer to write the UTF-8 string into.
- * @param[in]  size   The size of buffer.  Must be at least 7.
- *
- * @returns The number of bytes written to the buffer (including the
- * terminating byte).  If the keysym does not have a Unicode
- * representation, returns 0.  If the buffer is too small, returns -1.
- *
- * This function does not perform any @ref keysym-transformations.
- * Therefore, prefer to use xkb_state_key_get_utf8() if possible.
- *
- * @sa xkb_state_key_get_utf8()
- */
-int
-xkb_keysym_to_utf8(xkb_keysym_t keysym, char *buffer, size_t size);
-
-/**
- * Get the Unicode/UTF-32 representation of a keysym.
- *
- * @returns The Unicode/UTF-32 representation of keysym, which is also
- * compatible with UCS-4.  If the keysym does not have a Unicode
- * representation, returns 0.
- *
- * This function does not perform any @ref keysym-transformations.
- * Therefore, prefer to use xkb_state_key_get_utf32() if possible.
- *
- * @sa xkb_state_key_get_utf32()
- */
-uint32_t
-xkb_keysym_to_utf32(xkb_keysym_t keysym);
-
-/**
- * Get the keysym corresponding to a Unicode/UTF-32 codepoint.
- *
- * @returns The keysym corresponding to the specified Unicode
- * codepoint, or XKB_KEY_NoSymbol if there is none.
- *
- * This function is the inverse of @ref xkb_keysym_to_utf32. In cases
- * where a single codepoint corresponds to multiple keysyms, returns
- * the keysym with the lowest value.
- *
- * Unicode codepoints which do not have a special (legacy) keysym
- * encoding use a direct encoding scheme. These keysyms don't usually
- * have an associated keysym constant (XKB_KEY_*).
- *
- * For noncharacter Unicode codepoints and codepoints outside of the
- * defined Unicode planes this function returns XKB_KEY_NoSymbol.
- *
- * @sa xkb_keysym_to_utf32()
- * @since 1.0.0
- */
-xkb_keysym_t
-xkb_utf32_to_keysym(uint32_t ucs);
-
-/**
- * Convert a keysym to its uppercase form.
- *
- * If there is no such form, the keysym is returned unchanged.
- *
- * The conversion rules may be incomplete; prefer to work with the Unicode
- * representation instead, when possible.
- */
-xkb_keysym_t
-xkb_keysym_to_upper(xkb_keysym_t ks);
-
-/**
- * Convert a keysym to its lowercase form.
- *
- * The conversion rules may be incomplete; prefer to work with the Unicode
- * representation instead, when possible.
- */
-xkb_keysym_t
-xkb_keysym_to_lower(xkb_keysym_t ks);
-
-/** @} */
-
-/**
- * @defgroup context Library Context
- * Creating, destroying and using library contexts.
- *
- * Every keymap compilation request must have a context associated with
- * it.  The context keeps around state such as the include path.
- *
- * @{
- */
-
-/**
- * @page envvars Environment Variables
- *
- * The user may set some environment variables which affect the library:
- *
- * - `XKB_CONFIG_ROOT`, `XKB_CONFIG_EXTRA_PATH`, `XDG_CONFIG_DIR`, `HOME` - see @ref include-path.
- * - `XKB_LOG_LEVEL` - see xkb_context_set_log_level().
- * - `XKB_LOG_VERBOSITY` - see xkb_context_set_log_verbosity().
- * - `XKB_DEFAULT_RULES`, `XKB_DEFAULT_MODEL`, `XKB_DEFAULT_LAYOUT`,
- *   `XKB_DEFAULT_VARIANT`, `XKB_DEFAULT_OPTIONS` - see xkb_rule_names.
- */
-
-/** Flags for context creation. */
-enum xkb_context_flags {
-    /** Do not apply any context flags. */
-    XKB_CONTEXT_NO_FLAGS = 0,
-    /** Create this context with an empty include path. */
-    XKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0),
-    /**
-     * Don't take RMLVO names from the environment.
-     * @since 0.3.0
-     */
-    XKB_CONTEXT_NO_ENVIRONMENT_NAMES = (1 << 1)
-};
-
-/**
- * Create a new context.
- *
- * @param flags Optional flags for the context, or 0.
- *
- * @returns A new context, or NULL on failure.
- *
- * @memberof xkb_context
- */
-struct xkb_context *
-xkb_context_new(enum xkb_context_flags flags);
-
-/**
- * Take a new reference on a context.
- *
- * @returns The passed in context.
- *
- * @memberof xkb_context
- */
-struct xkb_context *
-xkb_context_ref(struct xkb_context *context);
-
-/**
- * Release a reference on a context, and possibly free it.
- *
- * @param context The context.  If it is NULL, this function does nothing.
- *
- * @memberof xkb_context
- */
-void
-xkb_context_unref(struct xkb_context *context);
-
-/**
- * Store custom user data in the context.
- *
- * This may be useful in conjunction with xkb_context_set_log_fn() or other
- * callbacks.
- *
- * @memberof xkb_context
- */
-void
-xkb_context_set_user_data(struct xkb_context *context, void *user_data);
-
-/**
- * Retrieves stored user data from the context.
- *
- * @returns The stored user data.  If the user data wasn't set, or the
- * passed in context is NULL, returns NULL.
- *
- * This may be useful to access private user data from callbacks like a
- * custom logging function.
- *
- * @memberof xkb_context
- **/
-void *
-xkb_context_get_user_data(struct xkb_context *context);
-
-/** @} */
-
-/**
- * @defgroup include-path Include Paths
- * Manipulating the include paths in a context.
- *
- * The include paths are the file-system paths that are searched when an
- * include statement is encountered during keymap compilation.
- *
- * The default include paths are, in that lookup order:
- * - The path `$XDG_CONFIG_HOME/xkb`, with the usual `XDG_CONFIG_HOME`
- *   fallback to `$HOME/.config/` if unset.
- * - The path `$HOME/.xkb`, where $HOME is the value of the environment
- *   variable `HOME`.
- * - The `XKB_CONFIG_EXTRA_PATH` environment variable, if defined, otherwise the
- *   system configuration directory, defined at library configuration time
- *   (usually `/etc/xkb`).
- * - The `XKB_CONFIG_ROOT` environment variable, if defined, otherwise
- *   the system XKB root, defined at library configuration time.
- *
- * @{
- */
-
-/**
- * Append a new entry to the context's include path.
- *
- * @returns 1 on success, or 0 if the include path could not be added or is
- * inaccessible.
- *
- * @memberof xkb_context
- */
-int
-xkb_context_include_path_append(struct xkb_context *context, const char *path);
-
-/**
- * Append the default include paths to the context's include path.
- *
- * @returns 1 on success, or 0 if the primary include path could not be added.
- *
- * @memberof xkb_context
- */
-int
-xkb_context_include_path_append_default(struct xkb_context *context);
-
-/**
- * Reset the context's include path to the default.
- *
- * Removes all entries from the context's include path, and inserts the
- * default paths.
- *
- * @returns 1 on success, or 0 if the primary include path could not be added.
- *
- * @memberof xkb_context
- */
-int
-xkb_context_include_path_reset_defaults(struct xkb_context *context);
-
-/**
- * Remove all entries from the context's include path.
- *
- * @memberof xkb_context
- */
-void
-xkb_context_include_path_clear(struct xkb_context *context);
-
-/**
- * Get the number of paths in the context's include path.
- *
- * @memberof xkb_context
- */
-unsigned int
-xkb_context_num_include_paths(struct xkb_context *context);
-
-/**
- * Get a specific include path from the context's include path.
- *
- * @returns The include path at the specified index.  If the index is
- * invalid, returns NULL.
- *
- * @memberof xkb_context
- */
-const char *
-xkb_context_include_path_get(struct xkb_context *context, unsigned int index);
-
-/** @} */
-
-/**
- * @defgroup logging Logging Handling
- * Manipulating how logging from this library is handled.
- *
- * @{
- */
-
-/** Specifies a logging level. */
-enum xkb_log_level {
-    XKB_LOG_LEVEL_CRITICAL = 10, /**< Log critical internal errors only. */
-    XKB_LOG_LEVEL_ERROR = 20,    /**< Log all errors. */
-    XKB_LOG_LEVEL_WARNING = 30,  /**< Log warnings and errors. */
-    XKB_LOG_LEVEL_INFO = 40,     /**< Log information, warnings, and errors. */
-    XKB_LOG_LEVEL_DEBUG = 50     /**< Log everything. */
-};
-
-/**
- * Set the current logging level.
- *
- * @param context The context in which to set the logging level.
- * @param level   The logging level to use.  Only messages from this level
- * and below will be logged.
- *
- * The default level is XKB_LOG_LEVEL_ERROR.  The environment variable
- * XKB_LOG_LEVEL, if set in the time the context was created, overrides the
- * default value.  It may be specified as a level number or name.
- *
- * @memberof xkb_context
- */
-void
-xkb_context_set_log_level(struct xkb_context *context,
-                          enum xkb_log_level level);
-
-/**
- * Get the current logging level.
- *
- * @memberof xkb_context
- */
-enum xkb_log_level
-xkb_context_get_log_level(struct xkb_context *context);
-
-/**
- * Sets the current logging verbosity.
- *
- * The library can generate a number of warnings which are not helpful to
- * ordinary users of the library.  The verbosity may be increased if more
- * information is desired (e.g. when developing a new keymap).
- *
- * The default verbosity is 0.  The environment variable XKB_LOG_VERBOSITY,
- * if set in the time the context was created, overrides the default value.
- *
- * @param context   The context in which to use the set verbosity.
- * @param verbosity The verbosity to use.  Currently used values are
- * 1 to 10, higher values being more verbose.  0 would result in no verbose
- * messages being logged.
- *
- * Most verbose messages are of level XKB_LOG_LEVEL_WARNING or lower.
- *
- * @memberof xkb_context
- */
-void
-xkb_context_set_log_verbosity(struct xkb_context *context, int verbosity);
-
-/**
- * Get the current logging verbosity of the context.
- *
- * @memberof xkb_context
- */
-int
-xkb_context_get_log_verbosity(struct xkb_context *context);
-
-/**
- * Set a custom function to handle logging messages.
- *
- * @param context The context in which to use the set logging function.
- * @param log_fn  The function that will be called for logging messages.
- * Passing NULL restores the default function, which logs to stderr.
- *
- * By default, log messages from this library are printed to stderr.  This
- * function allows you to replace the default behavior with a custom
- * handler.  The handler is only called with messages which match the
- * current logging level and verbosity settings for the context.
- * level is the logging level of the message.  @a format and @a args are
- * the same as in the vprintf(3) function.
- *
- * You may use xkb_context_set_user_data() on the context, and then call
- * xkb_context_get_user_data() from within the logging function to provide
- * it with additional private context.
- *
- * @memberof xkb_context
- */
-void
-xkb_context_set_log_fn(struct xkb_context *context,
-                       void (*log_fn)(struct xkb_context *context,
-                                      enum xkb_log_level level,
-                                      const char *format, va_list args));
-
-/** @} */
-
-/**
- * @defgroup keymap Keymap Creation
- * Creating and destroying keymaps.
- *
- * @{
- */
-
-/** Flags for keymap compilation. */
-enum xkb_keymap_compile_flags {
-    /** Do not apply any flags. */
-    XKB_KEYMAP_COMPILE_NO_FLAGS = 0
-};
-
-/**
- * Create a keymap from RMLVO names.
- *
- * The primary keymap entry point: creates a new XKB keymap from a set of
- * RMLVO (Rules + Model + Layouts + Variants + Options) names.
- *
- * @param context The context in which to create the keymap.
- * @param names   The RMLVO names to use.  See xkb_rule_names.
- * @param flags   Optional flags for the keymap, or 0.
- *
- * @returns A keymap compiled according to the RMLVO names, or NULL if
- * the compilation failed.
- *
- * @sa xkb_rule_names
- * @memberof xkb_keymap
- */
-struct xkb_keymap *
-xkb_keymap_new_from_names(struct xkb_context *context,
-                          const struct xkb_rule_names *names,
-                          enum xkb_keymap_compile_flags flags);
-
-/** The possible keymap formats. */
-enum xkb_keymap_format {
-    /** The current/classic XKB text format, as generated by xkbcomp -xkb. */
-    XKB_KEYMAP_FORMAT_TEXT_V1 = 1
-};
-
-/**
- * Create a keymap from a keymap file.
- *
- * @param context The context in which to create the keymap.
- * @param file    The keymap file to compile.
- * @param format  The text format of the keymap file to compile.
- * @param flags   Optional flags for the keymap, or 0.
- *
- * @returns A keymap compiled from the given XKB keymap file, or NULL if
- * the compilation failed.
- *
- * The file must contain a complete keymap.  For example, in the
- * XKB_KEYMAP_FORMAT_TEXT_V1 format, this means the file must contain one
- * top level '%xkb_keymap' section, which in turn contains other required
- * sections.
- *
- * @memberof xkb_keymap
- */
-struct xkb_keymap *
-xkb_keymap_new_from_file(struct xkb_context *context, FILE *file,
-                         enum xkb_keymap_format format,
-                         enum xkb_keymap_compile_flags flags);
-
-/**
- * Create a keymap from a keymap string.
- *
- * This is just like xkb_keymap_new_from_file(), but instead of a file, gets
- * the keymap as one enormous string.
- *
- * @see xkb_keymap_new_from_file()
- * @memberof xkb_keymap
- */
-struct xkb_keymap *
-xkb_keymap_new_from_string(struct xkb_context *context, const char *string,
-                           enum xkb_keymap_format format,
-                           enum xkb_keymap_compile_flags flags);
-
-/**
- * Create a keymap from a memory buffer.
- *
- * This is just like xkb_keymap_new_from_string(), but takes a length argument
- * so the input string does not have to be zero-terminated.
- *
- * @see xkb_keymap_new_from_string()
- * @memberof xkb_keymap
- * @since 0.3.0
- */
-struct xkb_keymap *
-xkb_keymap_new_from_buffer(struct xkb_context *context, const char *buffer,
-                           size_t length, enum xkb_keymap_format format,
-                           enum xkb_keymap_compile_flags flags);
-
-/**
- * Take a new reference on a keymap.
- *
- * @returns The passed in keymap.
- *
- * @memberof xkb_keymap
- */
-struct xkb_keymap *
-xkb_keymap_ref(struct xkb_keymap *keymap);
-
-/**
- * Release a reference on a keymap, and possibly free it.
- *
- * @param keymap The keymap.  If it is NULL, this function does nothing.
- *
- * @memberof xkb_keymap
- */
-void
-xkb_keymap_unref(struct xkb_keymap *keymap);
-
-/**
- * Get the keymap as a string in the format from which it was created.
- * @sa xkb_keymap_get_as_string()
- **/
-#define XKB_KEYMAP_USE_ORIGINAL_FORMAT ((enum xkb_keymap_format) -1)
-
-/**
- * Get the compiled keymap as a string.
- *
- * @param keymap The keymap to get as a string.
- * @param format The keymap format to use for the string.  You can pass
- * in the special value XKB_KEYMAP_USE_ORIGINAL_FORMAT to use the format
- * from which the keymap was originally created.
- *
- * @returns The keymap as a NUL-terminated string, or NULL if unsuccessful.
- *
- * The returned string may be fed back into xkb_keymap_new_from_string() to get
- * the exact same keymap (possibly in another process, etc.).
- *
- * The returned string is dynamically allocated and should be freed by the
- * caller.
- *
- * @memberof xkb_keymap
- */
-char *
-xkb_keymap_get_as_string(struct xkb_keymap *keymap,
-                         enum xkb_keymap_format format);
-
-/** @} */
-
-/**
- * @defgroup components Keymap Components
- * Enumeration of state components in a keymap.
- *
- * @{
- */
-
-/**
- * Get the minimum keycode in the keymap.
- *
- * @sa xkb_keycode_t
- * @memberof xkb_keymap
- * @since 0.3.1
- */
-xkb_keycode_t
-xkb_keymap_min_keycode(struct xkb_keymap *keymap);
-
-/**
- * Get the maximum keycode in the keymap.
- *
- * @sa xkb_keycode_t
- * @memberof xkb_keymap
- * @since 0.3.1
- */
-xkb_keycode_t
-xkb_keymap_max_keycode(struct xkb_keymap *keymap);
-
-/**
- * The iterator used by xkb_keymap_key_for_each().
- *
- * @sa xkb_keymap_key_for_each
- * @memberof xkb_keymap
- * @since 0.3.1
- */
-typedef void
-(*xkb_keymap_key_iter_t)(struct xkb_keymap *keymap, xkb_keycode_t key,
-                         void *data);
-
-/**
- * Run a specified function for every valid keycode in the keymap.  If a
- * keymap is sparse, this function may be called fewer than
- * (max_keycode - min_keycode + 1) times.
- *
- * @sa xkb_keymap_min_keycode() xkb_keymap_max_keycode() xkb_keycode_t
- * @memberof xkb_keymap
- * @since 0.3.1
- */
-void
-xkb_keymap_key_for_each(struct xkb_keymap *keymap, xkb_keymap_key_iter_t iter,
-                        void *data);
-
-/**
- * Find the name of the key with the given keycode.
- *
- * This function always returns the canonical name of the key (see
- * description in xkb_keycode_t).
- *
- * @returns The key name. If no key with this keycode exists,
- * returns NULL.
- *
- * @sa xkb_keycode_t
- * @memberof xkb_keymap
- * @since 0.6.0
- */
-const char *
-xkb_keymap_key_get_name(struct xkb_keymap *keymap, xkb_keycode_t key);
-
-/**
- * Find the keycode of the key with the given name.
- *
- * The name can be either a canonical name or an alias.
- *
- * @returns The keycode. If no key with this name exists,
- * returns XKB_KEYCODE_INVALID.
- *
- * @sa xkb_keycode_t
- * @memberof xkb_keymap
- * @since 0.6.0
- */
-xkb_keycode_t
-xkb_keymap_key_by_name(struct xkb_keymap *keymap, const char *name);
-
-/**
- * Get the number of modifiers in the keymap.
- *
- * @sa xkb_mod_index_t
- * @memberof xkb_keymap
- */
-xkb_mod_index_t
-xkb_keymap_num_mods(struct xkb_keymap *keymap);
-
-/**
- * Get the name of a modifier by index.
- *
- * @returns The name.  If the index is invalid, returns NULL.
- *
- * @sa xkb_mod_index_t
- * @memberof xkb_keymap
- */
-const char *
-xkb_keymap_mod_get_name(struct xkb_keymap *keymap, xkb_mod_index_t idx);
-
-/**
- * Get the index of a modifier by name.
- *
- * @returns The index.  If no modifier with this name exists, returns
- * XKB_MOD_INVALID.
- *
- * @sa xkb_mod_index_t
- * @memberof xkb_keymap
- */
-xkb_mod_index_t
-xkb_keymap_mod_get_index(struct xkb_keymap *keymap, const char *name);
-
-/**
- * Get the number of layouts in the keymap.
- *
- * @sa xkb_layout_index_t xkb_rule_names xkb_keymap_num_layouts_for_key()
- * @memberof xkb_keymap
- */
-xkb_layout_index_t
-xkb_keymap_num_layouts(struct xkb_keymap *keymap);
-
-/**
- * Get the name of a layout by index.
- *
- * @returns The name.  If the index is invalid, or the layout does not have
- * a name, returns NULL.
- *
- * @sa xkb_layout_index_t
- *     For notes on layout names.
- * @memberof xkb_keymap
- */
-const char *
-xkb_keymap_layout_get_name(struct xkb_keymap *keymap, xkb_layout_index_t idx);
-
-/**
- * Get the index of a layout by name.
- *
- * @returns The index.  If no layout exists with this name, returns
- * XKB_LAYOUT_INVALID.  If more than one layout in the keymap has this name,
- * returns the lowest index among them.
- *
- * @sa xkb_layout_index_t
- *     For notes on layout names.
- * @memberof xkb_keymap
- */
-xkb_layout_index_t
-xkb_keymap_layout_get_index(struct xkb_keymap *keymap, const char *name);
-
-/**
- * Get the number of LEDs in the keymap.
- *
- * @warning The range [ 0...xkb_keymap_num_leds() ) includes all of the LEDs
- * in the keymap, but may also contain inactive LEDs.  When iterating over
- * this range, you need the handle this case when calling functions such as
- * xkb_keymap_led_get_name() or xkb_state_led_index_is_active().
- *
- * @sa xkb_led_index_t
- * @memberof xkb_keymap
- */
-xkb_led_index_t
-xkb_keymap_num_leds(struct xkb_keymap *keymap);
-
-/**
- * Get the name of a LED by index.
- *
- * @returns The name.  If the index is invalid, returns NULL.
- *
- * @memberof xkb_keymap
- */
-const char *
-xkb_keymap_led_get_name(struct xkb_keymap *keymap, xkb_led_index_t idx);
-
-/**
- * Get the index of a LED by name.
- *
- * @returns The index.  If no LED with this name exists, returns
- * XKB_LED_INVALID.
- *
- * @memberof xkb_keymap
- */
-xkb_led_index_t
-xkb_keymap_led_get_index(struct xkb_keymap *keymap, const char *name);
-
-/**
- * Get the number of layouts for a specific key.
- *
- * This number can be different from xkb_keymap_num_layouts(), but is always
- * smaller.  It is the appropriate value to use when iterating over the
- * layouts of a key.
- *
- * @sa xkb_layout_index_t
- * @memberof xkb_keymap
- */
-xkb_layout_index_t
-xkb_keymap_num_layouts_for_key(struct xkb_keymap *keymap, xkb_keycode_t key);
-
-/**
- * Get the number of shift levels for a specific key and layout.
- *
- * If @c layout is out of range for this key (that is, larger or equal to
- * the value returned by xkb_keymap_num_layouts_for_key()), it is brought
- * back into range in a manner consistent with xkb_state_key_get_layout().
- *
- * @sa xkb_level_index_t
- * @memberof xkb_keymap
- */
-xkb_level_index_t
-xkb_keymap_num_levels_for_key(struct xkb_keymap *keymap, xkb_keycode_t key,
-                              xkb_layout_index_t layout);
-
-/**
- * Retrieves every possible modifier mask that produces the specified
- * shift level for a specific key and layout.
- *
- * This API is useful for inverse key transformation; i.e. finding out
- * which modifiers need to be active in order to be able to type the
- * keysym(s) corresponding to the specific key code, layout and level.
- *
- * @warning It returns only up to masks_size modifier masks. If the
- * buffer passed is too small, some of the possible modifier combinations
- * will not be returned.
- *
- * @param[in] keymap      The keymap.
- * @param[in] key         The keycode of the key.
- * @param[in] layout      The layout for which to get modifiers.
- * @param[in] level       The shift level in the layout for which to get the
- * modifiers. This should be smaller than:
- * @code xkb_keymap_num_levels_for_key(keymap, key) @endcode
- * @param[out] masks_out  A buffer in which the requested masks should be
- * stored.
- * @param[out] masks_size The size of the buffer pointed to by masks_out.
- *
- * If @c layout is out of range for this key (that is, larger or equal to
- * the value returned by xkb_keymap_num_layouts_for_key()), it is brought
- * back into range in a manner consistent with xkb_state_key_get_layout().
- *
- * @returns The number of modifier masks stored in the masks_out array.
- * If the key is not in the keymap or if the specified shift level cannot
- * be reached it returns 0 and does not modify the masks_out buffer.
- *
- * @sa xkb_level_index_t
- * @sa xkb_mod_mask_t
- * @memberof xkb_keymap
- * @since 1.0.0
- */
-size_t
-xkb_keymap_key_get_mods_for_level(struct xkb_keymap *keymap,
-                                  xkb_keycode_t key,
-                                  xkb_layout_index_t layout,
-                                  xkb_level_index_t level,
-                                  xkb_mod_mask_t *masks_out,
-                                  size_t masks_size);
-
-/**
- * Get the keysyms obtained from pressing a key in a given layout and
- * shift level.
- *
- * This function is like xkb_state_key_get_syms(), only the layout and
- * shift level are not derived from the keyboard state but are instead
- * specified explicitly.
- *
- * @param[in] keymap    The keymap.
- * @param[in] key       The keycode of the key.
- * @param[in] layout    The layout for which to get the keysyms.
- * @param[in] level     The shift level in the layout for which to get the
- * keysyms. This should be smaller than:
- * @code xkb_keymap_num_levels_for_key(keymap, key) @endcode
- * @param[out] syms_out An immutable array of keysyms corresponding to the
- * key in the given layout and shift level.
- *
- * If @c layout is out of range for this key (that is, larger or equal to
- * the value returned by xkb_keymap_num_layouts_for_key()), it is brought
- * back into range in a manner consistent with xkb_state_key_get_layout().
- *
- * @returns The number of keysyms in the syms_out array.  If no keysyms
- * are produced by the key in the given layout and shift level, returns 0
- * and sets syms_out to NULL.
- *
- * @sa xkb_state_key_get_syms()
- * @memberof xkb_keymap
- */
-int
-xkb_keymap_key_get_syms_by_level(struct xkb_keymap *keymap,
-                                 xkb_keycode_t key,
-                                 xkb_layout_index_t layout,
-                                 xkb_level_index_t level,
-                                 const xkb_keysym_t **syms_out);
-
-/**
- * Determine whether a key should repeat or not.
- *
- * A keymap may specify different repeat behaviors for different keys.
- * Most keys should generally exhibit repeat behavior; for example, holding
- * the 'a' key down in a text editor should normally insert a single 'a'
- * character every few milliseconds, until the key is released.  However,
- * there are keys which should not or do not need to be repeated.  For
- * example, repeating modifier keys such as Left/Right Shift or Caps Lock
- * is not generally useful or desired.
- *
- * @returns 1 if the key should repeat, 0 otherwise.
- *
- * @memberof xkb_keymap
- */
-int
-xkb_keymap_key_repeats(struct xkb_keymap *keymap, xkb_keycode_t key);
-
-/** @} */
-
-/**
- * @defgroup state Keyboard State
- * Creating, destroying and manipulating keyboard state objects.
- *
- * @{
- */
-
-/**
- * Create a new keyboard state object.
- *
- * @param keymap The keymap which the state will use.
- *
- * @returns A new keyboard state object, or NULL on failure.
- *
- * @memberof xkb_state
- */
-struct xkb_state *
-xkb_state_new(struct xkb_keymap *keymap);
-
-/**
- * Take a new reference on a keyboard state object.
- *
- * @returns The passed in object.
- *
- * @memberof xkb_state
- */
-struct xkb_state *
-xkb_state_ref(struct xkb_state *state);
-
-/**
- * Release a reference on a keybaord state object, and possibly free it.
- *
- * @param state The state.  If it is NULL, this function does nothing.
- *
- * @memberof xkb_state
- */
-void
-xkb_state_unref(struct xkb_state *state);
-
-/**
- * Get the keymap which a keyboard state object is using.
- *
- * @returns The keymap which was passed to xkb_state_new() when creating
- * this state object.
- *
- * This function does not take a new reference on the keymap; you must
- * explicitly reference it yourself if you plan to use it beyond the
- * lifetime of the state.
- *
- * @memberof xkb_state
- */
-struct xkb_keymap *
-xkb_state_get_keymap(struct xkb_state *state);
-
-/** Specifies the direction of the key (press / release). */
-enum xkb_key_direction {
-    XKB_KEY_UP,   /**< The key was released. */
-    XKB_KEY_DOWN  /**< The key was pressed. */
-};
-
-/**
- * Modifier and layout types for state objects.  This enum is bitmaskable,
- * e.g. (XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED) is valid to
- * exclude locked modifiers.
- *
- * In XKB, the DEPRESSED components are also known as 'base'.
- */
-enum xkb_state_component {
-    /** Depressed modifiers, i.e. a key is physically holding them. */
-    XKB_STATE_MODS_DEPRESSED = (1 << 0),
-    /** Latched modifiers, i.e. will be unset after the next non-modifier
-     *  key press. */
-    XKB_STATE_MODS_LATCHED = (1 << 1),
-    /** Locked modifiers, i.e. will be unset after the key provoking the
-     *  lock has been pressed again. */
-    XKB_STATE_MODS_LOCKED = (1 << 2),
-    /** Effective modifiers, i.e. currently active and affect key
-     *  processing (derived from the other state components).
-     *  Use this unless you explicitly care how the state came about. */
-    XKB_STATE_MODS_EFFECTIVE = (1 << 3),
-    /** Depressed layout, i.e. a key is physically holding it. */
-    XKB_STATE_LAYOUT_DEPRESSED = (1 << 4),
-    /** Latched layout, i.e. will be unset after the next non-modifier
-     *  key press. */
-    XKB_STATE_LAYOUT_LATCHED = (1 << 5),
-    /** Locked layout, i.e. will be unset after the key provoking the lock
-     *  has been pressed again. */
-    XKB_STATE_LAYOUT_LOCKED = (1 << 6),
-    /** Effective layout, i.e. currently active and affects key processing
-     *  (derived from the other state components).
-     *  Use this unless you explicitly care how the state came about. */
-    XKB_STATE_LAYOUT_EFFECTIVE = (1 << 7),
-    /** LEDs (derived from the other state components). */
-    XKB_STATE_LEDS = (1 << 8)
-};
-
-/**
- * Update the keyboard state to reflect a given key being pressed or
- * released.
- *
- * This entry point is intended for programs which track the keyboard state
- * explicitly (like an evdev client).  If the state is serialized to you by
- * a master process (like a Wayland compositor) using functions like
- * xkb_state_serialize_mods(), you should use xkb_state_update_mask() instead.
- * The two functions should not generally be used together.
- *
- * A series of calls to this function should be consistent; that is, a call
- * with XKB_KEY_DOWN for a key should be matched by an XKB_KEY_UP; if a key
- * is pressed twice, it should be released twice; etc. Otherwise (e.g. due
- * to missed input events), situations like "stuck modifiers" may occur.
- *
- * This function is often used in conjunction with the function
- * xkb_state_key_get_syms() (or xkb_state_key_get_one_sym()), for example,
- * when handling a key event.  In this case, you should prefer to get the
- * keysyms *before* updating the key, such that the keysyms reported for
- * the key event are not affected by the event itself.  This is the
- * conventional behavior.
- *
- * @returns A mask of state components that have changed as a result of
- * the update.  If nothing in the state has changed, returns 0.
- *
- * @memberof xkb_state
- *
- * @sa xkb_state_update_mask()
- */
-enum xkb_state_component
-xkb_state_update_key(struct xkb_state *state, xkb_keycode_t key,
-                     enum xkb_key_direction direction);
-
-/**
- * Update a keyboard state from a set of explicit masks.
- *
- * This entry point is intended for window systems and the like, where a
- * master process holds an xkb_state, then serializes it over a wire
- * protocol, and clients then use the serialization to feed in to their own
- * xkb_state.
- *
- * All parameters must always be passed, or the resulting state may be
- * incoherent.
- *
- * The serialization is lossy and will not survive round trips; it must only
- * be used to feed slave state objects, and must not be used to update the
- * master state.
- *
- * If you do not fit the description above, you should use
- * xkb_state_update_key() instead.  The two functions should not generally be
- * used together.
- *
- * @returns A mask of state components that have changed as a result of
- * the update.  If nothing in the state has changed, returns 0.
- *
- * @memberof xkb_state
- *
- * @sa xkb_state_component
- * @sa xkb_state_update_key
- */
-enum xkb_state_component
-xkb_state_update_mask(struct xkb_state *state,
-                      xkb_mod_mask_t depressed_mods,
-                      xkb_mod_mask_t latched_mods,
-                      xkb_mod_mask_t locked_mods,
-                      xkb_layout_index_t depressed_layout,
-                      xkb_layout_index_t latched_layout,
-                      xkb_layout_index_t locked_layout);
-
-/**
- * Get the keysyms obtained from pressing a particular key in a given
- * keyboard state.
- *
- * Get the keysyms for a key according to the current active layout,
- * modifiers and shift level for the key, as determined by a keyboard
- * state.
- *
- * @param[in]  state    The keyboard state object.
- * @param[in]  key      The keycode of the key.
- * @param[out] syms_out An immutable array of keysyms corresponding the
- * key in the given keyboard state.
- *
- * As an extension to XKB, this function can return more than one keysym.
- * If you do not want to handle this case, you can use
- * xkb_state_key_get_one_sym() for a simpler interface.
- *
- * This function does not perform any @ref keysym-transformations.
- * (This might change).
- *
- * @returns The number of keysyms in the syms_out array.  If no keysyms
- * are produced by the key in the given keyboard state, returns 0 and sets
- * syms_out to NULL.
- *
- * @memberof xkb_state
- */
-int
-xkb_state_key_get_syms(struct xkb_state *state, xkb_keycode_t key,
-                       const xkb_keysym_t **syms_out);
-
-/**
- * Get the Unicode/UTF-8 string obtained from pressing a particular key
- * in a given keyboard state.
- *
- * @param[in]  state  The keyboard state object.
- * @param[in]  key    The keycode of the key.
- * @param[out] buffer A buffer to write the string into.
- * @param[in]  size   Size of the buffer.
- *
- * @warning If the buffer passed is too small, the string is truncated
- * (though still NUL-terminated).
- *
- * @returns The number of bytes required for the string, excluding the
- * NUL byte.  If there is nothing to write, returns 0.
- *
- * You may check if truncation has occurred by comparing the return value
- * with the size of @p buffer, similarly to the snprintf(3) function.
- * You may safely pass NULL and 0 to @p buffer and @p size to find the
- * required size (without the NUL-byte).
- *
- * This function performs Capitalization and Control @ref
- * keysym-transformations.
- *
- * @memberof xkb_state
- * @since 0.4.1
- */
-int
-xkb_state_key_get_utf8(struct xkb_state *state, xkb_keycode_t key,
-                       char *buffer, size_t size);
-
-/**
- * Get the Unicode/UTF-32 codepoint obtained from pressing a particular
- * key in a a given keyboard state.
- *
- * @returns The UTF-32 representation for the key, if it consists of only
- * a single codepoint.  Otherwise, returns 0.
- *
- * This function performs Capitalization and Control @ref
- * keysym-transformations.
- *
- * @memberof xkb_state
- * @since 0.4.1
- */
-uint32_t
-xkb_state_key_get_utf32(struct xkb_state *state, xkb_keycode_t key);
-
-/**
- * Get the single keysym obtained from pressing a particular key in a
- * given keyboard state.
- *
- * This function is similar to xkb_state_key_get_syms(), but intended
- * for users which cannot or do not want to handle the case where
- * multiple keysyms are returned (in which case this function is
- * preferred).
- *
- * @returns The keysym.  If the key does not have exactly one keysym,
- * returns XKB_KEY_NoSymbol
- *
- * This function performs Capitalization @ref keysym-transformations.
- *
- * @sa xkb_state_key_get_syms()
- * @memberof xkb_state
- */
-xkb_keysym_t
-xkb_state_key_get_one_sym(struct xkb_state *state, xkb_keycode_t key);
-
-/**
- * Get the effective layout index for a key in a given keyboard state.
- *
- * @returns The layout index for the key in the given keyboard state.  If
- * the given keycode is invalid, or if the key is not included in any
- * layout at all, returns XKB_LAYOUT_INVALID.
- *
- * @invariant If the returned layout is valid, the following always holds:
- * @code
- * xkb_state_key_get_layout(state, key) < xkb_keymap_num_layouts_for_key(keymap, key)
- * @endcode
- *
- * @memberof xkb_state
- */
-xkb_layout_index_t
-xkb_state_key_get_layout(struct xkb_state *state, xkb_keycode_t key);
-
-/**
- * Get the effective shift level for a key in a given keyboard state and
- * layout.
- *
- * @param state The keyboard state.
- * @param key The keycode of the key.
- * @param layout The layout for which to get the shift level.  This must be
- * smaller than:
- * @code xkb_keymap_num_layouts_for_key(keymap, key) @endcode
- * usually it would be:
- * @code xkb_state_key_get_layout(state, key) @endcode
- *
- * @return The shift level index.  If the key or layout are invalid,
- * returns XKB_LEVEL_INVALID.
- *
- * @invariant If the returned level is valid, the following always holds:
- * @code
- * xkb_state_key_get_level(state, key, layout) < xkb_keymap_num_levels_for_key(keymap, key, layout)
- * @endcode
- *
- * @memberof xkb_state
- */
-xkb_level_index_t
-xkb_state_key_get_level(struct xkb_state *state, xkb_keycode_t key,
-                        xkb_layout_index_t layout);
-
-/**
- * Match flags for xkb_state_mod_indices_are_active() and
- * xkb_state_mod_names_are_active(), specifying the conditions for a
- * successful match.  XKB_STATE_MATCH_NON_EXCLUSIVE is bitmaskable with
- * the other modes.
- */
-enum xkb_state_match {
-    /** Returns true if any of the modifiers are active. */
-    XKB_STATE_MATCH_ANY = (1 << 0),
-    /** Returns true if all of the modifiers are active. */
-    XKB_STATE_MATCH_ALL = (1 << 1),
-    /** Makes matching non-exclusive, i.e. will not return false if a
-     *  modifier not specified in the arguments is active. */
-    XKB_STATE_MATCH_NON_EXCLUSIVE = (1 << 16)
-};
-
-/**
- * The counterpart to xkb_state_update_mask for modifiers, to be used on
- * the server side of serialization.
- *
- * @param state      The keyboard state.
- * @param components A mask of the modifier state components to serialize.
- * State components other than XKB_STATE_MODS_* are ignored.
- * If XKB_STATE_MODS_EFFECTIVE is included, all other state components are
- * ignored.
- *
- * @returns A xkb_mod_mask_t representing the given components of the
- * modifier state.
- *
- * This function should not be used in regular clients; please use the
- * xkb_state_mod_*_is_active API instead.
- *
- * @memberof xkb_state
- */
-xkb_mod_mask_t
-xkb_state_serialize_mods(struct xkb_state *state,
-                         enum xkb_state_component components);
-
-/**
- * The counterpart to xkb_state_update_mask for layouts, to be used on
- * the server side of serialization.
- *
- * @param state      The keyboard state.
- * @param components A mask of the layout state components to serialize.
- * State components other than XKB_STATE_LAYOUT_* are ignored.
- * If XKB_STATE_LAYOUT_EFFECTIVE is included, all other state components are
- * ignored.
- *
- * @returns A layout index representing the given components of the
- * layout state.
- *
- * This function should not be used in regular clients; please use the
- * xkb_state_layout_*_is_active API instead.
- *
- * @memberof xkb_state
- */
-xkb_layout_index_t
-xkb_state_serialize_layout(struct xkb_state *state,
-                           enum xkb_state_component components);
-
-/**
- * Test whether a modifier is active in a given keyboard state by name.
- *
- * @returns 1 if the modifier is active, 0 if it is not.  If the modifier
- * name does not exist in the keymap, returns -1.
- *
- * @memberof xkb_state
- */
-int
-xkb_state_mod_name_is_active(struct xkb_state *state, const char *name,
-                             enum xkb_state_component type);
-
-/**
- * Test whether a set of modifiers are active in a given keyboard state by
- * name.
- *
- * @param state The keyboard state.
- * @param type  The component of the state against which to match the
- * given modifiers.
- * @param match The manner by which to match the state against the
- * given modifiers.
- * @param ...   The set of of modifier names to test, terminated by a NULL
- * argument (sentinel).
- *
- * @returns 1 if the modifiers are active, 0 if they are not.  If any of
- * the modifier names do not exist in the keymap, returns -1.
- *
- * @memberof xkb_state
- */
-int
-xkb_state_mod_names_are_active(struct xkb_state *state,
-                               enum xkb_state_component type,
-                               enum xkb_state_match match,
-                               ...);
-
-/**
- * Test whether a modifier is active in a given keyboard state by index.
- *
- * @returns 1 if the modifier is active, 0 if it is not.  If the modifier
- * index is invalid in the keymap, returns -1.
- *
- * @memberof xkb_state
- */
-int
-xkb_state_mod_index_is_active(struct xkb_state *state, xkb_mod_index_t idx,
-                              enum xkb_state_component type);
-
-/**
- * Test whether a set of modifiers are active in a given keyboard state by
- * index.
- *
- * @param state The keyboard state.
- * @param type  The component of the state against which to match the
- * given modifiers.
- * @param match The manner by which to match the state against the
- * given modifiers.
- * @param ...   The set of of modifier indices to test, terminated by a
- * XKB_MOD_INVALID argument (sentinel).
- *
- * @returns 1 if the modifiers are active, 0 if they are not.  If any of
- * the modifier indices are invalid in the keymap, returns -1.
- *
- * @memberof xkb_state
- */
-int
-xkb_state_mod_indices_are_active(struct xkb_state *state,
-                                 enum xkb_state_component type,
-                                 enum xkb_state_match match,
-                                 ...);
-
-/**
- * @page consumed-modifiers Consumed Modifiers
- * @parblock
- *
- * Some functions, like xkb_state_key_get_syms(), look at the state of
- * the modifiers in the keymap and derive from it the correct shift level
- * to use for the key.  For example, in a US layout, pressing the key
- * labeled \<A\> while the Shift modifier is active, generates the keysym
- * 'A'.  In this case, the Shift modifier is said to be "consumed".
- * However, the Num Lock modifier does not affect this translation at all,
- * even if it is active, so it is not consumed by this translation.
- *
- * It may be desirable for some application to not reuse consumed modifiers
- * for further processing, e.g. for hotkeys or keyboard shortcuts.  To
- * understand why, consider some requirements from a standard shortcut
- * mechanism, and how they are implemented:
- *
- * 1. The shortcut's modifiers must match exactly to the state.  For
- *    example, it is possible to bind separate actions to \<Alt\>\<Tab\>
- *    and to \<Alt\>\<Shift\>\<Tab\>.  Further, if only \<Alt\>\<Tab\> is
- *    bound to an action, pressing \<Alt\>\<Shift\>\<Tab\> should not
- *    trigger the shortcut.
- *    Effectively, this means that the modifiers are compared using the
- *    equality operator (==).
- *
- * 2. Only relevant modifiers are considered for the matching.  For example,
- *    Caps Lock and Num Lock should not generally affect the matching, e.g.
- *    when matching \<Alt\>\<Tab\> against the state, it does not matter
- *    whether Num Lock is active or not.  These relevant, or "significant",
- *    modifiers usually include Alt, Control, Shift, Super and similar.
- *    Effectively, this means that non-significant modifiers are masked out,
- *    before doing the comparison as described above.
- *
- * 3. The matching must be independent of the layout/keymap.  For example,
- *    the \<Plus\> (+) symbol is found on the first level on some layouts,
- *    but requires holding Shift on others.  If you simply bind the action
- *    to the \<Plus\> keysym, it would work for the unshifted kind, but
- *    not for the others, because the match against Shift would fail.  If
- *    you bind the action to \<Shift\>\<Plus\>, only the shifted kind would
- *    work.  So what is needed is to recognize that Shift is used up in the
- *    translation of the keysym itself, and therefore should not be included
- *    in the matching.
- *    Effectively, this means that consumed modifiers (Shift in this example)
- *    are masked out as well, before doing the comparison.
- *
- * In summary, this is approximately how the matching would be performed:
- * @code
- *   (keysym == shortcut_keysym) &&
- *   ((state_mods & ~consumed_mods & significant_mods) == shortcut_mods)
- * @endcode
- *
- * @c state_mods are the modifiers reported by
- * xkb_state_mod_index_is_active() and similar functions.
- * @c consumed_mods are the modifiers reported by
- * xkb_state_mod_index_is_consumed() and similar functions.
- * @c significant_mods are decided upon by the application/toolkit/user;
- * it is up to them to decide whether these are configurable or hard-coded.
- *
- * @endparblock
- */
-
-/**
- * Consumed modifiers mode.
- *
- * There are several possible methods for deciding which modifiers are
- * consumed and which are not, each applicable for different systems or
- * situations. The mode selects the method to use.
- *
- * Keep in mind that in all methods, the keymap may decide to "preserve"
- * a modifier, meaning it is not reported as consumed even if it would
- * have otherwise.
- */
-enum xkb_consumed_mode {
-    /**
-     * This is the mode defined in the XKB specification and used by libX11.
-     *
-     * A modifier is consumed if and only if it *may affect* key translation.
-     *
-     * For example, if `Control+Alt+<Backspace>` produces some assigned keysym,
-     * then when pressing just `<Backspace>`, `Control` and `Alt` are consumed,
-     * even though they are not active, since if they *were* active they would
-     * have affected key translation.
-     */
-    XKB_CONSUMED_MODE_XKB,
-    /**
-     * This is the mode used by the GTK+ toolkit.
-     *
-     * The mode consists of the following two independent heuristics:
-     *
-     * - The currently active set of modifiers, excluding modifiers which do
-     *   not affect the key (as described for @ref XKB_CONSUMED_MODE_XKB), are
-     *   considered consumed, if the keysyms produced when all of them are
-     *   active are different from the keysyms produced when no modifiers are
-     *   active.
-     *
-     * - A single modifier is considered consumed if the keysyms produced for
-     *   the key when it is the only active modifier are different from the
-     *   keysyms produced when no modifiers are active.
-     */
-    XKB_CONSUMED_MODE_GTK
-};
-
-/**
- * Get the mask of modifiers consumed by translating a given key.
- *
- * @param state The keyboard state.
- * @param key   The keycode of the key.
- * @param mode  The consumed modifiers mode to use; see enum description.
- *
- * @returns a mask of the consumed modifiers.
- *
- * @memberof xkb_state
- * @since 0.7.0
- */
-xkb_mod_mask_t
-xkb_state_key_get_consumed_mods2(struct xkb_state *state, xkb_keycode_t key,
-                                 enum xkb_consumed_mode mode);
-
-/**
- * Same as xkb_state_key_get_consumed_mods2() with mode XKB_CONSUMED_MODE_XKB.
- *
- * @memberof xkb_state
- * @since 0.4.1
- */
-xkb_mod_mask_t
-xkb_state_key_get_consumed_mods(struct xkb_state *state, xkb_keycode_t key);
-
-/**
- * Test whether a modifier is consumed by keyboard state translation for
- * a key.
- *
- * @param state The keyboard state.
- * @param key   The keycode of the key.
- * @param idx   The index of the modifier to check.
- * @param mode  The consumed modifiers mode to use; see enum description.
- *
- * @returns 1 if the modifier is consumed, 0 if it is not.  If the modifier
- * index is not valid in the keymap, returns -1.
- *
- * @sa xkb_state_mod_mask_remove_consumed()
- * @sa xkb_state_key_get_consumed_mods()
- * @memberof xkb_state
- * @since 0.7.0
- */
-int
-xkb_state_mod_index_is_consumed2(struct xkb_state *state,
-                                 xkb_keycode_t key,
-                                 xkb_mod_index_t idx,
-                                 enum xkb_consumed_mode mode);
-
-/**
- * Same as xkb_state_mod_index_is_consumed2() with mode XKB_CONSUMED_MOD_XKB.
- *
- * @memberof xkb_state
- * @since 0.4.1
- */
-int
-xkb_state_mod_index_is_consumed(struct xkb_state *state, xkb_keycode_t key,
-                                xkb_mod_index_t idx);
-
-/**
- * Remove consumed modifiers from a modifier mask for a key.
- *
- * @deprecated Use xkb_state_key_get_consumed_mods2() instead.
- *
- * Takes the given modifier mask, and removes all modifiers which are
- * consumed for that particular key (as in xkb_state_mod_index_is_consumed()).
- *
- * @sa xkb_state_mod_index_is_consumed()
- * @memberof xkb_state
- */
-xkb_mod_mask_t
-xkb_state_mod_mask_remove_consumed(struct xkb_state *state, xkb_keycode_t key,
-                                   xkb_mod_mask_t mask);
-
-/**
- * Test whether a layout is active in a given keyboard state by name.
- *
- * @returns 1 if the layout is active, 0 if it is not.  If no layout with
- * this name exists in the keymap, return -1.
- *
- * If multiple layouts in the keymap have this name, the one with the lowest
- * index is tested.
- *
- * @sa xkb_layout_index_t
- * @memberof xkb_state
- */
-int
-xkb_state_layout_name_is_active(struct xkb_state *state, const char *name,
-                                enum xkb_state_component type);
-
-/**
- * Test whether a layout is active in a given keyboard state by index.
- *
- * @returns 1 if the layout is active, 0 if it is not.  If the layout index
- * is not valid in the keymap, returns -1.
- *
- * @sa xkb_layout_index_t
- * @memberof xkb_state
- */
-int
-xkb_state_layout_index_is_active(struct xkb_state *state,
-                                 xkb_layout_index_t idx,
-                                 enum xkb_state_component type);
-
-/**
- * Test whether a LED is active in a given keyboard state by name.
- *
- * @returns 1 if the LED is active, 0 if it not.  If no LED with this name
- * exists in the keymap, returns -1.
- *
- * @sa xkb_led_index_t
- * @memberof xkb_state
- */
-int
-xkb_state_led_name_is_active(struct xkb_state *state, const char *name);
-
-/**
- * Test whether a LED is active in a given keyboard state by index.
- *
- * @returns 1 if the LED is active, 0 if it not.  If the LED index is not
- * valid in the keymap, returns -1.
- *
- * @sa xkb_led_index_t
- * @memberof xkb_state
- */
-int
-xkb_state_led_index_is_active(struct xkb_state *state, xkb_led_index_t idx);
-
-/** @} */
-
-/* Leave this include last, so it can pick up our types, etc. */
-#include <xkbcommon/xkbcommon-compat.h>
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* _XKBCOMMON_H_ */
diff --git a/xkbcommon/xkbregistry.h b/xkbcommon/xkbregistry.h
deleted file mode 100644
index 4e7e926..0000000
--- a/xkbcommon/xkbregistry.h
+++ /dev/null
@@ -1,782 +0,0 @@
-/*
- * Copyright © 2020 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef _XKBREGISTRY_H_
-#define _XKBREGISTRY_H_
-
-#include <stdarg.h>
-#include <stdbool.h>
-
-/**
- * @file
- * @brief Query for available RMLVO
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup registry Query for available RMLVO
- *
- * The libxkbregistry API to query for available rules, models, layouts,
- * variants and options (RMLVO). libxkbregistry is a separate library to
- * libxkbcommon.
- *
- * This library is the replacement for clients currently parsing evdev.xml
- * directly. The library is intended to provide easy access to the set of
- * **possible** MLVO configurations for a given ruleset. It is not a library to
- * apply these configurations, merely to enumerate them. The intended users of
- * this library are the configuration UIs that allow a user to select their
- * keyboard layout of choice.
- *
- * @{
- */
-
-/**
- * @struct rxkb_context
- *
- * Opaque top level library context object.
- *
- * The context contains general library state, like include paths and parsed
- * data. Objects are created in a specific context, and multiple contexts
- * may coexist simultaneously. Objects from different contexts are
- * completely separated and do not share any memory or state.
- */
-struct rxkb_context;
-
-/**
- * @struct rxkb_model
- *
- * Opaque struct representing an XKB model.
- */
-struct rxkb_model;
-
-/**
- * @struct rxkb_layout
- *
- * Opaque struct representing an XKB layout, including an optional variant.
- * Where the variant is NULL, the layout is the base layout.
- *
- * For example, "us" is the base layout, "us(intl)" is the "intl" variant of the
- * layout "us".
- */
-struct rxkb_layout;
-
-/**
- * @struct rxkb_option_group
- *
- * Opaque struct representing an option group. Option groups divide the
- * individual options into logical groups. Their main purpose is to indicate
- * whether some options are mutually exclusive or not.
- */
-struct rxkb_option_group;
-
-/**
- * @struct rxkb_option
- *
- * Opaque struct representing an XKB option. Options are grouped inside an @ref
- * rxkb_option_group.
- */
-struct rxkb_option;
-
-/**
- *
- * @struct rxkb_iso639_code
- *
- * Opaque struct representing an ISO 639-3 code (e.g. "eng", "fra"). There
- * is no guarantee that two identical ISO codes share the same struct. You
- * must not rely on the pointer value of this struct.
- *
- * See https://iso639-3.sil.org/code_tables/639/data for a list of codes.
- */
-struct rxkb_iso639_code;
-
-/**
- *
- * @struct rxkb_iso3166_code
- *
- * Opaque struct representing an ISO 3166 Alpha 2 code (e.g. "US", "FR").
- * There is no guarantee that two identical ISO codes share the same struct.
- * You must not rely on the pointer value of this struct.
- *
- * See https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes for a list
- * of codes.
- */
-struct rxkb_iso3166_code;
-
-/**
- * Describes the popularity of an item. Historically, some highly specialized or
- * experimental definitions are excluded from the default list and shipped in
- * separate files. If these extra definitions are loaded (see @ref
- * RXKB_CONTEXT_LOAD_EXOTIC_RULES), the popularity of the item is set
- * accordingly.
- *
- * If the exotic items are not loaded, all items will have the standard
- * popularity.
- */
-enum rxkb_popularity {
-    RXKB_POPULARITY_STANDARD = 1,
-    RXKB_POPULARITY_EXOTIC,
-};
-
-/**
- * Flags for context creation.
- */
-enum rxkb_context_flags {
-    RXKB_CONTEXT_NO_FLAGS = 0,
-    /**
-     * Skip the default include paths. This requires the caller to call
-     * rxkb_context_include_path_append() or
-     * rxkb_context_include_path_append_default().
-     */
-    RXKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0),
-    /**
-     * Load the extra items that are considered too exotic for the default list.
-     *
-     * For historical reasons, xkeyboard-config ships those exotic rules in a
-     * separate file (e.g. `evdev.extras.xml`). Where the exotic rules are
-     * requested, libxkbregistry will look for and load `$ruleset.extras.xml`
-     * in the include paths, see rxkb_context_include_path_append() for details
-     * on the lookup behavior.
-     */
-    RXKB_CONTEXT_LOAD_EXOTIC_RULES = (1 << 1),
-};
-
-/**
- * Create a new xkb registry context.
- *
- * The context has an initial refcount of 1. Use rxkb_context_unref() to release
- * memory associated with this context.
- *
- * Creating a context does not parse the files yet, use
- * rxkb_context_parse().
- *
- * @param flags Flags affecting context behavior
- * @return A new xkb registry context or NULL on failure
- */
-struct rxkb_context *
-rxkb_context_new(enum rxkb_context_flags flags);
-
-/** Specifies a logging level. */
-enum rxkb_log_level {
-    RXKB_LOG_LEVEL_CRITICAL = 10, /**< Log critical internal errors only. */
-    RXKB_LOG_LEVEL_ERROR = 20,    /**< Log all errors. */
-    RXKB_LOG_LEVEL_WARNING = 30,  /**< Log warnings and errors. */
-    RXKB_LOG_LEVEL_INFO = 40,     /**< Log information, warnings, and errors. */
-    RXKB_LOG_LEVEL_DEBUG = 50     /**< Log everything. */
-};
-
-/**
- * Set the current logging level.
- *
- * @param ctx     The context in which to set the logging level.
- * @param level   The logging level to use.  Only messages from this level
- * and below will be logged.
- *
- * The default level is RXKB_LOG_LEVEL_ERROR.  The environment variable
- * RXKB_LOG_LEVEL, if set at the time the context was created, overrides the
- * default value.  It may be specified as a level number or name.
- */
-void
-rxkb_context_set_log_level(struct rxkb_context *ctx,
-                           enum rxkb_log_level level);
-
-/**
- * Get the current logging level.
- */
-enum rxkb_log_level
-rxkb_context_get_log_level(struct rxkb_context *ctx);
-
-/**
- * Set a custom function to handle logging messages.
- *
- * @param ctx     The context in which to use the set logging function.
- * @param log_fn  The function that will be called for logging messages.
- * Passing NULL restores the default function, which logs to stderr.
- *
- * By default, log messages from this library are printed to stderr.  This
- * function allows you to replace the default behavior with a custom
- * handler.  The handler is only called with messages which match the
- * current logging level and verbosity settings for the context.
- * level is the logging level of the message.  @a format and @a args are
- * the same as in the vprintf(3) function.
- *
- * You may use rxkb_context_set_user_data() on the context, and then call
- * rxkb_context_get_user_data() from within the logging function to provide
- * it with additional private context.
- */
-void
-rxkb_context_set_log_fn(struct rxkb_context *ctx,
-                        void (*log_fn)(struct rxkb_context *ctx,
-                                       enum rxkb_log_level level,
-                                       const char *format, va_list args));
-
-
-/**
- * Parse the given ruleset. This can only be called once per context and once
- * parsed the data in the context is considered constant and will never
- * change.
- *
- * This function parses all files with the given ruleset name. See
- * rxkb_context_include_path_append() for details.
- *
- * If this function returns false, libxkbregistry failed to parse the xml files.
- * This is usually caused by invalid files on the host and should be debugged by
- * the host's administrator using external tools. Callers should reduce the
- * include paths to known good paths and/or fall back to a default RMLVO set.
- *
- * If this function returns false, the context should be be considered dead and
- * must be released with rxkb_context_unref().
- *
- * @param ctx The xkb registry context
- * @param ruleset The ruleset to parse, e.g. "evdev"
- * @return true on success or false on failure
- */
-bool
-rxkb_context_parse(struct rxkb_context *ctx, const char *ruleset);
-
-/**
- * Parse the default ruleset as configured at build time. See
- * rxkb_context_parse() for details.
- */
-bool
-rxkb_context_parse_default_ruleset(struct rxkb_context *ctx);
-
-/**
- * Increases the refcount of this object by one and returns the object.
- *
- * @param ctx The xkb registry context
- * @return The passed in object
- */
-struct rxkb_context*
-rxkb_context_ref(struct rxkb_context *ctx);
-
-/**
- * Decreases the refcount of this object by one. Where the refcount of an
- * object hits zero, associated resources will be freed.
- *
- * @param ctx The xkb registry context
- * @return always NULL
- */
-struct rxkb_context*
-rxkb_context_unref(struct rxkb_context *ctx);
-
-/**
- * Assign user-specific data. libxkbregistry will not look at or modify the
- * data, it will merely return the same pointer in
- * rxkb_context_get_user_data().
- *
- * @param ctx The xkb registry context
- * @param user_data User-specific data pointer
- */
-void
-rxkb_context_set_user_data(struct rxkb_context *ctx, void *user_data);
-
-/**
- * Return the pointer passed into rxkb_context_get_user_data().
- *
- * @param ctx The xkb registry context
- * @return User-specific data pointer
- */
-void *
-rxkb_context_get_user_data(struct rxkb_context *ctx);
-
-/**
- * Append a new entry to the context's include path.
- *
- * The include path handling is optimized for the most common use-case: a set of
- * system files that provide a complete set of MLVO and some
- * custom MLVO provided by a user **in addition** to the system set.
- *
- * The include paths should be given so that the least complete path is
- * specified first and the most complete path is appended last. For example:
- *
- * @code
- *    ctx = rxkb_context_new(RXKB_CONTEXT_NO_DEFAULT_INCLUDES);
- *    rxkb_context_include_path_append(ctx, "/home/user/.config/xkb");
- *    rxkb_context_include_path_append(ctx, "/usr/share/X11/xkb");
- *    rxkb_context_parse(ctx, "evdev");
- * @endcode
- *
- * The above example reflects the default behavior unless @ref
- * RXKB_CONTEXT_NO_DEFAULT_INCLUDES is provided.
- *
- * Loading of the files is in **reverse order**, i.e. the last path appended is
- * loaded first - in this case the ``/usr/share/X11/xkb`` path.
- * Any models, layouts, variants and options defined in the "evdev" ruleset
- * are loaded into the context. Then, any RMLVO found in the "evdev" ruleset of
- * the user's path (``/home/user/.config/xkb`` in this example) are **appended**
- * to the existing set.
- *
- * Note that data from previously loaded include paths is never overwritten,
- * only appended to. It is not not possible to change the system-provided data,
- * only to append new models, layouts, variants and options to it.
- *
- * In other words, to define a new variant of the "us" layout called "banana",
- * the following XML is sufficient.
- *
- * @verbatim
- * <xkbConfigRegistry version="1.1">
- * <layoutList>
- *   <layout>
- *     <configItem>
- *       <name>us</name>
- *     </configItem>
- *     <variantList>
- *       <variant>
- *         <configItem>
- *          <name>banana</name>
- *          <description>English (Banana)</description>
- *        </configItem>
- *      </variant>
- *    </layout>
- * </layoutList>
- * </xkbConfigRegistry>
- * @endverbatim
- *
- * The list of models, options and all other layouts (including "us" and its
- * variants) is taken from the system files. The resulting list of layouts will
- * thus have a "us" keyboard layout with the variant "banana" and all other
- * system-provided variants (dvorak, colemak, intl, etc.)
- *
- * This function must be called before rxkb_context_parse() or
- * rxkb_context_parse_default_ruleset().
- *
- * @returns true on success, or false if the include path could not be added
- * or is inaccessible.
- */
-bool
-rxkb_context_include_path_append(struct rxkb_context *ctx, const char *path);
-
-/**
- * Append the default include paths to the context's include path.
- * See rxkb_context_include_path_append() for details about the merge order.
- *
- * This function must be called before rxkb_context_parse() or
- * rxkb_context_parse_default_ruleset().
- *
- * @returns true on success, or false if the include path could not be added
- * or is inaccessible.
- */
-bool
-rxkb_context_include_path_append_default(struct rxkb_context *ctx);
-
-/**
- * Return the first model for this context. Use this to start iterating over
- * the models, followed by calls to rxkb_model_next(). Models are not sorted.
- *
- * The refcount of the returned model is not increased. Use rxkb_model_ref() if
- * you need to keep this struct outside the immediate scope.
- *
- * @return The first model in the model list.
- */
-struct rxkb_model *
-rxkb_model_first(struct rxkb_context *ctx);
-
-/**
- * Return the next model for this context. Returns NULL when no more models
- * are available.
- *
- * The refcount of the returned model is not increased. Use rxkb_model_ref() if
- * you need to keep this struct outside the immediate scope.
- *
- * @return the next model or NULL at the end of the list
- */
-struct rxkb_model *
-rxkb_model_next(struct rxkb_model *m);
-
-/**
- * Increase the refcount of the argument by one.
- *
- * @returns The argument passed in to this function.
- */
-struct rxkb_model *
-rxkb_model_ref(struct rxkb_model *m);
-
-/**
- * Decrease the refcount of the argument by one. When the refcount hits zero,
- * all memory associated with this struct is freed.
- *
- * @returns always NULL
- */
-struct rxkb_model *
-rxkb_model_unref(struct rxkb_model *m);
-
-/**
- * Return the name of this model. This is the value for M in RMLVO, to be used
- * with libxkbcommon.
- */
-const char *
-rxkb_model_get_name(struct rxkb_model *m);
-
-/**
- * Return a human-readable description of this model. This function may return
- * NULL.
- */
-const char *
-rxkb_model_get_description(struct rxkb_model *m);
-
-/**
- * Return the vendor name for this model. This function may return NULL.
- */
-const char *
-rxkb_model_get_vendor(struct rxkb_model *m);
-
-/**
- * Return the popularity for this model.
- */
-enum rxkb_popularity
-rxkb_model_get_popularity(struct rxkb_model *m);
-
-/**
- * Return the first layout for this context. Use this to start iterating over
- * the layouts, followed by calls to rxkb_layout_next(). Layouts are not sorted.
- *
- * The refcount of the returned layout is not increased. Use rxkb_layout_ref() if
- * you need to keep this struct outside the immediate scope.
- *
- * @return The first layout in the layout list.
- */
-struct rxkb_layout *
-rxkb_layout_first(struct rxkb_context *ctx);
-
-/**
- * Return the next layout for this context. Returns NULL when no more layouts
- * are available.
- *
- * The refcount of the returned layout is not increased. Use rxkb_layout_ref()
- * if you need to keep this struct outside the immediate scope.
- *
- * @return the next layout or NULL at the end of the list
- */
-struct rxkb_layout *
-rxkb_layout_next(struct rxkb_layout *l);
-
-/**
- * Increase the refcount of the argument by one.
- *
- * @returns The argument passed in to this function.
- */
-struct rxkb_layout *
-rxkb_layout_ref(struct rxkb_layout *l);
-
-/**
- * Decrease the refcount of the argument by one. When the refcount hits zero,
- * all memory associated with this struct is freed.
- *
- * @returns always NULL
- */
-struct rxkb_layout *
-rxkb_layout_unref(struct rxkb_layout *l);
-
-/**
- * Return the name of this layout. This is the value for L in RMLVO, to be used
- * with libxkbcommon.
- */
-const char *
-rxkb_layout_get_name(struct rxkb_layout *l);
-
-/**
- * Return the variant of this layout. This is the value for V in RMLVO, to be
- * used with libxkbcommon.
- *
- * A variant does not stand on its own, it always depends on the base layout.
- * e.g. there may be multiple variants called "intl" but there is only one
- * "us(intl)".
- *
- * Where the variant is NULL, the layout is the base layout (e.g. "us").
- */
-const char *
-rxkb_layout_get_variant(struct rxkb_layout *l);
-
-/**
- * Return a short (one-word) description of this layout. This function may
- * return NULL.
- */
-const char *
-rxkb_layout_get_brief(struct rxkb_layout *l);
-
-/**
- * Return a human-readable description of this layout. This function may return
- * NULL.
- */
-const char *
-rxkb_layout_get_description(struct rxkb_layout *l);
-
-/**
- * Return the popularity for this layout.
- */
-enum rxkb_popularity
-rxkb_layout_get_popularity(struct rxkb_layout *l);
-
-/**
- * Return the first option group for this context. Use this to start iterating
- * over the option groups, followed by calls to rxkb_option_group_next().
- * Option groups are not sorted.
- *
- * The refcount of the returned option group is not increased. Use
- * rxkb_option_group_ref() if you need to keep this struct outside the immediate
- * scope.
- *
- * @return The first option group in the option group list.
- */
-struct rxkb_option_group *
-rxkb_option_group_first(struct rxkb_context *ctx);
-
-/**
- * Return the next option group for this context. Returns NULL when no more
- * option groups are available.
- *
- * The refcount of the returned option group is not increased. Use
- * rxkb_option_group_ref() if you need to keep this struct outside the immediate
- * scope.
- *
- * @return the next option group or NULL at the end of the list
- */
-struct rxkb_option_group *
-rxkb_option_group_next(struct rxkb_option_group *g);
-
-/**
- * Increase the refcount of the argument by one.
- *
- * @returns The argument passed in to this function.
- */
-struct rxkb_option_group *
-rxkb_option_group_ref(struct rxkb_option_group *g);
-
-/**
- * Decrease the refcount of the argument by one. When the refcount hits zero,
- * all memory associated with this struct is freed.
- *
- * @returns always NULL
- */
-struct rxkb_option_group *
-rxkb_option_group_unref(struct rxkb_option_group *g);
-
-/**
- * Return the name of this option group. This is **not** the value for O in
- * RMLVO, the name can be used for internal sorting in the caller. This function
- * may return NULL.
- */
-const char *
-rxkb_option_group_get_name(struct rxkb_option_group *m);
-
-/**
- * Return a human-readable description of this option group. This function may
- * return NULL.
- */
-const char *
-rxkb_option_group_get_description(struct rxkb_option_group *m);
-
-/**
- * @return true if multiple options within this option group can be selected
- *              simultaneously, false if all options within this option group
- *              are mutually exclusive.
- */
-bool
-rxkb_option_group_allows_multiple(struct rxkb_option_group *g);
-
-/**
- * Return the popularity for this option group.
- */
-enum rxkb_popularity
-rxkb_option_group_get_popularity(struct rxkb_option_group *g);
-
-/**
- * Return the first option for this option group. Use this to start iterating
- * over the options, followed by calls to rxkb_option_next(). Options are not
- * sorted.
- *
- * The refcount of the returned option is not increased. Use rxkb_option_ref()
- * if you need to keep this struct outside the immediate scope.
- *
- * @return The first option in the option list.
- */
-struct rxkb_option *
-rxkb_option_first(struct rxkb_option_group *group);
-
-/**
- * Return the next option for this option group. Returns NULL when no more
- * options are available.
- *
- * The refcount of the returned options is not increased. Use rxkb_option_ref()
- * if you need to keep this struct outside the immediate scope.
- *
- * @returns The next option or NULL at the end of the list
- */
-struct rxkb_option *
-rxkb_option_next(struct rxkb_option *o);
-
-/**
- * Increase the refcount of the argument by one.
- *
- * @returns The argument passed in to this function.
- */
-struct rxkb_option *
-rxkb_option_ref(struct rxkb_option *o);
-
-/**
- * Decrease the refcount of the argument by one. When the refcount hits zero,
- * all memory associated with this struct is freed.
- *
- * @returns always NULL
- */
-struct rxkb_option *
-rxkb_option_unref(struct rxkb_option *o);
-
-/**
- * Return the name of this option. This is the value for O in RMLVO, to be used
- * with libxkbcommon.
- */
-const char *
-rxkb_option_get_name(struct rxkb_option *o);
-
-/**
- * Return a short (one-word) description of this option. This function may
- * return NULL.
- */
-const char *
-rxkb_option_get_brief(struct rxkb_option *o);
-
-/**
- * Return a human-readable description of this option. This function may return
- * NULL.
- */
-const char *
-rxkb_option_get_description(struct rxkb_option *o);
-
-/**
- * Return the popularity for this option.
- */
-enum rxkb_popularity
-rxkb_option_get_popularity(struct rxkb_option *o);
-
-/**
- * Increase the refcount of the argument by one.
- *
- * @returns The argument passed in to this function.
- */
-struct rxkb_iso639_code *
-rxkb_iso639_code_ref(struct rxkb_iso639_code *iso639);
-
-/**
- * Decrease the refcount of the argument by one. When the refcount hits zero,
- * all memory associated with this struct is freed.
- *
- * @returns always NULL
- */
-struct rxkb_iso639_code *
-rxkb_iso639_code_unref(struct rxkb_iso639_code *iso639);
-
-/**
- * Return the ISO 639-3 code for this code (e.g. "eng", "fra").
- */
-const char *
-rxkb_iso639_code_get_code(struct rxkb_iso639_code *iso639);
-
-/**
- * Return the first ISO 639 for this layout. Use this to start iterating over
- * the codes, followed by calls to rxkb_iso639_code_next(). Codes are not
- * sorted.
- *
- * The refcount of the returned code is not increased. Use rxkb_iso639_code_ref()
- * if you need to keep this struct outside the immediate scope.
- *
- * @return The first code in the code list.
- */
-struct rxkb_iso639_code *
-rxkb_layout_get_iso639_first(struct rxkb_layout *layout);
-
-/**
- * Return the next code in the list. Returns NULL when no more codes
- * are available.
- *
- * The refcount of the returned codes is not increased. Use
- * rxkb_iso639_code_ref() if you need to keep this struct outside the immediate
- * scope.
- *
- * @returns The next code or NULL at the end of the list
- */
-struct rxkb_iso639_code *
-rxkb_iso639_code_next(struct rxkb_iso639_code *iso639);
-
-/**
- * Increase the refcount of the argument by one.
- *
- * @returns The argument passed in to this function.
- */
-struct rxkb_iso3166_code *
-rxkb_iso3166_code_ref(struct rxkb_iso3166_code *iso3166);
-
-/**
- * Decrease the refcount of the argument by one. When the refcount hits zero,
- * all memory associated with this struct is freed.
- *
- * @returns always NULL
- */
-struct rxkb_iso3166_code *
-rxkb_iso3166_code_unref(struct rxkb_iso3166_code *iso3166);
-
-/**
- * Return the ISO 3166 Alpha 2 code for this code (e.g. "US", "FR").
- */
-const char *
-rxkb_iso3166_code_get_code(struct rxkb_iso3166_code *iso3166);
-
-/**
- * Return the first ISO 3166 for this layout. Use this to start iterating over
- * the codes, followed by calls to rxkb_iso3166_code_next(). Codes are not
- * sorted.
- *
- * The refcount of the returned code is not increased. Use
- * rxkb_iso3166_code_ref() if you need to keep this struct outside the immediate
- * scope.
- *
- * @return The first code in the code list.
- */
-struct rxkb_iso3166_code *
-rxkb_layout_get_iso3166_first(struct rxkb_layout *layout);
-
-/**
- * Return the next code in the list. Returns NULL when no more codes
- * are available.
- *
- * The refcount of the returned codes is not increased. Use
- * rxkb_iso3166_code_ref() if you need to keep this struct outside the immediate
- * scope.
- *
- * @returns The next code or NULL at the end of the list
- */
-struct rxkb_iso3166_code *
-rxkb_iso3166_code_next(struct rxkb_iso3166_code *iso3166);
-
-/** @} */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* _XKBREGISTRY_H_ */
kc3-lang/libxkbcommon

Commit de1b6943d2b0ddcbcc757cee7446bf8b297fa9fd
