[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/2] ui/cocoa: add option to swap Option and Command, enable
|
From: |
'Gerd Hoffmann ' |
|
Subject: |
Re: [PATCH 2/2] ui/cocoa: add option to swap Option and Command, enable by default |
|
Date: |
Fri, 30 Apr 2021 10:04:14 +0200 |
> @@ -797,12 +806,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);
> + }
> }
Wouldn't it be easier to swap the bits in the modifiers variable once
instead of having lots of isSwapOptionCommandEnabled checks in the code?
take care,
Gerd