diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/llwindow | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llkeyboard.cpp | 1 | ||||
| -rw-r--r-- | indra/llwindow/llkeyboardmacosx.cpp | 4 | ||||
| -rw-r--r-- | indra/llwindow/llkeyboardsdl.cpp | 4 | ||||
| -rw-r--r-- | indra/llwindow/llkeyboardwin32.cpp | 6 |
4 files changed, 10 insertions, 5 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 23f3dc76c5..83abcce3c1 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -96,6 +96,7 @@ LLKeyboard::LLKeyboard() : mCallbacks(NULL), mNumpadDistinct(ND_NUMLOCK_OFF) addKeyName(KEY_SUBTRACT, "Subtract" ); addKeyName(KEY_MULTIPLY, "Multiply" ); addKeyName(KEY_DIVIDE, "Divide" ); + addKeyName(KEY_PAD_DIVIDE, "PAD_DIVIDE" ); addKeyName(KEY_PAD_LEFT, "PAD_LEFT" ); addKeyName(KEY_PAD_RIGHT, "PAD_RIGHT" ); addKeyName(KEY_PAD_DOWN, "PAD_DOWN" ); diff --git a/indra/llwindow/llkeyboardmacosx.cpp b/indra/llwindow/llkeyboardmacosx.cpp index 74b64b4826..b415ba43c7 100644 --- a/indra/llwindow/llkeyboardmacosx.cpp +++ b/indra/llwindow/llkeyboardmacosx.cpp @@ -83,7 +83,7 @@ LLKeyboardMacOSX::LLKeyboardMacOSX() mTranslateKeyMap[0x29] = ';'; mTranslateKeyMap[0x2a] = '\\'; mTranslateKeyMap[0x2b] = ','; - mTranslateKeyMap[0x2c] = '/'; + mTranslateKeyMap[0x2c] = KEY_DIVIDE; mTranslateKeyMap[0x2d] = 'N'; mTranslateKeyMap[0x2e] = 'M'; mTranslateKeyMap[0x2f] = '.'; @@ -100,7 +100,7 @@ LLKeyboardMacOSX::LLKeyboardMacOSX() mTranslateKeyMap[0x41] = '.'; // keypad mTranslateKeyMap[0x43] = '*'; // keypad mTranslateKeyMap[0x45] = '+'; // keypad - mTranslateKeyMap[0x4b] = '/'; // keypad + mTranslateKeyMap[0x4b] = KEY_PAD_DIVIDE; // keypad mTranslateKeyMap[0x4c] = KEY_RETURN; // keypad enter mTranslateKeyMap[0x4e] = '-'; // keypad mTranslateKeyMap[0x51] = '='; // keypad diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp index d832506078..d29d917def 100644 --- a/indra/llwindow/llkeyboardsdl.cpp +++ b/indra/llwindow/llkeyboardsdl.cpp @@ -103,7 +103,7 @@ LLKeyboardSDL::LLKeyboardSDL() mTranslateKeyMap[SDLK_KP_PLUS] = KEY_ADD; mTranslateKeyMap[SDLK_KP_MINUS] = KEY_SUBTRACT; mTranslateKeyMap[SDLK_KP_MULTIPLY] = KEY_MULTIPLY; - mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_DIVIDE; + mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_PAD_DIVIDE; mTranslateKeyMap[SDLK_F1] = KEY_F1; mTranslateKeyMap[SDLK_F2] = KEY_F2; mTranslateKeyMap[SDLK_F3] = KEY_F3; @@ -121,7 +121,7 @@ LLKeyboardSDL::LLKeyboardSDL() mTranslateKeyMap[SDLK_MINUS] = '-'; mTranslateKeyMap[SDLK_PERIOD] = '.'; mTranslateKeyMap[SDLK_BACKQUOTE] = '`'; - mTranslateKeyMap[SDLK_SLASH] = '/'; + mTranslateKeyMap[SDLK_SLASH] = KEY_DIVIDE; mTranslateKeyMap[SDLK_SEMICOLON] = ';'; mTranslateKeyMap[SDLK_LEFTBRACKET] = '['; mTranslateKeyMap[SDLK_BACKSLASH] = '\\'; diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index a5e7f3b3fe..e8aaa658ca 100644 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -77,7 +77,7 @@ LLKeyboardWin32::LLKeyboardWin32() mTranslateKeyMap[VK_OEM_COMMA] = ','; mTranslateKeyMap[VK_OEM_MINUS] = '-'; mTranslateKeyMap[VK_OEM_PERIOD] = '.'; - mTranslateKeyMap[VK_OEM_2] = '/'; + mTranslateKeyMap[VK_OEM_2] = KEY_PAD_DIVIDE; mTranslateKeyMap[VK_OEM_3] = '`'; mTranslateKeyMap[VK_OEM_4] = '['; mTranslateKeyMap[VK_OEM_5] = '\\'; @@ -137,7 +137,11 @@ LLKeyboardWin32::LLKeyboardWin32() mTranslateNumpadMap[0x67] = KEY_PAD_HOME; // keypad 7 mTranslateNumpadMap[0x68] = KEY_PAD_UP; // keypad 8 mTranslateNumpadMap[0x69] = KEY_PAD_PGUP; // keypad 9 + mTranslateNumpadMap[0x6A] = KEY_PAD_MULTIPLY; // keypad * + mTranslateNumpadMap[0x6B] = KEY_PAD_ADD; // keypad + + mTranslateNumpadMap[0x6D] = KEY_PAD_SUBTRACT; // keypad - mTranslateNumpadMap[0x6E] = KEY_PAD_DEL; // keypad . + mTranslateNumpadMap[0x6F] = KEY_PAD_DIVIDE; // keypad / for (iter = mTranslateNumpadMap.begin(); iter != mTranslateNumpadMap.end(); iter++) { |