[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 2/2] ui/cocoa: add option to swap Option and Command
|
From: |
Akihiko Odaki |
|
Subject: |
Re: [PATCH v4 2/2] ui/cocoa: add option to swap Option and Command |
|
Date: |
Wed, 12 May 2021 12:06:42 +0900 |
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
I applied them to my personal tree:
https://github.com/akihikodaki/qemu/tree/macos
2021年5月12日(水) 3:56 <gustavo@noronha.eti.br>:
>
> From: Gustavo Noronha Silva <gustavo@noronha.eti.br>
>
> On Mac OS X the Option key maps to Alt and Command to Super/Meta. This change
> swaps them around so that Alt is the key closer to the space bar and
> Meta/Super
> is between Control and Alt, like on non-Mac keyboards.
>
> It is a cocoa display option, disabled by default.
>
> Acked-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Gustavo Noronha Silva <gustavo@noronha.eti.br>
> ---
> qapi/ui.json | 8 ++++++-
> qemu-options.hx | 3 ++-
> ui/cocoa.m | 64 ++++++++++++++++++++++++++++++++++++++++++-------
> 3 files changed, 65 insertions(+), 10 deletions(-)
>
> diff --git a/qapi/ui.json b/qapi/ui.json
> index 4ccfae4bbb..ee6fde46d5 100644
> --- a/qapi/ui.json
> +++ b/qapi/ui.json
> @@ -1098,10 +1098,16 @@
> # a global grab on key events. (default: off)
> # See https://support.apple.com/en-in/guide/mac-help/mh32356/mac
> #
> +# @swap-option-command: Swap the Option and Command keys so that their key
> +# codes match their position on non-Mac keyboards and
> +# you can use Meta/Super and Alt where you expect them.
> +# (default: off)
> +#
> # Since: 6.1
> ##
> { 'struct' : 'DisplayCocoa',
> - 'data' : { '*full-grab' : 'bool' } }
> + 'data' : { '*full-grab' : 'bool',
> + '*swap-option-command' : 'bool' } }
>
> ##
> # @DisplayType:
> diff --git a/qemu-options.hx b/qemu-options.hx
> index eeaa5c73e9..e0e93724b1 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1784,7 +1784,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
> "-display curses[,charset=<encoding>]\n"
> #endif
> #if defined(CONFIG_COCOA)
> - "-display cocoa[,full_grab=on|off]\n"
> + "-display cocoa[,full-grab=on|off]\n"
> + " [,swap-option-command=on|off]\n"
> #endif
> #if defined(CONFIG_OPENGL)
> "-display egl-headless[,rendernode=<file>]\n"
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 236352deac..995301502b 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -72,6 +72,7 @@
> typedef struct {
> int width;
> int height;
> + bool swap_option_command;
> } QEMUScreen;
>
> static void cocoa_update(DisplayChangeListener *dcl,
> @@ -325,6 +326,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled;
> */
> - (BOOL) isMouseGrabbed;
> - (BOOL) isAbsoluteEnabled;
> +- (BOOL) isSwapOptionCommandEnabled;
> - (float) cdx;
> - (float) cdy;
> - (QEMUScreen) gscreen;
> @@ -643,6 +645,13 @@ - (void) setFullGrab:(id)sender
> CFRelease(tapEventsSrc);
> }
>
> +- (void) setSwapOptionCommand:(id)sender
> +{
> + COCOA_DEBUG("QemuCocoaView: setSwapOptionCommand\n");
> +
> + screen.swap_option_command = true;
> +}
> +
> - (void) toggleKey: (int)keycode {
> qkbd_state_key_event(kbd, keycode, !qkbd_state_key_get(kbd, keycode));
> }
> @@ -792,12 +801,22 @@ - (bool) handleEventLocked:(NSEvent *)event
> qkbd_state_key_event(kbd, Q_KEY_CODE_CTRL_R, false);
> }
> if (!(modifiers & NSEventModifierFlagOption)) {
> - qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false);
> - qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false);
> + if ([self isSwapOptionCommandEnabled]) {
> + qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false);
> + qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false);
> + } else {
> + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false);
> + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false);
> + }
> }
> if (!(modifiers & NSEventModifierFlagCommand)) {
> - qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false);
> - qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false);
> + if ([self isSwapOptionCommandEnabled]) {
> + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false);
> + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false);
> + } else {
> + qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false);
> + qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false);
> + }
> }
>
> switch ([event type]) {
> @@ -829,13 +848,21 @@ - (bool) handleEventLocked:(NSEvent *)event
>
> case kVK_Option:
> if (!!(modifiers & NSEventModifierFlagOption)) {
> - [self toggleKey:Q_KEY_CODE_ALT];
> + if ([self isSwapOptionCommandEnabled]) {
> + [self toggleKey:Q_KEY_CODE_META_L];
> + } else {
> + [self toggleKey:Q_KEY_CODE_ALT];
> + }
> }
> break;
>
> case kVK_RightOption:
> if (!!(modifiers & NSEventModifierFlagOption)) {
> - [self toggleKey:Q_KEY_CODE_ALT_R];
> + if ([self isSwapOptionCommandEnabled]) {
> + [self toggleKey:Q_KEY_CODE_META_R];
> + } else {
> + [self toggleKey:Q_KEY_CODE_ALT_R];
> + }
> }
> break;
>
> @@ -843,14 +870,22 @@ - (bool) handleEventLocked:(NSEvent *)event
> case kVK_Command:
> if (isMouseGrabbed &&
> !!(modifiers & NSEventModifierFlagCommand)) {
> - [self toggleKey:Q_KEY_CODE_META_L];
> + if ([self isSwapOptionCommandEnabled]) {
> + [self toggleKey:Q_KEY_CODE_ALT];
> + } else {
> + [self toggleKey:Q_KEY_CODE_META_L];
> + }
> }
> break;
>
> case kVK_RightCommand:
> if (isMouseGrabbed &&
> !!(modifiers & NSEventModifierFlagCommand)) {
> - [self toggleKey:Q_KEY_CODE_META_R];
> + if ([self isSwapOptionCommandEnabled]) {
> + [self toggleKey:Q_KEY_CODE_ALT_R];
> + } else {
> + [self toggleKey:Q_KEY_CODE_META_R];
> + }
> }
> break;
> }
> @@ -1079,6 +1114,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled {
> }
> - (BOOL) isMouseGrabbed {return isMouseGrabbed;}
> - (BOOL) isAbsoluteEnabled {return isAbsoluteEnabled;}
> +- (BOOL) isSwapOptionCommandEnabled {return screen.swap_option_command;}
> - (float) cdx {return cdx;}
> - (float) cdy {return cdy;}
> - (QEMUScreen) gscreen {return screen;}
> @@ -1265,6 +1301,13 @@ - (void) setFullGrab:(id)sender
> [cocoaView setFullGrab:sender];
> }
>
> +- (void) setSwapOptionCommand:(id)sender
> +{
> + COCOA_DEBUG("QemuCocoaAppController: setSwapOptionCommand\n");
> +
> + [cocoaView setSwapOptionCommand:sender];
> +}
> +
> /* Tries to find then open the specified filename */
> - (void) openDocumentation: (NSString *) filename
> {
> @@ -1947,6 +1990,11 @@ static void cocoa_display_init(DisplayState *ds,
> DisplayOptions *opts)
> [[controller delegate] setFullGrab: nil];
> });
> }
> + if (opts->u.cocoa.has_swap_option_command &&
> opts->u.cocoa.swap_option_command) {
> + dispatch_async(dispatch_get_main_queue(), ^{
> + [[controller delegate] setSwapOptionCommand: nil];
> + });
> + }
> if (opts->has_show_cursor && opts->show_cursor) {
> cursor_hide = 0;
> }
> --
> 2.30.1 (Apple Git-130)
>