encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-10 05:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added new HIDAPI driver files to the Xcode projects

Browse Source
This commit is contained in:
Sam Lantinga
2019-12-19 15:18:50 -08:00
parent 8d742d4745
commit 20daf54fd8
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/darwin/SDL_sysjoystick.c
View File

@@ -458,7 +458,7 @@ GetDeviceInfo(IOHIDDeviceRef hidDevice, recDevice *pDevice)
if ((!refCF) || (!CFStringGetCString(refCF, product_string, sizeof(product_string), kCFStringEncodingUTF8))) {
SDL_strlcpy(product_string, "Unidentified joystick", sizeof(product_string));
}
for (i = SDL_strlen(manufacturer_string) - 1; i > 0; --i) {
for (i = (int)SDL_strlen(manufacturer_string) - 1; i > 0; --i) {
if (SDL_isspace(manufacturer_string[i])) {
manufacturer_string[i] = '\0';
} else {

4
src/video/cocoa/SDL_cocoakeyboard.m
View File

@@ -473,7 +473,7 @@ Cocoa_InitKeyboard(_THIS)
SDL_SetScancodeName(SDL_SCANCODE_RALT, "Right Option");
SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Command");
data->modifierFlags = [NSEvent modifierFlags];
data->modifierFlags = (unsigned int)[NSEvent modifierFlags];
SDL_ToggleModState(KMOD_CAPS, (data->modifierFlags & NSEventModifierFlagCapsLock) != 0);
}
@@ -590,7 +590,7 @@ Cocoa_HandleKeyEvent(_THIS, NSEvent *event)
break;
case NSEventTypeFlagsChanged:
/* FIXME CW 2007-08-14: check if this whole mess that takes up half of this file is really necessary */
HandleModifiers(_this, scancode, [event modifierFlags]);
HandleModifiers(_this, scancode, (unsigned int)[event modifierFlags]);
break;
default: /* just to avoid compiler warnings */
break;