flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-23 05:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash and memory leaks in MacOS' keyboard implementation

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-01-07 17:04:37 +01:00
committed by Mat Sutcliffe
parent 9a7af86a5e
commit 6d905f2132
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackinput/macos/keyboardmacos.h
View File

@@ -54,7 +54,8 @@ namespace BlackInput
void *refcon); void *refcon);
BlackMisc::Input::CHotkeyCombination m_keyCombination; //!< Current status of pressed keys; BlackMisc::Input::CHotkeyCombination m_keyCombination; //!< Current status of pressed keys;
CFMachPortRef m_eventTap; CFMachPortRef m_eventTap = nullptr;
CFRunLoopSourceRef m_sourceRef = nullptr;
}; };
} // ns } // ns

23
src/blackinput/macos/keyboardmacos.mm
View File

@@ -87,6 +87,13 @@ namespace BlackInput
CKeyboardMacOS::~CKeyboardMacOS() CKeyboardMacOS::~CKeyboardMacOS()
{ {
if (m_eventTap) { CGEventTapEnable(m_eventTap, false); }
if (m_sourceRef)
{
CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_sourceRef, kCFRunLoopCommonModes);
CFRelease(m_sourceRef);
}
if (m_eventTap) { CFRelease(m_eventTap); }
} }
bool CKeyboardMacOS::init() bool CKeyboardMacOS::init()
@@ -104,30 +111,28 @@ namespace BlackInput
&kCFTypeDictionaryValueCallBacks); &kCFTypeDictionaryValueCallBacks);
bool accessibilityEnabled = AXIsProcessTrustedWithOptions(options); bool accessibilityEnabled = AXIsProcessTrustedWithOptions(options);
CFRelease(options);
if (!accessibilityEnabled) if (!accessibilityEnabled)
{ {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setText("In order to enable hotkeys first add Swift to the list of apps allowed to " msgBox.setText("In order to enable hotkeys first add swift to the list of apps allowed to "
"control your computer in System Preferences / Security & Privacy / Privacy / Accessiblity and then restart Swift."); "control your computer in System Preferences / Security & Privacy / Privacy / Accessiblity and then restart Swift.");
msgBox.exec(); msgBox.exec();
return false; return false;
} }
CGEventMask eventMask = ((1 << kCGEventKeyDown) | (1 << kCGEventKeyUp) | (1 << kCGEventFlagsChanged)); CGEventMask eventMask = ((1 << kCGEventKeyDown) | (1 << kCGEventKeyUp) | (1 << kCGEventFlagsChanged));
// try creating an event tap just for keypresses. if it fails, we need Universal Access. // try creating an event tap just for keypresses. if it fails, we need Universal Access.
m_eventTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault, m_eventTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault,
eventMask, myCGEventCallback, this); eventMask, myCGEventCallback, this);
if (! m_eventTap) { return false; }
CFRunLoopSourceRef source = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, m_sourceRef = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, m_eventTap, 0);
m_eventTap, 0); if (! m_sourceRef) { return false; }
CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes); CFRunLoopAddSource(CFRunLoopGetCurrent(), m_sourceRef, kCFRunLoopCommonModes);
CGEventTapEnable(m_eventTap, true); CGEventTapEnable(m_eventTap, true);
return true; return true;
} }
@@ -218,6 +223,8 @@ namespace BlackInput
CGEventRef event, CGEventRef event,
void *refcon) void *refcon)
{ {
// If disabled on purpose, don't do anything further.
if (type == kCGEventTapDisabledByUserInput) { return event; }
CKeyboardMacOS *keyboardMac = static_cast<CKeyboardMacOS*>(refcon); CKeyboardMacOS *keyboardMac = static_cast<CKeyboardMacOS*>(refcon);
if (type == kCGEventTapDisabledByTimeout) if (type == kCGEventTapDisabledByTimeout)