The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a
data file mapping between all the different scancode/keycode/keysym
sets that are known, and a tool to auto-generate lookup tables for
different combinations.
It is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys.
Using it in QEMU will let us replace many hand written lookup
tables with auto-generated tables from a master data source,
reducing bugs. Adding new QKeyCodes will now only require the
master table to be updated, all ~20 other tables will be
automatically updated to follow.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
.gitignore | 1 +
.gitmodules | 3 +++
Makefile | 18 ++++++++++++++++++
configure | 8 +++++++-
scripts/archive-source.sh | 2 +-
ui/keycodemapdb | 1 +
6 files changed, 31 insertions(+), 2 deletions(-)
create mode 160000 ui/keycodemapdb
diff --git a/.gitignore b/.gitignore
index 06bf972fc3..1eada71afd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
/trace/generated-tcg-tracers.h
/ui/shader/texture-blit-frag.h
/ui/shader/texture-blit-vert.h
+/ui/input-keymap-*.c
*-timestamp
/*-softmmu
/*-darwin-user
diff --git a/.gitmodules b/.gitmodules
index 84c54cdc49..f3bbc01f82 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
[submodule "roms/QemuMacDrivers"]
path = roms/QemuMacDrivers
url = git://git.qemu.org/QemuMacDrivers.git
+[submodule "ui/keycodemapdb"]
+ path = ui/keycodemapdb
+ url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/Makefile b/Makefile
index c00ed7141a..8eb6c9085e 100644
--- a/Makefile
+++ b/Makefile
@@ -214,6 +214,24 @@ trace-dtrace-root.h: trace-dtrace-root.dtrace
trace-dtrace-root.o: trace-dtrace-root.dtrace
+KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
+KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
+
+KEYCODEMAP_FILES = \
+ $(NULL)
+
+GENERATED_FILES += $(KEYCODEMAP_FILES)
+
+ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile.objs .git-submodule-status
+ $(call quiet-command,\
+ src=$$(echo $@ | sed -E -e "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\1,") && \
+ dst=$$(echo $@ | sed -E -e "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\2,") && \
+ $(PYTHON) $(KEYCODEMAP_GEN) \
+ --lang glib2 \
+ --varname qemu_input_map_$${src}_to_$${dst} \
+ code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
+ > $@ || rm $@, "GEN", "$@")
+
# Don't try to regenerate Makefile or configure
# We don't generate any of them
Makefile: ;
diff --git a/configure b/configure
index b324e057f1..eb420abc47 100755
--- a/configure
+++ b/configure
@@ -264,7 +264,13 @@ cc_i386=i386-pc-linux-gnu-gcc
libs_qga=""
debug_info="yes"
stack_protector=""
-git_submodules=""
+
+if test -e "$source_path/.git"
+then
+ git_submodules="ui/keycodemapdb"
+else
+ git_submodules=""
+fi
# Don't accept a target_list environment variable.
unset target_list
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 4029de7b20..4e63774f9a 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -26,7 +26,7 @@ vroot_dir="${tar_file}.vroot"
# independent of what the developer currently has initialized
# in their checkout, because the build environment is completely
# different to the host OS.
-submodules="dtc"
+submodules="dtc ui/keycodemapdb"
trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15
diff --git a/ui/keycodemapdb b/ui/keycodemapdb
new file mode 160000
index 0000000000..56ce5650d2
--- /dev/null
+++ b/ui/keycodemapdb
@@ -0,0 +1 @@
+Subproject commit 56ce5650d2c6ea216b4580df44b9a6dd3bc92c3b
--
2.13.5
On Fri, 29 Sep 2017 at 11:12, Daniel P. Berrange <berrange@redhat.com> wrote: > > The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a > data file mapping between all the different scancode/keycode/keysym > sets that are known, and a tool to auto-generate lookup tables for > different combinations Hi Dan; apologies for hauling up this commit from 2017, but I just noticed something while reading through configure: > diff --git a/configure b/configure > index b324e057f1..eb420abc47 100755 > --- a/configure > +++ b/configure > @@ -264,7 +264,13 @@ cc_i386=i386-pc-linux-gnu-gcc > libs_qga="" > debug_info="yes" > stack_protector="" > -git_submodules="" > + > +if test -e "$source_path/.git" > +then > + git_submodules="ui/keycodemapdb" > +else > + git_submodules="" > +fi Configure has a --source-path option, which overrides the default $source_path setting (of the directory where the configure script lives), but this commit (927128222b0a91f56c13a) added a use of $source_path before the part of configure that parses the option and updates $source_path accordingly. Could this lump of code (and the later enhancements to it) be moved further down in the file? (Alternatively, we could drop the --source-path option entirely: I didn't even know it existed and I'm not sure it's very useful...) thanks -- PMM
On Fri, Mar 15, 2019 at 06:35:59PM +0000, Peter Maydell wrote: > On Fri, 29 Sep 2017 at 11:12, Daniel P. Berrange <berrange@redhat.com> wrote: > > > > The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a > > data file mapping between all the different scancode/keycode/keysym > > sets that are known, and a tool to auto-generate lookup tables for > > different combinations > > Hi Dan; apologies for hauling up this commit from 2017, but > I just noticed something while reading through configure: > > > diff --git a/configure b/configure > > index b324e057f1..eb420abc47 100755 > > --- a/configure > > +++ b/configure > > @@ -264,7 +264,13 @@ cc_i386=i386-pc-linux-gnu-gcc > > libs_qga="" > > debug_info="yes" > > stack_protector="" > > -git_submodules="" > > + > > +if test -e "$source_path/.git" > > +then > > + git_submodules="ui/keycodemapdb" > > +else > > + git_submodules="" > > +fi > > Configure has a --source-path option, which overrides the > default $source_path setting (of the directory where the > configure script lives), but this commit (927128222b0a91f56c13a) > added a use of $source_path before the part of configure that > parses the option and updates $source_path accordingly. > Could this lump of code (and the later enhancements to it) be moved > further down in the file? > > (Alternatively, we could drop the --source-path option entirely: > I didn't even know it existed and I'm not sure it's very > useful...) I checked the history of this and it dates from 2003 when Fabrice first created the 'configure' script. Normally we find source path based on where 'configure' exists. I can't think of a compelling case where 'configure' would not be in the source path, so I agree we could just drop the option. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2026 Red Hat, Inc.