From nobody Sun May 19 12:00:58 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; dkim=fail; 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 1509552391578497.70356655670184; Wed, 1 Nov 2017 09:06:31 -0700 (PDT) Received: from localhost ([::1]:56581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9vX8-0001x0-Po for importer@patchew.org; Wed, 01 Nov 2017 12:06:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9vE6-0001XZ-7y for qemu-devel@nongnu.org; Wed, 01 Nov 2017 11:46:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9vE1-0000Sc-5D for qemu-devel@nongnu.org; Wed, 01 Nov 2017 11:46:46 -0400 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]:55131) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e9vE1-0000Rj-0D for qemu-devel@nongnu.org; Wed, 01 Nov 2017 11:46:41 -0400 Received: by mail-io0-x241.google.com with SMTP id e89so6951462ioi.11 for ; Wed, 01 Nov 2017 08:46:40 -0700 (PDT) Received: from localhost.localdomain (d14-69-20-184.try.wideopenwest.com. [69.14.184.20]) by smtp.gmail.com with ESMTPSA id 5sm364509ion.46.2017.11.01.08.46.39 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 01 Nov 2017 08:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=L5eP8Yo5sAyw4Ep6cdfT3qyAv00CjpSWTs7gs5PIgCM=; b=Y16BOSpwRkUm6CA51JmOuWot38uI5/wW++LrR7ZR9ycK7pymiArRyT0yUkCzwDh4hR NbYvMdAbADT/62Aav0si5HQf2lCL2YVYTClLy1qa30JAGS5E1C3BNouQYH8dJLceZt2U DfsaPhzUlqHhDe/Vr+VzganMK1bDJ8psDS2qBD6+IYJaN82HlFUukuAteagWqyWniKQo m6exbXqIATwz0BfPxmrId6jPxbKRa89QVcNuZJaXyQD6xC8WbOmt0TzYS7ZHsi/q+Rei 8zvliitatOGUlbY5GIaqQ4LNKcRAERNpGDbks8v8v/C1QvCa9bybUwRtnt2CORjs7MP0 nyCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=L5eP8Yo5sAyw4Ep6cdfT3qyAv00CjpSWTs7gs5PIgCM=; b=SAtxj1G7CaiAaq/SSNqpTY0xUHy2rx9URn+VZuBFIg1H4mQ9Sd07WZ8u9zHUgixpAK GCHbbghTTO2mlcb/SqNnTQW+5gdJB4m/k5tBuIq6pzCLYQLUVOEmAPdERA0cXu8MF5qT Zr2/Q7rGTr3VtsNRSq583NK/BCNNXqb8kel0VqaiUz6wrY/SIv3mJlvHi9BdChBt2mhJ J8NHKxbKfxiWR8aolBbWbRnNT/a7UBC8N2yFA+vzS0Y6e00TniIe/+oeLN7UNjUon6DM XSv8A+qJnuH1EsXPvg7wOa7qGOdvkEuVuYLQ6H/Gjn1QXSCFBFxTMmCIBjXGwLJ8CVpw Knkg== X-Gm-Message-State: AMCzsaXU5CAh6atTDMRzdBRFu6KY/N8gLLpe6wQR+geH290o5M5kXfJC a/B2kRnBbUWllo70545yokw= X-Google-Smtp-Source: ABhQp+RYglAK2fn+gG5f3dPvdvrbqhMmQVStn1TvbFc1uaHWAgE1WUadY2cPDxsHVPUYwAUL2EXKyA== X-Received: by 10.36.200.139 with SMTP id w133mr1085754itf.26.1509551200215; Wed, 01 Nov 2017 08:46:40 -0700 (PDT) From: John Arbuckle To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Wed, 1 Nov 2017 11:46:07 -0400 Message-Id: <20171101154607.1582-1-programmingkidx@gmail.com> X-Mailer: git-send-email 2.13.5 (Apple Git-94) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::241 Subject: [Qemu-devel] [PATCH v2] Make scrolling work again 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: John Arbuckle Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Make scrolling in the monitor work. Signed-off-by: John Arbuckle --- ui/cocoa.m | 96 +++++++++++++++++++++++++++++++++++++++++-----------------= ---- 1 file changed, 64 insertions(+), 32 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 93e56d0518..744fa31a56 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -281,6 +281,7 @@ - (void) switchSurface:(DisplaySurface *)surface; - (void) grabMouse; - (void) ungrabMouse; - (void) toggleFullScreen:(id)sender; +- (void) handleMonitorInput:(NSEvent *)event; - (void) handleEvent:(NSEvent *)event; - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled; /* The state surrounding mouse grabbing is potentially confusing. @@ -554,6 +555,68 @@ - (void) toggleStatefulModifier: (int)keycode { qemu_input_event_send_key_qcode(dcl->con, keycode, false); } =20 +// Does the work of sending input to the monitor +- (void) handleMonitorInput:(NSEvent *)event +{ + int keysym =3D 0; + int control_key =3D 0; + + // if the control key is down + if ([event modifierFlags] & NSEventModifierFlagControl) { + control_key =3D 1; + } + + /* translates Macintosh keycodes to QEMU's keysym */ + + int without_control_translation[] =3D { + [0 ... 0xff] =3D 0, // invalid key + + [kVK_UpArrow] =3D QEMU_KEY_UP, + [kVK_DownArrow] =3D QEMU_KEY_DOWN, + [kVK_RightArrow] =3D QEMU_KEY_RIGHT, + [kVK_LeftArrow] =3D QEMU_KEY_LEFT, + [kVK_Home] =3D QEMU_KEY_HOME, + [kVK_End] =3D QEMU_KEY_END, + [kVK_PageUp] =3D QEMU_KEY_PAGEUP, + [kVK_PageDown] =3D QEMU_KEY_PAGEDOWN, + [kVK_ForwardDelete] =3D QEMU_KEY_DELETE, + [kVK_Delete] =3D QEMU_KEY_BACKSPACE, + }; + + int with_control_translation[] =3D { + [0 ... 0xff] =3D 0, // invalid key + + [kVK_UpArrow] =3D QEMU_KEY_CTRL_UP, + [kVK_DownArrow] =3D QEMU_KEY_CTRL_DOWN, + [kVK_RightArrow] =3D QEMU_KEY_CTRL_RIGHT, + [kVK_LeftArrow] =3D QEMU_KEY_CTRL_LEFT, + [kVK_Home] =3D QEMU_KEY_CTRL_HOME, + [kVK_End] =3D QEMU_KEY_CTRL_END, + [kVK_PageUp] =3D QEMU_KEY_CTRL_PAGEUP, + [kVK_PageDown] =3D QEMU_KEY_CTRL_PAGEDOWN, + }; + + if (control_key !=3D 0) { /* If the control key is being used */ + if ([event keyCode] < ARRAY_SIZE(with_control_translation)) { + keysym =3D with_control_translation[[event keyCode]]; + } + } else { + if ([event keyCode] < ARRAY_SIZE(without_control_translation)) { + keysym =3D without_control_translation[[event keyCode]]; + } + } + + // if not a key that needs translating + if (keysym =3D=3D 0) { + NSString *ks =3D [event characters]; + if ([ks length] > 0) + keysym =3D [ks characterAtIndex:0]; + } + + if (keysym) + kbd_put_keysym(keysym); +} + - (void) handleEvent:(NSEvent *)event { COCOA_DEBUG("QemuCocoaView: handleEvent\n"); @@ -641,38 +704,7 @@ - (void) handleEvent:(NSEvent *)event =20 // handlekeys for Monitor } else { - int keysym =3D 0; - switch([event keyCode]) { - case 115: - keysym =3D QEMU_KEY_HOME; - break; - case 117: - keysym =3D QEMU_KEY_DELETE; - break; - case 119: - keysym =3D QEMU_KEY_END; - break; - case 123: - keysym =3D QEMU_KEY_LEFT; - break; - case 124: - keysym =3D QEMU_KEY_RIGHT; - break; - case 125: - keysym =3D QEMU_KEY_DOWN; - break; - case 126: - keysym =3D QEMU_KEY_UP; - break; - default: - { - NSString *ks =3D [event characters]; - if ([ks length] > 0) - keysym =3D [ks characterAtIndex:0]; - } - } - if (keysym) - kbd_put_keysym(keysym); + [self handleMonitorInput: event]; } break; case NSEventTypeKeyUp: --=20 2.13.5 (Apple Git-94)