@end
-static CVReturn displayLink_update_cb(CVDisplayLinkRef displayLink,
- const CVTimeStamp *inNow,
- const CVTimeStamp *inOutputTime,
- CVOptionFlags flagsIn,
- CVOptionFlags *flagsOut,
- void *ctxManager) {
+static CVReturn _updateDL(CVDisplayLinkRef displayLink,
+ const CVTimeStamp *inNow,
+ const CVTimeStamp *inOutputTime,
+ CVOptionFlags flagsIn,
+ CVOptionFlags *flagsOut,
+ void *ctxManager) {
NJInputController *manager = (__bridge NJInputController *)ctxManager;
[manager performSelectorOnMainThread:@selector(updateContinuousOutputs)
withObject:nil
NSMutableArray *_devices;
NSMutableArray *_mappings;
NJMapping *_manualMapping;
- CVDisplayLinkRef displayLink;
-
+ CVDisplayLinkRef _displayLink;
}
#define NSSTR(e) ((NSString *)CFSTR(e))
_devices = [[NSMutableArray alloc] initWithCapacity:16];
_continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
- CVReturn error = CVDisplayLinkCreateWithActiveCGDisplays(&displayLink);
- if (error) {
- [self.delegate inputController:self
- didError:[NSError errorWithDomain:NSCocoaErrorDomain
- code:error
- userInfo:nil]];
- NSLog(@"DisplayLink failed creation with error: %d.", error);
- displayLink = NULL;
+ CVReturn cvErr = CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink);
+ if (cvErr) {
+ NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
+ code:cvErr
+ userInfo:nil];
+ [self.delegate inputController:self didError:error];
+ NSLog(@"DisplayLink failed creation with error: %@", error);
+ _displayLink = NULL;
}
- CVDisplayLinkSetOutputCallback(displayLink, displayLink_update_cb, (__bridge void *)self);
+ CVDisplayLinkSetOutputCallback(_displayLink, _updateDL, (__bridge void *)self);
_HIDManager = [[NJHIDManager alloc] initWithCriteria:@[
@{ NSSTR(kIOHIDDeviceUsagePageKey) : @(kHIDPage_GenericDesktop),
- (void)dealloc {
[NSNotificationCenter.defaultCenter removeObserver:self];
- if (displayLink) {
- CVDisplayLinkStop(displayLink);
- CVDisplayLinkRelease(displayLink);
+ if (_displayLink) {
+ CVDisplayLinkStop(_displayLink);
+ CVDisplayLinkRelease(_displayLink);
}
}
// re-adding them or they trigger multiple times each time.
if (![_continousOutputs containsObject:output])
[_continousOutputs addObject:output];
- if (displayLink && !CVDisplayLinkIsRunning(displayLink)) {
- CVDisplayLinkStart(displayLink);
- }
+ if (_displayLink && !CVDisplayLinkIsRunning(_displayLink))
+ CVDisplayLinkStart(_displayLink);
}
-- (void)runOutputForDevice:(IOHIDDeviceRef)device value:(IOHIDValueRef)value {
+- (void)runOutputForValue:(IOHIDValueRef)value {
+ IOHIDElementRef elt = value ? IOHIDValueGetElement(value) : NULL;
+ IOHIDDeviceRef device = elt ? IOHIDElementGetDevice(elt) : NULL;
NJDevice *dev = [self findDeviceByRef:device];
NJInput *mainInput = [dev inputForEvent:value];
[mainInput notifyEvent:value];
}
}
-- (void)showOutputForDevice:(IOHIDDeviceRef)device value:(IOHIDValueRef)value {
+- (void)showOutputForValue:(IOHIDValueRef)value {
+ IOHIDElementRef elt = value ? IOHIDValueGetElement(value) : NULL;
+ IOHIDDeviceRef device = elt ? IOHIDElementGetDevice(elt) : NULL;
NJDevice *dev = [self findDeviceByRef:device];
NJInput *handler = [dev handlerForEvent:value];
if (!handler)
[self.delegate inputController:self didInput:handler];
}
-- (void)HIDManager:(NJHIDManager *)manager
- valueChanged:(IOHIDValueRef)value
- fromDevice:(IOHIDDeviceRef)device {
- if (self.simulatingEvents
- && !NSApplication.sharedApplication.isActive) {
- [self runOutputForDevice:device value:value];
+- (void)HIDManager:(NJHIDManager *)manager valueChanged:(IOHIDValueRef)value {
+ if (self.simulatingEvents && !NSApplication.sharedApplication.isActive) {
+ [self runOutputForValue:value];
} else {
- [self showOutputForDevice:device value:value];
+ [self showOutputForValue:value];
}
}
[_continousOutputs removeObject:output];
}
}
- if (!_continousOutputs.count && displayLink) {
- CVDisplayLinkStop(displayLink);
+ if (!_continousOutputs.count && _displayLink) {
+ CVDisplayLinkStop(_displayLink);
}
}
- (void)HIDManager:(NJHIDManager *)manager didError:(NSError *)error {
[self.delegate inputController:self didError:error];
self.simulatingEvents = NO;
- if (displayLink)
- CVDisplayLinkStop(displayLink);
+ if (_displayLink)
+ CVDisplayLinkStop(_displayLink);
}
- (void)HIDManagerDidStart:(NJHIDManager *)manager {
- (void)HIDManagerDidStop:(NJHIDManager *)manager {
[_devices removeAllObjects];
- if (displayLink)
- CVDisplayLinkStop(displayLink);
+ if (_displayLink)
+ CVDisplayLinkStop(_displayLink);
[self.delegate inputControllerDidStopHID:self];
}
- (void)removeMappingAtIndex:(NSInteger)idx {
NSInteger currentIdx = [self indexOfMapping:_currentMapping];
[_mappings removeObjectAtIndex:idx];
- [self activateMapping:self.mappings[MIN(currentIdx, _mappings.count - 1)]];
+ NSInteger activeIdx = MIN(currentIdx, (NSInteger)_mappings.count - 1);
+ [self activateMapping:self.mappings[activeIdx]];
[self mappingsChanged];
}