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

Mac: reject keyboard output when the app is in the background

This commit is contained in:
Michael Buckley 2019-11-10 20:01:07 -08:00
parent 32727b822f
commit 37a84fa54b
1 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
macosx/mac-os.mm
View File

@ -351,32 +351,6 @@ static void * MacSnes9xThread (void *)
void CopyPressedKeys(bool8 keys[MAC_MAX_PLAYERS][kNumButtons], bool8 gamepadButtons[MAC_MAX_PLAYERS][kNumButtons]) void CopyPressedKeys(bool8 keys[MAC_MAX_PLAYERS][kNumButtons], bool8 gamepadButtons[MAC_MAX_PLAYERS][kNumButtons])
{ {
os_unfair_lock_lock(&keyLock); os_unfair_lock_lock(&keyLock);
NSEventModifierFlags flags = [NSEvent modifierFlags];
struct S9xButton button = keyCodes[kVK_Shift];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagShift) != 0;
}
button = keyCodes[kVK_Command];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagCommand) != 0;
}
button = keyCodes[kVK_Control];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagControl) != 0;
}
button = keyCodes[kVK_Option];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagOption) != 0;
}
memcpy(keys, pressedKeys, sizeof(pressedKeys)); memcpy(keys, pressedKeys, sizeof(pressedKeys));
memcpy(gamepadButtons, pressedGamepadButtons, sizeof(pressedGamepadButtons)); memcpy(gamepadButtons, pressedGamepadButtons, sizeof(pressedGamepadButtons));
os_unfair_lock_unlock(&keyLock); os_unfair_lock_unlock(&keyLock);
@ -2936,6 +2910,11 @@ void QuitWithFatalError ( NSString *message)
- (void)keyDown:(NSEvent *)event - (void)keyDown:(NSEvent *)event
{ {
if (!NSApp.isActive)
{
return;
}
os_unfair_lock_lock(&keyLock); os_unfair_lock_lock(&keyLock);
S9xButton button = keyCodes[event.keyCode]; S9xButton button = keyCodes[event.keyCode];
if ( button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player <= 0 && button.player <= MAC_MAX_PLAYERS) if ( button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player <= 0 && button.player <= MAC_MAX_PLAYERS)
@ -2959,6 +2938,11 @@ void QuitWithFatalError ( NSString *message)
- (void)keyUp:(NSEvent *)event - (void)keyUp:(NSEvent *)event
{ {
if (!NSApp.isActive)
{
return;
}
os_unfair_lock_lock(&keyLock); os_unfair_lock_lock(&keyLock);
S9xButton button = keyCodes[event.keyCode]; S9xButton button = keyCodes[event.keyCode];
if ( button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player <= 0 && button.player <= MAC_MAX_PLAYERS) if ( button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player <= 0 && button.player <= MAC_MAX_PLAYERS)
@ -2981,6 +2965,44 @@ void QuitWithFatalError ( NSString *message)
os_unfair_lock_unlock(&keyLock); os_unfair_lock_unlock(&keyLock);
} }
- (void)flagsChanged:(NSEvent *)event
{
if (!NSApp.isActive)
{
return;
}
os_unfair_lock_lock(&keyLock);
NSEventModifierFlags flags = event.modifierFlags;
struct S9xButton button = keyCodes[kVK_Shift];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagShift) != 0;
}
button = keyCodes[kVK_Command];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagCommand) != 0;
}
button = keyCodes[kVK_Control];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagControl) != 0;
}
button = keyCodes[kVK_Option];
if (button.buttonCode >= 0 && button.buttonCode < kNumButtons && button.player >= 0 && button.player < MAC_MAX_PLAYERS)
{
pressedKeys[button.player][button.buttonCode] = (flags & NSEventModifierFlagOption) != 0;
}
os_unfair_lock_unlock(&keyLock);
}
- (void)mouseDown:(NSEvent *)event - (void)mouseDown:(NSEvent *)event
{ {
pauseEmulation = true; pauseEmulation = true;