[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 3/6] ui: add keycodemapdb repository as a GIT sub
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 3/6] ui: add keycodemapdb repository as a GIT submodule |
Date: |
Thu, 28 Sep 2017 09:44:27 +0100 |
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 <address@hidden>
---
.gitignore | 1 +
.gitmodules | 3 +++
configure | 8 +++++++-
scripts/archive-source.sh | 2 +-
ui/Makefile.objs | 18 ++++++++++++++++++
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/configure b/configure
index ed4048f8b2..1aeb09f83f 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 -d "$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 0d2046a80e..c843b7ac13 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -26,7 +26,7 @@ vroot_dir="${tar_file}.vroot"
# independant 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"
if test $? -ne 0; then
error "git submodule command failed"
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index ec8533d6d9..bb60a18331 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -50,3 +50,21 @@ gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS)
+
+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
+ $(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", "$@")
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
- [Qemu-devel] [PATCH v6 0/6] Initial support for keycodemapdb GIT submodule, Daniel P. Berrange, 2017/09/28
- [Qemu-devel] [PATCH v6 2/6] docker: don't rely on submodules existing in the main checkout, Daniel P. Berrange, 2017/09/28
- [Qemu-devel] [PATCH v6 3/6] ui: add keycodemapdb repository as a GIT submodule,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 1/6] build: automatically handle GIT submodule checkout for dtc, Daniel P. Berrange, 2017/09/28
- [Qemu-devel] [PATCH v6 5/6] ui: convert key events to QKeyCodes immediately, Daniel P. Berrange, 2017/09/28
- [Qemu-devel] [PATCH v6 4/6] ui: convert common input code to keycodemapdb, Daniel P. Berrange, 2017/09/28
- [Qemu-devel] [PATCH v6 6/6] ui: don't export qemu_input_event_new_key, Daniel P. Berrange, 2017/09/28
- Re: [Qemu-devel] [PATCH v6 0/6] Initial support for keycodemapdb GIT submodule, no-reply, 2017/09/28