Update to latest keycodemapdb content

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index de43d0f50177be248cc1b382afbcd6d51a2252fe..4c022d1e44b979ee973682bf0bd51b7e4ded71f3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -253,7 +253,7 @@ util/virkey%.7: util/virkey%.pod
        rm -f $@-t1 && \
        mv $@-t2 $@
 
-KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb
+KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb
 KEYNAMES = linux osx win32
 
 KEYTABLES = \

diff --git a/src/keycodemapdb b/src/keycodemapdb
index 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0..267157b96c62b5445de9cddd21de42fcd943ffe6 160000 (submodule)
--- a/src/keycodemapdb
+++ b/src/keycodemapdb
@@ -1 +1 @@
-Subproject commit 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0
+Subproject commit 267157b96c62b5445de9cddd21de42fcd943ffe6

diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c
index e09aaadaa7bc6c29ced6d85163e1ae49ea487002..eda263218c27f37792102c2df0ce835148cb0a55 100644 (file)
--- a/src/util/virkeycode.c
+++ b/src/util/virkeycode.c
@@ -30,7 +30,6 @@
 #include "virkeycodetable_rfb.h"
 #include "virkeycodetable_usb.h"
 #include "virkeycodetable_win32.h"
-#include "virkeycodetable_xt.h"
 #include "virkeycodetable_xtkbd.h"
 #include "virkeynametable_linux.h"
 #include "virkeynametable_osx.h"
@@ -44,7 +43,8 @@ static const char **virKeymapNames[VIR_KEYCODE_SET_LAST] = {
 
 static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = {
     [VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux,
-    [VIR_KEYCODE_SET_XT] = virKeyCodeTable_xt,
+    /* XT is same as AT Set1 - it was included by mistake */
+    [VIR_KEYCODE_SET_XT] = virKeyCodeTable_atset1,
     [VIR_KEYCODE_SET_ATSET1] = virKeyCodeTable_atset1,
     [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2,
     [VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3,
@@ -57,7 +57,6 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = {
 
 #define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux)
 
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xt));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset1));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3));

diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index dec1ee84275927a480d16056999251892432f54d..24887a36d4eb8724fd56711984a75dc1c8be9712 100644 (file)
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -56,9 +56,9 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED)
     TRANSLATE(LINUX, USB, 111, 76);
     TRANSLATE(LINUX, RFB, 88, 88);
     TRANSLATE(LINUX, RFB, 160, 163);
-    TRANSLATE(ATSET2, ATSET3, 259, 55);
+    TRANSLATE(ATSET2, ATSET3, 131, 55);
     TRANSLATE(OSX, WIN32, 90, 131);
-    TRANSLATE(OSX, ATSET1, 90, 0);
+    TRANSLATE(OSX, ATSET1, 90, 90);
     TRANSLATE(OSX, ATSET1, 3200, -1);
 
 #undef TRANSLATE