godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OSX GUID to SDL uid conversion. 

Co-authored-by: John Wakley <johncwakley@users.noreply.github.com>
This commit is contained in:
Marcel Admiraal 2020-05-30 16:02:19 +01:00
parent a8787d1ae5
commit d04cbbd76b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/osx/joypad_osx.cpp
View File

@ -311,9 +311,16 @@ bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) {
if (refCF) { if (refCF) {
CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &product_id); CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &product_id);
} }
int version = 0;
refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDVersionNumberKey));
if (refCF) {
CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &version);
}
if (vendor && product_id) { if (vendor && product_id) {
char uid[128]; char uid[128];
sprintf(uid, "%04x%08x%04x%08x", OSSwapHostToBigInt32(vendor), 0, OSSwapHostToBigInt32(product_id), 0); sprintf(uid, "%08x%08x%08x%08x", OSSwapHostToBigInt32(3), OSSwapHostToBigInt32(vendor), OSSwapHostToBigInt32(product_id), OSSwapHostToBigInt32(version));
input->joy_connection_changed(id, true, name, uid); input->joy_connection_changed(id, true, name, uid);
} else { } else {
//bluetooth device //bluetooth device