From nobody Wed May 8 13:50:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501223743071746.5677374033369; Thu, 27 Jul 2017 23:35:43 -0700 (PDT) Received: from localhost ([::1]:46321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1days7-00070x-Um for importer@patchew.org; Fri, 28 Jul 2017 02:35:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dayqz-0005z9-JV for qemu-devel@nongnu.org; Fri, 28 Jul 2017 02:34:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dayqw-0004cP-RS for qemu-devel@nongnu.org; Fri, 28 Jul 2017 02:34:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37418) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dayqw-0004ai-JF for qemu-devel@nongnu.org; Fri, 28 Jul 2017 02:34:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EEC048839 for ; Fri, 28 Jul 2017 06:34:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE87C52FC2; Fri, 28 Jul 2017 06:34:22 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 107BA17469; Fri, 28 Jul 2017 08:34:22 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9EEC048839 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 08:34:15 +0200 Message-Id: <20170728063415.27480-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 28 Jul 2017 06:34:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] ui: drop ac_search and ac_stop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Both keys exist already: "ac_search" is "find" and "ac_stop" is "stop". Fixes: 37810e80553c19f0dac3644924895a9bf5c70785 Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange --- hw/input/ps2.c | 8 ++++---- ui/input-keymap.c | 8 ++++---- qapi-schema.json | 5 +---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 9f057e46ea..77906d5f46 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -239,11 +239,11 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_COD= E__MAX] =3D { [Q_KEY_CODE_MAIL] =3D 0xe06c, [Q_KEY_CODE_CALCULATOR] =3D 0xe021, [Q_KEY_CODE_COMPUTER] =3D 0xe06b, - [Q_KEY_CODE_AC_SEARCH] =3D 0xe065, + [Q_KEY_CODE_FIND] =3D 0xe065, [Q_KEY_CODE_AC_HOME] =3D 0xe032, [Q_KEY_CODE_AC_BACK] =3D 0xe06a, [Q_KEY_CODE_AC_FORWARD] =3D 0xe069, - [Q_KEY_CODE_AC_STOP] =3D 0xe068, + [Q_KEY_CODE_STOP] =3D 0xe068, [Q_KEY_CODE_AC_REFRESH] =3D 0xe067, [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe066, =20 @@ -379,11 +379,11 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_COD= E__MAX] =3D { [Q_KEY_CODE_MAIL] =3D 0xe048, [Q_KEY_CODE_CALCULATOR] =3D 0xe02b, [Q_KEY_CODE_COMPUTER] =3D 0xe040, - [Q_KEY_CODE_AC_SEARCH] =3D 0xe010, + [Q_KEY_CODE_FIND] =3D 0xe010, [Q_KEY_CODE_AC_HOME] =3D 0xe03a, [Q_KEY_CODE_AC_BACK] =3D 0xe038, [Q_KEY_CODE_AC_FORWARD] =3D 0xe030, - [Q_KEY_CODE_AC_STOP] =3D 0xe028, + [Q_KEY_CODE_STOP] =3D 0xe028, [Q_KEY_CODE_AC_REFRESH] =3D 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe018, =20 diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 0d9ddde9c9..cdad5652d3 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -123,13 +123,13 @@ static int linux_to_qcode[KEY_CNT] =3D { [KEY_MAIL] =3D Q_KEY_CODE_MAIL, [KEY_COMPUTER] =3D Q_KEY_CODE_COMPUTER, =20 - [KEY_STOP] =3D Q_KEY_CODE_AC_STOP, + [KEY_STOP] =3D Q_KEY_CODE_STOP, [KEY_BOOKMARKS] =3D Q_KEY_CODE_AC_BOOKMARKS, [KEY_BACK] =3D Q_KEY_CODE_AC_BACK, [KEY_FORWARD] =3D Q_KEY_CODE_AC_FORWARD, [KEY_HOMEPAGE] =3D Q_KEY_CODE_AC_HOME, [KEY_REFRESH] =3D Q_KEY_CODE_AC_REFRESH, - [KEY_FIND] =3D Q_KEY_CODE_AC_SEARCH, + [KEY_FIND] =3D Q_KEY_CODE_FIND, =20 [KEY_NEXTSONG] =3D Q_KEY_CODE_AUDIONEXT, [KEY_PREVIOUSSONG] =3D Q_KEY_CODE_AUDIOPREV, @@ -279,13 +279,13 @@ static const int qcode_to_number[] =3D { [Q_KEY_CODE_MAIL] =3D 0xec, [Q_KEY_CODE_COMPUTER] =3D 0xeb, =20 - [Q_KEY_CODE_AC_STOP] =3D 0xe8, + [Q_KEY_CODE_STOP] =3D 0xe8, [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe6, [Q_KEY_CODE_AC_BACK] =3D 0xea, [Q_KEY_CODE_AC_FORWARD] =3D 0xe9, [Q_KEY_CODE_AC_HOME] =3D 0xb2, [Q_KEY_CODE_AC_REFRESH] =3D 0xe7, - [Q_KEY_CODE_AC_SEARCH] =3D 0xe5, + [Q_KEY_CODE_FIND] =3D 0xe5, =20 [Q_KEY_CODE_AUDIONEXT] =3D 0x99, [Q_KEY_CODE_AUDIOPREV] =3D 0x90, diff --git a/qapi-schema.json b/qapi-schema.json index dcc12c83a9..c96f0a26f6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4856,11 +4856,9 @@ # @mail: since 2.10 # @calculator: since 2.10 # @computer: since 2.10 -# @ac_search: since 2.10 # @ac_home: since 2.10 # @ac_back: since 2.10 # @ac_forward: since 2.10 -# @ac_stop: since 2.10 # @ac_refresh: since 2.10 # @ac_bookmarks: since 2.10 # altgr, altgr_r: dropped in 2.10 @@ -4890,8 +4888,7 @@ 'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute= ', 'volumeup', 'volumedown', 'mediaselect', 'mail', 'calculator', 'computer', - 'ac_search', 'ac_home', 'ac_back', 'ac_forward', 'ac_stop', - 'ac_refresh', 'ac_bookmarks' ] } + 'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmark= s' ] } =20 ## # @KeyValue: --=20 2.9.3