From patchwork Wed Jan 14 00:12:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 428755 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 5F18614017F for ; Wed, 14 Jan 2015 11:13:02 +1100 (AEDT) Received: from localhost ([::1]:41917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBBa0-0002GK-08 for incoming@patchwork.ozlabs.org; Tue, 13 Jan 2015 19:13:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBBZj-0001zL-IS for qemu-devel@nongnu.org; Tue, 13 Jan 2015 19:12:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBBZg-0003Bo-BK for qemu-devel@nongnu.org; Tue, 13 Jan 2015 19:12:43 -0500 Received: from mail-qc0-x234.google.com ([2607:f8b0:400d:c01::234]:53633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBBZg-0003BD-7f for qemu-devel@nongnu.org; Tue, 13 Jan 2015 19:12:40 -0500 Received: by mail-qc0-f180.google.com with SMTP id i8so4996741qcq.11 for ; Tue, 13 Jan 2015 16:12:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:date:message-id :cc:to:mime-version; bh=a2yEtobjJ4p2FjY8Mh2+e5/Ie3Db3GUWOscNE/2UQpI=; b=LbiKimwVG4jQFnZpbPfJPEEAsRBkWv8yfxQ6UwTV+rYpzHYnEHy1APaFRYa3hIlhxb A18Xo/WKm3flxZgAUopx7Fr56IvGoVpl7ezj8uN3bB2HOQAAi1fIzkqUnngp/gNf3TlN pGMaZPEHDk/b0gRKuyiIDMGK5v19HRh0uBgUs/1NdzVPzpnqlHW9nKdDlM8MCJagP67f lw9KtHb7Gvufw1DjyWMigzaolEnIOo/1PQMOedmkSojUA0JqpW7sb0xBfZ+FmJKPYCCs bhF+3h3ip6LL8sf/bLvAj5JMN6ISHbUKWLqM7KCsA6ucD9J2rM9ZOrf1xXN0ykuqmb7o PF0g== X-Received: by 10.140.92.33 with SMTP id a30mr2157991qge.30.1421194359145; Tue, 13 Jan 2015 16:12:39 -0800 (PST) Received: from [192.168.0.2] (d199-74-164-53.col.wideopenwest.com. [74.199.53.164]) by mx.google.com with ESMTPSA id t9sm19113334qak.14.2015.01.13.16.12.37 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Jan 2015 16:12:38 -0800 (PST) From: Programmingkid Date: Tue, 13 Jan 2015 19:12:36 -0500 Message-Id: To: qemu-devel qemu-devel Mime-Version: 1.0 (Apple Message framework v1084) X-Mailer: Apple Mail (2.1084) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::234 Cc: Peter Maydell Subject: [Qemu-devel] [PATCH] Fixes key mapping so all keys work 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 allows for all the keys on an Apple extended keyboard to work in QEMU. Signed-off-by: John Arbuckle --- ui/cocoa.m | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index c8535a3..afac987 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -128,18 +128,26 @@ int keymap[] = 14, // 51 0x33 0x0e BKSP QZ_BACKSPACE 0, // 52 0x34 Undefined 1, // 53 0x35 0x01 ESC QZ_ESCAPE - 220, // 54 0x36 0xdc E0,5C R GUI QZ_RMETA - 219, // 55 0x37 0xdb E0,5B L GUI QZ_LMETA + 219,// 54 0x36 QZ_RMETA + 219,// 55 0x37 QZ_LMETA 42, // 56 0x38 0x2a L SHFT QZ_LSHIFT 58, // 57 0x39 0x3a CAPS QZ_CAPSLOCK 56, // 58 0x3A 0x38 L ALT QZ_LALT 29, // 59 0x3B 0x1d L CTRL QZ_LCTRL - 54, // 60 0x3C 0x36 R SHFT QZ_RSHIFT - 184,// 61 0x3D 0xb8 E0,38 R ALT QZ_RALT - 157,// 62 0x3E 0x9d E0,1D R CTRL QZ_RCTRL + + /* + Map right shift, control, option, and command keys to left counterpart + to improve compatibility with Mac OS. + */ + + 42, // 60 0x3C 0x36 R SHFT QZ_RSHIFT + 56, // 61 0x3D 0xb8 E0,38 R ALT QZ_RALT + 29, // 62 0x3E 0x9d E0,1D R CTRL QZ_RCTRL + + 0, // 63 0x3F Undefined 0, // 64 0x40 Undefined - 0, // 65 0x41 Undefined + 0x53,// 65 0x41 Keypad . 0, // 66 0x42 Undefined 55, // 67 0x43 0x37 KP * QZ_KP_MULTIPLY 0, // 68 0x44 Undefined @@ -150,12 +158,12 @@ int keymap[] = 0, // 73 0x49 Undefined 0, // 74 0x4A Undefined 181,// 75 0x4B 0xb5 E0,35 KP / QZ_KP_DIVIDE - 152,// 76 0x4C 0x9c E0,1C KP EN QZ_KP_ENTER + 0xe01c, //152,// 76 0x4C 0x9c E0,1C KP EN QZ_KP_ENTER 0, // 77 0x4D undefined 74, // 78 0x4E 0x4a KP - QZ_KP_MINUS 0, // 79 0x4F Undefined 0, // 80 0x50 Undefined - 0, // 81 0x51 QZ_KP_EQUALS + 13, // 81 0x51 QZ_KP_EQUALS 82, // 82 0x52 0x52 KP 0 QZ_KP0 79, // 83 0x53 0x4f KP 1 QZ_KP1 80, // 84 0x54 0x50 KP 2 QZ_KP2 @@ -201,10 +209,13 @@ int keymap[] = 205,// 124 0x7C 0xcd e0,4D R ARROW QZ_RIGHT 208,// 125 0x7D 0xd0 E0,50 D ARROW QZ_DOWN 200,// 126 0x7E 0xc8 E0,48 U ARROW QZ_UP + /* completed according to http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/video/quartz/SDL_QuartzKeys.h?rev=1.6&content-type=text/x-cvsweb-markup */ -/* Additional 104 Key XP-Keyboard Scancodes from http://www.computer-engineering.org/ps2keyboard/scancodes1.html */ +/* Aditional 104 Key XP-Keyboard Scancodes from http://www.computer-engineering.org/ps2keyboard/scancodes1.html */ /* + 219 // 0xdb e0,5b L GUI + 220 // 0xdc e0,5c R GUI 221 // 0xdd e0,5d APPS // E0,2A,E0,37 PRNT SCRN // E1,1D,45,E1,9D,C5 PAUSE