* [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule
@ 2017-09-29 10:11 Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 1/6] build: automatically handle GIT submodule checkout for dtc Daniel P. Berrange
` (6 more replies)
0 siblings, 7 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:11 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
This patch series is an update to:
v1: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02047.html
v2: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02471.html
v3: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02517.html
v4: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02708.html
v5: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02950.html
v6: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07673.html
v7: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07740.html
The keycodemap project[1] provides a database mapping between many different
keysym/keycode/scancode sets, along with a tool to generate mapping/lookup
tables in various programming languages. It is already used by GTK-VNC,
SPICE-GTK and libvirt.
In this v6 posting I have dropped most of the conversion to keycodemapdb
across the devices / UI frontends. This only converts the core input
APIs, and wires up the git submodule build system mechanics. The remaining
patches from the v5 posting will be submitted separately, once this initial
conversion is mergable.
Changed in v8:
- Fix error checking in archive-source.sh changes (Eric)
- Use -e instead of -d to check for .git (Eric)
- Misc typos (Eric)
- Use && instead of ; in make shell rules (Eric)
- Fully quote $source_path usage (Eric)
- Fix position of trap statement for cleanup (Eric)
- Added missing dependnacy for Makefile (Patchew)
- Moved build rules from ui/Makefile.objs into Makefile because
we must not have those rules defined in the target specific
Makefiles
Changed in v7:
- subdir-dtc and ui/input-keymap-* make rules must depend on
the submodule status file to ensure build ordering (patchew)
- Use 'git stash' to ensure archive-source.sh keeps non-committed
changes for docker/vm testing (Fam)
Changed in v6:
- Switched back to using a git submodule
- Wire up Makefile rules so that git submodule is automatically
refreshed when needed prior to build.
- Fix source tarball creation for docker/vm tests wrt submodules
Changed in v5:
- Don't try to initialize git submodule at all
- Store generate keymap files in GIT
Changed in v4:
- Run submodule update in source_dir for vpath builds (patchew)
- Force submodule update in docker rules in case they
are run without configure (patchew)
Changed in v3:
- Ensure docker builds pull in keycodemapdb submodule (patchew)
- Add compat with py26 for RHEL-6 in keycodemapdb tools (patchew)
- Initialize submodule in configure script (patchew)
Changed in v2:
- Change filename pattern to 'ui/input-keymap-$SRC-to-$DST.c'
and map names 'qemu_input_map_$SRC_to_$DST' (Eric)
- Fix typos (Eric)
- Drop changes to InputKeyEvent struct (Eric)
- Fix VPATH build (patchew)
- Fix code style errors (patchew)
[1] https://gitlab.com/keycodemap/keycodemapdb/
Daniel P. Berrange (6):
build: automatically handle GIT submodule checkout for dtc
docker: don't rely on submodules existing in the main checkout
ui: add keycodemapdb repository as a GIT submodule
ui: convert common input code to keycodemapdb
ui: convert key events to QKeyCodes immediately
ui: don't export qemu_input_event_new_key
.gitignore | 2 +
.gitmodules | 3 +
MAINTAINERS | 6 +
Makefile | 46 ++++++-
configure | 52 +++++---
include/ui/input.h | 12 +-
scripts/archive-source.sh | 34 ++++-
scripts/git-submodule.sh | 38 ++++++
ui/input-keymap.c | 326 +++-------------------------------------------
ui/input.c | 26 ++--
ui/keycodemapdb | 1 +
11 files changed, 198 insertions(+), 348 deletions(-)
create mode 100755 scripts/git-submodule.sh
create mode 160000 ui/keycodemapdb
--
2.13.5
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v8 1/6] build: automatically handle GIT submodule checkout for dtc
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
@ 2017-09-29 10:11 ` Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout Daniel P. Berrange
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:11 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
Currently if DTC is required by configure and not available in the host
OS install, we exit with an error message telling the user to checkout a
git submodule or install the library.
This introduces automatic handling of the git submodule checkout process
and enables it for dtc. This only runs if building from GIT, so users of
release tarballs still need the system library install. The current state
of the git checkout is stashed in .git-submodule-status, and a helper
program is used to determine if this state matches the desired submodule
state. A dependency against 'Makefile' ensures that the submodule state
is refreshed at the start of the build process
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
.gitignore | 1 +
MAINTAINERS | 6 ++++++
Makefile | 25 ++++++++++++++++++++++++-
configure | 46 ++++++++++++++++++++++++++--------------------
scripts/git-submodule.sh | 38 ++++++++++++++++++++++++++++++++++++++
5 files changed, 95 insertions(+), 21 deletions(-)
create mode 100755 scripts/git-submodule.sh
diff --git a/.gitignore b/.gitignore
index 40acfcb9e2..06bf972fc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,7 @@
/docs/version.texi
*.tps
.stgit-*
+.git-submodule-status
cscope.*
tags
TAGS
diff --git a/MAINTAINERS b/MAINTAINERS
index 932443df41..7708bbb21d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1947,3 +1947,9 @@ M: Daniel P. Berrange <berrange@redhat.com>
S: Odd Fixes
F: docs/devel/build-system.txt
+Build System
+------------
+GIT submodules
+M: Daniel P. Berrange <berrange@redhat.com>
+S: Odd Fixes
+F: scripts/git-submodule.sh
diff --git a/Makefile b/Makefile
index 2be61fcf1c..c00ed7141a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,29 @@ ifneq ($(wildcard config-host.mak),)
all:
include config-host.mak
+git-submodule-update:
+
+.PHONY: git-submodule-update
+
+ifeq (0,$(MAKELEVEL))
+ git_module_status := $(shell \
+ cd '$(SRC_PATH)' && \
+ ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
+ echo $$?; \
+ )
+
+ifeq (1,$(git_module_status))
+git-submodule-update:
+ $(call quiet-command, \
+ (cd $(SRC_PATH) && ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
+ "GIT","$(GIT_SUBMODULES)")
+endif
+endif
+
+.git-submodule-status: git-submodule-update
+
+Makefile: .git-submodule-status
+
# 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.
ifneq ($(realpath $(SRC_PATH)),$(realpath .))
@@ -329,7 +352,7 @@ DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_src
DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
-subdir-dtc:dtc/libfdt dtc/tests
+subdir-dtc: .git-submodule-status dtc/libfdt dtc/tests
$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
dtc/%:
diff --git a/configure b/configure
index 7727f6ba5b..b324e057f1 100755
--- a/configure
+++ b/configure
@@ -264,6 +264,7 @@ cc_i386=i386-pc-linux-gnu-gcc
libs_qga=""
debug_info="yes"
stack_protector=""
+git_submodules=""
# Don't accept a target_list environment variable.
unset target_list
@@ -3580,27 +3581,30 @@ EOF
if compile_prog "" "$fdt_libs" ; then
# system DTC is good - use it
fdt=yes
- elif test -d ${source_path}/dtc/libfdt ; then
- # have submodule DTC - use it
- fdt=yes
- dtc_internal="yes"
- mkdir -p dtc
- if [ "$pwd_is_source_path" != "y" ] ; then
- symlink "$source_path/dtc/Makefile" "dtc/Makefile"
- symlink "$source_path/dtc/scripts" "dtc/scripts"
- fi
- fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
- fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs"
- elif test "$fdt" = "yes" ; then
- # have neither and want - prompt for system/submodule install
- error_exit "DTC (libfdt) version >= 1.4.2 not present. Your options:" \
- " (1) Preferred: Install the DTC (libfdt) devel package" \
- " (2) Fetch the DTC submodule, using:" \
- " git submodule update --init dtc"
else
- # don't have and don't want
- fdt_libs=
- fdt=no
+ # have GIT checkout, so activate dtc submodule
+ if test -e "${source_path}/.git" ; then
+ git_submodules="${git_submodules} dtc"
+ fi
+ if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
+ fdt=yes
+ dtc_internal="yes"
+ mkdir -p dtc
+ if [ "$pwd_is_source_path" != "y" ] ; then
+ symlink "$source_path/dtc/Makefile" "dtc/Makefile"
+ symlink "$source_path/dtc/scripts" "dtc/scripts"
+ fi
+ fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
+ fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs"
+ elif test "$fdt" = "yes" ; then
+ # Not a git build & no libfdt found, prompt for system install
+ error_exit "DTC (libfdt) version >= 1.4.2 not present." \
+ "Please install the DTC (libfdt) devel package"
+ else
+ # don't have and don't want
+ fdt_libs=
+ fdt=no
+ fi
fi
fi
@@ -5290,6 +5294,7 @@ echo "local state directory queried at runtime"
echo "Windows SDK $win_sdk"
fi
echo "Source path $source_path"
+echo "GIT submodules $git_submodules"
echo "C compiler $cc"
echo "Host C compiler $host_cc"
echo "C++ compiler $cxx"
@@ -5477,6 +5482,7 @@ echo "extra_cxxflags=$EXTRA_CXXFLAGS" >> $config_host_mak
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
+echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
new file mode 100755
index 0000000000..9f73f0e6e3
--- /dev/null
+++ b/scripts/git-submodule.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# This code is licensed under the GPL version 2 or later. See
+# the COPYING file in the top-level directory.
+
+set -e
+
+substat=".git-submodule-status"
+
+command=$1
+shift
+modules="$@"
+
+if test -z "$modules"
+then
+ test -e $substat || touch $substat
+ exit 0
+fi
+
+if ! test -e ".git"
+then
+ echo "$0: unexpectedly called with submodules but no git checkout exists"
+ exit 1
+fi
+
+case "$command" in
+status)
+ test -f "$substat" || exit 1
+ trap "rm -f ${substat}.tmp" EXIT
+ git submodule status $modules > "${substat}.tmp"
+ diff "${substat}" "${substat}.tmp" >/dev/null
+ exit $?
+ ;;
+update)
+ git submodule update --init $modules 1>/dev/null 2>&1
+ git submodule status $modules > "${substat}"
+ ;;
+esac
--
2.13.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 1/6] build: automatically handle GIT submodule checkout for dtc Daniel P. Berrange
@ 2017-09-29 10:11 ` Daniel P. Berrange
2017-10-02 12:52 ` Alex Bennée
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 3/6] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
` (4 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:11 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
When building the tarball to pass into the docker/vm test image,
the code relies on the git submodules being checked out in the
main checkout.
ie if the developer has not run 'git submodule update --init dtc'
many of the docker tests will fail due to the libfdt package not
being present in the test images. Patchew manually checks out the
dtc submodule in the main git checkout, but this is a bad idea.
When running tests we want to have a predictable set of submodules
included in the source that's tested. The build environment is
completely independent of the developers host OS, so the submodules
the developer has checked out should not be considered relevant for
the tests.
This changes the archive-source.sh script so that it clones the
current git checkout into a temporary directory, checks out a
fixed set of submodules, builds the tarball and finally removes
the temporary git clone.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/archive-source.sh | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index c4e7d98f4d..4029de7b20 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -18,15 +18,37 @@ if test $# -lt 1; then
error "Usage: $0 <output tarball>"
fi
-tar_file="$1"
-list_file="$1.list"
-submodules=$(git submodule foreach --recursive --quiet 'echo $name')
+tar_file=`realpath "$1"`
+list_file="${tar_file}.list"
+vroot_dir="${tar_file}.vroot"
-if test $? -ne 0; then
- error "git submodule command failed"
+# We want a predictable list of submodules for builds, that is
+# independent of what the developer currently has initialized
+# in their checkout, because the build environment is completely
+# different to the host OS.
+submodules="dtc"
+
+trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15
+
+if git diff-index --quiet HEAD -- &>/dev/null
+then
+ HEAD=HEAD
+else
+ HEAD=`git stash create`
fi
+git clone --shared . "$vroot_dir"
+test $? -ne 0 && error "failed to clone into '$vroot_dir'"
+
+cd "$vroot_dir"
+test $? -ne 0 && error "failed to change into '$vroot_dir'"
+
+git checkout $HEAD
+test $? -ne 0 && error "failed to checkout $HEAD revision"
-trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15
+for sm in $submodules; do
+ git submodule update --init $sm
+ test $? -ne 0 && error "failed to init submodule $sm"
+done
if test -n "$submodules"; then
{
--
2.13.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v8 3/6] ui: add keycodemapdb repository as a GIT submodule
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 1/6] build: automatically handle GIT submodule checkout for dtc Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout Daniel P. Berrange
@ 2017-09-29 10:11 ` Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 4/6] ui: convert common input code to keycodemapdb Daniel P. Berrange
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:11 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v8 4/6] ui: convert common input code to keycodemapdb
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
` (2 preceding siblings ...)
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 3/6] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
@ 2017-09-29 10:11 ` Daniel P. Berrange
2017-09-29 10:12 ` [Qemu-devel] [PATCH v8 5/6] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:11 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
Replace the number_to_qcode, qcode_to_number and linux_to_qcode
tables with automatically generated tables.
Missing entries in linux_to_qcode now fixed:
KEY_LINEFEED -> Q_KEY_CODE_LF
KEY_KPEQUAL -> Q_KEY_CODE_KP_EQUALS
KEY_COMPOSE -> Q_KEY_CODE_COMPOSE
KEY_AGAIN -> Q_KEY_CODE_AGAIN
KEY_PROPS -> Q_KEY_CODE_PROPS
KEY_UNDO -> Q_KEY_CODE_UNDO
KEY_FRONT -> Q_KEY_CODE_FRONT
KEY_COPY -> Q_KEY_CODE_COPY
KEY_OPEN -> Q_KEY_CODE_OPEN
KEY_PASTE -> Q_KEY_CODE_PASTE
KEY_CUT -> Q_KEY_CODE_CUT
KEY_HELP -> Q_KEY_CODE_HELP
KEY_MEDIA -> Q_KEY_CODE_MEDIASELECT
In addition, some fixes:
- KEY_PLAYPAUSE now maps to Q_KEY_CODE_AUDIOPLAY, instead of
KEY_PLAYCD. KEY_PLAYPAUSE is defined across almost all scancodes
sets, while KEY_PLAYCD only appears in AT set1, so the former is
a more useful mapping.
Missing entries in qcode_to_number now fixed:
Q_KEY_CODE_AGAIN -> 0x85
Q_KEY_CODE_PROPS -> 0x86
Q_KEY_CODE_UNDO -> 0x87
Q_KEY_CODE_FRONT -> 0x8c
Q_KEY_CODE_COPY -> 0xf8
Q_KEY_CODE_OPEN -> 0x64
Q_KEY_CODE_PASTE -> 0x65
Q_KEY_CODE_CUT -> 0xbc
Q_KEY_CODE_LF -> 0x5b
Q_KEY_CODE_HELP -> 0xf5
Q_KEY_CODE_COMPOSE -> 0xdd
Q_KEY_CODE_KP_EQUALS -> 0x59
Q_KEY_CODE_MEDIASELECT -> 0xed
In addition, some fixes:
- Q_KEY_CODE_MENU was incorrectly mapped to the compose
scancode (0xdd) and is now mapped to 0x9e
- Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead
of to 0xe041 (Find)
- Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana)
instead of of 0x77 (Hirigana)
- Q_KEY_CODE_PRINT was mapped to 0xb7 which is not a defined
scan code in AT set 1, it is now mapped to 0x54 (sysrq)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
Makefile | 3 +
include/ui/input.h | 11 +-
ui/input-keymap.c | 326 +++--------------------------------------------------
3 files changed, 28 insertions(+), 312 deletions(-)
diff --git a/Makefile b/Makefile
index 8eb6c9085e..64cb116bf7 100644
--- a/Makefile
+++ b/Makefile
@@ -218,6 +218,9 @@ KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
+ ui/input-keymap-linux-to-qcode.c \
+ ui/input-keymap-qcode-to-qnum.c \
+ ui/input-keymap-qnum-to-qcode.c \
$(NULL)
GENERATED_FILES += $(KEYCODEMAP_FILES)
diff --git a/include/ui/input.h b/include/ui/input.h
index c488585def..479cc46cfc 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -43,7 +43,7 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
-int qemu_input_key_number_to_qcode(uint8_t nr);
+int qemu_input_key_number_to_qcode(unsigned int nr);
int qemu_input_key_value_to_number(const KeyValue *value);
int qemu_input_key_value_to_qcode(const KeyValue *value);
int qemu_input_key_value_to_scancode(const KeyValue *value, bool down,
@@ -69,4 +69,13 @@ void qemu_input_check_mode_change(void);
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
+extern const guint qemu_input_map_linux_to_qcode_len;
+extern const guint16 qemu_input_map_linux_to_qcode[];
+
+extern const guint qemu_input_map_qcode_to_qnum_len;
+extern const guint16 qemu_input_map_qcode_to_qnum[];
+
+extern const guint qemu_input_map_qnum_to_qcode_len;
+extern const guint16 qemu_input_map_qnum_to_qcode[];
+
#endif /* INPUT_H */
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index cf979c2ce9..3a19a169f5 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -5,333 +5,37 @@
#include "standard-headers/linux/input.h"
-static int linux_to_qcode[KEY_CNT] = {
- [KEY_ESC] = Q_KEY_CODE_ESC,
- [KEY_1] = Q_KEY_CODE_1,
- [KEY_2] = Q_KEY_CODE_2,
- [KEY_3] = Q_KEY_CODE_3,
- [KEY_4] = Q_KEY_CODE_4,
- [KEY_5] = Q_KEY_CODE_5,
- [KEY_6] = Q_KEY_CODE_6,
- [KEY_7] = Q_KEY_CODE_7,
- [KEY_8] = Q_KEY_CODE_8,
- [KEY_9] = Q_KEY_CODE_9,
- [KEY_0] = Q_KEY_CODE_0,
- [KEY_MINUS] = Q_KEY_CODE_MINUS,
- [KEY_EQUAL] = Q_KEY_CODE_EQUAL,
- [KEY_BACKSPACE] = Q_KEY_CODE_BACKSPACE,
- [KEY_TAB] = Q_KEY_CODE_TAB,
- [KEY_Q] = Q_KEY_CODE_Q,
- [KEY_W] = Q_KEY_CODE_W,
- [KEY_E] = Q_KEY_CODE_E,
- [KEY_R] = Q_KEY_CODE_R,
- [KEY_T] = Q_KEY_CODE_T,
- [KEY_Y] = Q_KEY_CODE_Y,
- [KEY_U] = Q_KEY_CODE_U,
- [KEY_I] = Q_KEY_CODE_I,
- [KEY_O] = Q_KEY_CODE_O,
- [KEY_P] = Q_KEY_CODE_P,
- [KEY_LEFTBRACE] = Q_KEY_CODE_BRACKET_LEFT,
- [KEY_RIGHTBRACE] = Q_KEY_CODE_BRACKET_RIGHT,
- [KEY_ENTER] = Q_KEY_CODE_RET,
- [KEY_LEFTCTRL] = Q_KEY_CODE_CTRL,
- [KEY_A] = Q_KEY_CODE_A,
- [KEY_S] = Q_KEY_CODE_S,
- [KEY_D] = Q_KEY_CODE_D,
- [KEY_F] = Q_KEY_CODE_F,
- [KEY_G] = Q_KEY_CODE_G,
- [KEY_H] = Q_KEY_CODE_H,
- [KEY_J] = Q_KEY_CODE_J,
- [KEY_K] = Q_KEY_CODE_K,
- [KEY_L] = Q_KEY_CODE_L,
- [KEY_SEMICOLON] = Q_KEY_CODE_SEMICOLON,
- [KEY_APOSTROPHE] = Q_KEY_CODE_APOSTROPHE,
- [KEY_GRAVE] = Q_KEY_CODE_GRAVE_ACCENT,
- [KEY_LEFTSHIFT] = Q_KEY_CODE_SHIFT,
- [KEY_BACKSLASH] = Q_KEY_CODE_BACKSLASH,
- [KEY_102ND] = Q_KEY_CODE_LESS,
- [KEY_Z] = Q_KEY_CODE_Z,
- [KEY_X] = Q_KEY_CODE_X,
- [KEY_C] = Q_KEY_CODE_C,
- [KEY_V] = Q_KEY_CODE_V,
- [KEY_B] = Q_KEY_CODE_B,
- [KEY_N] = Q_KEY_CODE_N,
- [KEY_M] = Q_KEY_CODE_M,
- [KEY_COMMA] = Q_KEY_CODE_COMMA,
- [KEY_DOT] = Q_KEY_CODE_DOT,
- [KEY_SLASH] = Q_KEY_CODE_SLASH,
- [KEY_RIGHTSHIFT] = Q_KEY_CODE_SHIFT_R,
- [KEY_LEFTALT] = Q_KEY_CODE_ALT,
- [KEY_SPACE] = Q_KEY_CODE_SPC,
- [KEY_CAPSLOCK] = Q_KEY_CODE_CAPS_LOCK,
- [KEY_F1] = Q_KEY_CODE_F1,
- [KEY_F2] = Q_KEY_CODE_F2,
- [KEY_F3] = Q_KEY_CODE_F3,
- [KEY_F4] = Q_KEY_CODE_F4,
- [KEY_F5] = Q_KEY_CODE_F5,
- [KEY_F6] = Q_KEY_CODE_F6,
- [KEY_F7] = Q_KEY_CODE_F7,
- [KEY_F8] = Q_KEY_CODE_F8,
- [KEY_F9] = Q_KEY_CODE_F9,
- [KEY_F10] = Q_KEY_CODE_F10,
- [KEY_NUMLOCK] = Q_KEY_CODE_NUM_LOCK,
- [KEY_SCROLLLOCK] = Q_KEY_CODE_SCROLL_LOCK,
- [KEY_KP0] = Q_KEY_CODE_KP_0,
- [KEY_KP1] = Q_KEY_CODE_KP_1,
- [KEY_KP2] = Q_KEY_CODE_KP_2,
- [KEY_KP3] = Q_KEY_CODE_KP_3,
- [KEY_KP4] = Q_KEY_CODE_KP_4,
- [KEY_KP5] = Q_KEY_CODE_KP_5,
- [KEY_KP6] = Q_KEY_CODE_KP_6,
- [KEY_KP7] = Q_KEY_CODE_KP_7,
- [KEY_KP8] = Q_KEY_CODE_KP_8,
- [KEY_KP9] = Q_KEY_CODE_KP_9,
- [KEY_KPMINUS] = Q_KEY_CODE_KP_SUBTRACT,
- [KEY_KPPLUS] = Q_KEY_CODE_KP_ADD,
- [KEY_KPDOT] = Q_KEY_CODE_KP_DECIMAL,
- [KEY_KPENTER] = Q_KEY_CODE_KP_ENTER,
- [KEY_KPSLASH] = Q_KEY_CODE_KP_DIVIDE,
- [KEY_KPASTERISK] = Q_KEY_CODE_KP_MULTIPLY,
- [KEY_F11] = Q_KEY_CODE_F11,
- [KEY_F12] = Q_KEY_CODE_F12,
- [KEY_RO] = Q_KEY_CODE_RO,
- [KEY_HIRAGANA] = Q_KEY_CODE_HIRAGANA,
- [KEY_HENKAN] = Q_KEY_CODE_HENKAN,
- [KEY_RIGHTCTRL] = Q_KEY_CODE_CTRL_R,
- [KEY_SYSRQ] = Q_KEY_CODE_SYSRQ,
- [KEY_RIGHTALT] = Q_KEY_CODE_ALT_R,
- [KEY_HOME] = Q_KEY_CODE_HOME,
- [KEY_UP] = Q_KEY_CODE_UP,
- [KEY_PAGEUP] = Q_KEY_CODE_PGUP,
- [KEY_LEFT] = Q_KEY_CODE_LEFT,
- [KEY_RIGHT] = Q_KEY_CODE_RIGHT,
- [KEY_END] = Q_KEY_CODE_END,
- [KEY_DOWN] = Q_KEY_CODE_DOWN,
- [KEY_PAGEDOWN] = Q_KEY_CODE_PGDN,
- [KEY_INSERT] = Q_KEY_CODE_INSERT,
- [KEY_DELETE] = Q_KEY_CODE_DELETE,
- [KEY_POWER] = Q_KEY_CODE_POWER,
- [KEY_KPCOMMA] = Q_KEY_CODE_KP_COMMA,
- [KEY_YEN] = Q_KEY_CODE_YEN,
- [KEY_LEFTMETA] = Q_KEY_CODE_META_L,
- [KEY_RIGHTMETA] = Q_KEY_CODE_META_R,
- [KEY_MENU] = Q_KEY_CODE_MENU,
- [KEY_PAUSE] = Q_KEY_CODE_PAUSE,
-
- [KEY_SLEEP] = Q_KEY_CODE_SLEEP,
- [KEY_WAKEUP] = Q_KEY_CODE_WAKE,
- [KEY_CALC] = Q_KEY_CODE_CALCULATOR,
- [KEY_MAIL] = Q_KEY_CODE_MAIL,
- [KEY_COMPUTER] = Q_KEY_CODE_COMPUTER,
-
- [KEY_STOP] = Q_KEY_CODE_STOP,
- [KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS,
- [KEY_BACK] = Q_KEY_CODE_AC_BACK,
- [KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD,
- [KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME,
- [KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH,
- [KEY_FIND] = Q_KEY_CODE_FIND,
-
- [KEY_NEXTSONG] = Q_KEY_CODE_AUDIONEXT,
- [KEY_PREVIOUSSONG] = Q_KEY_CODE_AUDIOPREV,
- [KEY_STOPCD] = Q_KEY_CODE_AUDIOSTOP,
- [KEY_PLAYCD] = Q_KEY_CODE_AUDIOPLAY,
- [KEY_MUTE] = Q_KEY_CODE_AUDIOMUTE,
- [KEY_VOLUMEDOWN] = Q_KEY_CODE_VOLUMEDOWN,
- [KEY_VOLUMEUP] = Q_KEY_CODE_VOLUMEUP,
-};
-
-static const int qcode_to_number[] = {
- [Q_KEY_CODE_SHIFT] = 0x2a,
- [Q_KEY_CODE_SHIFT_R] = 0x36,
-
- [Q_KEY_CODE_ALT] = 0x38,
- [Q_KEY_CODE_ALT_R] = 0xb8,
- [Q_KEY_CODE_CTRL] = 0x1d,
- [Q_KEY_CODE_CTRL_R] = 0x9d,
-
- [Q_KEY_CODE_META_L] = 0xdb,
- [Q_KEY_CODE_META_R] = 0xdc,
- [Q_KEY_CODE_MENU] = 0xdd,
-
- [Q_KEY_CODE_ESC] = 0x01,
-
- [Q_KEY_CODE_1] = 0x02,
- [Q_KEY_CODE_2] = 0x03,
- [Q_KEY_CODE_3] = 0x04,
- [Q_KEY_CODE_4] = 0x05,
- [Q_KEY_CODE_5] = 0x06,
- [Q_KEY_CODE_6] = 0x07,
- [Q_KEY_CODE_7] = 0x08,
- [Q_KEY_CODE_8] = 0x09,
- [Q_KEY_CODE_9] = 0x0a,
- [Q_KEY_CODE_0] = 0x0b,
- [Q_KEY_CODE_MINUS] = 0x0c,
- [Q_KEY_CODE_EQUAL] = 0x0d,
- [Q_KEY_CODE_BACKSPACE] = 0x0e,
-
- [Q_KEY_CODE_TAB] = 0x0f,
- [Q_KEY_CODE_Q] = 0x10,
- [Q_KEY_CODE_W] = 0x11,
- [Q_KEY_CODE_E] = 0x12,
- [Q_KEY_CODE_R] = 0x13,
- [Q_KEY_CODE_T] = 0x14,
- [Q_KEY_CODE_Y] = 0x15,
- [Q_KEY_CODE_U] = 0x16,
- [Q_KEY_CODE_I] = 0x17,
- [Q_KEY_CODE_O] = 0x18,
- [Q_KEY_CODE_P] = 0x19,
- [Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
- [Q_KEY_CODE_RET] = 0x1c,
-
- [Q_KEY_CODE_A] = 0x1e,
- [Q_KEY_CODE_S] = 0x1f,
- [Q_KEY_CODE_D] = 0x20,
- [Q_KEY_CODE_F] = 0x21,
- [Q_KEY_CODE_G] = 0x22,
- [Q_KEY_CODE_H] = 0x23,
- [Q_KEY_CODE_J] = 0x24,
- [Q_KEY_CODE_K] = 0x25,
- [Q_KEY_CODE_L] = 0x26,
- [Q_KEY_CODE_SEMICOLON] = 0x27,
- [Q_KEY_CODE_APOSTROPHE] = 0x28,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
-
- [Q_KEY_CODE_BACKSLASH] = 0x2b,
- [Q_KEY_CODE_Z] = 0x2c,
- [Q_KEY_CODE_X] = 0x2d,
- [Q_KEY_CODE_C] = 0x2e,
- [Q_KEY_CODE_V] = 0x2f,
- [Q_KEY_CODE_B] = 0x30,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_M] = 0x32,
- [Q_KEY_CODE_COMMA] = 0x33,
- [Q_KEY_CODE_DOT] = 0x34,
- [Q_KEY_CODE_SLASH] = 0x35,
-
- [Q_KEY_CODE_ASTERISK] = 0x37,
-
- [Q_KEY_CODE_SPC] = 0x39,
- [Q_KEY_CODE_CAPS_LOCK] = 0x3a,
- [Q_KEY_CODE_F1] = 0x3b,
- [Q_KEY_CODE_F2] = 0x3c,
- [Q_KEY_CODE_F3] = 0x3d,
- [Q_KEY_CODE_F4] = 0x3e,
- [Q_KEY_CODE_F5] = 0x3f,
- [Q_KEY_CODE_F6] = 0x40,
- [Q_KEY_CODE_F7] = 0x41,
- [Q_KEY_CODE_F8] = 0x42,
- [Q_KEY_CODE_F9] = 0x43,
- [Q_KEY_CODE_F10] = 0x44,
- [Q_KEY_CODE_NUM_LOCK] = 0x45,
- [Q_KEY_CODE_SCROLL_LOCK] = 0x46,
-
- [Q_KEY_CODE_KP_DIVIDE] = 0xb5,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x37,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
- [Q_KEY_CODE_KP_ADD] = 0x4e,
- [Q_KEY_CODE_KP_ENTER] = 0x9c,
- [Q_KEY_CODE_KP_DECIMAL] = 0x53,
- [Q_KEY_CODE_SYSRQ] = 0x54,
- [Q_KEY_CODE_PAUSE] = 0xc6,
-
- [Q_KEY_CODE_KP_0] = 0x52,
- [Q_KEY_CODE_KP_1] = 0x4f,
- [Q_KEY_CODE_KP_2] = 0x50,
- [Q_KEY_CODE_KP_3] = 0x51,
- [Q_KEY_CODE_KP_4] = 0x4b,
- [Q_KEY_CODE_KP_5] = 0x4c,
- [Q_KEY_CODE_KP_6] = 0x4d,
- [Q_KEY_CODE_KP_7] = 0x47,
- [Q_KEY_CODE_KP_8] = 0x48,
- [Q_KEY_CODE_KP_9] = 0x49,
-
- [Q_KEY_CODE_LESS] = 0x56,
-
- [Q_KEY_CODE_F11] = 0x57,
- [Q_KEY_CODE_F12] = 0x58,
-
- [Q_KEY_CODE_PRINT] = 0xb7,
-
- [Q_KEY_CODE_HOME] = 0xc7,
- [Q_KEY_CODE_PGUP] = 0xc9,
- [Q_KEY_CODE_PGDN] = 0xd1,
- [Q_KEY_CODE_END] = 0xcf,
-
- [Q_KEY_CODE_LEFT] = 0xcb,
- [Q_KEY_CODE_UP] = 0xc8,
- [Q_KEY_CODE_DOWN] = 0xd0,
- [Q_KEY_CODE_RIGHT] = 0xcd,
-
- [Q_KEY_CODE_INSERT] = 0xd2,
- [Q_KEY_CODE_DELETE] = 0xd3,
-
- [Q_KEY_CODE_RO] = 0x73,
- [Q_KEY_CODE_HIRAGANA] = 0x70,
- [Q_KEY_CODE_HENKAN] = 0x79,
- [Q_KEY_CODE_POWER] = 0xde,
- [Q_KEY_CODE_YEN] = 0x7d,
- [Q_KEY_CODE_KP_COMMA] = 0x7e,
-
- [Q_KEY_CODE_SLEEP] = 0xdf,
- [Q_KEY_CODE_WAKE] = 0xe3,
- [Q_KEY_CODE_CALCULATOR] = 0xa1,
- [Q_KEY_CODE_MAIL] = 0xec,
- [Q_KEY_CODE_COMPUTER] = 0xeb,
-
- [Q_KEY_CODE_STOP] = 0xe8,
- [Q_KEY_CODE_AC_BOOKMARKS] = 0xe6,
- [Q_KEY_CODE_AC_BACK] = 0xea,
- [Q_KEY_CODE_AC_FORWARD] = 0xe9,
- [Q_KEY_CODE_AC_HOME] = 0xb2,
- [Q_KEY_CODE_AC_REFRESH] = 0xe7,
- [Q_KEY_CODE_FIND] = 0xe5,
-
- [Q_KEY_CODE_AUDIONEXT] = 0x99,
- [Q_KEY_CODE_AUDIOPREV] = 0x90,
- [Q_KEY_CODE_AUDIOSTOP] = 0xa4,
- [Q_KEY_CODE_AUDIOPLAY] = 0xa2,
- [Q_KEY_CODE_AUDIOMUTE] = 0xa0,
- [Q_KEY_CODE_VOLUMEDOWN] = 0xae,
- [Q_KEY_CODE_VOLUMEUP] = 0xb0,
-
- [Q_KEY_CODE__MAX] = 0,
-};
-
-static int number_to_qcode[0x100];
+#include "ui/input-keymap-linux-to-qcode.c"
+#include "ui/input-keymap-qcode-to-qnum.c"
+#include "ui/input-keymap-qnum-to-qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx)
{
- assert(lnx < KEY_CNT);
- return linux_to_qcode[lnx];
+ if (lnx >= qemu_input_map_linux_to_qcode_len) {
+ return 0;
+ }
+ return qemu_input_map_linux_to_qcode[lnx];
}
int qemu_input_key_value_to_number(const KeyValue *value)
{
if (value->type == KEY_VALUE_KIND_QCODE) {
- return qcode_to_number[value->u.qcode.data];
+ if (value->u.qcode.data >= qemu_input_map_qcode_to_qnum_len) {
+ return 0;
+ }
+ return qemu_input_map_qcode_to_qnum[value->u.qcode.data];
} else {
assert(value->type == KEY_VALUE_KIND_NUMBER);
return value->u.number.data;
}
}
-int qemu_input_key_number_to_qcode(uint8_t nr)
+int qemu_input_key_number_to_qcode(unsigned int nr)
{
- static int first = true;
-
- if (first) {
- int qcode, number;
- first = false;
- for (qcode = 0; qcode < Q_KEY_CODE__MAX; qcode++) {
- number = qcode_to_number[qcode];
- assert(number < ARRAY_SIZE(number_to_qcode));
- number_to_qcode[number] = qcode;
- }
+ if (nr >= qemu_input_map_qnum_to_qcode_len) {
+ return 0;
}
-
- return number_to_qcode[nr];
+ return qemu_input_map_qnum_to_qcode[nr];
}
int qemu_input_key_value_to_qcode(const KeyValue *value)
--
2.13.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v8 5/6] ui: convert key events to QKeyCodes immediately
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
` (3 preceding siblings ...)
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 4/6] ui: convert common input code to keycodemapdb Daniel P. Berrange
@ 2017-09-29 10:12 ` Daniel P. Berrange
2017-09-29 10:12 ` [Qemu-devel] [PATCH v8 6/6] ui: don't export qemu_input_event_new_key Daniel P. Berrange
2017-10-02 9:56 ` [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
6 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
Always use QKeyCode in the InputKeyEvent struct, by converting key
numbers to QKeyCode at the time the event is created. This allows
the code processing / consuming key events to assume QKeyCode is
used. The only place we accept a key number in the InputKeyEvent
struct is with QMP commands sent by the user.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
ui/input.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/ui/input.c b/ui/input.c
index 3422d4a8ef..4b241aa823 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -157,9 +157,16 @@ void qmp_input_send_event(bool has_device, const char *device,
}
for (e = events; e != NULL; e = e->next) {
- InputEvent *event = e->value;
-
- qemu_input_event_send(con, event);
+ InputEvent *evt = e->value;
+
+ if (evt->type == INPUT_EVENT_KIND_KEY &&
+ evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER) {
+ KeyValue *key = evt->u.key.data->key;
+ QKeyCode code = qemu_input_key_number_to_qcode(key->u.qcode.data);
+ qemu_input_event_send_key_qcode(con, code, evt->u.key.data->down);
+ } else {
+ qemu_input_event_send(con, evt);
+ }
}
qemu_input_event_sync();
@@ -341,6 +348,11 @@ void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt)
void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
{
+ /* Expect all parts of QEMU to send events with QCodes exclusively.
+ * Key numbers are only supported as end-user input via QMP */
+ assert(!(evt->type == INPUT_EVENT_KIND_KEY &&
+ evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER));
+
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
return;
}
@@ -400,10 +412,8 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
{
- KeyValue *key = g_new0(KeyValue, 1);
- key->type = KEY_VALUE_KIND_NUMBER;
- key->u.number.data = num;
- qemu_input_event_send_key(src, key, down);
+ QKeyCode code = qemu_input_key_number_to_qcode(num);
+ qemu_input_event_send_key_qcode(src, code, down);
}
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
--
2.13.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v8 6/6] ui: don't export qemu_input_event_new_key
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
` (4 preceding siblings ...)
2017-09-29 10:12 ` [Qemu-devel] [PATCH v8 5/6] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
@ 2017-09-29 10:12 ` Daniel P. Berrange
2017-10-02 9:56 ` [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
6 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-09-29 10:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini,
Daniel P. Berrange
All public code should use qemu_input_event_send_key* functions
instead of creating an event directly.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 1 -
ui/input.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index 479cc46cfc..f8cee43f65 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -38,7 +38,6 @@ void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt);
void qemu_input_event_sync(void);
void qemu_input_event_sync_impl(void);
-InputEvent *qemu_input_event_new_key(KeyValue *key, bool down);
void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
diff --git a/ui/input.c b/ui/input.c
index 4b241aa823..290b47354a 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -386,7 +386,7 @@ void qemu_input_event_sync(void)
replay_input_sync_event();
}
-InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
+static InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
{
InputEvent *evt = g_new0(InputEvent, 1);
evt->u.key.data = g_new0(InputKeyEvent, 1);
--
2.13.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
` (5 preceding siblings ...)
2017-09-29 10:12 ` [Qemu-devel] [PATCH v8 6/6] ui: don't export qemu_input_event_new_key Daniel P. Berrange
@ 2017-10-02 9:56 ` Daniel P. Berrange
6 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-10-02 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Fam Zheng, Gerd Hoffmann, Peter Maydell, Paolo Bonzini
FYI, in case people were wondering, patchew successfully passed all
tests. So it looks like 8th time lucky for getting submodules working
correctly unless someone can break it again.....
http://patchew.org/QEMU/20170929101201.21039-1-berrange@redhat.com/
On Fri, Sep 29, 2017 at 11:11:55AM +0100, Daniel P. Berrange wrote:
> This patch series is an update to:
>
> v1: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02047.html
> v2: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02471.html
> v3: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02517.html
> v4: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02708.html
> v5: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02950.html
> v6: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07673.html
> v7: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07740.html
>
> The keycodemap project[1] provides a database mapping between many different
> keysym/keycode/scancode sets, along with a tool to generate mapping/lookup
> tables in various programming languages. It is already used by GTK-VNC,
> SPICE-GTK and libvirt.
>
> In this v6 posting I have dropped most of the conversion to keycodemapdb
> across the devices / UI frontends. This only converts the core input
> APIs, and wires up the git submodule build system mechanics. The remaining
> patches from the v5 posting will be submitted separately, once this initial
> conversion is mergable.
>
> Changed in v8:
>
> - Fix error checking in archive-source.sh changes (Eric)
> - Use -e instead of -d to check for .git (Eric)
> - Misc typos (Eric)
> - Use && instead of ; in make shell rules (Eric)
> - Fully quote $source_path usage (Eric)
> - Fix position of trap statement for cleanup (Eric)
> - Added missing dependnacy for Makefile (Patchew)
> - Moved build rules from ui/Makefile.objs into Makefile because
> we must not have those rules defined in the target specific
> Makefiles
>
> Changed in v7:
>
> - subdir-dtc and ui/input-keymap-* make rules must depend on
> the submodule status file to ensure build ordering (patchew)
> - Use 'git stash' to ensure archive-source.sh keeps non-committed
> changes for docker/vm testing (Fam)
>
> Changed in v6:
>
> - Switched back to using a git submodule
> - Wire up Makefile rules so that git submodule is automatically
> refreshed when needed prior to build.
> - Fix source tarball creation for docker/vm tests wrt submodules
>
> Changed in v5:
>
> - Don't try to initialize git submodule at all
> - Store generate keymap files in GIT
>
> Changed in v4:
>
> - Run submodule update in source_dir for vpath builds (patchew)
> - Force submodule update in docker rules in case they
> are run without configure (patchew)
>
> Changed in v3:
>
> - Ensure docker builds pull in keycodemapdb submodule (patchew)
> - Add compat with py26 for RHEL-6 in keycodemapdb tools (patchew)
> - Initialize submodule in configure script (patchew)
>
> Changed in v2:
>
> - Change filename pattern to 'ui/input-keymap-$SRC-to-$DST.c'
> and map names 'qemu_input_map_$SRC_to_$DST' (Eric)
> - Fix typos (Eric)
> - Drop changes to InputKeyEvent struct (Eric)
> - Fix VPATH build (patchew)
> - Fix code style errors (patchew)
>
> [1] https://gitlab.com/keycodemap/keycodemapdb/
>
> Daniel P. Berrange (6):
> build: automatically handle GIT submodule checkout for dtc
> docker: don't rely on submodules existing in the main checkout
> ui: add keycodemapdb repository as a GIT submodule
> ui: convert common input code to keycodemapdb
> ui: convert key events to QKeyCodes immediately
> ui: don't export qemu_input_event_new_key
>
> .gitignore | 2 +
> .gitmodules | 3 +
> MAINTAINERS | 6 +
> Makefile | 46 ++++++-
> configure | 52 +++++---
> include/ui/input.h | 12 +-
> scripts/archive-source.sh | 34 ++++-
> scripts/git-submodule.sh | 38 ++++++
> ui/input-keymap.c | 326 +++-------------------------------------------
> ui/input.c | 26 ++--
> ui/keycodemapdb | 1 +
> 11 files changed, 198 insertions(+), 348 deletions(-)
> create mode 100755 scripts/git-submodule.sh
> create mode 160000 ui/keycodemapdb
>
> --
> 2.13.5
>
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 :|
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout Daniel P. Berrange
@ 2017-10-02 12:52 ` Alex Bennée
2017-10-02 13:01 ` Daniel P. Berrange
0 siblings, 1 reply; 10+ messages in thread
From: Alex Bennée @ 2017-10-02 12:52 UTC (permalink / raw)
To: Daniel P. Berrange
Cc: qemu-devel, Peter Maydell, Fam Zheng, Gerd Hoffmann, Paolo Bonzini
Daniel P. Berrange <berrange@redhat.com> writes:
> When building the tarball to pass into the docker/vm test image,
> the code relies on the git submodules being checked out in the
> main checkout.
>
> ie if the developer has not run 'git submodule update --init dtc'
> many of the docker tests will fail due to the libfdt package not
> being present in the test images. Patchew manually checks out the
> dtc submodule in the main git checkout, but this is a bad idea.
>
> When running tests we want to have a predictable set of submodules
> included in the source that's tested. The build environment is
> completely independent of the developers host OS, so the submodules
> the developer has checked out should not be considered relevant for
> the tests.
>
> This changes the archive-source.sh script so that it clones the
> current git checkout into a temporary directory, checks out a
> fixed set of submodules, builds the tarball and finally removes
> the temporary git clone.
I feel like we've just gone around in one big circle here. The whole
point of passing the tarball into the docker build in the first place
was to avoid messing around with checkouts and the like. Is it not
possible to get what we want direct from git?
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> scripts/archive-source.sh | 34 ++++++++++++++++++++++++++++------
> 1 file changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
> index c4e7d98f4d..4029de7b20 100755
> --- a/scripts/archive-source.sh
> +++ b/scripts/archive-source.sh
> @@ -18,15 +18,37 @@ if test $# -lt 1; then
> error "Usage: $0 <output tarball>"
> fi
>
> -tar_file="$1"
> -list_file="$1.list"
> -submodules=$(git submodule foreach --recursive --quiet 'echo $name')
> +tar_file=`realpath "$1"`
> +list_file="${tar_file}.list"
> +vroot_dir="${tar_file}.vroot"
>
> -if test $? -ne 0; then
> - error "git submodule command failed"
> +# We want a predictable list of submodules for builds, that is
> +# independent of what the developer currently has initialized
> +# in their checkout, because the build environment is completely
> +# different to the host OS.
> +submodules="dtc"
> +
> +trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15
> +
> +if git diff-index --quiet HEAD -- &>/dev/null
> +then
> + HEAD=HEAD
> +else
> + HEAD=`git stash create`
> fi
> +git clone --shared . "$vroot_dir"
> +test $? -ne 0 && error "failed to clone into '$vroot_dir'"
> +
> +cd "$vroot_dir"
> +test $? -ne 0 && error "failed to change into '$vroot_dir'"
> +
> +git checkout $HEAD
> +test $? -ne 0 && error "failed to checkout $HEAD revision"
>
> -trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15
> +for sm in $submodules; do
> + git submodule update --init $sm
> + test $? -ne 0 && error "failed to init submodule $sm"
> +done
>
> if test -n "$submodules"; then
> {
--
Alex Bennée
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout
2017-10-02 12:52 ` Alex Bennée
@ 2017-10-02 13:01 ` Daniel P. Berrange
0 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrange @ 2017-10-02 13:01 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, Peter Maydell, Fam Zheng, Gerd Hoffmann, Paolo Bonzini
On Mon, Oct 02, 2017 at 01:52:33PM +0100, Alex Bennée wrote:
>
> Daniel P. Berrange <berrange@redhat.com> writes:
>
> > When building the tarball to pass into the docker/vm test image,
> > the code relies on the git submodules being checked out in the
> > main checkout.
> >
> > ie if the developer has not run 'git submodule update --init dtc'
> > many of the docker tests will fail due to the libfdt package not
> > being present in the test images. Patchew manually checks out the
> > dtc submodule in the main git checkout, but this is a bad idea.
> >
> > When running tests we want to have a predictable set of submodules
> > included in the source that's tested. The build environment is
> > completely independent of the developers host OS, so the submodules
> > the developer has checked out should not be considered relevant for
> > the tests.
> >
> > This changes the archive-source.sh script so that it clones the
> > current git checkout into a temporary directory, checks out a
> > fixed set of submodules, builds the tarball and finally removes
> > the temporary git clone.
>
> I feel like we've just gone around in one big circle here. The whole
> point of passing the tarball into the docker build in the first place
> was to avoid messing around with checkouts and the like. Is it not
> possible to get what we want direct from git?
What I've implemented here gets what we want straight from git, with
minimal performance overhead because entire .git is shared with hard
links.
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > scripts/archive-source.sh | 34 ++++++++++++++++++++++++++++------
> > 1 file changed, 28 insertions(+), 6 deletions(-)
> >
> > diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
> > index c4e7d98f4d..4029de7b20 100755
> > --- a/scripts/archive-source.sh
> > +++ b/scripts/archive-source.sh
> > @@ -18,15 +18,37 @@ if test $# -lt 1; then
> > error "Usage: $0 <output tarball>"
> > fi
> >
> > -tar_file="$1"
> > -list_file="$1.list"
> > -submodules=$(git submodule foreach --recursive --quiet 'echo $name')
> > +tar_file=`realpath "$1"`
> > +list_file="${tar_file}.list"
> > +vroot_dir="${tar_file}.vroot"
> >
> > -if test $? -ne 0; then
> > - error "git submodule command failed"
> > +# We want a predictable list of submodules for builds, that is
> > +# independent of what the developer currently has initialized
> > +# in their checkout, because the build environment is completely
> > +# different to the host OS.
> > +submodules="dtc"
> > +
> > +trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15
> > +
> > +if git diff-index --quiet HEAD -- &>/dev/null
> > +then
> > + HEAD=HEAD
> > +else
> > + HEAD=`git stash create`
> > fi
> > +git clone --shared . "$vroot_dir"
> > +test $? -ne 0 && error "failed to clone into '$vroot_dir'"
> > +
> > +cd "$vroot_dir"
> > +test $? -ne 0 && error "failed to change into '$vroot_dir'"
> > +
> > +git checkout $HEAD
> > +test $? -ne 0 && error "failed to checkout $HEAD revision"
> >
> > -trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15
> > +for sm in $submodules; do
> > + git submodule update --init $sm
> > + test $? -ne 0 && error "failed to init submodule $sm"
> > +done
> >
> > if test -n "$submodules"; then
> > {
>
>
> --
> Alex Bennée
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 :|
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-10-02 13:02 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-29 10:11 [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 1/6] build: automatically handle GIT submodule checkout for dtc Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout Daniel P. Berrange
2017-10-02 12:52 ` Alex Bennée
2017-10-02 13:01 ` Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 3/6] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
2017-09-29 10:11 ` [Qemu-devel] [PATCH v8 4/6] ui: convert common input code to keycodemapdb Daniel P. Berrange
2017-09-29 10:12 ` [Qemu-devel] [PATCH v8 5/6] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
2017-09-29 10:12 ` [Qemu-devel] [PATCH v8 6/6] ui: don't export qemu_input_event_new_key Daniel P. Berrange
2017-10-02 9:56 ` [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule Daniel P. Berrange
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.