<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d0fa7d04fb10fbf94168684607e550e1b8ca2689">https://github.com/macports/macports-ports/commit/d0fa7d04fb10fbf94168684607e550e1b8ca2689</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d0fa7d04fb1 input-leap: remove unused and obsolete patch; fix lint warnings - Got caught in previous commit by mistake, this patch is already merged to upstream and part of the port.
</span>d0fa7d04fb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d0fa7d04fb10fbf94168684607e550e1b8ca2689
</span>Author: Atte Peltomäki <koston@iki.fi>
AuthorDate: Thu May 4 12:38:46 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> input-leap: remove unused and obsolete patch; fix lint warnings
</span><span style='display:block; white-space:pre;color:#404040;'> - Got caught in previous commit by mistake, this patch is already merged to upstream and part of the port.
</span>---
aqua/input-leap/Portfile | 1 +
...-add-support-for-right-side-modifier-keys.patch | 202 ---------------------
2 files changed, 1 insertion(+), 202 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/Portfile b/aqua/input-leap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18f8dd10e65..eb43c95f1f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/input-leap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/input-leap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.setup input-leap input-leap 198779cf9e798aac6ad41427e32d031305736de3
version 2.4.0-20230416
revision 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/files/macOS-add-support-for-right-side-modifier-keys.patch b/aqua/input-leap/files/macOS-add-support-for-right-side-modifier-keys.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3adb4ae21b0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/input-leap/files/macOS-add-support-for-right-side-modifier-keys.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,202 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index afcac51d..a932716a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/lib/platform/OSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/lib/platform/OSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,17 +28,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace inputleap {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Note that some virtual keys codes appear more than once. The
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// first instance of a virtual key code maps to the KeyID that we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// want to generate for that code. The others are for mapping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// different KeyIDs to a single key code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const std::uint32_t s_shiftVK = kVK_Shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const std::uint32_t s_controlVK = kVK_Control;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const std::uint32_t s_altVK = kVK_Option;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const std::uint32_t s_superVK = kVK_Command;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const std::uint32_t s_capsLockVK = kVK_CapsLock;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const std::uint32_t s_numLockVK = kVK_ANSI_KeypadClear; // 71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const std::uint32_t s_brightnessUp = 144;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const std::uint32_t s_brightnessDown = 145;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const std::uint32_t s_missionControlVK = 160;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,22 +97,21 @@ static const KeyEntry s_controlKeys[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // to map to. also the enter key with numlock on is a modifier but i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // don't know which.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // modifier keys. OS X doesn't seem to support right handed versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // of modifier keys so we map them to the left handed versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyShift_L, s_shiftVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyShift_R, s_shiftVK }, // 60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyControl_L, s_controlVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyControl_R, s_controlVK }, // 62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyAlt_L, s_altVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyAlt_R, s_altVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeySuper_L, s_superVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeySuper_R, s_superVK }, // 61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyMeta_L, s_superVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyMeta_R, s_superVK }, // 61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // modifier keys. Support for right side keys is a later addition in macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyShift_L, kVK_Shift }, // 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyShift_R, kVK_RightShift }, // 60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyControl_L, kVK_Control }, // 59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyControl_R, kVK_RightControl }, // 62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyAlt_L, kVK_Option }, // 58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyAlt_R, kVK_RightOption }, // 61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeySuper_L, kVK_Command }, // 55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeySuper_R, kVK_RightCommand }, // 54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyMeta_L, kVK_Command }, // 55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyMeta_R, kVK_RightCommand }, // 54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // toggle modifiers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyNumLock, s_numLockVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { kKeyCapsLock, s_capsLockVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyNumLock, kVK_ANSI_KeypadClear },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { kKeyCapsLock, kVK_CapsLock },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { kKeyMissionControl, s_missionControlVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { kKeyLaunchpad, s_launchpadVK },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -521,30 +509,50 @@ void OSXKeyState::postHIDVirtualKey(const std::uint8_t virtualKeyCode, const boo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (virtualKeyCode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_shiftVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_superVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_altVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_controlVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_capsLockVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Shift:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightShift:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Command:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightCommand:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Option:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightOption:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Control:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightControl:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_CapsLock:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (virtualKeyCode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_shiftVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Shift:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modifiersDelta = NX_SHIFTMASK | NX_DEVICELSHIFTKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_shiftPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_superVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightShift:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modifiersDelta = NX_SHIFTMASK | NX_DEVICERSHIFTKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_shiftPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Command:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modifiersDelta = NX_COMMANDMASK | NX_DEVICELCMDKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_superPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_altVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightCommand:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modifiersDelta = NX_COMMANDMASK | NX_DEVICERCMDKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_superPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Option:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modifiersDelta = NX_ALTERNATEMASK | NX_DEVICELALTKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_altPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_controlVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightOption:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modifiersDelta = NX_ALTERNATEMASK | NX_DEVICERALTKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_altPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_Control:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modifiersDelta = NX_CONTROLMASK | NX_DEVICELCTLKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_controlPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case s_capsLockVK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_RightControl:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modifiersDelta = NX_CONTROLMASK | NX_DEVICERCTLKEYMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_controlPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case kVK_CapsLock:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modifiersDelta = NX_ALPHASHIFTMASK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_capsPressed = postDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -794,7 +802,7 @@ bool OSXKeyState::map_hot_key_to_mac(KeyID key, KeyModifierMask mask,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void OSXKeyState::handleModifierKeys(const EventTarget* target,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void OSXKeyState::handleModifierKeys(const EventTarget* target, std::uint32_t virtualKey,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask oldMask, KeyModifierMask newMask)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // compute changed modifiers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -802,27 +810,27 @@ void OSXKeyState::handleModifierKeys(const EventTarget* target,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // synthesize changed modifier keys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((changed & KeyModifierShift) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- handleModifierKey(target, s_shiftVK, kKeyShift_L,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleModifierKey(target, virtualKey, m_virtualKeyMap.find(virtualKey)->second,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (newMask & KeyModifierShift) != 0, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((changed & KeyModifierControl) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- handleModifierKey(target, s_controlVK, kKeyControl_L,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleModifierKey(target, virtualKey, m_virtualKeyMap.find(virtualKey)->second,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (newMask & KeyModifierControl) != 0, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((changed & KeyModifierAlt) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- handleModifierKey(target, s_altVK, kKeyAlt_L,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleModifierKey(target, virtualKey, m_virtualKeyMap.find(virtualKey)->second,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (newMask & KeyModifierAlt) != 0, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((changed & KeyModifierSuper) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- handleModifierKey(target, s_superVK, kKeySuper_L,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleModifierKey(target, virtualKey, m_virtualKeyMap.find(virtualKey)->second,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (newMask & KeyModifierSuper) != 0, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((changed & KeyModifierCapsLock) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- handleModifierKey(target, s_capsLockVK, kKeyCapsLock,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleModifierKey(target, virtualKey, m_virtualKeyMap.find(virtualKey)->second,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (newMask & KeyModifierCapsLock) != 0, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((changed & KeyModifierNumLock) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- handleModifierKey(target, s_numLockVK, kKeyNumLock,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleModifierKey(target, virtualKey, m_virtualKeyMap.find(virtualKey)->second,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (newMask & KeyModifierNumLock) != 0, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2288d9ce..df0ae3a4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/lib/platform/OSXKeyState.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/lib/platform/OSXKeyState.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Determines which modifier keys have changed and updates the modifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state and sends key events as appropriate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void handleModifierKeys(const EventTarget* target,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void handleModifierKeys(const EventTarget* target, std::uint32_t virtualKey,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask oldMask, KeyModifierMask newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //@}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 214a6958..c8c74abd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/lib/platform/OSXScreen.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/lib/platform/OSXScreen.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1193,7 +1193,7 @@ OSXScreen::onKey(CGEventRef event)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // get old and new modifier state
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask oldMask = getActiveModifiers();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask newMask = m_keyState->mapModifiersFromOSX(macMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_keyState->handleModifierKeys(get_event_target(), oldMask, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_keyState->handleModifierKeys(get_event_target(), virtualKey, oldMask, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // if the current set of modifiers exactly matches a modifiers-only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // hot key then generate a hot key down event.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/platform/OSXUchrKeyResource.cpp b/src/lib/platform/OSXUchrKeyResource.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e4b87b65..b38082d5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/lib/platform/OSXUchrKeyResource.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/lib/platform/OSXUchrKeyResource.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,8 +97,7 @@ OSXUchrKeyResource::isValid() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::uint32_t OSXUchrKeyResource::getNumModifierCombinations() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // only 32 (not 256) because the righthanded modifier bits are ignored
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return 32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 256;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::uint32_t OSXUchrKeyResource::getNumTables() const
</span></pre><pre style='margin:0'>
</pre>