{"id":819554,"url":"http://patchwork.ozlabs.org/api/patches/819554/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170928120621.30288-6-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-6-berrange@redhat.com>","list_archive_url":null,"date":"2017-09-28T12:06:20","name":"[v7,5/6] ui: convert key events to QKeyCodes immediately","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6e637c2219d7c14cbeefb1660df541fdcee84757","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-6-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/819554/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819554/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3y2tjg00DZz9t3v\n\tfor ;\n\tThu, 28 Sep 2017 22:07:34 +1000 (AEST)","from localhost ([::1]:58961 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dxXbJ-0000Nm-0z\n\tfor incoming@patchwork.ozlabs.org; Thu, 28 Sep 2017 08:07:33 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44531)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dxXaV-0000FR-OX\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 08:06:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dxXaU-0007oA-QJ\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 08:06:43 -0400","from mx1.redhat.com ([209.132.183.28]:40626)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dxXaU-0007nr-Kr\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 08:06:42 -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 C29E2C02D257;\n\tThu, 28 Sep 2017 12:06:41 +0000 (UTC)","from t460.redhat.com (unknown [10.33.36.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 72E158F898;\n\tThu, 28 Sep 2017 12:06:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C29E2C02D257","From":"\"Daniel P. Berrange\" ","To":"qemu-devel@nongnu.org","Date":"Thu, 28 Sep 2017 13:06:20 +0100","Message-Id":"<20170928120621.30288-6-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.31]);\n\tThu, 28 Sep 2017 12:06:41 +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 5/6] ui: convert key events to QKeyCodes\n\timmediately","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":"Always use QKeyCode in the InputKeyEvent struct, by converting key\nnumbers to QKeyCode at the time the event is created. This allows\nthe code processing / consuming key events to assume QKeyCode is\nused. The only place we accept a key number in the InputKeyEvent\nstruct is with QMP commands sent by the user.\n\nSigned-off-by: Daniel P. Berrange \n---\n ui/input.c | 24 +++++++++++++++++-------\n 1 file changed, 17 insertions(+), 7 deletions(-)","diff":"diff --git a/ui/input.c b/ui/input.c\nindex 3422d4a8ef..4b241aa823 100644\n--- a/ui/input.c\n+++ b/ui/input.c\n@@ -157,9 +157,16 @@ void qmp_input_send_event(bool has_device, const char *device,\n }\n \n for (e = events; e != NULL; e = e->next) {\n- InputEvent *event = e->value;\n-\n- qemu_input_event_send(con, event);\n+ InputEvent *evt = e->value;\n+\n+ if (evt->type == INPUT_EVENT_KIND_KEY &&\n+ evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER) {\n+ KeyValue *key = evt->u.key.data->key;\n+ QKeyCode code = qemu_input_key_number_to_qcode(key->u.qcode.data);\n+ qemu_input_event_send_key_qcode(con, code, evt->u.key.data->down);\n+ } else {\n+ qemu_input_event_send(con, evt);\n+ }\n }\n \n qemu_input_event_sync();\n@@ -341,6 +348,11 @@ void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt)\n \n void qemu_input_event_send(QemuConsole *src, InputEvent *evt)\n {\n+ /* Expect all parts of QEMU to send events with QCodes exclusively.\n+ * Key numbers are only supported as end-user input via QMP */\n+ assert(!(evt->type == INPUT_EVENT_KIND_KEY &&\n+ evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER));\n+\n if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {\n return;\n }\n@@ -400,10 +412,8 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)\n \n void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)\n {\n- KeyValue *key = g_new0(KeyValue, 1);\n- key->type = KEY_VALUE_KIND_NUMBER;\n- key->u.number.data = num;\n- qemu_input_event_send_key(src, key, down);\n+ QKeyCode code = qemu_input_key_number_to_qcode(num);\n+ qemu_input_event_send_key_qcode(src, code, down);\n }\n \n void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)\n","prefixes":["v7","5/6"]}