#3705 Hotkeys broken on macOS servers

This commit is contained in:
James Spurin 2016-08-03 20:51:51 +01:00 committed by Jnewbon
parent 22f47f86db
commit 9702d7e8c6
1 changed files with 23 additions and 28 deletions

7
src/lib/platform/OSXScreen.mm Normal file → Executable file
View File

@ -1282,11 +1282,7 @@ OSXScreen::onKey(CGEventRef event)
return true; return true;
} }
// check for hot key. when we're on a secondary screen we disable // check for hot key
// all hotkeys so we can capture the OS defined hot keys as regular
// keystrokes but that means we don't get our own hot keys either.
// so we check for a key/modifier match in our hot key map.
if (!m_isOnScreen) {
HotKeyToIDMap::const_iterator i = HotKeyToIDMap::const_iterator i =
m_hotKeyToIDMap.find(HotKeyItem(virtualKey, m_hotKeyToIDMap.find(HotKeyItem(virtualKey,
m_keyState->mapModifiersToCarbon(macMask) m_keyState->mapModifiersToCarbon(macMask)
@ -1312,7 +1308,6 @@ OSXScreen::onKey(CGEventRef event)
return true; return true;
} }
}
// decode event type // decode event type
bool down = (eventKind == kCGEventKeyDown); bool down = (eventKind == kCGEventKeyDown);