From patchwork Fri May 29 09:11:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 477674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 5053B1400A0 for ; Fri, 29 May 2015 19:13:26 +1000 (AEST) Received: from localhost ([::1]:34514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyGM0-00059P-4Q for incoming@patchwork.ozlabs.org; Fri, 29 May 2015 05:13:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyGK7-0001Dp-Ut for qemu-devel@nongnu.org; Fri, 29 May 2015 05:11:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyGK5-0003o9-Id for qemu-devel@nongnu.org; Fri, 29 May 2015 05:11:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyGK5-0003nt-Di; Fri, 29 May 2015 05:11:25 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 210B8CA626; Fri, 29 May 2015 09:11:25 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4T9BNo1018162; Fri, 29 May 2015 05:11:24 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 026C781F2E; Fri, 29 May 2015 11:11:22 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 29 May 2015 11:11:18 +0200 Message-Id: <1432890681-22679-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1432890681-22679-1-git-send-email-kraxel@redhat.com> References: <1432890681-22679-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , qemu-stable@nongnu.org Subject: [Qemu-devel] [PULL 2/5] kbd: add brazil kbd keys to x11 evdev map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds the two extra brazilian keys to the evdev keymap for X11. This patch gets the two keys going with the vnc, gtk and sdl1 UIs. The SDL2 library complains it doesn't know these keys, so the SDL2 library must be fixed before we can update ui/sdl2-keymap.h Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann Reviewed-by: Markus Armbruster Reviewed-by: Daniel P. Berrange Reviewed-by: Michael Tokarev --- ui/x_keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/x_keymap.c b/ui/x_keymap.c index b9b0944..1a77317 100644 --- a/ui/x_keymap.c +++ b/ui/x_keymap.c @@ -94,7 +94,7 @@ static const uint8_t x_keycode_to_pc_keycode[115] = { */ static const uint8_t evdev_keycode_to_pc_keycode[61] = { - 0, /* 97 EVDEV - RO ("Internet" Keyboards) */ + 0x73, /* 97 EVDEV - RO ("Internet" Keyboards) */ 0, /* 98 EVDEV - KATA (Katakana) */ 0, /* 99 EVDEV - HIRA (Hiragana) */ 0x79, /* 100 EVDEV - HENK (Henkan) */ @@ -126,7 +126,7 @@ static const uint8_t evdev_keycode_to_pc_keycode[61] = { 0, /* 126 EVDEV - I126 ("Internet" Keyboards) */ 0, /* 127 EVDEV - PAUS */ 0, /* 128 EVDEV - ???? */ - 0, /* 129 EVDEV - I129 ("Internet" Keyboards) */ + 0x7e, /* 129 EVDEV - KP_COMMA (brazilian) */ 0xf1, /* 130 EVDEV - HNGL (Korean Hangul Latin toggle) */ 0xf2, /* 131 EVDEV - HJCV (Korean Hangul Hanja toggle) */ 0x7d, /* 132 AE13 (Yen)*/