ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(UI CocoaTouch) Cleanups

This commit is contained in:
twinaphex 2021-01-16 22:15:17 +01:00
parent 225b851eb6
commit 809b96e221
1 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
ui/drivers/ui_cocoatouch.m
View File

@ -193,12 +193,18 @@ enum
uint32_t character = 0; uint32_t character = 0;
uint32_t mod = 0; uint32_t mod = 0;
mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0; if (event._modifierFlags & NSAlphaShiftKeyMask)
mod |= (event._modifierFlags & NSShiftKeyMask ) ? RETROKMOD_SHIFT : 0; mod |= RETROKMOD_CAPSLOCK;
mod |= (event._modifierFlags & NSControlKeyMask ) ? RETROKMOD_CTRL : 0; if (event._modifierFlags & NSShiftKeyMask)
mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT : 0; mod |= RETROKMOD_SHIFT;
mod |= (event._modifierFlags & NSCommandKeyMask ) ? RETROKMOD_META : 0; if (event._modifierFlags & NSControlKeyMask)
mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK : 0; mod |= RETROKMOD_CTRL;
if (event._modifierFlags & NSAlternateKeyMask)
mod |= RETROKMOD_ALT;
if (event._modifierFlags & NSCommandKeyMask)
mod |= RETROKMOD_META;
if (event._modifierFlags & NSNumericPadKeyMask)
mod |= RETROKMOD_NUMLOCK;
if (ch && ch.length != 0) if (ch && ch.length != 0)
{ {
@ -206,18 +212,18 @@ enum
character = [ch characterAtIndex:0]; character = [ch characterAtIndex:0];
apple_input_keyboard_event(event._isKeyDown, apple_input_keyboard_event(event._isKeyDown,
(uint32_t)event._keyCode, 0, mod, (uint32_t)event._keyCode, 0, mod,
RETRO_DEVICE_KEYBOARD); RETRO_DEVICE_KEYBOARD);
for (i = 1; i < ch.length; i++) for (i = 1; i < ch.length; i++)
apple_input_keyboard_event(event._isKeyDown, apple_input_keyboard_event(event._isKeyDown,
0, [ch characterAtIndex:i], mod, 0, [ch characterAtIndex:i], mod,
RETRO_DEVICE_KEYBOARD); RETRO_DEVICE_KEYBOARD);
} }
apple_input_keyboard_event(event._isKeyDown, apple_input_keyboard_event(event._isKeyDown,
(uint32_t)event._keyCode, character, mod, (uint32_t)event._keyCode, character, mod,
RETRO_DEVICE_KEYBOARD); RETRO_DEVICE_KEYBOARD);
} }
[super handleKeyUIEvent:event]; [super handleKeyUIEvent:event];
@ -243,12 +249,18 @@ enum
uint32_t character = 0; uint32_t character = 0;
uint32_t mod = 0; uint32_t mod = 0;
mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0; if (event._modifierFlags & NSAlphaShiftKeyMask)
mod |= (event._modifierFlags & NSShiftKeyMask ) ? RETROKMOD_SHIFT : 0; mod |= RETROKMOD_CAPSLOCK;
mod |= (event._modifierFlags & NSControlKeyMask ) ? RETROKMOD_CTRL : 0; if (event._modifierFlags & NSShiftKeyMask)
mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT : 0; mod |= RETROKMOD_SHIFT;
mod |= (event._modifierFlags & NSCommandKeyMask ) ? RETROKMOD_META : 0; if (event._modifierFlags & NSControlKeyMask)
mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK : 0; mod |= RETROKMOD_CTRL;
if (event._modifierFlags & NSAlternateKeyMask)
mod |= RETROKMOD_ALT;
if (event._modifierFlags & NSCommandKeyMask)
mod |= RETROKMOD_META;
if (event._modifierFlags & NSNumericPadKeyMask)
mod |= RETROKMOD_NUMLOCK;
if (ch && ch.length != 0) if (ch && ch.length != 0)
{ {
@ -279,33 +291,35 @@ enum
- (void)sendEvent:(UIEvent *)event - (void)sendEvent:(UIEvent *)event
{ {
int major, minor;
[super sendEvent:event]; [super sendEvent:event];
if (event.allTouches.count) if (event.allTouches.count)
handle_touch_event(event.allTouches.allObjects); handle_touch_event(event.allTouches.allObjects);
get_ios_version(&major, &minor);
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000
if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)])
{ {
/* Keyboard event hack for iOS versions prior to iOS 7. int major, minor;
* get_ios_version(&major, &minor);
* Derived from:
* http://nacho4d-nacho4d.blogspot.com/2012/01/
* catching-keyboard-events-in-ios.html
*/
const uint8_t *eventMem = objc_unretainedPointer([event performSelector:@selector(_gsEvent)]);
int eventType = eventMem ? *(int*)&eventMem[8] : 0;
switch (eventType) if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)])
{ {
case GSEVENT_TYPE_KEYDOWN: /* Keyboard event hack for iOS versions prior to iOS 7.
case GSEVENT_TYPE_KEYUP: *
apple_input_keyboard_event(eventType == GSEVENT_TYPE_KEYDOWN, * Derived from:
*(uint16_t*)&eventMem[0x3C], 0, 0, RETRO_DEVICE_KEYBOARD); * http://nacho4d-nacho4d.blogspot.com/2012/01/
break; * catching-keyboard-events-in-ios.html
*/
const uint8_t *eventMem = objc_unretainedPointer([event performSelector:@selector(_gsEvent)]);
int eventType = eventMem ? *(int*)&eventMem[8] : 0;
switch (eventType)
{
case GSEVENT_TYPE_KEYDOWN:
case GSEVENT_TYPE_KEYUP:
apple_input_keyboard_event(eventType == GSEVENT_TYPE_KEYDOWN,
*(uint16_t*)&eventMem[0x3C], 0, 0, RETRO_DEVICE_KEYBOARD);
break;
}
} }
} }
#endif #endif