[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] ui: add keycodemapdb repository as a GIT submo
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 03/11] ui: add keycodemapdb repository as a GIT submodule |
Date: |
Mon, 16 Oct 2017 15:16:36 +0200 |
From: "Daniel P. Berrange" <address@hidden>
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>
Message-id: address@hidden
[ kraxel: fix build ]
[ kraxel: switch repo to qemu.git mirror ]
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 8 +++++++-
Makefile | 24 +++++++++++++++++++++++-
.gitignore | 1 +
.gitmodules | 3 +++
scripts/archive-source.sh | 2 +-
ui/keycodemapdb | 1 +
6 files changed, 36 insertions(+), 3 deletions(-)
create mode 160000 ui/keycodemapdb
diff --git a/configure b/configure
index 38f1710c80..06f18ea9af 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/Makefile b/Makefile
index 9866909e08..7b9b93c3dc 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ git-submodule-update:
endif
endif
-.git-submodule-status: git-submodule-update
+.git-submodule-status: git-submodule-update config-host.mak
# Check that we're not trying to do an out-of-tree build from
# a tree that's been used for an in-tree build.
@@ -213,6 +213,28 @@ 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
+ $(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,") && \
+ test -e $(KEYCODEMAP_GEN) && \
+ $(PYTHON) $(KEYCODEMAP_GEN) \
+ --lang glib2 \
+ --varname qemu_input_map_$${src}_to_$${dst} \
+ code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
+ > $@ || rm -f $@, "GEN", "$@")
+
+$(KEYCODEMAP_GEN): .git-submodule-status
+$(KEYCODEMAP_CSV): .git-submodule-status
+
# Don't try to regenerate Makefile or configure
# We don't generate any of them
Makefile: ;
diff --git a/.gitignore b/.gitignore
index b5e115d96b..620eec6b47 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..7c981a42b6 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 = git://git.qemu.org/keycodemapdb.git
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.9.3
- [Qemu-devel] [PULL 00/11] Ui 20171016 patches, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 11/11] gtk: fix wrong id between texture and framebuffer, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 05/11] ui: convert key events to QKeyCodes immediately, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 01/11] build: automatically handle GIT submodule checkout for dtc, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 03/11] ui: add keycodemapdb repository as a GIT submodule,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 04/11] ui: convert common input code to keycodemapdb, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 07/11] tools: add qemu-keymap, Gerd Hoffmann, 2017/10/16
[Qemu-devel] [PULL 10/11] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard, Gerd Hoffmann, 2017/10/16
[Qemu-devel] [PULL 06/11] ui: don't export qemu_input_event_new_key, Gerd Hoffmann, 2017/10/16
[Qemu-devel] [PULL 02/11] docker: don't rely on submodules existing in the main checkout, Gerd Hoffmann, 2017/10/16
[Qemu-devel] [PULL 08/11] Add pc-bios/keymaps/Makefile, Gerd Hoffmann, 2017/10/16