From patchwork Thu Jul 27 10:47:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 794337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xJ7xH73dzz9s7C for ; Thu, 27 Jul 2017 20:48:19 +1000 (AEST) Received: from localhost ([::1]:42208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dagL3-0000Dp-OD for incoming@patchwork.ozlabs.org; Thu, 27 Jul 2017 06:48:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dagKK-0000CD-7U for qemu-devel@nongnu.org; Thu, 27 Jul 2017 06:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dagKH-0007uk-ER for qemu-devel@nongnu.org; Thu, 27 Jul 2017 06:47:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35060) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dagKH-0007uV-6Q for qemu-devel@nongnu.org; Thu, 27 Jul 2017 06:47:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CEFFABBBA for ; Thu, 27 Jul 2017 10:47:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0CEFFABBBA Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com 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 99D175D73C; Thu, 27 Jul 2017 10:47:24 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C2305973; Thu, 27 Jul 2017 12:47:23 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 12:47:20 +0200 Message-Id: <20170727104720.30061-1-kraxel@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 (mx1.redhat.com [10.5.110.25]); Thu, 27 Jul 2017 10:47:28 +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 altgr and altgr_r QKeyCodes 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: Paolo Bonzini , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The right alt key (alt_r aka KEY_RIGHTALT) is used for AltGr. The altgr and altgr_r keys simply don't exist. Drop them. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- hw/char/escc.c | 1 - hw/input/adb.c | 1 - hw/input/ps2.c | 2 -- ui/input-keymap.c | 2 -- qapi-schema.json | 3 ++- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/char/escc.c b/hw/char/escc.c index 89ae9eb997..1aca564e33 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -722,7 +722,6 @@ static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_SHIFT_R] = 110, [Q_KEY_CODE_ALT] = 19, [Q_KEY_CODE_ALT_R] = 13, - [Q_KEY_CODE_ALTGR] = 13, [Q_KEY_CODE_CTRL] = 76, [Q_KEY_CODE_CTRL_R] = 76, [Q_KEY_CODE_ESC] = 29, diff --git a/hw/input/adb.c b/hw/input/adb.c index 43d3205472..fcca3a8eb9 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -201,7 +201,6 @@ int qcode_to_adb_keycode[] = { [Q_KEY_CODE_SHIFT_R] = ADB_KEY_RIGHT_SHIFT, [Q_KEY_CODE_ALT] = ADB_KEY_LEFT_OPTION, [Q_KEY_CODE_ALT_R] = ADB_KEY_RIGHT_OPTION, - [Q_KEY_CODE_ALTGR] = ADB_KEY_RIGHT_OPTION, [Q_KEY_CODE_CTRL] = ADB_KEY_LEFT_CONTROL, [Q_KEY_CODE_CTRL_R] = ADB_KEY_RIGHT_CONTROL, [Q_KEY_CODE_META_L] = ADB_KEY_COMMAND, diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 25ae7fc852..9f057e46ea 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -387,8 +387,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_AC_REFRESH] = 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018, - [Q_KEY_CODE_ALTGR] = 0x08, - [Q_KEY_CODE_ALTGR_R] = 0xe008, [Q_KEY_CODE_ASTERISK] = 0x7c, [Q_KEY_CODE_LESS] = 0x61, [Q_KEY_CODE_SYSRQ] = 0x7f, diff --git a/ui/input-keymap.c b/ui/input-keymap.c index ae781beae9..f96adf4165 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -146,8 +146,6 @@ static const int qcode_to_number[] = { [Q_KEY_CODE_ALT] = 0x38, [Q_KEY_CODE_ALT_R] = 0xb8, - [Q_KEY_CODE_ALTGR] = 0x64, - [Q_KEY_CODE_ALTGR_R] = 0xe4, [Q_KEY_CODE_CTRL] = 0x1d, [Q_KEY_CODE_CTRL_R] = 0x9d, diff --git a/qapi-schema.json b/qapi-schema.json index 9cb15092a7..dcc12c83a9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4863,13 +4863,14 @@ # @ac_stop: since 2.10 # @ac_refresh: since 2.10 # @ac_bookmarks: since 2.10 +# altgr, altgr_r: dropped in 2.10 # # Since: 1.3.0 # ## { 'enum': 'QKeyCode', 'data': [ 'unmapped', - 'shift', 'shift_r', 'alt', 'alt_r', 'altgr', 'altgr_r', 'ctrl', + 'shift', 'shift_r', 'alt', 'alt_r', 'ctrl', 'ctrl_r', 'menu', 'esc', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'minus', 'equal', 'backspace', 'tab', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', 'bracket_left', 'bracket_right',