{"id":819553,"url":"http://patchwork.ozlabs.org/api/patches/819553/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170928120621.30288-4-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170928120621.30288-4-berrange@redhat.com>","list_archive_url":null,"date":"2017-09-28T12:06:18","name":"[v7,3/6] ui: add keycodemapdb repository as a GIT submodule","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0221d12d86c9bd49da2704deac8b2c8f0c163159","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170928120621.30288-4-berrange@redhat.com/mbox/","series":[{"id":5547,"url":"http://patchwork.ozlabs.org/api/series/5547/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5547","date":"2017-09-28T12:06:16","name":"Initial support for keycodemapdb GIT submodule","version":7,"mbox":"http://patchwork.ozlabs.org/series/5547/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819553/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819553/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y2tjd435Sz9t3v\n\tfor ;\n\tThu, 28 Sep 2017 22:07:33 +1000 (AEST)","from localhost ([::1]:58960 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dxXbH-0000MI-Gu\n\tfor incoming@patchwork.ozlabs.org; Thu, 28 Sep 2017 08:07:31 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44499)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dxXaS-0000Dc-To\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 08:06:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dxXaQ-0007mR-Jy\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 08:06:40 -0400","from mx1.redhat.com ([209.132.183.28]:35212)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dxXaQ-0007lo-BS\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 08:06:38 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 78C4B11372A;\n\tThu, 28 Sep 2017 12:06:37 +0000 (UTC)","from t460.redhat.com (unknown [10.33.36.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D7C6C90C68;\n\tThu, 28 Sep 2017 12:06:35 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 78C4B11372A","From":"\"Daniel P. Berrange\" ","To":"qemu-devel@nongnu.org","Date":"Thu, 28 Sep 2017 13:06:18 +0100","Message-Id":"<20170928120621.30288-4-berrange@redhat.com>","In-Reply-To":"<20170928120621.30288-1-berrange@redhat.com>","References":"<20170928120621.30288-1-berrange@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 28 Sep 2017 12:06:37 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 3/6] ui: add keycodemapdb repository as a\n\tGIT submodule","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell , Fam Zheng ,\n\tGerd Hoffmann , Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a\ndata file mapping between all the different scancode/keycode/keysym\nsets that are known, and a tool to auto-generate lookup tables for\ndifferent combinations.\n\nIt is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys.\nUsing it in QEMU will let us replace many hand written lookup\ntables with auto-generated tables from a master data source,\nreducing bugs. Adding new QKeyCodes will now only require the\nmaster table to be updated, all ~20 other tables will be\nautomatically updated to follow.\n\nSigned-off-by: Daniel P. Berrange \n---\n .gitignore | 1 +\n .gitmodules | 3 +++\n configure | 8 +++++++-\n scripts/archive-source.sh | 2 +-\n ui/Makefile.objs | 18 ++++++++++++++++++\n ui/keycodemapdb | 1 +\n 6 files changed, 31 insertions(+), 2 deletions(-)\n create mode 160000 ui/keycodemapdb","diff":"diff --git a/.gitignore b/.gitignore\nindex 06bf972fc3..1eada71afd 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -14,6 +14,7 @@\n /trace/generated-tcg-tracers.h\n /ui/shader/texture-blit-frag.h\n /ui/shader/texture-blit-vert.h\n+/ui/input-keymap-*.c\n *-timestamp\n /*-softmmu\n /*-darwin-user\ndiff --git a/.gitmodules b/.gitmodules\nindex 84c54cdc49..f3bbc01f82 100644\n--- a/.gitmodules\n+++ b/.gitmodules\n@@ -34,3 +34,6 @@\n [submodule \"roms/QemuMacDrivers\"]\n \tpath = roms/QemuMacDrivers\n \turl = git://git.qemu.org/QemuMacDrivers.git\n+[submodule \"ui/keycodemapdb\"]\n+\tpath = ui/keycodemapdb\n+\turl = https://gitlab.com/keycodemap/keycodemapdb.git\ndiff --git a/configure b/configure\nindex ed4048f8b2..1aeb09f83f 100755\n--- a/configure\n+++ b/configure\n@@ -264,7 +264,13 @@ cc_i386=i386-pc-linux-gnu-gcc\n libs_qga=\"\"\n debug_info=\"yes\"\n stack_protector=\"\"\n-git_submodules=\"\"\n+\n+if test -d \"$source_path/.git\"\n+then\n+ git_submodules=\"ui/keycodemapdb\"\n+else\n+ git_submodules=\"\"\n+fi\n \n # Don't accept a target_list environment variable.\n unset target_list\ndiff --git a/scripts/archive-source.sh b/scripts/archive-source.sh\nindex 0c06af0d00..9c789c5d9c 100755\n--- a/scripts/archive-source.sh\n+++ b/scripts/archive-source.sh\n@@ -26,7 +26,7 @@ vroot_dir=\"${tar_file}.vroot\"\n # independant of what the developer currently has initialized\n # in their checkout, because the build environment is completely\n # different to the host OS.\n-submodules=\"dtc\"\n+submodules=\"dtc ui/keycodemapdb\"\n \n if test $? -ne 0; then\n error \"git submodule command failed\"\ndiff --git a/ui/Makefile.objs b/ui/Makefile.objs\nindex ec8533d6d9..a930afafe5 100644\n--- a/ui/Makefile.objs\n+++ b/ui/Makefile.objs\n@@ -50,3 +50,21 @@ gtk-egl.o-libs += $(OPENGL_LIBS)\n shader.o-libs += $(OPENGL_LIBS)\n console-gl.o-libs += $(OPENGL_LIBS)\n egl-helpers.o-libs += $(OPENGL_LIBS)\n+\n+KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen\n+KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv\n+\n+KEYCODEMAP_FILES = \\\n+\t\t $(NULL)\n+\n+GENERATED_FILES += $(KEYCODEMAP_FILES)\n+\n+ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile.objs .git-submodule-status\n+\t$(call quiet-command,\\\n+\t src=$$(echo $@ | sed -E -e \"s,^ui/input-keymap-(.+)-to-(.+)\\.c$$,\\1,\") && \\\n+\t dst=$$(echo $@ | sed -E -e \"s,^ui/input-keymap-(.+)-to-(.+)\\.c$$,\\2,\") && \\\n+\t $(PYTHON) $(KEYCODEMAP_GEN) \\\n+\t --lang glib2 \\\n+\t --varname qemu_input_map_$${src}_to_$${dst} \\\n+\t code-map $(KEYCODEMAP_CSV) $${src} $${dst} \\\n+\t > $@ || rm $@, \"GEN\", \"$@\")\ndiff --git a/ui/keycodemapdb b/ui/keycodemapdb\nnew file mode 160000\nindex 0000000000..56ce5650d2\n--- /dev/null\n+++ b/ui/keycodemapdb\n@@ -0,0 +1 @@\n+Subproject commit 56ce5650d2c6ea216b4580df44b9a6dd3bc92c3b\n","prefixes":["v7","3/6"]}