livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP mac keyboard cleanup. Possibly fix sticky control.

Cinders 2013-12-02 19:17:26 -07:00
parent 910a1d6811
commit 49bb37e11d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llkeyboardmacosx.cpp
View File

@ -175,7 +175,7 @@ void LLKeyboardMacOSX::resetMaskKeys()
mKeyLevel[KEY_SHIFT] = TRUE;
}
if(mask & MAC_CTRL_KEY)
if(mask & (MAC_CTRL_KEY | MAC_CMD_KEY))
{
mKeyLevel[KEY_CONTROL] = TRUE;
}

17
indra/llwindow/llopenglview-objc.mm
View File

@ -250,13 +250,12 @@ attributedStringInfo getSegments(NSAttributedString *str)
{
// Apparently people still use this?
if ([theEvent modifierFlags] & NSCommandKeyMask &&
!([theEvent modifierFlags] & NSControlKeyMask) &&
!([theEvent modifierFlags] & NSShiftKeyMask) &&
!([theEvent modifierFlags] & NSAlternateKeyMask) &&
!([theEvent modifierFlags] & NSAlphaShiftKeyMask) &&
!([theEvent modifierFlags] & NSFunctionKeyMask) &&
!([theEvent modifierFlags] & NSHelpKeyMask))
{
!([theEvent modifierFlags] & (NSControlKeyMask | NSShiftKeyMask
| NSAlternateKeyMask | NSAlphaShiftKeyMask
| NSFunctionKeyMask | NSHelpKeyMask)
)
)
{
callRightMouseDown(mMousePos, mModifiers);
mSimulatedRightClick = true;
} else {
@ -562,9 +561,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
- (void) insertNewline:(id)sender
{
if (!(mModifiers & NSCommandKeyMask) &&
!(mModifiers & NSShiftKeyMask) &&
!(mModifiers & NSAlternateKeyMask))
if (!(mModifiers & (NSCommandKeyMask | NSShiftKeyMask | NSAlternateKeyMask)))
{
callUnicodeCallback(13, 0);
} else {