diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index 3319f1a0b1..36b6a9f87d 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -79,11 +79,11 @@ void apple_rarch_exited(void) mod |= RETROKMOD_NUMLOCK; for (i = 1; i < ch.length; i++) - apple_input_keyboard_event(event_type == NSKeyDown, + cocoa_input_keyboard_event(event_type == NSKeyDown, 0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD); } - apple_input_keyboard_event(event_type == NSKeyDown, + cocoa_input_keyboard_event(event_type == NSKeyDown, event.keyCode, character, mod, RETRO_DEVICE_KEYBOARD); } break; @@ -94,7 +94,7 @@ void apple_rarch_exited(void) bool down = (new_flags & old_flags) == old_flags; old_flags = new_flags; - apple_input_keyboard_event(down, event.keyCode, + cocoa_input_keyboard_event(down, event.keyCode, 0, event.modifierFlags, RETRO_DEVICE_KEYBOARD); } break; diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index dfd50eab33..12694c504f 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -209,17 +209,17 @@ enum unsigned i; character = [ch characterAtIndex:0]; - apple_input_keyboard_event(event._isKeyDown, + cocoa_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, 0, mod, RETRO_DEVICE_KEYBOARD); for (i = 1; i < ch.length; i++) - apple_input_keyboard_event(event._isKeyDown, + cocoa_input_keyboard_event(event._isKeyDown, 0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD); } - apple_input_keyboard_event(event._isKeyDown, + cocoa_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, character, mod, RETRO_DEVICE_KEYBOARD); } @@ -254,7 +254,7 @@ enum { case GSEVENT_TYPE_KEYDOWN: case GSEVENT_TYPE_KEYUP: - apple_input_keyboard_event(eventType == GSEVENT_TYPE_KEYDOWN, + cocoa_input_keyboard_event(eventType == GSEVENT_TYPE_KEYDOWN, *(uint16_t*)&eventMem[0x3C], 0, 0, RETRO_DEVICE_KEYBOARD); break; } diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index 4c37d8175b..15607acf45 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -136,7 +136,7 @@ static void handle_icade_event(unsigned keycode) } } -void apple_input_keyboard_event(bool down, +void cocoa_input_keyboard_event(bool down, unsigned code, uint32_t character, uint32_t mod, unsigned device) { driver_t *driver = driver_get_ptr();