Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize Joypad initialization

This commit is contained in:
Lior Halphon 2020-05-02 23:04:12 +03:00
parent 9413d68976
commit bb37f8d2f0
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
JoyKit/JOYElement.m
View File

@ -1,5 +1,6 @@
#import "JOYElement.h" #import "JOYElement.h"
#include <IOKit/hid/IOHIDLib.h> #include <IOKit/hid/IOHIDLib.h>
#include <objc/runtime.h>
@implementation JOYElement @implementation JOYElement
{ {
@ -28,6 +29,24 @@
_max = max; _max = max;
} }
/* Ugly hack because IOHIDDeviceCopyMatchingElements is slow */
+ (NSArray *) cookiesToSkipForDevice:(IOHIDDeviceRef)device
{
id _device = (__bridge id)device;
NSMutableArray *ret = objc_getAssociatedObject(_device, _cmd);
if (ret) return ret;
ret = [NSMutableArray array];
NSArray *nones = CFBridgingRelease(IOHIDDeviceCopyMatchingElements(device,
(__bridge CFDictionaryRef)@{@(kIOHIDElementTypeKey): @(kIOHIDElementTypeInput_NULL)},
0));
for (id none in nones) {
[ret addObject:@(IOHIDElementGetCookie((__bridge IOHIDElementRef)none))];
}
objc_setAssociatedObject(_device, _cmd, ret, OBJC_ASSOCIATION_RETAIN);
return ret;
}
- (instancetype)initWithElement:(IOHIDElementRef)element - (instancetype)initWithElement:(IOHIDElementRef)element
{ {
if ((self = [super init])) { if ((self = [super init])) {
@ -45,14 +64,12 @@
/* Catalina added a new input type in a way that breaks cookie consistency across macOS versions, /* Catalina added a new input type in a way that breaks cookie consistency across macOS versions,
we shall adjust our cookies to to compensate */ we shall adjust our cookies to to compensate */
unsigned cookieShift = 0, parentCookieShift = 0; unsigned cookieShift = 0, parentCookieShift = 0;
NSArray *nones = CFBridgingRelease(IOHIDDeviceCopyMatchingElements(IOHIDElementGetDevice(element),
(__bridge CFDictionaryRef)@{@(kIOHIDElementTypeKey): @(kIOHIDElementTypeInput_NULL)}, for (NSNumber *none in [JOYElement cookiesToSkipForDevice:_device]) {
0)); if (none.unsignedIntValue < _uniqueID) {
for (id none in nones) {
if (IOHIDElementGetCookie((__bridge IOHIDElementRef) none) < _uniqueID) {
cookieShift++; cookieShift++;
} }
if (IOHIDElementGetCookie((__bridge IOHIDElementRef) none) < (int32_t)_parentID) { if (none.unsignedIntValue < (int32_t)_parentID) {
parentCookieShift++; parentCookieShift++;
} }
} }