* [PATCH] ui/cocoa: Respect left-command-key option
@ 2022-03-17 15:29 Akihiko Odaki
2022-03-17 18:02 ` [PATCH-for-7.0] " Philippe Mathieu-Daudé
2022-03-28 22:28 ` [PATCH] " Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Akihiko Odaki @ 2022-03-17 15:29 UTC (permalink / raw)
Cc: Peter Maydell, Gerd Hoffmann, qemu-devel, Akihiko Odaki,
Philippe Mathieu-Daudé
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
ui/cocoa.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index cb6e7c41dc6..c4e5468f9e6 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.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH-for-7.0] ui/cocoa: Respect left-command-key option
2022-03-17 15:29 [PATCH] ui/cocoa: Respect left-command-key option Akihiko Odaki
@ 2022-03-17 18:02 ` Philippe Mathieu-Daudé
2022-03-28 22:28 ` [PATCH] " Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-17 18:02 UTC (permalink / raw)
To: Akihiko Odaki, Gustavo Noronha Silva, Will Cohen
Cc: Peter Maydell, Gerd Hoffmann, qemu-devel, Philippe Mathieu-Daudé
On 17/3/22 16:29, Akihiko Odaki wrote:
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
> ui/cocoa.m | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index cb6e7c41dc6..c4e5468f9e6 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) {
My bad for trying to resolve merge conflict myself sigh :(
Fixes: 4797adce5f ("ui/cocoa: add option to swap Option and Command")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> if (swap_opt_cmd) {
> [self toggleKey:Q_KEY_CODE_ALT];
> } else {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ui/cocoa: Respect left-command-key option
2022-03-17 15:29 [PATCH] ui/cocoa: Respect left-command-key option Akihiko Odaki
2022-03-17 18:02 ` [PATCH-for-7.0] " Philippe Mathieu-Daudé
@ 2022-03-28 22:28 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-28 22:28 UTC (permalink / raw)
To: Akihiko Odaki
Cc: Peter Maydell, Gerd Hoffmann, qemu-devel, Philippe Mathieu-Daudé
On 17/3/22 16:29, Akihiko Odaki wrote:
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
> ui/cocoa.m | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks, queued to darwin-fixes.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-28 22:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-17 15:29 [PATCH] ui/cocoa: Respect left-command-key option Akihiko Odaki
2022-03-17 18:02 ` [PATCH-for-7.0] " Philippe Mathieu-Daudé
2022-03-28 22:28 ` [PATCH] " Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.