Skip to content

Commit

Permalink
Stop using deprecated keymasks
Browse files Browse the repository at this point in the history
  • Loading branch information
Ybalrid committed Dec 1, 2018
1 parent 3de7711 commit 00184b8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/mac/CocoaKeyboard.mm
Original file line number Diff line number Diff line change
Expand Up @@ -390,30 +390,30 @@ - (void)flagsChanged:(NSEvent*)theEvent
// TODO test modifiers on a full keyboard to check if different mask for left/right
switch(change)
{
case(NSShiftKeyMask): // shift
case(NSEventModifierFlagShift): // shift
oisKeyboardObj->_getModifiers() &= (newstate == MAC_KEYDOWN) ? OIS::Keyboard::Shift : ~OIS::Keyboard::Shift;
[self injectEvent:KC_LSHIFT eventTime:time eventType:newstate];
break;

case(NSAlternateKeyMask): // option (alt)
case(NSEventModifierFlagOption): // option (alt)
oisKeyboardObj->_getModifiers() &= (newstate == MAC_KEYDOWN) ? OIS::Keyboard::Alt : -OIS::Keyboard::Alt;
[self injectEvent:KC_LMENU eventTime:time eventType:newstate];
break;

case(NSControlKeyMask): // Ctrl
case(NSEventModifierFlagControl): // Ctrl
oisKeyboardObj->_getModifiers() += (newstate == MAC_KEYDOWN) ? OIS::Keyboard::Ctrl : -OIS::Keyboard::Ctrl;
[self injectEvent:KC_LCONTROL eventTime:time eventType:newstate];
break;

case(NSCommandKeyMask): // apple
case(NSEventModifierFlagCommand): // apple
[self injectEvent:KC_LWIN eventTime:time eventType:newstate];
break;

case(NSFunctionKeyMask): // fn key
case(NSEventModifierFlagFunction): // fn key
[self injectEvent:KC_APPS eventTime:time eventType:newstate];
break;

case(NSAlphaShiftKeyMask): // caps lock
case(NSEventModifierFlagCapsLock): // caps lock
[self injectEvent:KC_CAPITAL eventTime:time eventType:newstate];
break;
}
Expand Down

0 comments on commit 00184b8

Please sign in to comment.