rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1282,36 +1282,31 @@ 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 HotKeyToIDMap::const_iterator i =
// keystrokes but that means we don't get our own hot keys either. m_hotKeyToIDMap.find(HotKeyItem(virtualKey,
// so we check for a key/modifier match in our hot key map. m_keyState->mapModifiersToCarbon(macMask)
if (!m_isOnScreen) { & 0xff00u));
HotKeyToIDMap::const_iterator i = if (i != m_hotKeyToIDMap.end()) {
m_hotKeyToIDMap.find(HotKeyItem(virtualKey, UInt32 id = i->second;
m_keyState->mapModifiersToCarbon(macMask)
& 0xff00u));
if (i != m_hotKeyToIDMap.end()) {
UInt32 id = i->second;
// determine event type // determine event type
Event::Type type; Event::Type type;
//UInt32 eventKind = GetEventKind(event); //UInt32 eventKind = GetEventKind(event);
if (eventKind == kCGEventKeyDown) { if (eventKind == kCGEventKeyDown) {
type = m_events->forIPrimaryScreen().hotKeyDown(); type = m_events->forIPrimaryScreen().hotKeyDown();
}
else if (eventKind == kCGEventKeyUp) {
type = m_events->forIPrimaryScreen().hotKeyUp();
}
else {
return false;
}
m_events->addEvent(Event(type, getEventTarget(),
HotKeyInfo::alloc(id)));
return true;
} }
else if (eventKind == kCGEventKeyUp) {
type = m_events->forIPrimaryScreen().hotKeyUp();
}
else {
return false;
}
m_events->addEvent(Event(type, getEventTarget(),
HotKeyInfo::alloc(id)));
return true;
} }
// decode event type // decode event type