From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Akihiko Odaki" <akihiko.odaki@gmail.com>
Subject: [PULL 3/4] ui/cocoa: Respect left-command-key option
Date: Tue, 29 Mar 2022 00:40:11 +0200 [thread overview]
Message-ID: <20220328224012.32737-4-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220328224012.32737-1-philippe.mathieu.daude@gmail.com>
From: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Fixes: 4797adce5f ("ui/cocoa: add option to swap Option and Command")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220317152949.68666-1-akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
ui/cocoa.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index cb6e7c41dc..c4e5468f9e 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -923,7 +923,8 @@ - (bool) handleEventLocked:(NSEvent *)event
/* Don't pass command key changes to guest unless mouse is grabbed */
case kVK_Command:
if (isMouseGrabbed &&
- !!(modifiers & NSEventModifierFlagCommand)) {
+ !!(modifiers & NSEventModifierFlagCommand) &&
+ left_command_key_enabled) {
if (swap_opt_cmd) {
[self toggleKey:Q_KEY_CODE_ALT];
} else {
--
2.35.1
next prev parent reply other threads:[~2022-03-28 22:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 22:40 [PULL 0/4] Darwin patches for 2022-03-29 Philippe Mathieu-Daudé
2022-03-28 22:40 ` [PULL 1/4] gitattributes: Cover Objective-C source files Philippe Mathieu-Daudé
2022-03-28 22:40 ` [PULL 2/4] qemu/main-loop: Disable block backend global state assertion on Cocoa Philippe Mathieu-Daudé
2022-03-28 22:40 ` Philippe Mathieu-Daudé [this message]
2022-03-28 22:40 ` [PULL 4/4] ui/console: Check console before emitting GL event Philippe Mathieu-Daudé
2022-03-29 10:27 ` [PULL 0/4] Darwin patches for 2022-03-29 Philippe Mathieu-Daudé
2022-03-29 12:10 ` Hanna Reitz
2022-03-29 17:03 ` Philippe Mathieu-Daudé
2022-03-29 15:38 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220328224012.32737-4-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=akihiko.odaki@gmail.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).