libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-03-01 14:16:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(Cocoa) Don't use NSEventModifierFlags type anymore - just

Browse Source 
use NSUInteger instead
This commit is contained in:
twinaphex 2021-01-18 20:41:30 +01:00
parent 234ebd715b
commit 0294b0c626
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/drivers/cocoa/cocoa_defines.h
View File

@ -23,10 +23,6 @@
#define MAC_OS_X_VERSION_10_12 101200
#endif
#ifndef NSEventModifierFlags
#define NSEventModifierFlags NSUInteger
#endif
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
#define NSEventModifierFlagCommand NSCommandKeyMask
#define NSEventModifierFlagControl NSControlKeyMask

6
ui/drivers/ui_cocoa.m
View File

@ -78,7 +78,7 @@ static char **waiting_argv;
uint32_t mod = 0;
const char *inputTextUTF8 = ch.UTF8String;
uint32_t character = inputTextUTF8[0];
NSEventModifierFlags mods = event.modifierFlags;
NSUInteger mods = event.modifierFlags;
uint16_t keycode = event.keyCode;
if (mods & NSEventModifierFlagCapsLock)
@ -108,8 +108,8 @@ static char **waiting_argv;
case NSFlagsChanged:
#endif
{
static NSEventModifierFlags old_flags = 0;
NSEventModifierFlags new_flags = event.modifierFlags;
static NSUInteger old_flags = 0;
NSUInteger new_flags = event.modifierFlags;
bool down = (new_flags & old_flags) == old_flags;
uint16_t keycode = event.keyCode;

26
ui/drivers/ui_cocoatouch.m
View File

@ -190,18 +190,19 @@ enum
NSString *ch = (NSString*)event._privateInput;
uint32_t character = 0;
uint32_t mod = 0;
NSUInteger mods = event._modifierFlags;
if (event._modifierFlags & NSAlphaShiftKeyMask)
if (mods & NSAlphaShiftKeyMask)
mod |= RETROKMOD_CAPSLOCK;
if (event._modifierFlags & NSShiftKeyMask)
if (mods & NSShiftKeyMask)
mod |= RETROKMOD_SHIFT;
if (event._modifierFlags & NSControlKeyMask)
if (mods & NSControlKeyMask)
mod |= RETROKMOD_CTRL;
if (event._modifierFlags & NSAlternateKeyMask)
if (mods & NSAlternateKeyMask)
mod |= RETROKMOD_ALT;
if (event._modifierFlags & NSCommandKeyMask)
if (mods & NSCommandKeyMask)
mod |= RETROKMOD_META;
if (event._modifierFlags & NSNumericPadKeyMask)
if (mods & NSNumericPadKeyMask)
mod |= RETROKMOD_NUMLOCK;
if (ch && ch.length != 0)
@ -246,18 +247,19 @@ enum
NSString *ch = (NSString*)event._privateInput;
uint32_t character = 0;
uint32_t mod = 0;
NSUInteger mods = event._modifierFlags;
if (event._modifierFlags & NSAlphaShiftKeyMask)
if (mods & NSAlphaShiftKeyMask)
mod |= RETROKMOD_CAPSLOCK;
if (event._modifierFlags & NSShiftKeyMask)
if (mods & NSShiftKeyMask)
mod |= RETROKMOD_SHIFT;
if (event._modifierFlags & NSControlKeyMask)
if (mods & NSControlKeyMask)
mod |= RETROKMOD_CTRL;
if (event._modifierFlags & NSAlternateKeyMask)
if (mods & NSAlternateKeyMask)
mod |= RETROKMOD_ALT;
if (event._modifierFlags & NSCommandKeyMask)
if (mods & NSCommandKeyMask)
mod |= RETROKMOD_META;
if (event._modifierFlags & NSNumericPadKeyMask)
if (mods & NSNumericPadKeyMask)
mod |= RETROKMOD_NUMLOCK;
if (ch && ch.length != 0)