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

42
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)
{ {
@ -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,15 +291,16 @@ 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);
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000
{
int major, minor;
get_ios_version(&major, &minor); get_ios_version(&major, &minor);
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000
if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)]) if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)])
{ {
/* Keyboard event hack for iOS versions prior to iOS 7. /* Keyboard event hack for iOS versions prior to iOS 7.
@ -308,6 +321,7 @@ enum
break; break;
} }
} }
}
#endif #endif
} }