diff options
| author | Ran Benita <ran234@gmail.com> | 2012-05-20 20:39:35 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-06-09 12:34:57 +0300 |
| commit | 58b030bb901b77ba97fdaf64fca4403b81445aaf (patch) | |
| tree | fccb135983c3bf0ae45a97454d87e1698acd2ed5 | |
| parent | 1c27bb8e77d85e3e3c9a4f3003bc429759482135 (diff) | |
| download | xorg-lib-libxkbcommon-58b030bb901b77ba97fdaf64fca4403b81445aaf.tar.gz | |
Move XKB_KEY_NoSymbol to xkbcommon-keysyms.h
This avoids a couple of special cases in the code, and is more
consistent. Since anyone who includes xkbcommon.h also gets
xkbcommon-keysyms.h, and anyone who include xkbcommon-keysyms.h would
want NoSymbol anyway, there's no down side.
Signed-off-by: Ran Benita <ran234@gmail.com>
| -rw-r--r-- | include/xkbcommon/xkbcommon-keysyms.h | 1 | ||||
| -rw-r--r-- | include/xkbcommon/xkbcommon.h | 2 | ||||
| -rw-r--r-- | makekeys/makekeys.c | 5 | ||||
| -rw-r--r-- | src/keysym.c | 6 |
4 files changed, 1 insertions, 13 deletions
diff --git a/include/xkbcommon/xkbcommon-keysyms.h b/include/xkbcommon/xkbcommon-keysyms.h index 26c1e3a..2c1ab95 100644 --- a/include/xkbcommon/xkbcommon-keysyms.h +++ b/include/xkbcommon/xkbcommon-keysyms.h @@ -112,6 +112,7 @@ SOFTWARE. * */ +#define XKB_KEY_NoSymbol 0x000000 /* Special KeySym */ #define XKB_KEY_VoidSymbol 0xffffff /* Void symbol */ /* diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h index 0fb5178..4c148d5 100644 --- a/include/xkbcommon/xkbcommon.h +++ b/include/xkbcommon/xkbcommon.h @@ -87,8 +87,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbcommon/xkbcommon-names.h> #include <xkbcommon/xkbcommon-keysyms.h> -#define XKB_KEY_NoSymbol 0L /* special KeySym */ - typedef uint32_t xkb_keycode_t; typedef uint32_t xkb_keysym_t; typedef uint32_t xkb_mod_index_t; diff --git a/makekeys/makekeys.c b/makekeys/makekeys.c index 751777f..6ac3799 100644 --- a/makekeys/makekeys.c +++ b/makekeys/makekeys.c @@ -132,11 +132,6 @@ main(int argc, char *argv[]) fclose(fptr); } - /* Special case XKB_KEY_NoSymbol. */ - info[ksnum].name = strdup("NoSymbol"); - info[ksnum].val = XKB_KEY_NoSymbol; - ksnum++; - printf("/* This file is generated from keysymdef.h. */\n"); printf("/* Do not edit. */\n"); printf("\n"); diff --git a/src/keysym.c b/src/keysym.c index 1b32f0b..6004aad 100644 --- a/src/keysym.c +++ b/src/keysym.c @@ -44,12 +44,6 @@ xkb_keysym_get_name(xkb_keysym_t ks, char *buffer, size_t size) return; } - /* Not listed in keysymdef.h for hysterical raisins. */ - if (ks == XKB_KEY_NoSymbol) { - snprintf(buffer, size, "NoSymbol"); - return; - } - /* Try to find it in our hash table. */ if (ks <= 0x1fffffff) { val1 = ks >> 24; |