External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 04:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest keycodemapdb content

Browse Source 
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-08-07 14:38:28 +01:00
parent fb8c0ea892
commit 917047de61
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -253,7 +253,7 @@ util/virkey%.7: util/virkey%.pod
rm -f $@-t1 && \ rm -f $@-t1 && \
mv $@-t2 $@ 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 KEYNAMES = linux osx win32
KEYTABLES = \ KEYTABLES = \

2
src/keycodemapdb

@ -1 +1 @@
Subproject commit 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0 Subproject commit 267157b96c62b5445de9cddd21de42fcd943ffe6

5
src/util/virkeycode.c
View File

@ -30,7 +30,6 @@
#include "virkeycodetable_rfb.h" #include "virkeycodetable_rfb.h"
#include "virkeycodetable_usb.h" #include "virkeycodetable_usb.h"
#include "virkeycodetable_win32.h" #include "virkeycodetable_win32.h"
#include "virkeycodetable_xt.h"
#include "virkeycodetable_xtkbd.h" #include "virkeycodetable_xtkbd.h"
#include "virkeynametable_linux.h" #include "virkeynametable_linux.h"
#include "virkeynametable_osx.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] = { static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = {
[VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux, [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_ATSET1] = virKeyCodeTable_atset1,
[VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2, [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2,
[VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3, [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) #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_atset1));
verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2));
verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3));

4
tests/virkeycodetest.c
View File

@ -56,9 +56,9 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED)
TRANSLATE(LINUX, USB, 111, 76); TRANSLATE(LINUX, USB, 111, 76);
TRANSLATE(LINUX, RFB, 88, 88); TRANSLATE(LINUX, RFB, 88, 88);
TRANSLATE(LINUX, RFB, 160, 163); TRANSLATE(LINUX, RFB, 160, 163);
TRANSLATE(ATSET2, ATSET3, 259, 55); TRANSLATE(ATSET2, ATSET3, 131, 55);
TRANSLATE(OSX, WIN32, 90, 131); TRANSLATE(OSX, WIN32, 90, 131);
TRANSLATE(OSX, ATSET1, 90, 0); TRANSLATE(OSX, ATSET1, 90, 90);
TRANSLATE(OSX, ATSET1, 3200, -1); TRANSLATE(OSX, ATSET1, 3200, -1);
#undef TRANSLATE #undef TRANSLATE