diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
| commit | 8c344f4da02105428c5933501d028a4a8908a657 (patch) | |
| tree | 1463f67247c48a7420620917aa7fde5d6a810820 /indra/llwindow/llkeyboardwin32.cpp | |
| parent | 8534623734e64387736ddb76683939104d796ade (diff) | |
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/llwindow/llkeyboardwin32.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboardwin32.cpp | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index ddc099418c..fe553a8230 100644 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -146,29 +146,32 @@ void LLKeyboardWin32::resetMaskKeys() } -void LLKeyboardWin32::setModifierKeyLevel( KEY key, BOOL new_state ) -{ - if( mKeyLevel[key] != new_state ) - { - mKeyLevelFrameCount[key] = 0; - - if( new_state ) - { - mKeyLevelTimer[key].reset(); - } - mKeyLevel[key] = new_state; - } -} +//void LLKeyboardWin32::setModifierKeyLevel( KEY key, BOOL new_state ) +//{ +// if( mKeyLevel[key] != new_state ) +// { +// mKeyLevelFrameCount[key] = 0; +// +// if( new_state ) +// { +// mKeyLevelTimer[key].reset(); +// } +// mKeyLevel[key] = new_state; +// } +//} MASK LLKeyboardWin32::updateModifiers() { + //RN: this seems redundant, as we should have already received the appropriate + // messages for the modifier keys + // Scan the modifier keys as of the last Windows key message // (keydown encoded in high order bit of short) - setModifierKeyLevel( KEY_SHIFT, GetKeyState(VK_SHIFT) & 0x8000 ); - setModifierKeyLevel( KEY_CONTROL, GetKeyState(VK_CONTROL) & 0x8000 ); - setModifierKeyLevel( KEY_ALT, GetKeyState(VK_MENU) & 0x8000 ); - setModifierKeyLevel( KEY_CAPSLOCK, GetKeyState(VK_CAPITAL) & 0x0001); // Low order bit carries the toggle state. + //setModifierKeyLevel( KEY_SHIFT, GetKeyState(VK_SHIFT) & 0x8000 ); + //setModifierKeyLevel( KEY_CONTROL, GetKeyState(VK_CONTROL) & 0x8000 ); + //setModifierKeyLevel( KEY_ALT, GetKeyState(VK_MENU) & 0x8000 ); + //setModifierKeyLevel( KEY_CAPSLOCK, GetKeyState(VK_CAPITAL) & 0x0001); // Low order bit carries the toggle state. // Get mask for keyboard events MASK mask = currentMask(FALSE); return mask; |