From nobody Tue Feb 10 12:39:56 2026 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 1501070422659177.37740149671163; Wed, 26 Jul 2017 05:00:22 -0700 (PDT) Received: from localhost ([::1]:37554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKzF-0006sB-AJ for importer@patchew.org; Wed, 26 Jul 2017 08:00:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKvk-0003rj-F9 for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKvi-000442-CX for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKvi-00043D-3r for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 113A47F7DA for ; Wed, 26 Jul 2017 11:56:41 +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 6A66B6A743; Wed, 26 Jul 2017 11:56:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B17F23BF; Wed, 26 Jul 2017 13:56:37 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 113A47F7DA Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 13:56:36 +0200 Message-Id: <20170726115637.21558-5-kraxel@redhat.com> In-Reply-To: <20170726115637.21558-1-kraxel@redhat.com> References: <20170726115637.21558-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 26 Jul 2017 11:56:41 +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 4/5] ui: add multimedia keys 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" Add multimedia keys to QKeyCodes and to the keymaps. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- ui/input-keymap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 17 ++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 7461e1edde..ae781beae9 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -116,6 +116,28 @@ static int linux_to_qcode[KEY_CNT] =3D { [KEY_LEFTMETA] =3D Q_KEY_CODE_META_L, [KEY_RIGHTMETA] =3D Q_KEY_CODE_META_R, [KEY_MENU] =3D Q_KEY_CODE_MENU, + + [KEY_SLEEP] =3D Q_KEY_CODE_SLEEP, + [KEY_WAKEUP] =3D Q_KEY_CODE_WAKE, + [KEY_CALC] =3D Q_KEY_CODE_CALCULATOR, + [KEY_MAIL] =3D Q_KEY_CODE_MAIL, + [KEY_COMPUTER] =3D Q_KEY_CODE_COMPUTER, + + [KEY_STOP] =3D Q_KEY_CODE_AC_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_NEXTSONG] =3D Q_KEY_CODE_AUDIONEXT, + [KEY_PREVIOUSSONG] =3D Q_KEY_CODE_AUDIOPREV, + [KEY_STOPCD] =3D Q_KEY_CODE_AUDIOSTOP, + [KEY_PLAYCD] =3D Q_KEY_CODE_AUDIOPLAY, + [KEY_MUTE] =3D Q_KEY_CODE_AUDIOMUTE, + [KEY_VOLUMEDOWN] =3D Q_KEY_CODE_VOLUMEDOWN, + [KEY_VOLUMEUP] =3D Q_KEY_CODE_VOLUMEUP, }; =20 static const int qcode_to_number[] =3D { @@ -252,6 +274,28 @@ static const int qcode_to_number[] =3D { [Q_KEY_CODE_YEN] =3D 0x7d, [Q_KEY_CODE_KP_COMMA] =3D 0x7e, =20 + [Q_KEY_CODE_SLEEP] =3D 0xdf, + [Q_KEY_CODE_WAKE] =3D 0xe3, + [Q_KEY_CODE_CALCULATOR] =3D 0xa1, + [Q_KEY_CODE_MAIL] =3D 0xec, + [Q_KEY_CODE_COMPUTER] =3D 0xeb, + + [Q_KEY_CODE_AC_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_AUDIONEXT] =3D 0x99, + [Q_KEY_CODE_AUDIOPREV] =3D 0x90, + [Q_KEY_CODE_AUDIOSTOP] =3D 0xa4, + [Q_KEY_CODE_AUDIOPLAY] =3D 0xa2, + [Q_KEY_CODE_AUDIOMUTE] =3D 0xa0, + [Q_KEY_CODE_VOLUMEDOWN] =3D 0xae, + [Q_KEY_CODE_VOLUMEUP] =3D 0xb0, + [Q_KEY_CODE__MAX] =3D 0, }; =20 diff --git a/qapi-schema.json b/qapi-schema.json index 9c6c3e1a53..93ff0f3921 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4843,6 +4843,16 @@ # @henkan: since 2.9 # @yen: since 2.9 # +# @sleep: since 2.10 +# @wake: since 2.10 +# @audio*: since 2.10 +# @volume*: since 2.10 +# @mediaselect: since 2.10 +# @mail: since 2.10 +# @calculator: since 2.10 +# @computer: since 2.10 +# @ac_*: since 2.10 +# # Since: 1.3.0 # ## @@ -4864,7 +4874,12 @@ 'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cu= t', 'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause', 'ro', 'hiragana', 'henkan', 'yen', - 'kp_comma', 'kp_equals', 'power' ] } + 'kp_comma', 'kp_equals', 'power', 'sleep', 'wake', + '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' ] } =20 ## # @KeyValue: --=20 2.9.3