Add a prefix to irrlicht key codes

This commit is contained in:
Deve 2017-07-20 21:53:37 +02:00
parent 10909b9556
commit 0dba3c8f67
29 changed files with 1329 additions and 1314 deletions

View File

@ -624,24 +624,24 @@ namespace scene
\code
SKeyMap keyMap[8];
keyMap[0].Action = EKA_MOVE_FORWARD;
keyMap[0].KeyCode = KEY_UP;
keyMap[0].KeyCode = IRR_KEY_UP;
keyMap[1].Action = EKA_MOVE_FORWARD;
keyMap[1].KeyCode = KEY_KEY_W;
keyMap[1].KeyCode = IRR_KEY_W;
keyMap[2].Action = EKA_MOVE_BACKWARD;
keyMap[2].KeyCode = KEY_DOWN;
keyMap[2].KeyCode = IRR_KEY_DOWN;
keyMap[3].Action = EKA_MOVE_BACKWARD;
keyMap[3].KeyCode = KEY_KEY_S;
keyMap[3].KeyCode = IRR_KEY_S;
keyMap[4].Action = EKA_STRAFE_LEFT;
keyMap[4].KeyCode = KEY_LEFT;
keyMap[4].KeyCode = IRR_KEY_LEFT;
keyMap[5].Action = EKA_STRAFE_LEFT;
keyMap[5].KeyCode = KEY_KEY_A;
keyMap[5].KeyCode = IRR_KEY_A;
keyMap[6].Action = EKA_STRAFE_RIGHT;
keyMap[6].KeyCode = KEY_RIGHT;
keyMap[6].KeyCode = IRR_KEY_RIGHT;
keyMap[7].Action = EKA_STRAFE_RIGHT;
keyMap[7].KeyCode = KEY_KEY_D;
keyMap[7].KeyCode = IRR_KEY_D;
camera = sceneManager->addCameraSceneNodeFPS(0, 100, 500, -1, keyMap, 8);
\endcode

View File

@ -10,176 +10,176 @@ namespace irr
enum EKEY_CODE
{
KEY_UNKNOWN = 0x0,
KEY_LBUTTON = 0x01, // Left mouse button
KEY_RBUTTON = 0x02, // Right mouse button
KEY_CANCEL = 0x03, // Control-break processing
KEY_MBUTTON = 0x04, // Middle mouse button (three-button mouse)
KEY_XBUTTON1 = 0x05, // Windows 2000/XP: X1 mouse button
KEY_XBUTTON2 = 0x06, // Windows 2000/XP: X2 mouse button
KEY_BACK = 0x08, // BACKSPACE key
KEY_TAB = 0x09, // TAB key
KEY_CLEAR = 0x0C, // CLEAR key
KEY_RETURN = 0x0D, // ENTER key
KEY_SHIFT = 0x10, // SHIFT key
KEY_CONTROL = 0x11, // CTRL key
KEY_MENU = 0x12, // ALT key
KEY_PAUSE = 0x13, // PAUSE key
KEY_CAPITAL = 0x14, // CAPS LOCK key
KEY_KANA = 0x15, // IME Kana mode
KEY_HANGUEL = 0x15, // IME Hanguel mode (maintained for compatibility use KEY_HANGUL)
KEY_HANGUL = 0x15, // IME Hangul mode
KEY_JUNJA = 0x17, // IME Junja mode
KEY_FINAL = 0x18, // IME final mode
KEY_HANJA = 0x19, // IME Hanja mode
KEY_KANJI = 0x19, // IME Kanji mode
KEY_ESCAPE = 0x1B, // ESC key
KEY_CONVERT = 0x1C, // IME convert
KEY_NONCONVERT = 0x1D, // IME nonconvert
KEY_ACCEPT = 0x1E, // IME accept
KEY_MODECHANGE = 0x1F, // IME mode change request
KEY_SPACE = 0x20, // SPACEBAR
KEY_PRIOR = 0x21, // PAGE UP key
KEY_NEXT = 0x22, // PAGE DOWN key
KEY_END = 0x23, // END key
KEY_HOME = 0x24, // HOME key
KEY_LEFT = 0x25, // LEFT ARROW key
KEY_UP = 0x26, // UP ARROW key
KEY_RIGHT = 0x27, // RIGHT ARROW key
KEY_DOWN = 0x28, // DOWN ARROW key
KEY_SELECT = 0x29, // SELECT key
KEY_PRINT = 0x2A, // PRINT key
KEY_EXECUT = 0x2B, // EXECUTE key
KEY_SNAPSHOT = 0x2C, // PRINT SCREEN key
KEY_INSERT = 0x2D, // INS key
KEY_DELETE = 0x2E, // DEL key
KEY_HELP = 0x2F, // HELP key
KEY_KEY_0 = 0x30, // 0 key
KEY_KEY_1 = 0x31, // 1 key
KEY_KEY_2 = 0x32, // 2 key
KEY_KEY_3 = 0x33, // 3 key
KEY_KEY_4 = 0x34, // 4 key
KEY_KEY_5 = 0x35, // 5 key
KEY_KEY_6 = 0x36, // 6 key
KEY_KEY_7 = 0x37, // 7 key
KEY_KEY_8 = 0x38, // 8 key
KEY_KEY_9 = 0x39, // 9 key
KEY_KEY_A = 0x41, // A key
KEY_KEY_B = 0x42, // B key
KEY_KEY_C = 0x43, // C key
KEY_KEY_D = 0x44, // D key
KEY_KEY_E = 0x45, // E key
KEY_KEY_F = 0x46, // F key
KEY_KEY_G = 0x47, // G key
KEY_KEY_H = 0x48, // H key
KEY_KEY_I = 0x49, // I key
KEY_KEY_J = 0x4A, // J key
KEY_KEY_K = 0x4B, // K key
KEY_KEY_L = 0x4C, // L key
KEY_KEY_M = 0x4D, // M key
KEY_KEY_N = 0x4E, // N key
KEY_KEY_O = 0x4F, // O key
KEY_KEY_P = 0x50, // P key
KEY_KEY_Q = 0x51, // Q key
KEY_KEY_R = 0x52, // R key
KEY_KEY_S = 0x53, // S key
KEY_KEY_T = 0x54, // T key
KEY_KEY_U = 0x55, // U key
KEY_KEY_V = 0x56, // V key
KEY_KEY_W = 0x57, // W key
KEY_KEY_X = 0x58, // X key
KEY_KEY_Y = 0x59, // Y key
KEY_KEY_Z = 0x5A, // Z key
KEY_LWIN = 0x5B, // Left Windows key (MicrosoftŽ NaturalŽ keyboard)
KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard)
KEY_APPS = 0x5D, // Applications key (Natural keyboard)
KEY_SLEEP = 0x5F, // Computer Sleep key
KEY_NUMPAD0 = 0x60, // Numeric keypad 0 key
KEY_NUMPAD1 = 0x61, // Numeric keypad 1 key
KEY_NUMPAD2 = 0x62, // Numeric keypad 2 key
KEY_NUMPAD3 = 0x63, // Numeric keypad 3 key
KEY_NUMPAD4 = 0x64, // Numeric keypad 4 key
KEY_NUMPAD5 = 0x65, // Numeric keypad 5 key
KEY_NUMPAD6 = 0x66, // Numeric keypad 6 key
KEY_NUMPAD7 = 0x67, // Numeric keypad 7 key
KEY_NUMPAD8 = 0x68, // Numeric keypad 8 key
KEY_NUMPAD9 = 0x69, // Numeric keypad 9 key
KEY_MULTIPLY = 0x6A, // Multiply key
KEY_ADD = 0x6B, // Add key
KEY_SEPARATOR = 0x6C, // Separator key
KEY_SUBTRACT = 0x6D, // Subtract key
KEY_DECIMAL = 0x6E, // Decimal key
KEY_DIVIDE = 0x6F, // Divide key
KEY_F1 = 0x70, // F1 key
KEY_F2 = 0x71, // F2 key
KEY_F3 = 0x72, // F3 key
KEY_F4 = 0x73, // F4 key
KEY_F5 = 0x74, // F5 key
KEY_F6 = 0x75, // F6 key
KEY_F7 = 0x76, // F7 key
KEY_F8 = 0x77, // F8 key
KEY_F9 = 0x78, // F9 key
KEY_F10 = 0x79, // F10 key
KEY_F11 = 0x7A, // F11 key
KEY_F12 = 0x7B, // F12 key
KEY_F13 = 0x7C, // F13 key
KEY_F14 = 0x7D, // F14 key
KEY_F15 = 0x7E, // F15 key
KEY_F16 = 0x7F, // F16 key
KEY_F17 = 0x80, // F17 key
KEY_F18 = 0x81, // F18 key
KEY_F19 = 0x82, // F19 key
KEY_F20 = 0x83, // F20 key
KEY_F21 = 0x84, // F21 key
KEY_F22 = 0x85, // F22 key
KEY_F23 = 0x86, // F23 key
KEY_F24 = 0x87, // F24 key
KEY_NUMLOCK = 0x90, // NUM LOCK key
KEY_SCROLL = 0x91, // SCROLL LOCK key
KEY_LSHIFT = 0xA0, // Left SHIFT key
KEY_RSHIFT = 0xA1, // Right SHIFT key
KEY_LCONTROL = 0xA2, // Left CONTROL key
KEY_RCONTROL = 0xA3, // Right CONTROL key
KEY_LMENU = 0xA4, // Left MENU key
KEY_RMENU = 0xA5, // Right MENU key
KEY_BROWSER_BACK = 0xA6, // Browser Back key
KEY_BROWSER_FORWARD = 0xA7, // Browser Forward key
KEY_BROWSER_REFRESH = 0xA8, // Browser Refresh key
KEY_BROWSER_STOP = 0xA9, // Browser Stop key
KEY_BROWSER_SEARCH = 0xAA, // Browser Search key
KEY_BROWSER_FAVORITES =0xAB, // Browser Favorites key
KEY_BROWSER_HOME = 0xAC, // Browser Start and Home key
KEY_VOLUME_MUTE = 0xAD, // Volume Mute key
KEY_VOLUME_DOWN = 0xAE, // Volume Down key
KEY_VOLUME_UP = 0xAF, // Volume Up key
KEY_MEDIA_NEXT_TRACK = 0xB0, // Next Track key
KEY_MEDIA_PREV_TRACK = 0xB1, // Previous Track key
KEY_MEDIA_STOP = 0xB2, // Stop Media key
KEY_MEDIA_PLAY_PAUSE = 0xB3, // Play/Pause Media key
KEY_OEM_1 = 0xBA, // for US ";:"
KEY_PLUS = 0xBB, // Plus Key "+"
KEY_COMMA = 0xBC, // Comma Key ","
KEY_MINUS = 0xBD, // Minus Key "-"
KEY_PERIOD = 0xBE, // Period Key "."
KEY_OEM_2 = 0xBF, // for US "/?"
KEY_OEM_3 = 0xC0, // for US "`~"
KEY_OEM_4 = 0xDB, // for US "[{"
KEY_OEM_5 = 0xDC, // for US "\|"
KEY_OEM_6 = 0xDD, // for US "]}"
KEY_OEM_7 = 0xDE, // for US "'""
KEY_OEM_8 = 0xDF, // None
KEY_OEM_AX = 0xE1, // for Japan "AX"
KEY_OEM_102 = 0xE2, // "<>" or "\|"
KEY_ATTN = 0xF6, // Attn key
KEY_CRSEL = 0xF7, // CrSel key
KEY_EXSEL = 0xF8, // ExSel key
KEY_EREOF = 0xF9, // Erase EOF key
KEY_PLAY = 0xFA, // Play key
KEY_ZOOM = 0xFB, // Zoom key
KEY_PA1 = 0xFD, // PA1 key
KEY_OEM_CLEAR = 0xFE, // Clear key
IRR_KEY_UNKNOWN = 0x0,
IRR_KEY_LBUTTON = 0x01, // Left mouse button
IRR_KEY_RBUTTON = 0x02, // Right mouse button
IRR_KEY_CANCEL = 0x03, // Control-break processing
IRR_KEY_MBUTTON = 0x04, // Middle mouse button (three-button mouse)
IRR_KEY_XBUTTON1 = 0x05, // Windows 2000/XP: X1 mouse button
IRR_KEY_XBUTTON2 = 0x06, // Windows 2000/XP: X2 mouse button
IRR_KEY_BACK = 0x08, // BACKSPACE key
IRR_KEY_TAB = 0x09, // TAB key
IRR_KEY_CLEAR = 0x0C, // CLEAR key
IRR_KEY_RETURN = 0x0D, // ENTER key
IRR_KEY_SHIFT = 0x10, // SHIFT key
IRR_KEY_CONTROL = 0x11, // CTRL key
IRR_KEY_MENU = 0x12, // ALT key
IRR_KEY_PAUSE = 0x13, // PAUSE key
IRR_KEY_CAPITAL = 0x14, // CAPS LOCK key
IRR_KEY_KANA = 0x15, // IME Kana mode
IRR_KEY_HANGUEL = 0x15, // IME Hanguel mode (maintained for compatibility use KEY_HANGUL)
IRR_KEY_HANGUL = 0x15, // IME Hangul mode
IRR_KEY_JUNJA = 0x17, // IME Junja mode
IRR_KEY_FINAL = 0x18, // IME final mode
IRR_KEY_HANJA = 0x19, // IME Hanja mode
IRR_KEY_KANJI = 0x19, // IME Kanji mode
IRR_KEY_ESCAPE = 0x1B, // ESC key
IRR_KEY_CONVERT = 0x1C, // IME convert
IRR_KEY_NONCONVERT = 0x1D, // IME nonconvert
IRR_KEY_ACCEPT = 0x1E, // IME accept
IRR_KEY_MODECHANGE = 0x1F, // IME mode change request
IRR_KEY_SPACE = 0x20, // SPACEBAR
IRR_KEY_PRIOR = 0x21, // PAGE UP key
IRR_KEY_NEXT = 0x22, // PAGE DOWN key
IRR_KEY_END = 0x23, // END key
IRR_KEY_HOME = 0x24, // HOME key
IRR_KEY_LEFT = 0x25, // LEFT ARROW key
IRR_KEY_UP = 0x26, // UP ARROW key
IRR_KEY_RIGHT = 0x27, // RIGHT ARROW key
IRR_KEY_DOWN = 0x28, // DOWN ARROW key
IRR_KEY_SELECT = 0x29, // SELECT key
IRR_KEY_PRINT = 0x2A, // PRINT key
IRR_KEY_EXECUT = 0x2B, // EXECUTE key
IRR_KEY_SNAPSHOT = 0x2C, // PRINT SCREEN key
IRR_KEY_INSERT = 0x2D, // INS key
IRR_KEY_DELETE = 0x2E, // DEL key
IRR_KEY_HELP = 0x2F, // HELP key
IRR_KEY_0 = 0x30, // 0 key
IRR_KEY_1 = 0x31, // 1 key
IRR_KEY_2 = 0x32, // 2 key
IRR_KEY_3 = 0x33, // 3 key
IRR_KEY_4 = 0x34, // 4 key
IRR_KEY_5 = 0x35, // 5 key
IRR_KEY_6 = 0x36, // 6 key
IRR_KEY_7 = 0x37, // 7 key
IRR_KEY_8 = 0x38, // 8 key
IRR_KEY_9 = 0x39, // 9 key
IRR_KEY_A = 0x41, // A key
IRR_KEY_B = 0x42, // B key
IRR_KEY_C = 0x43, // C key
IRR_KEY_D = 0x44, // D key
IRR_KEY_E = 0x45, // E key
IRR_KEY_F = 0x46, // F key
IRR_KEY_G = 0x47, // G key
IRR_KEY_H = 0x48, // H key
IRR_KEY_I = 0x49, // I key
IRR_KEY_J = 0x4A, // J key
IRR_KEY_K = 0x4B, // K key
IRR_KEY_L = 0x4C, // L key
IRR_KEY_M = 0x4D, // M key
IRR_KEY_N = 0x4E, // N key
IRR_KEY_O = 0x4F, // O key
IRR_KEY_P = 0x50, // P key
IRR_KEY_Q = 0x51, // Q key
IRR_KEY_R = 0x52, // R key
IRR_KEY_S = 0x53, // S key
IRR_KEY_T = 0x54, // T key
IRR_KEY_U = 0x55, // U key
IRR_KEY_V = 0x56, // V key
IRR_KEY_W = 0x57, // W key
IRR_KEY_X = 0x58, // X key
IRR_KEY_Y = 0x59, // Y key
IRR_KEY_Z = 0x5A, // Z key
IRR_KEY_LWIN = 0x5B, // Left Windows key (MicrosoftŽ NaturalŽ keyboard)
IRR_KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard)
IRR_KEY_APPS = 0x5D, // Applications key (Natural keyboard)
IRR_KEY_SLEEP = 0x5F, // Computer Sleep key
IRR_KEY_NUMPAD0 = 0x60, // Numeric keypad 0 key
IRR_KEY_NUMPAD1 = 0x61, // Numeric keypad 1 key
IRR_KEY_NUMPAD2 = 0x62, // Numeric keypad 2 key
IRR_KEY_NUMPAD3 = 0x63, // Numeric keypad 3 key
IRR_KEY_NUMPAD4 = 0x64, // Numeric keypad 4 key
IRR_KEY_NUMPAD5 = 0x65, // Numeric keypad 5 key
IRR_KEY_NUMPAD6 = 0x66, // Numeric keypad 6 key
IRR_KEY_NUMPAD7 = 0x67, // Numeric keypad 7 key
IRR_KEY_NUMPAD8 = 0x68, // Numeric keypad 8 key
IRR_KEY_NUMPAD9 = 0x69, // Numeric keypad 9 key
IRR_KEY_MULTIPLY = 0x6A, // Multiply key
IRR_KEY_ADD = 0x6B, // Add key
IRR_KEY_SEPARATOR = 0x6C, // Separator key
IRR_KEY_SUBTRACT = 0x6D, // Subtract key
IRR_KEY_DECIMAL = 0x6E, // Decimal key
IRR_KEY_DIVIDE = 0x6F, // Divide key
IRR_KEY_F1 = 0x70, // F1 key
IRR_KEY_F2 = 0x71, // F2 key
IRR_KEY_F3 = 0x72, // F3 key
IRR_KEY_F4 = 0x73, // F4 key
IRR_KEY_F5 = 0x74, // F5 key
IRR_KEY_F6 = 0x75, // F6 key
IRR_KEY_F7 = 0x76, // F7 key
IRR_KEY_F8 = 0x77, // F8 key
IRR_KEY_F9 = 0x78, // F9 key
IRR_KEY_F10 = 0x79, // F10 key
IRR_KEY_F11 = 0x7A, // F11 key
IRR_KEY_F12 = 0x7B, // F12 key
IRR_KEY_F13 = 0x7C, // F13 key
IRR_KEY_F14 = 0x7D, // F14 key
IRR_KEY_F15 = 0x7E, // F15 key
IRR_KEY_F16 = 0x7F, // F16 key
IRR_KEY_F17 = 0x80, // F17 key
IRR_KEY_F18 = 0x81, // F18 key
IRR_KEY_F19 = 0x82, // F19 key
IRR_KEY_F20 = 0x83, // F20 key
IRR_KEY_F21 = 0x84, // F21 key
IRR_KEY_F22 = 0x85, // F22 key
IRR_KEY_F23 = 0x86, // F23 key
IRR_KEY_F24 = 0x87, // F24 key
IRR_KEY_NUMLOCK = 0x90, // NUM LOCK key
IRR_KEY_SCROLL = 0x91, // SCROLL LOCK key
IRR_KEY_LSHIFT = 0xA0, // Left SHIFT key
IRR_KEY_RSHIFT = 0xA1, // Right SHIFT key
IRR_KEY_LCONTROL = 0xA2, // Left CONTROL key
IRR_KEY_RCONTROL = 0xA3, // Right CONTROL key
IRR_KEY_LMENU = 0xA4, // Left MENU key
IRR_KEY_RMENU = 0xA5, // Right MENU key
IRR_KEY_BROWSER_BACK = 0xA6, // Browser Back key
IRR_KEY_BROWSER_FORWARD = 0xA7, // Browser Forward key
IRR_KEY_BROWSER_REFRESH = 0xA8, // Browser Refresh key
IRR_KEY_BROWSER_STOP = 0xA9, // Browser Stop key
IRR_KEY_BROWSER_SEARCH = 0xAA, // Browser Search key
IRR_KEY_BROWSER_FAVORITES =0xAB, // Browser Favorites key
IRR_KEY_BROWSER_HOME = 0xAC, // Browser Start and Home key
IRR_KEY_VOLUME_MUTE = 0xAD, // Volume Mute key
IRR_KEY_VOLUME_DOWN = 0xAE, // Volume Down key
IRR_KEY_VOLUME_UP = 0xAF, // Volume Up key
IRR_KEY_MEDIA_NEXT_TRACK = 0xB0, // Next Track key
IRR_KEY_MEDIA_PREV_TRACK = 0xB1, // Previous Track key
IRR_KEY_MEDIA_STOP = 0xB2, // Stop Media key
IRR_KEY_MEDIA_PLAY_PAUSE = 0xB3, // Play/Pause Media key
IRR_KEY_OEM_1 = 0xBA, // for US ";:"
IRR_KEY_PLUS = 0xBB, // Plus Key "+"
IRR_KEY_COMMA = 0xBC, // Comma Key ","
IRR_KEY_MINUS = 0xBD, // Minus Key "-"
IRR_KEY_PERIOD = 0xBE, // Period Key "."
IRR_KEY_OEM_2 = 0xBF, // for US "/?"
IRR_KEY_OEM_3 = 0xC0, // for US "`~"
IRR_KEY_OEM_4 = 0xDB, // for US "[{"
IRR_KEY_OEM_5 = 0xDC, // for US "\|"
IRR_KEY_OEM_6 = 0xDD, // for US "]}"
IRR_KEY_OEM_7 = 0xDE, // for US "'""
IRR_KEY_OEM_8 = 0xDF, // None
IRR_KEY_OEM_AX = 0xE1, // for Japan "AX"
IRR_KEY_OEM_102 = 0xE2, // "<>" or "\|"
IRR_KEY_ATTN = 0xF6, // Attn key
IRR_KEY_CRSEL = 0xF7, // CrSel key
IRR_KEY_EXSEL = 0xF8, // ExSel key
IRR_KEY_EREOF = 0xF9, // Erase EOF key
IRR_KEY_PLAY = 0xFA, // Play key
IRR_KEY_ZOOM = 0xFB, // Zoom key
IRR_KEY_PA1 = 0xFD, // PA1 key
IRR_KEY_OEM_CLEAR = 0xFE, // Clear key
KEY_KEY_CODES_COUNT = 0xFF // this is not a key, but the amount of keycodes there are.
IRR_KEY_CODES_COUNT = 0xFF // this is not a key, but the amount of keycodes there are.
};
} // end namespace irr

View File

@ -116,7 +116,8 @@ bool CGUIButton::OnEvent(const SEvent& event)
{
case EET_KEY_INPUT_EVENT:
if (event.KeyInput.PressedDown &&
(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
(event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE))
{
if (!IsPushButton)
setPressed(true);
@ -125,14 +126,16 @@ bool CGUIButton::OnEvent(const SEvent& event)
return true;
}
if (Pressed && !IsPushButton && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
if (Pressed && !IsPushButton && event.KeyInput.PressedDown &&
event.KeyInput.Key == IRR_KEY_ESCAPE)
{
setPressed(false);
return true;
}
else
if (!event.KeyInput.PressedDown && Pressed &&
(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
(event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE))
{
if (!IsPushButton)

View File

@ -40,20 +40,23 @@ bool CGUICheckBox::OnEvent(const SEvent& event)
{
case EET_KEY_INPUT_EVENT:
if (event.KeyInput.PressedDown &&
(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
(event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE))
{
Pressed = true;
return true;
}
else
if (Pressed && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
if (Pressed && event.KeyInput.PressedDown &&
event.KeyInput.Key == IRR_KEY_ESCAPE)
{
Pressed = false;
return true;
}
else
if (!event.KeyInput.PressedDown && Pressed &&
(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
(event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE))
{
Pressed = false;
if (Parent)

View File

@ -208,14 +208,16 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
{
case EET_KEY_INPUT_EVENT:
if (ListBox && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
if (ListBox && event.KeyInput.PressedDown &&
event.KeyInput.Key == IRR_KEY_ESCAPE)
{
// hide list box
openCloseMenu();
return true;
}
else
if (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)
if (event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE)
{
if (!event.KeyInput.PressedDown)
{
@ -233,18 +235,18 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
bool absorb = true;
switch (event.KeyInput.Key)
{
case KEY_DOWN:
case IRR_KEY_DOWN:
setSelected(Selected+1);
break;
case KEY_UP:
case IRR_KEY_UP:
setSelected(Selected-1);
break;
case KEY_HOME:
case KEY_PRIOR:
case IRR_KEY_HOME:
case IRR_KEY_PRIOR:
setSelected(0);
break;
case KEY_END:
case KEY_NEXT:
case IRR_KEY_END:
case IRR_KEY_NEXT:
setSelected((s32)Items.size()-1);
break;
default:

View File

@ -274,12 +274,12 @@ bool CGUIEditBox::processKey(const SEvent& event)
switch(event.KeyInput.Key)
{
case KEY_KEY_A:
case IRR_KEY_A:
// select all
newMarkBegin = 0;
newMarkEnd = Text.size();
break;
case KEY_KEY_C:
case IRR_KEY_C:
// copy to clipboard
if (!PasswordBox && Operator && MarkBegin != MarkEnd)
{
@ -295,7 +295,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
Operator->copyToClipboard(s.c_str());
}
break;
case KEY_KEY_X:
case IRR_KEY_X:
// cut to the clipboard
if (!PasswordBox && Operator && MarkBegin != MarkEnd)
{
@ -326,7 +326,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
}
break;
case KEY_KEY_V:
case IRR_KEY_V:
if ( !isEnabled() )
break;
@ -380,7 +380,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
textChanged = true;
}
break;
case KEY_HOME:
case IRR_KEY_HOME:
// move/highlight to start of text
if (event.KeyInput.Shift)
{
@ -395,7 +395,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
newMarkEnd = 0;
}
break;
case KEY_END:
case IRR_KEY_END:
// move/highlight to end of text
if (event.KeyInput.Shift)
{
@ -418,7 +418,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
else
switch(event.KeyInput.Key)
{
case KEY_END:
case IRR_KEY_END:
{
s32 p = Text.size();
if (WordWrap || MultiLine)
@ -445,7 +445,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
BlinkStartTime = os::Timer::getTime();
}
break;
case KEY_HOME:
case IRR_KEY_HOME:
{
s32 p = 0;
@ -470,7 +470,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
BlinkStartTime = os::Timer::getTime();
}
break;
case KEY_RETURN:
case IRR_KEY_RETURN:
if (MultiLine)
{
inputChar(L'\n');
@ -481,7 +481,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
sendGuiEvent( EGET_EDITBOX_ENTER );
}
return true;
case KEY_LEFT:
case IRR_KEY_LEFT:
if (event.KeyInput.Shift)
{
@ -503,7 +503,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
BlinkStartTime = os::Timer::getTime();
break;
case KEY_RIGHT:
case IRR_KEY_RIGHT:
if (event.KeyInput.Shift)
{
if (Text.size() > (u32)CursorPos)
@ -523,7 +523,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
if (Text.size() > (u32)CursorPos) CursorPos++;
BlinkStartTime = os::Timer::getTime();
break;
case KEY_UP:
case IRR_KEY_UP:
if (MultiLine || (WordWrap && BrokenText.size() > 1) )
{
s32 lineNo = getLineFromPos(CursorPos);
@ -554,7 +554,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
return false;
}
break;
case KEY_DOWN:
case IRR_KEY_DOWN:
if (MultiLine || (WordWrap && BrokenText.size() > 1) )
{
s32 lineNo = getLineFromPos(CursorPos);
@ -586,7 +586,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
break;
case KEY_BACK:
case IRR_KEY_BACK:
if ( !isEnabled() )
break;
@ -626,7 +626,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
textChanged = true;
}
break;
case KEY_DELETE:
case IRR_KEY_DELETE:
if ( !isEnabled() )
break;
@ -664,33 +664,33 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
break;
case KEY_ESCAPE:
case KEY_TAB:
case KEY_SHIFT:
case KEY_F1:
case KEY_F2:
case KEY_F3:
case KEY_F4:
case KEY_F5:
case KEY_F6:
case KEY_F7:
case KEY_F8:
case KEY_F9:
case KEY_F10:
case KEY_F11:
case KEY_F12:
case KEY_F13:
case KEY_F14:
case KEY_F15:
case KEY_F16:
case KEY_F17:
case KEY_F18:
case KEY_F19:
case KEY_F20:
case KEY_F21:
case KEY_F22:
case KEY_F23:
case KEY_F24:
case IRR_KEY_ESCAPE:
case IRR_KEY_TAB:
case IRR_KEY_SHIFT:
case IRR_KEY_F1:
case IRR_KEY_F2:
case IRR_KEY_F3:
case IRR_KEY_F4:
case IRR_KEY_F5:
case IRR_KEY_F6:
case IRR_KEY_F7:
case IRR_KEY_F8:
case IRR_KEY_F9:
case IRR_KEY_F10:
case IRR_KEY_F11:
case IRR_KEY_F12:
case IRR_KEY_F13:
case IRR_KEY_F14:
case IRR_KEY_F15:
case IRR_KEY_F16:
case IRR_KEY_F17:
case IRR_KEY_F18:
case IRR_KEY_F19:
case IRR_KEY_F20:
case IRR_KEY_F21:
case IRR_KEY_F22:
case IRR_KEY_F23:
case IRR_KEY_F24:
// ignore these keys
return false;

View File

@ -561,7 +561,7 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event)
// Send focus changing event
if (event.EventType == EET_KEY_INPUT_EVENT &&
event.KeyInput.PressedDown &&
event.KeyInput.Key == KEY_TAB)
event.KeyInput.Key == IRR_KEY_TAB)
{
IGUIElement *next = getNextElement(event.KeyInput.Shift, event.KeyInput.Control);
if (next && next != Focus)

View File

@ -236,32 +236,32 @@ bool CGUIListBox::OnEvent(const SEvent& event)
{
case EET_KEY_INPUT_EVENT:
if (event.KeyInput.PressedDown &&
(event.KeyInput.Key == KEY_DOWN ||
event.KeyInput.Key == KEY_UP ||
event.KeyInput.Key == KEY_HOME ||
event.KeyInput.Key == KEY_END ||
event.KeyInput.Key == KEY_NEXT ||
event.KeyInput.Key == KEY_PRIOR ) )
(event.KeyInput.Key == IRR_KEY_DOWN ||
event.KeyInput.Key == IRR_KEY_UP ||
event.KeyInput.Key == IRR_KEY_HOME ||
event.KeyInput.Key == IRR_KEY_END ||
event.KeyInput.Key == IRR_KEY_NEXT ||
event.KeyInput.Key == IRR_KEY_PRIOR))
{
s32 oldSelected = Selected;
switch (event.KeyInput.Key)
{
case KEY_DOWN:
case IRR_KEY_DOWN:
Selected += 1;
break;
case KEY_UP:
case IRR_KEY_UP:
Selected -= 1;
break;
case KEY_HOME:
case IRR_KEY_HOME:
Selected = 0;
break;
case KEY_END:
case IRR_KEY_END:
Selected = (s32)Items.size()-1;
break;
case KEY_NEXT:
case IRR_KEY_NEXT:
Selected += AbsoluteRect.getHeight() / ItemHeight;
break;
case KEY_PRIOR:
case IRR_KEY_PRIOR:
Selected -= AbsoluteRect.getHeight() / ItemHeight;
break;
default:
@ -290,7 +290,9 @@ bool CGUIListBox::OnEvent(const SEvent& event)
return true;
}
else
if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
if (!event.KeyInput.PressedDown &&
(event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE))
{
if (Parent)
{

View File

@ -269,28 +269,28 @@ bool CGUIMessageBox::OnEvent(const SEvent& event)
{
switch (event.KeyInput.Key)
{
case KEY_RETURN:
case IRR_KEY_RETURN:
if (OkButton)
{
OkButton->setPressed(true);
Pressed = true;
}
break;
case KEY_KEY_Y:
case IRR_KEY_Y:
if (YesButton)
{
YesButton->setPressed(true);
Pressed = true;
}
break;
case KEY_KEY_N:
case IRR_KEY_N:
if (NoButton)
{
NoButton->setPressed(true);
Pressed = true;
}
break;
case KEY_ESCAPE:
case IRR_KEY_ESCAPE:
if (Pressed)
{
// cancel press
@ -319,7 +319,7 @@ bool CGUIMessageBox::OnEvent(const SEvent& event)
else
if (Pressed)
{
if (OkButton && event.KeyInput.Key == KEY_RETURN)
if (OkButton && event.KeyInput.Key == IRR_KEY_RETURN)
{
setVisible(false); // this is a workaround to make sure it's no longer the hovered element, crashes on pressing 1-2 times ESC
Environment->setFocus(0);
@ -329,7 +329,7 @@ bool CGUIMessageBox::OnEvent(const SEvent& event)
return true;
}
else
if ((CancelButton || CloseButton) && event.KeyInput.Key == KEY_ESCAPE)
if ((CancelButton || CloseButton) && event.KeyInput.Key == IRR_KEY_ESCAPE)
{
setVisible(false); // this is a workaround to make sure it's no longer the hovered element, crashes on pressing 1-2 times ESC
Environment->setFocus(0);
@ -339,7 +339,7 @@ bool CGUIMessageBox::OnEvent(const SEvent& event)
return true;
}
else
if (YesButton && event.KeyInput.Key == KEY_KEY_Y)
if (YesButton && event.KeyInput.Key == IRR_KEY_Y)
{
setVisible(false); // this is a workaround to make sure it's no longer the hovered element, crashes on pressing 1-2 times ESC
Environment->setFocus(0);
@ -349,7 +349,7 @@ bool CGUIMessageBox::OnEvent(const SEvent& event)
return true;
}
else
if (NoButton && event.KeyInput.Key == KEY_KEY_N)
if (NoButton && event.KeyInput.Key == IRR_KEY_N)
{
setVisible(false); // this is a workaround to make sure it's no longer the hovered element, crashes on pressing 1-2 times ESC
Environment->setFocus(0);

View File

@ -71,24 +71,24 @@ bool CGUIScrollBar::OnEvent(const SEvent& event)
bool absorb = true;
switch (event.KeyInput.Key)
{
case KEY_LEFT:
case KEY_UP:
case IRR_KEY_LEFT:
case IRR_KEY_UP:
setPos(Pos-SmallStep);
break;
case KEY_RIGHT:
case KEY_DOWN:
case IRR_KEY_RIGHT:
case IRR_KEY_DOWN:
setPos(Pos+SmallStep);
break;
case KEY_HOME:
case IRR_KEY_HOME:
setPos(Min);
break;
case KEY_PRIOR:
case IRR_KEY_PRIOR:
setPos(Pos-LargeStep);
break;
case KEY_END:
case IRR_KEY_END:
setPos(Max);
break;
case KEY_NEXT:
case IRR_KEY_NEXT:
setPos(Pos+LargeStep);
break;
default:

View File

@ -495,7 +495,7 @@ s32 CIrrDeviceAndroid::handleInput(android_app* app, AInputEvent* androidEvent)
event.EventType = EET_KEY_INPUT_EVENT;
event.KeyInput.Char = 0;
event.KeyInput.PressedDown = false;
event.KeyInput.Key = KEY_UNKNOWN;
event.KeyInput.Key = IRR_KEY_UNKNOWN;
int32_t keyCode = AKeyEvent_getKeyCode(androidEvent);
int32_t keyAction = AKeyEvent_getAction(androidEvent);
@ -582,232 +582,232 @@ void CIrrDeviceAndroid::createKeyMap()
{
KeyMap.set_used(223);
KeyMap[0] = KEY_UNKNOWN; // AKEYCODE_UNKNOWN
KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT
KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT
KeyMap[3] = KEY_HOME; // AKEYCODE_HOME
KeyMap[4] = KEY_ESCAPE; // AKEYCODE_BACK
KeyMap[5] = KEY_UNKNOWN; // AKEYCODE_CALL
KeyMap[6] = KEY_UNKNOWN; // AKEYCODE_ENDCALL
KeyMap[7] = KEY_KEY_0; // AKEYCODE_0
KeyMap[8] = KEY_KEY_1; // AKEYCODE_1
KeyMap[9] = KEY_KEY_2; // AKEYCODE_2
KeyMap[10] = KEY_KEY_3; // AKEYCODE_3
KeyMap[11] = KEY_KEY_4; // AKEYCODE_4
KeyMap[12] = KEY_KEY_5; // AKEYCODE_5
KeyMap[13] = KEY_KEY_6; // AKEYCODE_6
KeyMap[14] = KEY_KEY_7; // AKEYCODE_7
KeyMap[15] = KEY_KEY_8; // AKEYCODE_8
KeyMap[16] = KEY_KEY_9; // AKEYCODE_9
KeyMap[17] = KEY_UNKNOWN; // AKEYCODE_STAR
KeyMap[18] = KEY_UNKNOWN; // AKEYCODE_POUND
KeyMap[19] = KEY_UP; // AKEYCODE_DPAD_UP
KeyMap[20] = KEY_DOWN; // AKEYCODE_DPAD_DOWN
KeyMap[21] = KEY_LEFT; // AKEYCODE_DPAD_LEFT
KeyMap[22] = KEY_RIGHT; // AKEYCODE_DPAD_RIGHT
KeyMap[23] = KEY_SELECT; // AKEYCODE_DPAD_CENTER
KeyMap[24] = KEY_VOLUME_DOWN; // AKEYCODE_VOLUME_UP
KeyMap[25] = KEY_VOLUME_UP; // AKEYCODE_VOLUME_DOWN
KeyMap[26] = KEY_UNKNOWN; // AKEYCODE_POWER
KeyMap[27] = KEY_UNKNOWN; // AKEYCODE_CAMERA
KeyMap[28] = KEY_CLEAR; // AKEYCODE_CLEAR
KeyMap[29] = KEY_KEY_A; // AKEYCODE_A
KeyMap[30] = KEY_KEY_B; // AKEYCODE_B
KeyMap[31] = KEY_KEY_C; // AKEYCODE_C
KeyMap[32] = KEY_KEY_D; // AKEYCODE_D
KeyMap[33] = KEY_KEY_E; // AKEYCODE_E
KeyMap[34] = KEY_KEY_F; // AKEYCODE_F
KeyMap[35] = KEY_KEY_G; // AKEYCODE_G
KeyMap[36] = KEY_KEY_H; // AKEYCODE_H
KeyMap[37] = KEY_KEY_I; // AKEYCODE_I
KeyMap[38] = KEY_KEY_J; // AKEYCODE_J
KeyMap[39] = KEY_KEY_K; // AKEYCODE_K
KeyMap[40] = KEY_KEY_L; // AKEYCODE_L
KeyMap[41] = KEY_KEY_M; // AKEYCODE_M
KeyMap[42] = KEY_KEY_N; // AKEYCODE_N
KeyMap[43] = KEY_KEY_O; // AKEYCODE_O
KeyMap[44] = KEY_KEY_P; // AKEYCODE_P
KeyMap[45] = KEY_KEY_Q; // AKEYCODE_Q
KeyMap[46] = KEY_KEY_R; // AKEYCODE_R
KeyMap[47] = KEY_KEY_S; // AKEYCODE_S
KeyMap[48] = KEY_KEY_T; // AKEYCODE_T
KeyMap[49] = KEY_KEY_U; // AKEYCODE_U
KeyMap[50] = KEY_KEY_V; // AKEYCODE_V
KeyMap[51] = KEY_KEY_W; // AKEYCODE_W
KeyMap[52] = KEY_KEY_X; // AKEYCODE_X
KeyMap[53] = KEY_KEY_Y; // AKEYCODE_Y
KeyMap[54] = KEY_KEY_Z; // AKEYCODE_Z
KeyMap[55] = KEY_COMMA; // AKEYCODE_COMMA
KeyMap[56] = KEY_PERIOD; // AKEYCODE_PERIOD
KeyMap[57] = KEY_MENU; // AKEYCODE_ALT_LEFT
KeyMap[58] = KEY_MENU; // AKEYCODE_ALT_RIGHT
KeyMap[59] = KEY_LSHIFT; // AKEYCODE_SHIFT_LEFT
KeyMap[60] = KEY_RSHIFT; // AKEYCODE_SHIFT_RIGHT
KeyMap[61] = KEY_TAB; // AKEYCODE_TAB
KeyMap[62] = KEY_SPACE; // AKEYCODE_SPACE
KeyMap[63] = KEY_UNKNOWN; // AKEYCODE_SYM
KeyMap[64] = KEY_UNKNOWN; // AKEYCODE_EXPLORER
KeyMap[65] = KEY_UNKNOWN; // AKEYCODE_ENVELOPE
KeyMap[66] = KEY_RETURN; // AKEYCODE_ENTER
KeyMap[67] = KEY_BACK; // AKEYCODE_DEL
KeyMap[68] = KEY_OEM_3; // AKEYCODE_GRAVE
KeyMap[69] = KEY_MINUS; // AKEYCODE_MINUS
KeyMap[70] = KEY_UNKNOWN; // AKEYCODE_EQUALS
KeyMap[71] = KEY_UNKNOWN; // AKEYCODE_LEFT_BRACKET
KeyMap[72] = KEY_UNKNOWN; // AKEYCODE_RIGHT_BRACKET
KeyMap[73] = KEY_UNKNOWN; // AKEYCODE_BACKSLASH
KeyMap[74] = KEY_UNKNOWN; // AKEYCODE_SEMICOLON
KeyMap[75] = KEY_UNKNOWN; // AKEYCODE_APOSTROPHE
KeyMap[76] = KEY_UNKNOWN; // AKEYCODE_SLASH
KeyMap[77] = KEY_UNKNOWN; // AKEYCODE_AT
KeyMap[78] = KEY_UNKNOWN; // AKEYCODE_NUM
KeyMap[79] = KEY_UNKNOWN; // AKEYCODE_HEADSETHOOK
KeyMap[80] = KEY_UNKNOWN; // AKEYCODE_FOCUS (*Camera* focus)
KeyMap[81] = KEY_PLUS; // AKEYCODE_PLUS
KeyMap[82] = KEY_MENU; // AKEYCODE_MENU
KeyMap[83] = KEY_UNKNOWN; // AKEYCODE_NOTIFICATION
KeyMap[84] = KEY_UNKNOWN; // AKEYCODE_SEARCH
KeyMap[85] = KEY_MEDIA_PLAY_PAUSE; // AKEYCODE_MEDIA_PLAY_PAUSE
KeyMap[86] = KEY_MEDIA_STOP; // AKEYCODE_MEDIA_STOP
KeyMap[87] = KEY_MEDIA_NEXT_TRACK; // AKEYCODE_MEDIA_NEXT
KeyMap[88] = KEY_MEDIA_PREV_TRACK; // AKEYCODE_MEDIA_PREVIOUS
KeyMap[89] = KEY_UNKNOWN; // AKEYCODE_MEDIA_REWIND
KeyMap[90] = KEY_UNKNOWN; // AKEYCODE_MEDIA_FAST_FORWARD
KeyMap[91] = KEY_VOLUME_MUTE; // AKEYCODE_MUTE
KeyMap[92] = KEY_PRIOR; // AKEYCODE_PAGE_UP
KeyMap[93] = KEY_NEXT; // AKEYCODE_PAGE_DOWN
KeyMap[94] = KEY_UNKNOWN; // AKEYCODE_PICTSYMBOLS
KeyMap[95] = KEY_UNKNOWN; // AKEYCODE_SWITCH_CHARSET
KeyMap[0] = IRR_KEY_UNKNOWN; // AKEYCODE_UNKNOWN
KeyMap[1] = IRR_KEY_LBUTTON; // AKEYCODE_SOFT_LEFT
KeyMap[2] = IRR_KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT
KeyMap[3] = IRR_KEY_HOME; // AKEYCODE_HOME
KeyMap[4] = IRR_KEY_ESCAPE; // AKEYCODE_BACK
KeyMap[5] = IRR_KEY_UNKNOWN; // AKEYCODE_CALL
KeyMap[6] = IRR_KEY_UNKNOWN; // AKEYCODE_ENDCALL
KeyMap[7] = IRR_KEY_0; // AKEYCODE_0
KeyMap[8] = IRR_KEY_1; // AKEYCODE_1
KeyMap[9] = IRR_KEY_2; // AKEYCODE_2
KeyMap[10] = IRR_KEY_3; // AKEYCODE_3
KeyMap[11] = IRR_KEY_4; // AKEYCODE_4
KeyMap[12] = IRR_KEY_5; // AKEYCODE_5
KeyMap[13] = IRR_KEY_6; // AKEYCODE_6
KeyMap[14] = IRR_KEY_7; // AKEYCODE_7
KeyMap[15] = IRR_KEY_8; // AKEYCODE_8
KeyMap[16] = IRR_KEY_9; // AKEYCODE_9
KeyMap[17] = IRR_KEY_UNKNOWN; // AKEYCODE_STAR
KeyMap[18] = IRR_KEY_UNKNOWN; // AKEYCODE_POUND
KeyMap[19] = IRR_KEY_UP; // AKEYCODE_DPAD_UP
KeyMap[20] = IRR_KEY_DOWN; // AKEYCODE_DPAD_DOWN
KeyMap[21] = IRR_KEY_LEFT; // AKEYCODE_DPAD_LEFT
KeyMap[22] = IRR_KEY_RIGHT; // AKEYCODE_DPAD_RIGHT
KeyMap[23] = IRR_KEY_SELECT; // AKEYCODE_DPAD_CENTER
KeyMap[24] = IRR_KEY_VOLUME_DOWN; // AKEYCODE_VOLUME_UP
KeyMap[25] = IRR_KEY_VOLUME_UP; // AKEYCODE_VOLUME_DOWN
KeyMap[26] = IRR_KEY_UNKNOWN; // AKEYCODE_POWER
KeyMap[27] = IRR_KEY_UNKNOWN; // AKEYCODE_CAMERA
KeyMap[28] = IRR_KEY_CLEAR; // AKEYCODE_CLEAR
KeyMap[29] = IRR_KEY_A; // AKEYCODE_A
KeyMap[30] = IRR_KEY_B; // AKEYCODE_B
KeyMap[31] = IRR_KEY_C; // AKEYCODE_C
KeyMap[32] = IRR_KEY_D; // AKEYCODE_D
KeyMap[33] = IRR_KEY_E; // AKEYCODE_E
KeyMap[34] = IRR_KEY_F; // AKEYCODE_F
KeyMap[35] = IRR_KEY_G; // AKEYCODE_G
KeyMap[36] = IRR_KEY_H; // AKEYCODE_H
KeyMap[37] = IRR_KEY_I; // AKEYCODE_I
KeyMap[38] = IRR_KEY_J; // AKEYCODE_J
KeyMap[39] = IRR_KEY_K; // AKEYCODE_K
KeyMap[40] = IRR_KEY_L; // AKEYCODE_L
KeyMap[41] = IRR_KEY_M; // AKEYCODE_M
KeyMap[42] = IRR_KEY_N; // AKEYCODE_N
KeyMap[43] = IRR_KEY_O; // AKEYCODE_O
KeyMap[44] = IRR_KEY_P; // AKEYCODE_P
KeyMap[45] = IRR_KEY_Q; // AKEYCODE_Q
KeyMap[46] = IRR_KEY_R; // AKEYCODE_R
KeyMap[47] = IRR_KEY_S; // AKEYCODE_S
KeyMap[48] = IRR_KEY_T; // AKEYCODE_T
KeyMap[49] = IRR_KEY_U; // AKEYCODE_U
KeyMap[50] = IRR_KEY_V; // AKEYCODE_V
KeyMap[51] = IRR_KEY_W; // AKEYCODE_W
KeyMap[52] = IRR_KEY_X; // AKEYCODE_X
KeyMap[53] = IRR_KEY_Y; // AKEYCODE_Y
KeyMap[54] = IRR_KEY_Z; // AKEYCODE_Z
KeyMap[55] = IRR_KEY_COMMA; // AKEYCODE_COMMA
KeyMap[56] = IRR_KEY_PERIOD; // AKEYCODE_PERIOD
KeyMap[57] = IRR_KEY_MENU; // AKEYCODE_ALT_LEFT
KeyMap[58] = IRR_KEY_MENU; // AKEYCODE_ALT_RIGHT
KeyMap[59] = IRR_KEY_LSHIFT; // AKEYCODE_SHIFT_LEFT
KeyMap[60] = IRR_KEY_RSHIFT; // AKEYCODE_SHIFT_RIGHT
KeyMap[61] = IRR_KEY_TAB; // AKEYCODE_TAB
KeyMap[62] = IRR_KEY_SPACE; // AKEYCODE_SPACE
KeyMap[63] = IRR_KEY_UNKNOWN; // AKEYCODE_SYM
KeyMap[64] = IRR_KEY_UNKNOWN; // AKEYCODE_EXPLORER
KeyMap[65] = IRR_KEY_UNKNOWN; // AKEYCODE_ENVELOPE
KeyMap[66] = IRR_KEY_RETURN; // AKEYCODE_ENTER
KeyMap[67] = IRR_KEY_BACK; // AKEYCODE_DEL
KeyMap[68] = IRR_KEY_OEM_3; // AKEYCODE_GRAVE
KeyMap[69] = IRR_KEY_MINUS; // AKEYCODE_MINUS
KeyMap[70] = IRR_KEY_UNKNOWN; // AKEYCODE_EQUALS
KeyMap[71] = IRR_KEY_UNKNOWN; // AKEYCODE_LEFT_BRACKET
KeyMap[72] = IRR_KEY_UNKNOWN; // AKEYCODE_RIGHT_BRACKET
KeyMap[73] = IRR_KEY_UNKNOWN; // AKEYCODE_BACKSLASH
KeyMap[74] = IRR_KEY_UNKNOWN; // AKEYCODE_SEMICOLON
KeyMap[75] = IRR_KEY_UNKNOWN; // AKEYCODE_APOSTROPHE
KeyMap[76] = IRR_KEY_UNKNOWN; // AKEYCODE_SLASH
KeyMap[77] = IRR_KEY_UNKNOWN; // AKEYCODE_AT
KeyMap[78] = IRR_KEY_UNKNOWN; // AKEYCODE_NUM
KeyMap[79] = IRR_KEY_UNKNOWN; // AKEYCODE_HEADSETHOOK
KeyMap[80] = IRR_KEY_UNKNOWN; // AKEYCODE_FOCUS (*Camera* focus)
KeyMap[81] = IRR_KEY_PLUS; // AKEYCODE_PLUS
KeyMap[82] = IRR_KEY_MENU; // AKEYCODE_MENU
KeyMap[83] = IRR_KEY_UNKNOWN; // AKEYCODE_NOTIFICATION
KeyMap[84] = IRR_KEY_UNKNOWN; // AKEYCODE_SEARCH
KeyMap[85] = IRR_KEY_MEDIA_PLAY_PAUSE; // AKEYCODE_MEDIA_PLAY_PAUSE
KeyMap[86] = IRR_KEY_MEDIA_STOP; // AKEYCODE_MEDIA_STOP
KeyMap[87] = IRR_KEY_MEDIA_NEXT_TRACK; // AKEYCODE_MEDIA_NEXT
KeyMap[88] = IRR_KEY_MEDIA_PREV_TRACK; // AKEYCODE_MEDIA_PREVIOUS
KeyMap[89] = IRR_KEY_UNKNOWN; // AKEYCODE_MEDIA_REWIND
KeyMap[90] = IRR_KEY_UNKNOWN; // AKEYCODE_MEDIA_FAST_FORWARD
KeyMap[91] = IRR_KEY_VOLUME_MUTE; // AKEYCODE_MUTE
KeyMap[92] = IRR_KEY_PRIOR; // AKEYCODE_PAGE_UP
KeyMap[93] = IRR_KEY_NEXT; // AKEYCODE_PAGE_DOWN
KeyMap[94] = IRR_KEY_UNKNOWN; // AKEYCODE_PICTSYMBOLS
KeyMap[95] = IRR_KEY_UNKNOWN; // AKEYCODE_SWITCH_CHARSET
// following look like controller inputs
KeyMap[96] = KEY_UNKNOWN; // AKEYCODE_BUTTON_A
KeyMap[97] = KEY_UNKNOWN; // AKEYCODE_BUTTON_B
KeyMap[98] = KEY_UNKNOWN; // AKEYCODE_BUTTON_C
KeyMap[99] = KEY_UNKNOWN; // AKEYCODE_BUTTON_X
KeyMap[100] = KEY_UNKNOWN; // AKEYCODE_BUTTON_Y
KeyMap[101] = KEY_UNKNOWN; // AKEYCODE_BUTTON_Z
KeyMap[102] = KEY_UNKNOWN; // AKEYCODE_BUTTON_L1
KeyMap[103] = KEY_UNKNOWN; // AKEYCODE_BUTTON_R1
KeyMap[104] = KEY_UNKNOWN; // AKEYCODE_BUTTON_L2
KeyMap[105] = KEY_UNKNOWN; // AKEYCODE_BUTTON_R2
KeyMap[106] = KEY_UNKNOWN; // AKEYCODE_BUTTON_THUMBL
KeyMap[107] = KEY_UNKNOWN; // AKEYCODE_BUTTON_THUMBR
KeyMap[108] = KEY_UNKNOWN; // AKEYCODE_BUTTON_START
KeyMap[109] = KEY_UNKNOWN; // AKEYCODE_BUTTON_SELECT
KeyMap[110] = KEY_UNKNOWN; // AKEYCODE_BUTTON_MODE
KeyMap[96] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_A
KeyMap[97] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_B
KeyMap[98] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_C
KeyMap[99] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_X
KeyMap[100] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_Y
KeyMap[101] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_Z
KeyMap[102] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_L1
KeyMap[103] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_R1
KeyMap[104] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_L2
KeyMap[105] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_R2
KeyMap[106] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_THUMBL
KeyMap[107] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_THUMBR
KeyMap[108] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_START
KeyMap[109] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_SELECT
KeyMap[110] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_MODE
KeyMap[111] = KEY_ESCAPE; // AKEYCODE_ESCAPE
KeyMap[112] = KEY_DELETE; // AKEYCODE_FORWARD_DEL
KeyMap[113] = KEY_CONTROL; // AKEYCODE_CTRL_LEFT
KeyMap[114] = KEY_CONTROL; // AKEYCODE_CTRL_RIGHT
KeyMap[115] = KEY_CAPITAL; // AKEYCODE_CAPS_LOCK
KeyMap[116] = KEY_SCROLL; // AKEYCODE_SCROLL_LOCK
KeyMap[117] = KEY_UNKNOWN; // AKEYCODE_META_LEFT
KeyMap[118] = KEY_UNKNOWN; // AKEYCODE_META_RIGHT
KeyMap[119] = KEY_UNKNOWN; // AKEYCODE_FUNCTION
KeyMap[120] = KEY_SNAPSHOT; // AKEYCODE_SYSRQ
KeyMap[121] = KEY_PAUSE; // AKEYCODE_BREAK
KeyMap[122] = KEY_HOME; // AKEYCODE_MOVE_HOME
KeyMap[123] = KEY_END; // AKEYCODE_MOVE_END
KeyMap[124] = KEY_INSERT; // AKEYCODE_INSERT
KeyMap[125] = KEY_UNKNOWN; // AKEYCODE_FORWARD
KeyMap[126] = KEY_PLAY; // AKEYCODE_MEDIA_PLAY
KeyMap[127] = KEY_MEDIA_PLAY_PAUSE; // AKEYCODE_MEDIA_PAUSE
KeyMap[128] = KEY_UNKNOWN; // AKEYCODE_MEDIA_CLOSE
KeyMap[129] = KEY_UNKNOWN; // AKEYCODE_MEDIA_EJECT
KeyMap[130] = KEY_UNKNOWN; // AKEYCODE_MEDIA_RECORD
KeyMap[131] = KEY_F1; // AKEYCODE_F1
KeyMap[132] = KEY_F2; // AKEYCODE_F2
KeyMap[133] = KEY_F3; // AKEYCODE_F3
KeyMap[134] = KEY_F4; // AKEYCODE_F4
KeyMap[135] = KEY_F5; // AKEYCODE_F5
KeyMap[136] = KEY_F6; // AKEYCODE_F6
KeyMap[137] = KEY_F7; // AKEYCODE_F7
KeyMap[138] = KEY_F8; // AKEYCODE_F8
KeyMap[139] = KEY_F9; // AKEYCODE_F9
KeyMap[140] = KEY_F10; // AKEYCODE_F10
KeyMap[141] = KEY_F11; // AKEYCODE_F11
KeyMap[142] = KEY_F12; // AKEYCODE_F12
KeyMap[143] = KEY_NUMLOCK; // AKEYCODE_NUM_LOCK
KeyMap[144] = KEY_NUMPAD0; // AKEYCODE_NUMPAD_0
KeyMap[145] = KEY_NUMPAD1; // AKEYCODE_NUMPAD_1
KeyMap[146] = KEY_NUMPAD2; // AKEYCODE_NUMPAD_2
KeyMap[147] = KEY_NUMPAD3; // AKEYCODE_NUMPAD_3
KeyMap[148] = KEY_NUMPAD4; // AKEYCODE_NUMPAD_4
KeyMap[149] = KEY_NUMPAD5; // AKEYCODE_NUMPAD_5
KeyMap[150] = KEY_NUMPAD6; // AKEYCODE_NUMPAD_6
KeyMap[151] = KEY_NUMPAD7; // AKEYCODE_NUMPAD_7
KeyMap[152] = KEY_NUMPAD8; // AKEYCODE_NUMPAD_8
KeyMap[153] = KEY_NUMPAD9; // AKEYCODE_NUMPAD_9
KeyMap[154] = KEY_DIVIDE; // AKEYCODE_NUMPAD_DIVIDE
KeyMap[155] = KEY_MULTIPLY; // AKEYCODE_NUMPAD_MULTIPLY
KeyMap[156] = KEY_SUBTRACT; // AKEYCODE_NUMPAD_SUBTRACT
KeyMap[157] = KEY_ADD; // AKEYCODE_NUMPAD_ADD
KeyMap[158] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_DOT
KeyMap[159] = KEY_COMMA; // AKEYCODE_NUMPAD_COMMA
KeyMap[160] = KEY_RETURN; // AKEYCODE_NUMPAD_ENTER
KeyMap[161] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_EQUALS
KeyMap[162] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_LEFT_PAREN
KeyMap[163] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_RIGHT_PAREN
KeyMap[164] = KEY_VOLUME_MUTE; // AKEYCODE_VOLUME_MUTE
KeyMap[165] = KEY_UNKNOWN; // AKEYCODE_INFO
KeyMap[166] = KEY_UNKNOWN; // AKEYCODE_CHANNEL_UP
KeyMap[167] = KEY_UNKNOWN; // AKEYCODE_CHANNEL_DOWN
KeyMap[168] = KEY_ZOOM; // AKEYCODE_ZOOM_IN
KeyMap[169] = KEY_UNKNOWN; // AKEYCODE_ZOOM_OUT
KeyMap[170] = KEY_UNKNOWN; // AKEYCODE_TV
KeyMap[171] = KEY_UNKNOWN; // AKEYCODE_WINDOW
KeyMap[172] = KEY_UNKNOWN; // AKEYCODE_GUIDE
KeyMap[173] = KEY_UNKNOWN; // AKEYCODE_DVR
KeyMap[174] = KEY_UNKNOWN; // AKEYCODE_BOOKMARK
KeyMap[175] = KEY_UNKNOWN; // AKEYCODE_CAPTIONS
KeyMap[176] = KEY_UNKNOWN; // AKEYCODE_SETTINGS
KeyMap[177] = KEY_UNKNOWN; // AKEYCODE_TV_POWER
KeyMap[178] = KEY_UNKNOWN; // AKEYCODE_TV_INPUT
KeyMap[179] = KEY_UNKNOWN; // AKEYCODE_STB_POWER
KeyMap[180] = KEY_UNKNOWN; // AKEYCODE_STB_INPUT
KeyMap[181] = KEY_UNKNOWN; // AKEYCODE_AVR_POWER
KeyMap[182] = KEY_UNKNOWN; // AKEYCODE_AVR_INPUT
KeyMap[183] = KEY_UNKNOWN; // AKEYCODE_PROG_RED
KeyMap[184] = KEY_UNKNOWN; // AKEYCODE_PROG_GREEN
KeyMap[185] = KEY_UNKNOWN; // AKEYCODE_PROG_YELLOW
KeyMap[186] = KEY_UNKNOWN; // AKEYCODE_PROG_BLUE
KeyMap[187] = KEY_UNKNOWN; // AKEYCODE_APP_SWITCH
KeyMap[188] = KEY_UNKNOWN; // AKEYCODE_BUTTON_1
KeyMap[189] = KEY_UNKNOWN; // AKEYCODE_BUTTON_2
KeyMap[190] = KEY_UNKNOWN; // AKEYCODE_BUTTON_3
KeyMap[191] = KEY_UNKNOWN; // AKEYCODE_BUTTON_4
KeyMap[192] = KEY_UNKNOWN; // AKEYCODE_BUTTON_5
KeyMap[193] = KEY_UNKNOWN; // AKEYCODE_BUTTON_6
KeyMap[194] = KEY_UNKNOWN; // AKEYCODE_BUTTON_7
KeyMap[195] = KEY_UNKNOWN; // AKEYCODE_BUTTON_8
KeyMap[196] = KEY_UNKNOWN; // AKEYCODE_BUTTON_9
KeyMap[197] = KEY_UNKNOWN; // AKEYCODE_BUTTON_10
KeyMap[198] = KEY_UNKNOWN; // AKEYCODE_BUTTON_11
KeyMap[199] = KEY_UNKNOWN; // AKEYCODE_BUTTON_12
KeyMap[200] = KEY_UNKNOWN; // AKEYCODE_BUTTON_13
KeyMap[201] = KEY_UNKNOWN; // AKEYCODE_BUTTON_14
KeyMap[202] = KEY_UNKNOWN; // AKEYCODE_BUTTON_15
KeyMap[203] = KEY_UNKNOWN; // AKEYCODE_BUTTON_16
KeyMap[204] = KEY_UNKNOWN; // AKEYCODE_LANGUAGE_SWITCH
KeyMap[205] = KEY_UNKNOWN; // AKEYCODE_MANNER_MODE
KeyMap[206] = KEY_UNKNOWN; // AKEYCODE_3D_MODE
KeyMap[207] = KEY_UNKNOWN; // AKEYCODE_CONTACTS
KeyMap[208] = KEY_UNKNOWN; // AKEYCODE_CALENDAR
KeyMap[209] = KEY_UNKNOWN; // AKEYCODE_MUSIC
KeyMap[210] = KEY_UNKNOWN; // AKEYCODE_CALCULATOR
KeyMap[211] = KEY_UNKNOWN; // AKEYCODE_ZENKAKU_HANKAKU
KeyMap[212] = KEY_UNKNOWN; // AKEYCODE_EISU
KeyMap[213] = KEY_UNKNOWN; // AKEYCODE_MUHENKAN
KeyMap[214] = KEY_UNKNOWN; // AKEYCODE_HENKAN
KeyMap[215] = KEY_UNKNOWN; // AKEYCODE_KATAKANA_HIRAGANA
KeyMap[216] = KEY_UNKNOWN; // AKEYCODE_YEN
KeyMap[217] = KEY_UNKNOWN; // AKEYCODE_RO
KeyMap[218] = KEY_UNKNOWN; // AKEYCODE_KANA
KeyMap[219] = KEY_UNKNOWN; // AKEYCODE_ASSIST
KeyMap[220] = KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_DOWN
KeyMap[221] = KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_UP ,
KeyMap[222] = KEY_UNKNOWN; // AKEYCODE_MEDIA_AUDIO_TRACK
KeyMap[111] = IRR_KEY_ESCAPE; // AKEYCODE_ESCAPE
KeyMap[112] = IRR_KEY_DELETE; // AKEYCODE_FORWARD_DEL
KeyMap[113] = IRR_KEY_CONTROL; // AKEYCODE_CTRL_LEFT
KeyMap[114] = IRR_KEY_CONTROL; // AKEYCODE_CTRL_RIGHT
KeyMap[115] = IRR_KEY_CAPITAL; // AKEYCODE_CAPS_LOCK
KeyMap[116] = IRR_KEY_SCROLL; // AKEYCODE_SCROLL_LOCK
KeyMap[117] = IRR_KEY_UNKNOWN; // AKEYCODE_META_LEFT
KeyMap[118] = IRR_KEY_UNKNOWN; // AKEYCODE_META_RIGHT
KeyMap[119] = IRR_KEY_UNKNOWN; // AKEYCODE_FUNCTION
KeyMap[120] = IRR_KEY_SNAPSHOT; // AKEYCODE_SYSRQ
KeyMap[121] = IRR_KEY_PAUSE; // AKEYCODE_BREAK
KeyMap[122] = IRR_KEY_HOME; // AKEYCODE_MOVE_HOME
KeyMap[123] = IRR_KEY_END; // AKEYCODE_MOVE_END
KeyMap[124] = IRR_KEY_INSERT; // AKEYCODE_INSERT
KeyMap[125] = IRR_KEY_UNKNOWN; // AKEYCODE_FORWARD
KeyMap[126] = IRR_KEY_PLAY; // AKEYCODE_MEDIA_PLAY
KeyMap[127] = IRR_KEY_MEDIA_PLAY_PAUSE; // AKEYCODE_MEDIA_PAUSE
KeyMap[128] = IRR_KEY_UNKNOWN; // AKEYCODE_MEDIA_CLOSE
KeyMap[129] = IRR_KEY_UNKNOWN; // AKEYCODE_MEDIA_EJECT
KeyMap[130] = IRR_KEY_UNKNOWN; // AKEYCODE_MEDIA_RECORD
KeyMap[131] = IRR_KEY_F1; // AKEYCODE_F1
KeyMap[132] = IRR_KEY_F2; // AKEYCODE_F2
KeyMap[133] = IRR_KEY_F3; // AKEYCODE_F3
KeyMap[134] = IRR_KEY_F4; // AKEYCODE_F4
KeyMap[135] = IRR_KEY_F5; // AKEYCODE_F5
KeyMap[136] = IRR_KEY_F6; // AKEYCODE_F6
KeyMap[137] = IRR_KEY_F7; // AKEYCODE_F7
KeyMap[138] = IRR_KEY_F8; // AKEYCODE_F8
KeyMap[139] = IRR_KEY_F9; // AKEYCODE_F9
KeyMap[140] = IRR_KEY_F10; // AKEYCODE_F10
KeyMap[141] = IRR_KEY_F11; // AKEYCODE_F11
KeyMap[142] = IRR_KEY_F12; // AKEYCODE_F12
KeyMap[143] = IRR_KEY_NUMLOCK; // AKEYCODE_NUM_LOCK
KeyMap[144] = IRR_KEY_NUMPAD0; // AKEYCODE_NUMPAD_0
KeyMap[145] = IRR_KEY_NUMPAD1; // AKEYCODE_NUMPAD_1
KeyMap[146] = IRR_KEY_NUMPAD2; // AKEYCODE_NUMPAD_2
KeyMap[147] = IRR_KEY_NUMPAD3; // AKEYCODE_NUMPAD_3
KeyMap[148] = IRR_KEY_NUMPAD4; // AKEYCODE_NUMPAD_4
KeyMap[149] = IRR_KEY_NUMPAD5; // AKEYCODE_NUMPAD_5
KeyMap[150] = IRR_KEY_NUMPAD6; // AKEYCODE_NUMPAD_6
KeyMap[151] = IRR_KEY_NUMPAD7; // AKEYCODE_NUMPAD_7
KeyMap[152] = IRR_KEY_NUMPAD8; // AKEYCODE_NUMPAD_8
KeyMap[153] = IRR_KEY_NUMPAD9; // AKEYCODE_NUMPAD_9
KeyMap[154] = IRR_KEY_DIVIDE; // AKEYCODE_NUMPAD_DIVIDE
KeyMap[155] = IRR_KEY_MULTIPLY; // AKEYCODE_NUMPAD_MULTIPLY
KeyMap[156] = IRR_KEY_SUBTRACT; // AKEYCODE_NUMPAD_SUBTRACT
KeyMap[157] = IRR_KEY_ADD; // AKEYCODE_NUMPAD_ADD
KeyMap[158] = IRR_KEY_UNKNOWN; // AKEYCODE_NUMPAD_DOT
KeyMap[159] = IRR_KEY_COMMA; // AKEYCODE_NUMPAD_COMMA
KeyMap[160] = IRR_KEY_RETURN; // AKEYCODE_NUMPAD_ENTER
KeyMap[161] = IRR_KEY_UNKNOWN; // AKEYCODE_NUMPAD_EQUALS
KeyMap[162] = IRR_KEY_UNKNOWN; // AKEYCODE_NUMPAD_LEFT_PAREN
KeyMap[163] = IRR_KEY_UNKNOWN; // AKEYCODE_NUMPAD_RIGHT_PAREN
KeyMap[164] = IRR_KEY_VOLUME_MUTE; // AKEYCODE_VOLUME_MUTE
KeyMap[165] = IRR_KEY_UNKNOWN; // AKEYCODE_INFO
KeyMap[166] = IRR_KEY_UNKNOWN; // AKEYCODE_CHANNEL_UP
KeyMap[167] = IRR_KEY_UNKNOWN; // AKEYCODE_CHANNEL_DOWN
KeyMap[168] = IRR_KEY_ZOOM; // AKEYCODE_ZOOM_IN
KeyMap[169] = IRR_KEY_UNKNOWN; // AKEYCODE_ZOOM_OUT
KeyMap[170] = IRR_KEY_UNKNOWN; // AKEYCODE_TV
KeyMap[171] = IRR_KEY_UNKNOWN; // AKEYCODE_WINDOW
KeyMap[172] = IRR_KEY_UNKNOWN; // AKEYCODE_GUIDE
KeyMap[173] = IRR_KEY_UNKNOWN; // AKEYCODE_DVR
KeyMap[174] = IRR_KEY_UNKNOWN; // AKEYCODE_BOOKMARK
KeyMap[175] = IRR_KEY_UNKNOWN; // AKEYCODE_CAPTIONS
KeyMap[176] = IRR_KEY_UNKNOWN; // AKEYCODE_SETTINGS
KeyMap[177] = IRR_KEY_UNKNOWN; // AKEYCODE_TV_POWER
KeyMap[178] = IRR_KEY_UNKNOWN; // AKEYCODE_TV_INPUT
KeyMap[179] = IRR_KEY_UNKNOWN; // AKEYCODE_STB_POWER
KeyMap[180] = IRR_KEY_UNKNOWN; // AKEYCODE_STB_INPUT
KeyMap[181] = IRR_KEY_UNKNOWN; // AKEYCODE_AVR_POWER
KeyMap[182] = IRR_KEY_UNKNOWN; // AKEYCODE_AVR_INPUT
KeyMap[183] = IRR_KEY_UNKNOWN; // AKEYCODE_PROG_RED
KeyMap[184] = IRR_KEY_UNKNOWN; // AKEYCODE_PROG_GREEN
KeyMap[185] = IRR_KEY_UNKNOWN; // AKEYCODE_PROG_YELLOW
KeyMap[186] = IRR_KEY_UNKNOWN; // AKEYCODE_PROG_BLUE
KeyMap[187] = IRR_KEY_UNKNOWN; // AKEYCODE_APP_SWITCH
KeyMap[188] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_1
KeyMap[189] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_2
KeyMap[190] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_3
KeyMap[191] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_4
KeyMap[192] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_5
KeyMap[193] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_6
KeyMap[194] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_7
KeyMap[195] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_8
KeyMap[196] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_9
KeyMap[197] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_10
KeyMap[198] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_11
KeyMap[199] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_12
KeyMap[200] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_13
KeyMap[201] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_14
KeyMap[202] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_15
KeyMap[203] = IRR_KEY_UNKNOWN; // AKEYCODE_BUTTON_16
KeyMap[204] = IRR_KEY_UNKNOWN; // AKEYCODE_LANGUAGE_SWITCH
KeyMap[205] = IRR_KEY_UNKNOWN; // AKEYCODE_MANNER_MODE
KeyMap[206] = IRR_KEY_UNKNOWN; // AKEYCODE_3D_MODE
KeyMap[207] = IRR_KEY_UNKNOWN; // AKEYCODE_CONTACTS
KeyMap[208] = IRR_KEY_UNKNOWN; // AKEYCODE_CALENDAR
KeyMap[209] = IRR_KEY_UNKNOWN; // AKEYCODE_MUSIC
KeyMap[210] = IRR_KEY_UNKNOWN; // AKEYCODE_CALCULATOR
KeyMap[211] = IRR_KEY_UNKNOWN; // AKEYCODE_ZENKAKU_HANKAKU
KeyMap[212] = IRR_KEY_UNKNOWN; // AKEYCODE_EISU
KeyMap[213] = IRR_KEY_UNKNOWN; // AKEYCODE_MUHENKAN
KeyMap[214] = IRR_KEY_UNKNOWN; // AKEYCODE_HENKAN
KeyMap[215] = IRR_KEY_UNKNOWN; // AKEYCODE_KATAKANA_HIRAGANA
KeyMap[216] = IRR_KEY_UNKNOWN; // AKEYCODE_YEN
KeyMap[217] = IRR_KEY_UNKNOWN; // AKEYCODE_RO
KeyMap[218] = IRR_KEY_UNKNOWN; // AKEYCODE_KANA
KeyMap[219] = IRR_KEY_UNKNOWN; // AKEYCODE_ASSIST
KeyMap[220] = IRR_KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_DOWN
KeyMap[221] = IRR_KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_UP ,
KeyMap[222] = IRR_KEY_UNKNOWN; // AKEYCODE_MEDIA_AUDIO_TRACK
}
void CIrrDeviceAndroid::getKeyChar(SEvent& event)

View File

@ -239,30 +239,30 @@ bool CIrrDeviceFB::run()
switch (ev.code)
{
case KEY_RIGHTCTRL:
case KEY_LEFTCTRL:
case IRR_KEY_RIGHTCTRL:
case IRR_KEY_LEFTCTRL:
irrevent.KeyInput.Control = true;
break;
case KEY_RIGHTSHIFT:
case KEY_LEFTSHIFT:
case IRR_KEY_RIGHTSHIFT:
case IRR_KEY_LEFTSHIFT:
irrevent.KeyInput.Shift = true;
break;
case KEY_ESC:
case IRR_KEY_ESC:
irrevent.KeyInput.Key = (EKEY_CODE)0x1B;
break;
case KEY_SPACE:
case IRR_KEY_SPACE:
irrevent.KeyInput.Key = (EKEY_CODE)0x20;
break;
case KEY_UP:
case IRR_KEY_UP:
irrevent.KeyInput.Key = (EKEY_CODE)0x26;
break;
case KEY_LEFT:
case IRR_KEY_LEFT:
irrevent.KeyInput.Key = (EKEY_CODE)0x25;
break;
case KEY_RIGHT:
case IRR_KEY_RIGHT:
irrevent.KeyInput.Key = (EKEY_CODE)0x27;
break;
case KEY_DOWN:
case IRR_KEY_DOWN:
irrevent.KeyInput.Key = (EKEY_CODE)0x28;
break;
default:

View File

@ -2163,194 +2163,194 @@ void CIrrDeviceLinux::createKeyMap()
#ifdef _IRR_COMPILE_WITH_X11_
KeyMap.reallocate(190);
KeyMap.push_back(SKeyMap(XK_BackSpace, KEY_BACK));
KeyMap.push_back(SKeyMap(XK_Tab, KEY_TAB));
KeyMap.push_back(SKeyMap(XK_ISO_Left_Tab, KEY_TAB));
KeyMap.push_back(SKeyMap(XK_BackSpace, IRR_KEY_BACK));
KeyMap.push_back(SKeyMap(XK_Tab, IRR_KEY_TAB));
KeyMap.push_back(SKeyMap(XK_ISO_Left_Tab, IRR_KEY_TAB));
KeyMap.push_back(SKeyMap(XK_Linefeed, 0)); // ???
KeyMap.push_back(SKeyMap(XK_Clear, KEY_CLEAR));
KeyMap.push_back(SKeyMap(XK_Return, KEY_RETURN));
KeyMap.push_back(SKeyMap(XK_Pause, KEY_PAUSE));
KeyMap.push_back(SKeyMap(XK_Scroll_Lock, KEY_SCROLL));
KeyMap.push_back(SKeyMap(XK_Clear, IRR_KEY_CLEAR));
KeyMap.push_back(SKeyMap(XK_Return, IRR_KEY_RETURN));
KeyMap.push_back(SKeyMap(XK_Pause, IRR_KEY_PAUSE));
KeyMap.push_back(SKeyMap(XK_Scroll_Lock, IRR_KEY_SCROLL));
KeyMap.push_back(SKeyMap(XK_Sys_Req, 0)); // ???
KeyMap.push_back(SKeyMap(XK_Escape, KEY_ESCAPE));
KeyMap.push_back(SKeyMap(XK_Insert, KEY_INSERT));
KeyMap.push_back(SKeyMap(XK_Delete, KEY_DELETE));
KeyMap.push_back(SKeyMap(XK_Home, KEY_HOME));
KeyMap.push_back(SKeyMap(XK_Left, KEY_LEFT));
KeyMap.push_back(SKeyMap(XK_Up, KEY_UP));
KeyMap.push_back(SKeyMap(XK_Right, KEY_RIGHT));
KeyMap.push_back(SKeyMap(XK_Down, KEY_DOWN));
KeyMap.push_back(SKeyMap(XK_Prior, KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_Page_Up, KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_Next, KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_Page_Down, KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_End, KEY_END));
KeyMap.push_back(SKeyMap(XK_Begin, KEY_HOME));
KeyMap.push_back(SKeyMap(XK_Num_Lock, KEY_NUMLOCK));
KeyMap.push_back(SKeyMap(XK_KP_Space, KEY_SPACE));
KeyMap.push_back(SKeyMap(XK_KP_Tab, KEY_TAB));
KeyMap.push_back(SKeyMap(XK_KP_Enter, KEY_RETURN));
KeyMap.push_back(SKeyMap(XK_KP_F1, KEY_F1));
KeyMap.push_back(SKeyMap(XK_KP_F2, KEY_F2));
KeyMap.push_back(SKeyMap(XK_KP_F3, KEY_F3));
KeyMap.push_back(SKeyMap(XK_KP_F4, KEY_F4));
KeyMap.push_back(SKeyMap(XK_KP_Home, KEY_HOME));
KeyMap.push_back(SKeyMap(XK_KP_Left, KEY_LEFT));
KeyMap.push_back(SKeyMap(XK_KP_Up, KEY_UP));
KeyMap.push_back(SKeyMap(XK_KP_Right, KEY_RIGHT));
KeyMap.push_back(SKeyMap(XK_KP_Down, KEY_DOWN));
KeyMap.push_back(SKeyMap(XK_Print, KEY_PRINT));
KeyMap.push_back(SKeyMap(XK_KP_Prior, KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_KP_Page_Up, KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_KP_Next, KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_KP_Page_Down, KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_KP_End, KEY_END));
KeyMap.push_back(SKeyMap(XK_KP_Begin, KEY_HOME));
KeyMap.push_back(SKeyMap(XK_KP_Insert, KEY_INSERT));
KeyMap.push_back(SKeyMap(XK_KP_Delete, KEY_DELETE));
KeyMap.push_back(SKeyMap(XK_Escape, IRR_KEY_ESCAPE));
KeyMap.push_back(SKeyMap(XK_Insert, IRR_KEY_INSERT));
KeyMap.push_back(SKeyMap(XK_Delete, IRR_KEY_DELETE));
KeyMap.push_back(SKeyMap(XK_Home, IRR_KEY_HOME));
KeyMap.push_back(SKeyMap(XK_Left, IRR_KEY_LEFT));
KeyMap.push_back(SKeyMap(XK_Up, IRR_KEY_UP));
KeyMap.push_back(SKeyMap(XK_Right, IRR_KEY_RIGHT));
KeyMap.push_back(SKeyMap(XK_Down, IRR_KEY_DOWN));
KeyMap.push_back(SKeyMap(XK_Prior, IRR_KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_Page_Up, IRR_KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_Next, IRR_KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_Page_Down, IRR_KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_End, IRR_KEY_END));
KeyMap.push_back(SKeyMap(XK_Begin, IRR_KEY_HOME));
KeyMap.push_back(SKeyMap(XK_Num_Lock, IRR_KEY_NUMLOCK));
KeyMap.push_back(SKeyMap(XK_KP_Space, IRR_KEY_SPACE));
KeyMap.push_back(SKeyMap(XK_KP_Tab, IRR_KEY_TAB));
KeyMap.push_back(SKeyMap(XK_KP_Enter, IRR_KEY_RETURN));
KeyMap.push_back(SKeyMap(XK_KP_F1, IRR_KEY_F1));
KeyMap.push_back(SKeyMap(XK_KP_F2, IRR_KEY_F2));
KeyMap.push_back(SKeyMap(XK_KP_F3, IRR_KEY_F3));
KeyMap.push_back(SKeyMap(XK_KP_F4, IRR_KEY_F4));
KeyMap.push_back(SKeyMap(XK_KP_Home, IRR_KEY_HOME));
KeyMap.push_back(SKeyMap(XK_KP_Left, IRR_KEY_LEFT));
KeyMap.push_back(SKeyMap(XK_KP_Up, IRR_KEY_UP));
KeyMap.push_back(SKeyMap(XK_KP_Right, IRR_KEY_RIGHT));
KeyMap.push_back(SKeyMap(XK_KP_Down, IRR_KEY_DOWN));
KeyMap.push_back(SKeyMap(XK_Print, IRR_KEY_PRINT));
KeyMap.push_back(SKeyMap(XK_KP_Prior, IRR_KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_KP_Page_Up, IRR_KEY_PRIOR));
KeyMap.push_back(SKeyMap(XK_KP_Next, IRR_KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_KP_Page_Down, IRR_KEY_NEXT));
KeyMap.push_back(SKeyMap(XK_KP_End, IRR_KEY_END));
KeyMap.push_back(SKeyMap(XK_KP_Begin, IRR_KEY_HOME));
KeyMap.push_back(SKeyMap(XK_KP_Insert, IRR_KEY_INSERT));
KeyMap.push_back(SKeyMap(XK_KP_Delete, IRR_KEY_DELETE));
KeyMap.push_back(SKeyMap(XK_KP_Equal, 0)); // ???
KeyMap.push_back(SKeyMap(XK_KP_Multiply, KEY_MULTIPLY));
KeyMap.push_back(SKeyMap(XK_KP_Add, KEY_ADD));
KeyMap.push_back(SKeyMap(XK_KP_Separator, KEY_SEPARATOR));
KeyMap.push_back(SKeyMap(XK_KP_Subtract, KEY_SUBTRACT));
KeyMap.push_back(SKeyMap(XK_KP_Decimal, KEY_DECIMAL));
KeyMap.push_back(SKeyMap(XK_KP_Divide, KEY_DIVIDE));
KeyMap.push_back(SKeyMap(XK_KP_0, KEY_NUMPAD0));
KeyMap.push_back(SKeyMap(XK_KP_1, KEY_NUMPAD1));
KeyMap.push_back(SKeyMap(XK_KP_2, KEY_NUMPAD2));
KeyMap.push_back(SKeyMap(XK_KP_3, KEY_NUMPAD3));
KeyMap.push_back(SKeyMap(XK_KP_4, KEY_NUMPAD4));
KeyMap.push_back(SKeyMap(XK_KP_5, KEY_NUMPAD5));
KeyMap.push_back(SKeyMap(XK_KP_6, KEY_NUMPAD6));
KeyMap.push_back(SKeyMap(XK_KP_7, KEY_NUMPAD7));
KeyMap.push_back(SKeyMap(XK_KP_8, KEY_NUMPAD8));
KeyMap.push_back(SKeyMap(XK_KP_9, KEY_NUMPAD9));
KeyMap.push_back(SKeyMap(XK_F1, KEY_F1));
KeyMap.push_back(SKeyMap(XK_F2, KEY_F2));
KeyMap.push_back(SKeyMap(XK_F3, KEY_F3));
KeyMap.push_back(SKeyMap(XK_F4, KEY_F4));
KeyMap.push_back(SKeyMap(XK_F5, KEY_F5));
KeyMap.push_back(SKeyMap(XK_F6, KEY_F6));
KeyMap.push_back(SKeyMap(XK_F7, KEY_F7));
KeyMap.push_back(SKeyMap(XK_F8, KEY_F8));
KeyMap.push_back(SKeyMap(XK_F9, KEY_F9));
KeyMap.push_back(SKeyMap(XK_F10, KEY_F10));
KeyMap.push_back(SKeyMap(XK_F11, KEY_F11));
KeyMap.push_back(SKeyMap(XK_F12, KEY_F12));
KeyMap.push_back(SKeyMap(XK_Shift_L, KEY_LSHIFT));
KeyMap.push_back(SKeyMap(XK_Shift_R, KEY_RSHIFT));
KeyMap.push_back(SKeyMap(XK_Control_L, KEY_LCONTROL));
KeyMap.push_back(SKeyMap(XK_Control_R, KEY_RCONTROL));
KeyMap.push_back(SKeyMap(XK_Caps_Lock, KEY_CAPITAL));
KeyMap.push_back(SKeyMap(XK_Shift_Lock, KEY_CAPITAL));
KeyMap.push_back(SKeyMap(XK_Meta_L, KEY_LWIN));
KeyMap.push_back(SKeyMap(XK_Meta_R, KEY_RWIN));
KeyMap.push_back(SKeyMap(XK_Alt_L, KEY_LMENU));
KeyMap.push_back(SKeyMap(XK_Alt_R, KEY_RMENU));
KeyMap.push_back(SKeyMap(XK_ISO_Level3_Shift, KEY_RMENU));
KeyMap.push_back(SKeyMap(XK_Menu, KEY_MENU));
KeyMap.push_back(SKeyMap(XK_space, KEY_SPACE));
KeyMap.push_back(SKeyMap(XK_KP_Multiply, IRR_KEY_MULTIPLY));
KeyMap.push_back(SKeyMap(XK_KP_Add, IRR_KEY_ADD));
KeyMap.push_back(SKeyMap(XK_KP_Separator, IRR_KEY_SEPARATOR));
KeyMap.push_back(SKeyMap(XK_KP_Subtract, IRR_KEY_SUBTRACT));
KeyMap.push_back(SKeyMap(XK_KP_Decimal, IRR_KEY_DECIMAL));
KeyMap.push_back(SKeyMap(XK_KP_Divide, IRR_KEY_DIVIDE));
KeyMap.push_back(SKeyMap(XK_KP_0, IRR_KEY_NUMPAD0));
KeyMap.push_back(SKeyMap(XK_KP_1, IRR_KEY_NUMPAD1));
KeyMap.push_back(SKeyMap(XK_KP_2, IRR_KEY_NUMPAD2));
KeyMap.push_back(SKeyMap(XK_KP_3, IRR_KEY_NUMPAD3));
KeyMap.push_back(SKeyMap(XK_KP_4, IRR_KEY_NUMPAD4));
KeyMap.push_back(SKeyMap(XK_KP_5, IRR_KEY_NUMPAD5));
KeyMap.push_back(SKeyMap(XK_KP_6, IRR_KEY_NUMPAD6));
KeyMap.push_back(SKeyMap(XK_KP_7, IRR_KEY_NUMPAD7));
KeyMap.push_back(SKeyMap(XK_KP_8, IRR_KEY_NUMPAD8));
KeyMap.push_back(SKeyMap(XK_KP_9, IRR_KEY_NUMPAD9));
KeyMap.push_back(SKeyMap(XK_F1, IRR_KEY_F1));
KeyMap.push_back(SKeyMap(XK_F2, IRR_KEY_F2));
KeyMap.push_back(SKeyMap(XK_F3, IRR_KEY_F3));
KeyMap.push_back(SKeyMap(XK_F4, IRR_KEY_F4));
KeyMap.push_back(SKeyMap(XK_F5, IRR_KEY_F5));
KeyMap.push_back(SKeyMap(XK_F6, IRR_KEY_F6));
KeyMap.push_back(SKeyMap(XK_F7, IRR_KEY_F7));
KeyMap.push_back(SKeyMap(XK_F8, IRR_KEY_F8));
KeyMap.push_back(SKeyMap(XK_F9, IRR_KEY_F9));
KeyMap.push_back(SKeyMap(XK_F10, IRR_KEY_F10));
KeyMap.push_back(SKeyMap(XK_F11, IRR_KEY_F11));
KeyMap.push_back(SKeyMap(XK_F12, IRR_KEY_F12));
KeyMap.push_back(SKeyMap(XK_Shift_L, IRR_KEY_LSHIFT));
KeyMap.push_back(SKeyMap(XK_Shift_R, IRR_KEY_RSHIFT));
KeyMap.push_back(SKeyMap(XK_Control_L, IRR_KEY_LCONTROL));
KeyMap.push_back(SKeyMap(XK_Control_R, IRR_KEY_RCONTROL));
KeyMap.push_back(SKeyMap(XK_Caps_Lock, IRR_KEY_CAPITAL));
KeyMap.push_back(SKeyMap(XK_Shift_Lock, IRR_KEY_CAPITAL));
KeyMap.push_back(SKeyMap(XK_Meta_L, IRR_KEY_LWIN));
KeyMap.push_back(SKeyMap(XK_Meta_R, IRR_KEY_RWIN));
KeyMap.push_back(SKeyMap(XK_Alt_L, IRR_KEY_LMENU));
KeyMap.push_back(SKeyMap(XK_Alt_R, IRR_KEY_RMENU));
KeyMap.push_back(SKeyMap(XK_ISO_Level3_Shift, IRR_KEY_RMENU));
KeyMap.push_back(SKeyMap(XK_Menu, IRR_KEY_MENU));
KeyMap.push_back(SKeyMap(XK_space, IRR_KEY_SPACE));
KeyMap.push_back(SKeyMap(XK_exclam, 0)); //?
KeyMap.push_back(SKeyMap(XK_quotedbl, 0)); //?
KeyMap.push_back(SKeyMap(XK_section, 0)); //?
KeyMap.push_back(SKeyMap(XK_numbersign, KEY_OEM_2));
KeyMap.push_back(SKeyMap(XK_numbersign, IRR_KEY_OEM_2));
KeyMap.push_back(SKeyMap(XK_dollar, 0)); //?
KeyMap.push_back(SKeyMap(XK_percent, 0)); //?
KeyMap.push_back(SKeyMap(XK_ampersand, 0)); //?
KeyMap.push_back(SKeyMap(XK_apostrophe, KEY_OEM_7));
KeyMap.push_back(SKeyMap(XK_apostrophe, IRR_KEY_OEM_7));
KeyMap.push_back(SKeyMap(XK_parenleft, 0)); //?
KeyMap.push_back(SKeyMap(XK_parenright, 0)); //?
KeyMap.push_back(SKeyMap(XK_asterisk, 0)); //?
KeyMap.push_back(SKeyMap(XK_plus, KEY_PLUS)); //?
KeyMap.push_back(SKeyMap(XK_comma, KEY_COMMA)); //?
KeyMap.push_back(SKeyMap(XK_minus, KEY_MINUS)); //?
KeyMap.push_back(SKeyMap(XK_period, KEY_PERIOD)); //?
KeyMap.push_back(SKeyMap(XK_slash, KEY_OEM_2)); //?
KeyMap.push_back(SKeyMap(XK_0, KEY_KEY_0));
KeyMap.push_back(SKeyMap(XK_1, KEY_KEY_1));
KeyMap.push_back(SKeyMap(XK_2, KEY_KEY_2));
KeyMap.push_back(SKeyMap(XK_3, KEY_KEY_3));
KeyMap.push_back(SKeyMap(XK_4, KEY_KEY_4));
KeyMap.push_back(SKeyMap(XK_5, KEY_KEY_5));
KeyMap.push_back(SKeyMap(XK_6, KEY_KEY_6));
KeyMap.push_back(SKeyMap(XK_7, KEY_KEY_7));
KeyMap.push_back(SKeyMap(XK_8, KEY_KEY_8));
KeyMap.push_back(SKeyMap(XK_9, KEY_KEY_9));
KeyMap.push_back(SKeyMap(XK_plus, IRR_KEY_PLUS)); //?
KeyMap.push_back(SKeyMap(XK_comma, IRR_KEY_COMMA)); //?
KeyMap.push_back(SKeyMap(XK_minus, IRR_KEY_MINUS)); //?
KeyMap.push_back(SKeyMap(XK_period, IRR_KEY_PERIOD)); //?
KeyMap.push_back(SKeyMap(XK_slash, IRR_KEY_OEM_2)); //?
KeyMap.push_back(SKeyMap(XK_0, IRR_KEY_0));
KeyMap.push_back(SKeyMap(XK_1, IRR_KEY_1));
KeyMap.push_back(SKeyMap(XK_2, IRR_KEY_2));
KeyMap.push_back(SKeyMap(XK_3, IRR_KEY_3));
KeyMap.push_back(SKeyMap(XK_4, IRR_KEY_4));
KeyMap.push_back(SKeyMap(XK_5, IRR_KEY_5));
KeyMap.push_back(SKeyMap(XK_6, IRR_KEY_6));
KeyMap.push_back(SKeyMap(XK_7, IRR_KEY_7));
KeyMap.push_back(SKeyMap(XK_8, IRR_KEY_8));
KeyMap.push_back(SKeyMap(XK_9, IRR_KEY_9));
KeyMap.push_back(SKeyMap(XK_colon, 0)); //?
KeyMap.push_back(SKeyMap(XK_semicolon, KEY_OEM_1));
KeyMap.push_back(SKeyMap(XK_less, KEY_OEM_102));
KeyMap.push_back(SKeyMap(XK_equal, KEY_PLUS));
KeyMap.push_back(SKeyMap(XK_semicolon, IRR_KEY_OEM_1));
KeyMap.push_back(SKeyMap(XK_less, IRR_KEY_OEM_102));
KeyMap.push_back(SKeyMap(XK_equal, IRR_KEY_PLUS));
KeyMap.push_back(SKeyMap(XK_greater, 0)); //?
KeyMap.push_back(SKeyMap(XK_question, 0)); //?
KeyMap.push_back(SKeyMap(XK_at, KEY_KEY_2)); //?
KeyMap.push_back(SKeyMap(XK_at, IRR_KEY_2)); //?
KeyMap.push_back(SKeyMap(XK_mu, 0)); //?
KeyMap.push_back(SKeyMap(XK_EuroSign, 0)); //?
KeyMap.push_back(SKeyMap(XK_A, KEY_KEY_A));
KeyMap.push_back(SKeyMap(XK_B, KEY_KEY_B));
KeyMap.push_back(SKeyMap(XK_C, KEY_KEY_C));
KeyMap.push_back(SKeyMap(XK_D, KEY_KEY_D));
KeyMap.push_back(SKeyMap(XK_E, KEY_KEY_E));
KeyMap.push_back(SKeyMap(XK_F, KEY_KEY_F));
KeyMap.push_back(SKeyMap(XK_G, KEY_KEY_G));
KeyMap.push_back(SKeyMap(XK_H, KEY_KEY_H));
KeyMap.push_back(SKeyMap(XK_I, KEY_KEY_I));
KeyMap.push_back(SKeyMap(XK_J, KEY_KEY_J));
KeyMap.push_back(SKeyMap(XK_K, KEY_KEY_K));
KeyMap.push_back(SKeyMap(XK_L, KEY_KEY_L));
KeyMap.push_back(SKeyMap(XK_M, KEY_KEY_M));
KeyMap.push_back(SKeyMap(XK_N, KEY_KEY_N));
KeyMap.push_back(SKeyMap(XK_O, KEY_KEY_O));
KeyMap.push_back(SKeyMap(XK_P, KEY_KEY_P));
KeyMap.push_back(SKeyMap(XK_Q, KEY_KEY_Q));
KeyMap.push_back(SKeyMap(XK_R, KEY_KEY_R));
KeyMap.push_back(SKeyMap(XK_S, KEY_KEY_S));
KeyMap.push_back(SKeyMap(XK_T, KEY_KEY_T));
KeyMap.push_back(SKeyMap(XK_U, KEY_KEY_U));
KeyMap.push_back(SKeyMap(XK_V, KEY_KEY_V));
KeyMap.push_back(SKeyMap(XK_W, KEY_KEY_W));
KeyMap.push_back(SKeyMap(XK_X, KEY_KEY_X));
KeyMap.push_back(SKeyMap(XK_Y, KEY_KEY_Y));
KeyMap.push_back(SKeyMap(XK_Z, KEY_KEY_Z));
KeyMap.push_back(SKeyMap(XK_bracketleft, KEY_OEM_4));
KeyMap.push_back(SKeyMap(XK_backslash, KEY_OEM_5));
KeyMap.push_back(SKeyMap(XK_bracketright, KEY_OEM_6));
KeyMap.push_back(SKeyMap(XK_asciicircum, KEY_OEM_5));
KeyMap.push_back(SKeyMap(XK_A, IRR_KEY_A));
KeyMap.push_back(SKeyMap(XK_B, IRR_KEY_B));
KeyMap.push_back(SKeyMap(XK_C, IRR_KEY_C));
KeyMap.push_back(SKeyMap(XK_D, IRR_KEY_D));
KeyMap.push_back(SKeyMap(XK_E, IRR_KEY_E));
KeyMap.push_back(SKeyMap(XK_F, IRR_KEY_F));
KeyMap.push_back(SKeyMap(XK_G, IRR_KEY_G));
KeyMap.push_back(SKeyMap(XK_H, IRR_KEY_H));
KeyMap.push_back(SKeyMap(XK_I, IRR_KEY_I));
KeyMap.push_back(SKeyMap(XK_J, IRR_KEY_J));
KeyMap.push_back(SKeyMap(XK_K, IRR_KEY_K));
KeyMap.push_back(SKeyMap(XK_L, IRR_KEY_L));
KeyMap.push_back(SKeyMap(XK_M, IRR_KEY_M));
KeyMap.push_back(SKeyMap(XK_N, IRR_KEY_N));
KeyMap.push_back(SKeyMap(XK_O, IRR_KEY_O));
KeyMap.push_back(SKeyMap(XK_P, IRR_KEY_P));
KeyMap.push_back(SKeyMap(XK_Q, IRR_KEY_Q));
KeyMap.push_back(SKeyMap(XK_R, IRR_KEY_R));
KeyMap.push_back(SKeyMap(XK_S, IRR_KEY_S));
KeyMap.push_back(SKeyMap(XK_T, IRR_KEY_T));
KeyMap.push_back(SKeyMap(XK_U, IRR_KEY_U));
KeyMap.push_back(SKeyMap(XK_V, IRR_KEY_V));
KeyMap.push_back(SKeyMap(XK_W, IRR_KEY_W));
KeyMap.push_back(SKeyMap(XK_X, IRR_KEY_X));
KeyMap.push_back(SKeyMap(XK_Y, IRR_KEY_Y));
KeyMap.push_back(SKeyMap(XK_Z, IRR_KEY_Z));
KeyMap.push_back(SKeyMap(XK_bracketleft, IRR_KEY_OEM_4));
KeyMap.push_back(SKeyMap(XK_backslash, IRR_KEY_OEM_5));
KeyMap.push_back(SKeyMap(XK_bracketright, IRR_KEY_OEM_6));
KeyMap.push_back(SKeyMap(XK_asciicircum, IRR_KEY_OEM_5));
KeyMap.push_back(SKeyMap(XK_degree, 0)); //?
KeyMap.push_back(SKeyMap(XK_underscore, KEY_MINUS)); //?
KeyMap.push_back(SKeyMap(XK_grave, KEY_OEM_3));
KeyMap.push_back(SKeyMap(XK_acute, KEY_OEM_6));
KeyMap.push_back(SKeyMap(XK_a, KEY_KEY_A));
KeyMap.push_back(SKeyMap(XK_b, KEY_KEY_B));
KeyMap.push_back(SKeyMap(XK_c, KEY_KEY_C));
KeyMap.push_back(SKeyMap(XK_d, KEY_KEY_D));
KeyMap.push_back(SKeyMap(XK_e, KEY_KEY_E));
KeyMap.push_back(SKeyMap(XK_f, KEY_KEY_F));
KeyMap.push_back(SKeyMap(XK_g, KEY_KEY_G));
KeyMap.push_back(SKeyMap(XK_h, KEY_KEY_H));
KeyMap.push_back(SKeyMap(XK_i, KEY_KEY_I));
KeyMap.push_back(SKeyMap(XK_j, KEY_KEY_J));
KeyMap.push_back(SKeyMap(XK_k, KEY_KEY_K));
KeyMap.push_back(SKeyMap(XK_l, KEY_KEY_L));
KeyMap.push_back(SKeyMap(XK_m, KEY_KEY_M));
KeyMap.push_back(SKeyMap(XK_n, KEY_KEY_N));
KeyMap.push_back(SKeyMap(XK_o, KEY_KEY_O));
KeyMap.push_back(SKeyMap(XK_p, KEY_KEY_P));
KeyMap.push_back(SKeyMap(XK_q, KEY_KEY_Q));
KeyMap.push_back(SKeyMap(XK_r, KEY_KEY_R));
KeyMap.push_back(SKeyMap(XK_s, KEY_KEY_S));
KeyMap.push_back(SKeyMap(XK_t, KEY_KEY_T));
KeyMap.push_back(SKeyMap(XK_u, KEY_KEY_U));
KeyMap.push_back(SKeyMap(XK_v, KEY_KEY_V));
KeyMap.push_back(SKeyMap(XK_w, KEY_KEY_W));
KeyMap.push_back(SKeyMap(XK_x, KEY_KEY_X));
KeyMap.push_back(SKeyMap(XK_y, KEY_KEY_Y));
KeyMap.push_back(SKeyMap(XK_z, KEY_KEY_Z));
KeyMap.push_back(SKeyMap(XK_ssharp, KEY_OEM_4));
KeyMap.push_back(SKeyMap(XK_adiaeresis, KEY_OEM_7));
KeyMap.push_back(SKeyMap(XK_odiaeresis, KEY_OEM_3));
KeyMap.push_back(SKeyMap(XK_udiaeresis, KEY_OEM_1));
KeyMap.push_back(SKeyMap(XK_Super_L, KEY_LWIN));
KeyMap.push_back(SKeyMap(XK_Super_R, KEY_RWIN));
KeyMap.push_back(SKeyMap(XK_underscore, IRR_KEY_MINUS)); //?
KeyMap.push_back(SKeyMap(XK_grave, IRR_KEY_OEM_3));
KeyMap.push_back(SKeyMap(XK_acute, IRR_KEY_OEM_6));
KeyMap.push_back(SKeyMap(XK_a, IRR_KEY_A));
KeyMap.push_back(SKeyMap(XK_b, IRR_KEY_B));
KeyMap.push_back(SKeyMap(XK_c, IRR_KEY_C));
KeyMap.push_back(SKeyMap(XK_d, IRR_KEY_D));
KeyMap.push_back(SKeyMap(XK_e, IRR_KEY_E));
KeyMap.push_back(SKeyMap(XK_f, IRR_KEY_F));
KeyMap.push_back(SKeyMap(XK_g, IRR_KEY_G));
KeyMap.push_back(SKeyMap(XK_h, IRR_KEY_H));
KeyMap.push_back(SKeyMap(XK_i, IRR_KEY_I));
KeyMap.push_back(SKeyMap(XK_j, IRR_KEY_J));
KeyMap.push_back(SKeyMap(XK_k, IRR_KEY_K));
KeyMap.push_back(SKeyMap(XK_l, IRR_KEY_L));
KeyMap.push_back(SKeyMap(XK_m, IRR_KEY_M));
KeyMap.push_back(SKeyMap(XK_n, IRR_KEY_N));
KeyMap.push_back(SKeyMap(XK_o, IRR_KEY_O));
KeyMap.push_back(SKeyMap(XK_p, IRR_KEY_P));
KeyMap.push_back(SKeyMap(XK_q, IRR_KEY_Q));
KeyMap.push_back(SKeyMap(XK_r, IRR_KEY_R));
KeyMap.push_back(SKeyMap(XK_s, IRR_KEY_S));
KeyMap.push_back(SKeyMap(XK_t, IRR_KEY_T));
KeyMap.push_back(SKeyMap(XK_u, IRR_KEY_U));
KeyMap.push_back(SKeyMap(XK_v, IRR_KEY_V));
KeyMap.push_back(SKeyMap(XK_w, IRR_KEY_W));
KeyMap.push_back(SKeyMap(XK_x, IRR_KEY_X));
KeyMap.push_back(SKeyMap(XK_y, IRR_KEY_Y));
KeyMap.push_back(SKeyMap(XK_z, IRR_KEY_Z));
KeyMap.push_back(SKeyMap(XK_ssharp, IRR_KEY_OEM_4));
KeyMap.push_back(SKeyMap(XK_adiaeresis, IRR_KEY_OEM_7));
KeyMap.push_back(SKeyMap(XK_odiaeresis, IRR_KEY_OEM_3));
KeyMap.push_back(SKeyMap(XK_udiaeresis, IRR_KEY_OEM_1));
KeyMap.push_back(SKeyMap(XK_Super_L, IRR_KEY_LWIN));
KeyMap.push_back(SKeyMap(XK_Super_R, IRR_KEY_RWIN));
KeyMap.sort();
#endif

View File

@ -402,7 +402,7 @@ bool CIrrDeviceSDL::run()
#ifdef _IRR_WINDOWS_API_
// handle alt+f4 in Windows, because SDL seems not to
if ( (SDL_event.key.keysym.mod & KMOD_LALT) && key == KEY_F4)
if ( (SDL_event.key.keysym.mod & KMOD_LALT) && key == IRR_KEY_F4)
{
Close = true;
break;
@ -837,131 +837,131 @@ void CIrrDeviceSDL::createKeyMap()
// buttons missing
KeyMap.push_back(SKeyMap(SDLK_BACKSPACE, KEY_BACK));
KeyMap.push_back(SKeyMap(SDLK_TAB, KEY_TAB));
KeyMap.push_back(SKeyMap(SDLK_CLEAR, KEY_CLEAR));
KeyMap.push_back(SKeyMap(SDLK_RETURN, KEY_RETURN));
KeyMap.push_back(SKeyMap(SDLK_BACKSPACE, IRR_KEY_BACK));
KeyMap.push_back(SKeyMap(SDLK_TAB, IRR_KEY_TAB));
KeyMap.push_back(SKeyMap(SDLK_CLEAR, IRR_KEY_CLEAR));
KeyMap.push_back(SKeyMap(SDLK_RETURN, IRR_KEY_RETURN));
// combined modifiers missing
KeyMap.push_back(SKeyMap(SDLK_PAUSE, KEY_PAUSE));
KeyMap.push_back(SKeyMap(SDLK_CAPSLOCK, KEY_CAPITAL));
KeyMap.push_back(SKeyMap(SDLK_PAUSE, IRR_KEY_PAUSE));
KeyMap.push_back(SKeyMap(SDLK_CAPSLOCK, IRR_KEY_CAPITAL));
// asian letter keys missing
KeyMap.push_back(SKeyMap(SDLK_ESCAPE, KEY_ESCAPE));
KeyMap.push_back(SKeyMap(SDLK_ESCAPE, IRR_KEY_ESCAPE));
// asian letter keys missing
KeyMap.push_back(SKeyMap(SDLK_SPACE, KEY_SPACE));
KeyMap.push_back(SKeyMap(SDLK_PAGEUP, KEY_PRIOR));
KeyMap.push_back(SKeyMap(SDLK_PAGEDOWN, KEY_NEXT));
KeyMap.push_back(SKeyMap(SDLK_END, KEY_END));
KeyMap.push_back(SKeyMap(SDLK_HOME, KEY_HOME));
KeyMap.push_back(SKeyMap(SDLK_LEFT, KEY_LEFT));
KeyMap.push_back(SKeyMap(SDLK_UP, KEY_UP));
KeyMap.push_back(SKeyMap(SDLK_RIGHT, KEY_RIGHT));
KeyMap.push_back(SKeyMap(SDLK_DOWN, KEY_DOWN));
KeyMap.push_back(SKeyMap(SDLK_SPACE, IRR_KEY_SPACE));
KeyMap.push_back(SKeyMap(SDLK_PAGEUP, IRR_KEY_PRIOR));
KeyMap.push_back(SKeyMap(SDLK_PAGEDOWN, IRR_KEY_NEXT));
KeyMap.push_back(SKeyMap(SDLK_END, IRR_KEY_END));
KeyMap.push_back(SKeyMap(SDLK_HOME, IRR_KEY_HOME));
KeyMap.push_back(SKeyMap(SDLK_LEFT, IRR_KEY_LEFT));
KeyMap.push_back(SKeyMap(SDLK_UP, IRR_KEY_UP));
KeyMap.push_back(SKeyMap(SDLK_RIGHT, IRR_KEY_RIGHT));
KeyMap.push_back(SKeyMap(SDLK_DOWN, IRR_KEY_DOWN));
// select missing
KeyMap.push_back(SKeyMap(SDLK_PRINT, KEY_PRINT));
KeyMap.push_back(SKeyMap(SDLK_PRINT, IRR_KEY_PRINT));
// execute missing
KeyMap.push_back(SKeyMap(SDLK_PRINT, KEY_SNAPSHOT));
KeyMap.push_back(SKeyMap(SDLK_PRINT, IRR_KEY_SNAPSHOT));
KeyMap.push_back(SKeyMap(SDLK_INSERT, KEY_INSERT));
KeyMap.push_back(SKeyMap(SDLK_DELETE, KEY_DELETE));
KeyMap.push_back(SKeyMap(SDLK_HELP, KEY_HELP));
KeyMap.push_back(SKeyMap(SDLK_INSERT, IRR_KEY_INSERT));
KeyMap.push_back(SKeyMap(SDLK_DELETE, IRR_KEY_DELETE));
KeyMap.push_back(SKeyMap(SDLK_HELP, IRR_KEY_HELP));
KeyMap.push_back(SKeyMap(SDLK_0, KEY_KEY_0));
KeyMap.push_back(SKeyMap(SDLK_1, KEY_KEY_1));
KeyMap.push_back(SKeyMap(SDLK_2, KEY_KEY_2));
KeyMap.push_back(SKeyMap(SDLK_3, KEY_KEY_3));
KeyMap.push_back(SKeyMap(SDLK_4, KEY_KEY_4));
KeyMap.push_back(SKeyMap(SDLK_5, KEY_KEY_5));
KeyMap.push_back(SKeyMap(SDLK_6, KEY_KEY_6));
KeyMap.push_back(SKeyMap(SDLK_7, KEY_KEY_7));
KeyMap.push_back(SKeyMap(SDLK_8, KEY_KEY_8));
KeyMap.push_back(SKeyMap(SDLK_9, KEY_KEY_9));
KeyMap.push_back(SKeyMap(SDLK_0, IRR_KEY_IRR_KEY_0));
KeyMap.push_back(SKeyMap(SDLK_1, IRR_KEY_IRR_KEY_1));
KeyMap.push_back(SKeyMap(SDLK_2, IRR_KEY_IRR_KEY_2));
KeyMap.push_back(SKeyMap(SDLK_3, IRR_KEY_IRR_KEY_3));
KeyMap.push_back(SKeyMap(SDLK_4, IRR_KEY_IRR_KEY_4));
KeyMap.push_back(SKeyMap(SDLK_5, IRR_KEY_IRR_KEY_5));
KeyMap.push_back(SKeyMap(SDLK_6, IRR_KEY_IRR_KEY_6));
KeyMap.push_back(SKeyMap(SDLK_7, IRR_KEY_IRR_KEY_7));
KeyMap.push_back(SKeyMap(SDLK_8, IRR_KEY_IRR_KEY_8));
KeyMap.push_back(SKeyMap(SDLK_9, IRR_KEY_IRR_KEY_9));
KeyMap.push_back(SKeyMap(SDLK_a, KEY_KEY_A));
KeyMap.push_back(SKeyMap(SDLK_b, KEY_KEY_B));
KeyMap.push_back(SKeyMap(SDLK_c, KEY_KEY_C));
KeyMap.push_back(SKeyMap(SDLK_d, KEY_KEY_D));
KeyMap.push_back(SKeyMap(SDLK_e, KEY_KEY_E));
KeyMap.push_back(SKeyMap(SDLK_f, KEY_KEY_F));
KeyMap.push_back(SKeyMap(SDLK_g, KEY_KEY_G));
KeyMap.push_back(SKeyMap(SDLK_h, KEY_KEY_H));
KeyMap.push_back(SKeyMap(SDLK_i, KEY_KEY_I));
KeyMap.push_back(SKeyMap(SDLK_j, KEY_KEY_J));
KeyMap.push_back(SKeyMap(SDLK_k, KEY_KEY_K));
KeyMap.push_back(SKeyMap(SDLK_l, KEY_KEY_L));
KeyMap.push_back(SKeyMap(SDLK_m, KEY_KEY_M));
KeyMap.push_back(SKeyMap(SDLK_n, KEY_KEY_N));
KeyMap.push_back(SKeyMap(SDLK_o, KEY_KEY_O));
KeyMap.push_back(SKeyMap(SDLK_p, KEY_KEY_P));
KeyMap.push_back(SKeyMap(SDLK_q, KEY_KEY_Q));
KeyMap.push_back(SKeyMap(SDLK_r, KEY_KEY_R));
KeyMap.push_back(SKeyMap(SDLK_s, KEY_KEY_S));
KeyMap.push_back(SKeyMap(SDLK_t, KEY_KEY_T));
KeyMap.push_back(SKeyMap(SDLK_u, KEY_KEY_U));
KeyMap.push_back(SKeyMap(SDLK_v, KEY_KEY_V));
KeyMap.push_back(SKeyMap(SDLK_w, KEY_KEY_W));
KeyMap.push_back(SKeyMap(SDLK_x, KEY_KEY_X));
KeyMap.push_back(SKeyMap(SDLK_y, KEY_KEY_Y));
KeyMap.push_back(SKeyMap(SDLK_z, KEY_KEY_Z));
KeyMap.push_back(SKeyMap(SDLK_a, IRR_KEY_IRR_KEY_A));
KeyMap.push_back(SKeyMap(SDLK_b, IRR_KEY_IRR_KEY_B));
KeyMap.push_back(SKeyMap(SDLK_c, IRR_KEY_IRR_KEY_C));
KeyMap.push_back(SKeyMap(SDLK_d, IRR_KEY_IRR_KEY_D));
KeyMap.push_back(SKeyMap(SDLK_e, IRR_KEY_IRR_KEY_E));
KeyMap.push_back(SKeyMap(SDLK_f, IRR_KEY_IRR_KEY_F));
KeyMap.push_back(SKeyMap(SDLK_g, IRR_KEY_IRR_KEY_G));
KeyMap.push_back(SKeyMap(SDLK_h, IRR_KEY_IRR_KEY_H));
KeyMap.push_back(SKeyMap(SDLK_i, IRR_KEY_IRR_KEY_I));
KeyMap.push_back(SKeyMap(SDLK_j, IRR_KEY_IRR_KEY_J));
KeyMap.push_back(SKeyMap(SDLK_k, IRR_KEY_IRR_KEY_K));
KeyMap.push_back(SKeyMap(SDLK_l, IRR_KEY_IRR_KEY_L));
KeyMap.push_back(SKeyMap(SDLK_m, IRR_KEY_IRR_KEY_M));
KeyMap.push_back(SKeyMap(SDLK_n, IRR_KEY_IRR_KEY_N));
KeyMap.push_back(SKeyMap(SDLK_o, IRR_KEY_IRR_KEY_O));
KeyMap.push_back(SKeyMap(SDLK_p, IRR_KEY_IRR_KEY_P));
KeyMap.push_back(SKeyMap(SDLK_q, IRR_KEY_IRR_KEY_Q));
KeyMap.push_back(SKeyMap(SDLK_r, IRR_KEY_IRR_KEY_R));
KeyMap.push_back(SKeyMap(SDLK_s, IRR_KEY_IRR_KEY_S));
KeyMap.push_back(SKeyMap(SDLK_t, IRR_KEY_IRR_KEY_T));
KeyMap.push_back(SKeyMap(SDLK_u, IRR_KEY_IRR_KEY_U));
KeyMap.push_back(SKeyMap(SDLK_v, IRR_KEY_IRR_KEY_V));
KeyMap.push_back(SKeyMap(SDLK_w, IRR_KEY_IRR_KEY_W));
KeyMap.push_back(SKeyMap(SDLK_x, IRR_KEY_IRR_KEY_X));
KeyMap.push_back(SKeyMap(SDLK_y, IRR_KEY_IRR_KEY_Y));
KeyMap.push_back(SKeyMap(SDLK_z, IRR_KEY_IRR_KEY_Z));
KeyMap.push_back(SKeyMap(SDLK_LSUPER, KEY_LWIN));
KeyMap.push_back(SKeyMap(SDLK_RSUPER, KEY_RWIN));
KeyMap.push_back(SKeyMap(SDLK_LSUPER, IRR_KEY_LWIN));
KeyMap.push_back(SKeyMap(SDLK_RSUPER, IRR_KEY_RWIN));
// apps missing
KeyMap.push_back(SKeyMap(SDLK_POWER, KEY_SLEEP)); //??
KeyMap.push_back(SKeyMap(SDLK_POWER, IRR_KEY_SLEEP)); //??
KeyMap.push_back(SKeyMap(SDLK_KP0, KEY_NUMPAD0));
KeyMap.push_back(SKeyMap(SDLK_KP1, KEY_NUMPAD1));
KeyMap.push_back(SKeyMap(SDLK_KP2, KEY_NUMPAD2));
KeyMap.push_back(SKeyMap(SDLK_KP3, KEY_NUMPAD3));
KeyMap.push_back(SKeyMap(SDLK_KP4, KEY_NUMPAD4));
KeyMap.push_back(SKeyMap(SDLK_KP5, KEY_NUMPAD5));
KeyMap.push_back(SKeyMap(SDLK_KP6, KEY_NUMPAD6));
KeyMap.push_back(SKeyMap(SDLK_KP7, KEY_NUMPAD7));
KeyMap.push_back(SKeyMap(SDLK_KP8, KEY_NUMPAD8));
KeyMap.push_back(SKeyMap(SDLK_KP9, KEY_NUMPAD9));
KeyMap.push_back(SKeyMap(SDLK_KP_MULTIPLY, KEY_MULTIPLY));
KeyMap.push_back(SKeyMap(SDLK_KP_PLUS, KEY_ADD));
// KeyMap.push_back(SKeyMap(SDLK_KP_, KEY_SEPARATOR));
KeyMap.push_back(SKeyMap(SDLK_KP_MINUS, KEY_SUBTRACT));
KeyMap.push_back(SKeyMap(SDLK_KP_PERIOD, KEY_DECIMAL));
KeyMap.push_back(SKeyMap(SDLK_KP_DIVIDE, KEY_DIVIDE));
KeyMap.push_back(SKeyMap(SDLK_KP0, IRR_KEY_NUMPAD0));
KeyMap.push_back(SKeyMap(SDLK_KP1, IRR_KEY_NUMPAD1));
KeyMap.push_back(SKeyMap(SDLK_KP2, IRR_KEY_NUMPAD2));
KeyMap.push_back(SKeyMap(SDLK_KP3, IRR_KEY_NUMPAD3));
KeyMap.push_back(SKeyMap(SDLK_KP4, IRR_KEY_NUMPAD4));
KeyMap.push_back(SKeyMap(SDLK_KP5, IRR_KEY_NUMPAD5));
KeyMap.push_back(SKeyMap(SDLK_KP6, IRR_KEY_NUMPAD6));
KeyMap.push_back(SKeyMap(SDLK_KP7, IRR_KEY_NUMPAD7));
KeyMap.push_back(SKeyMap(SDLK_KP8, IRR_KEY_NUMPAD8));
KeyMap.push_back(SKeyMap(SDLK_KP9, IRR_KEY_NUMPAD9));
KeyMap.push_back(SKeyMap(SDLK_KP_MULTIPLY, IRR_KEY_MULTIPLY));
KeyMap.push_back(SKeyMap(SDLK_KP_PLUS, IRR_KEY_ADD));
// KeyMap.push_back(SKeyMap(SDLK_KP_, IRR_KEY_SEPARATOR));
KeyMap.push_back(SKeyMap(SDLK_KP_MINUS, IRR_KEY_SUBTRACT));
KeyMap.push_back(SKeyMap(SDLK_KP_PERIOD, IRR_KEY_DECIMAL));
KeyMap.push_back(SKeyMap(SDLK_KP_DIVIDE, IRR_KEY_DIVIDE));
KeyMap.push_back(SKeyMap(SDLK_F1, KEY_F1));
KeyMap.push_back(SKeyMap(SDLK_F2, KEY_F2));
KeyMap.push_back(SKeyMap(SDLK_F3, KEY_F3));
KeyMap.push_back(SKeyMap(SDLK_F4, KEY_F4));
KeyMap.push_back(SKeyMap(SDLK_F5, KEY_F5));
KeyMap.push_back(SKeyMap(SDLK_F6, KEY_F6));
KeyMap.push_back(SKeyMap(SDLK_F7, KEY_F7));
KeyMap.push_back(SKeyMap(SDLK_F8, KEY_F8));
KeyMap.push_back(SKeyMap(SDLK_F9, KEY_F9));
KeyMap.push_back(SKeyMap(SDLK_F10, KEY_F10));
KeyMap.push_back(SKeyMap(SDLK_F11, KEY_F11));
KeyMap.push_back(SKeyMap(SDLK_F12, KEY_F12));
KeyMap.push_back(SKeyMap(SDLK_F13, KEY_F13));
KeyMap.push_back(SKeyMap(SDLK_F14, KEY_F14));
KeyMap.push_back(SKeyMap(SDLK_F15, KEY_F15));
KeyMap.push_back(SKeyMap(SDLK_F1, IRR_KEY_F1));
KeyMap.push_back(SKeyMap(SDLK_F2, IRR_KEY_F2));
KeyMap.push_back(SKeyMap(SDLK_F3, IRR_KEY_F3));
KeyMap.push_back(SKeyMap(SDLK_F4, IRR_KEY_F4));
KeyMap.push_back(SKeyMap(SDLK_F5, IRR_KEY_F5));
KeyMap.push_back(SKeyMap(SDLK_F6, IRR_KEY_F6));
KeyMap.push_back(SKeyMap(SDLK_F7, IRR_KEY_F7));
KeyMap.push_back(SKeyMap(SDLK_F8, IRR_KEY_F8));
KeyMap.push_back(SKeyMap(SDLK_F9, IRR_KEY_F9));
KeyMap.push_back(SKeyMap(SDLK_F10, IRR_KEY_F10));
KeyMap.push_back(SKeyMap(SDLK_F11, IRR_KEY_F11));
KeyMap.push_back(SKeyMap(SDLK_F12, IRR_KEY_F12));
KeyMap.push_back(SKeyMap(SDLK_F13, IRR_KEY_F13));
KeyMap.push_back(SKeyMap(SDLK_F14, IRR_KEY_F14));
KeyMap.push_back(SKeyMap(SDLK_F15, IRR_KEY_F15));
// no higher F-keys
KeyMap.push_back(SKeyMap(SDLK_NUMLOCK, KEY_NUMLOCK));
KeyMap.push_back(SKeyMap(SDLK_SCROLLOCK, KEY_SCROLL));
KeyMap.push_back(SKeyMap(SDLK_LSHIFT, KEY_LSHIFT));
KeyMap.push_back(SKeyMap(SDLK_RSHIFT, KEY_RSHIFT));
KeyMap.push_back(SKeyMap(SDLK_LCTRL, KEY_LCONTROL));
KeyMap.push_back(SKeyMap(SDLK_RCTRL, KEY_RCONTROL));
KeyMap.push_back(SKeyMap(SDLK_LALT, KEY_LMENU));
KeyMap.push_back(SKeyMap(SDLK_RALT, KEY_RMENU));
KeyMap.push_back(SKeyMap(SDLK_NUMLOCK, IRR_KEY_NUMLOCK));
KeyMap.push_back(SKeyMap(SDLK_SCROLLOCK, IRR_KEY_SCROLL));
KeyMap.push_back(SKeyMap(SDLK_LSHIFT, IRR_KEY_LSHIFT));
KeyMap.push_back(SKeyMap(SDLK_RSHIFT, IRR_KEY_RSHIFT));
KeyMap.push_back(SKeyMap(SDLK_LCTRL, IRR_KEY_LCONTROL));
KeyMap.push_back(SKeyMap(SDLK_RCTRL, IRR_KEY_RCONTROL));
KeyMap.push_back(SKeyMap(SDLK_LALT, IRR_KEY_LMENU));
KeyMap.push_back(SKeyMap(SDLK_RALT, IRR_KEY_RMENU));
KeyMap.push_back(SKeyMap(SDLK_PLUS, KEY_PLUS));
KeyMap.push_back(SKeyMap(SDLK_COMMA, KEY_COMMA));
KeyMap.push_back(SKeyMap(SDLK_MINUS, KEY_MINUS));
KeyMap.push_back(SKeyMap(SDLK_PERIOD, KEY_PERIOD));
KeyMap.push_back(SKeyMap(SDLK_PLUS, IRR_KEY_PLUS));
KeyMap.push_back(SKeyMap(SDLK_COMMA, IRR_KEY_COMMA));
KeyMap.push_back(SKeyMap(SDLK_MINUS, IRR_KEY_MINUS));
KeyMap.push_back(SKeyMap(SDLK_PERIOD, IRR_KEY_PERIOD));
// some special keys missing

View File

@ -388,7 +388,7 @@ public:
if (irrevent.KeyInput.Key == 0 && key > 0)
{
irrevent.KeyInput.Key = (EKEY_CODE)(KEY_KEY_CODES_COUNT + key);
irrevent.KeyInput.Key = (EKEY_CODE)(IRR_KEY_CODES_COUNT + key);
}
device->signalEvent(irrevent);
@ -1085,133 +1085,133 @@ void CIrrDeviceWayland::clearSystemMessages()
void CIrrDeviceWayland::createKeyMap()
{
m_key_map[0] = KEY_UNKNOWN; //KEY_RESERVED
m_key_map[1] = KEY_ESCAPE; //KEY_ESC
m_key_map[2] = KEY_KEY_1; //KEY_1
m_key_map[3] = KEY_KEY_2; //KEY_2
m_key_map[4] = KEY_KEY_3; //KEY_3
m_key_map[5] = KEY_KEY_4; //KEY_4
m_key_map[6] = KEY_KEY_5; //KEY_5
m_key_map[7] = KEY_KEY_6; //KEY_6
m_key_map[8] = KEY_KEY_7; //KEY_7
m_key_map[9] = KEY_KEY_8; //KEY_8
m_key_map[10] = KEY_KEY_9; //KEY_9
m_key_map[11] = KEY_KEY_0; //KEY_0
m_key_map[12] = KEY_MINUS; //KEY_MINUS
m_key_map[13] = KEY_PLUS; //KEY_EQUAL
m_key_map[14] = KEY_BACK; //KEY_BACKSPACE
m_key_map[15] = KEY_TAB; //KEY_TAB
m_key_map[16] = KEY_KEY_Q; //KEY_Q
m_key_map[17] = KEY_KEY_W; //KEY_W
m_key_map[18] = KEY_KEY_E; //KEY_E
m_key_map[19] = KEY_KEY_R; //KEY_R
m_key_map[20] = KEY_KEY_T; //KEY_T
m_key_map[21] = KEY_KEY_Y; //KEY_Y
m_key_map[22] = KEY_KEY_U; //KEY_U
m_key_map[23] = KEY_KEY_I; //KEY_I
m_key_map[25] = KEY_KEY_P; //KEY_P
m_key_map[24] = KEY_KEY_O; //KEY_O
m_key_map[26] = KEY_OEM_4; //KEY_LEFTBRACE
m_key_map[27] = KEY_OEM_6; //KEY_RIGHTBRACE
m_key_map[28] = KEY_RETURN; //KEY_ENTER
m_key_map[29] = KEY_LCONTROL; //KEY_LEFTCTRL
m_key_map[30] = KEY_KEY_A; //KEY_A
m_key_map[31] = KEY_KEY_S; // KEY_S
m_key_map[32] = KEY_KEY_D; //KEY_D
m_key_map[33] = KEY_KEY_F; //KEY_F
m_key_map[34] = KEY_KEY_G; //KEY_G
m_key_map[35] = KEY_KEY_H; //KEY_H
m_key_map[36] = KEY_KEY_J; //KEY_J
m_key_map[37] = KEY_KEY_K; //KEY_K
m_key_map[38] = KEY_KEY_L; //KEY_L
m_key_map[39] = KEY_OEM_1; //KEY_SEMICOLON
m_key_map[40] = KEY_OEM_7; //KEY_APOSTROPHE
m_key_map[41] = KEY_OEM_3; //KEY_GRAVE
m_key_map[42] = KEY_LSHIFT; //KEY_LEFTSHIFT
m_key_map[43] = KEY_OEM_5; //KEY_BACKSLASH
m_key_map[44] = KEY_KEY_Z; //KEY_Z
m_key_map[45] = KEY_KEY_X; //KEY_X
m_key_map[46] = KEY_KEY_C; //KEY_C
m_key_map[47] = KEY_KEY_V; //KEY_V
m_key_map[48] = KEY_KEY_B; //KEY_B
m_key_map[49] = KEY_KEY_N; //KEY_N
m_key_map[50] = KEY_KEY_M; //KEY_M
m_key_map[51] = KEY_COMMA; //KEY_COMMA
m_key_map[52] = KEY_PERIOD; //KEY_DOT
m_key_map[53] = KEY_OEM_2; // KEY_SLASH
m_key_map[54] = KEY_RSHIFT; //KEY_RIGHTSHIFT
m_key_map[55] = KEY_MULTIPLY; //KEY_KPASTERISK
m_key_map[56] = KEY_LMENU; //KEY_LEFTALT
m_key_map[57] = KEY_SPACE; //KEY_SPACE
m_key_map[58] = KEY_CAPITAL; //KEY_CAPSLOCK
m_key_map[59] = KEY_F1; //KEY_F1
m_key_map[60] = KEY_F2; //KEY_F2
m_key_map[61] = KEY_F3; //KEY_F3
m_key_map[62] = KEY_F4; //KEY_F4
m_key_map[63] = KEY_F5; //KEY_F5
m_key_map[64] = KEY_F6; //KEY_F6
m_key_map[65] = KEY_F7; //KEY_F7
m_key_map[66] = KEY_F8; //KEY_F8
m_key_map[67] = KEY_F9; //KEY_F9
m_key_map[68] = KEY_F10; //KEY_F10
m_key_map[69] = KEY_NUMLOCK; //KEY_NUMLOCK
m_key_map[70] = KEY_SCROLL; //KEY_SCROLLLOCK
m_key_map[71] = KEY_NUMPAD7; //KEY_KP7
m_key_map[72] = KEY_NUMPAD8; //KEY_KP8
m_key_map[73] = KEY_NUMPAD9; //KEY_KP9
m_key_map[74] = KEY_SUBTRACT; //KEY_KPMINUS
m_key_map[75] = KEY_NUMPAD4; //KEY_KP4
m_key_map[76] = KEY_NUMPAD5; //KEY_KP5
m_key_map[77] = KEY_NUMPAD6; //KEY_KP6
m_key_map[78] = KEY_ADD; //KEY_KPPLUS
m_key_map[79] = KEY_NUMPAD1; //KEY_KP1
m_key_map[80] = KEY_NUMPAD2; //KEY_KP2
m_key_map[81] = KEY_NUMPAD3; //KEY_KP3
m_key_map[82] = KEY_NUMPAD0; //KEY_KP0
m_key_map[83] = KEY_SEPARATOR; //KEY_KPDOT
m_key_map[85] = KEY_UNKNOWN; //KEY_ZENKAKUHANKAKU
m_key_map[86] = KEY_OEM_102; //KEY_102ND
m_key_map[87] = KEY_F11; //KEY_F11
m_key_map[88] = KEY_F12; //KEY_F12
m_key_map[89] = KEY_UNKNOWN; //KEY_RO
m_key_map[90] = KEY_UNKNOWN; //KEY_KATAKANA
m_key_map[91] = KEY_UNKNOWN; //KEY_HIRAGANA
m_key_map[92] = KEY_UNKNOWN; //KEY_HENKAN
m_key_map[93] = KEY_UNKNOWN; //KEY_KATAKANAHIRAGANA
m_key_map[94] = KEY_UNKNOWN; //KEY_MUHENKAN
m_key_map[95] = KEY_SEPARATOR; //KEY_KPJPCOMMA
m_key_map[96] = KEY_RETURN; //KEY_KPENTER
m_key_map[97] = KEY_RCONTROL; //KEY_RIGHTCTRL
m_key_map[98] = KEY_DIVIDE; //KEY_KPSLASH
m_key_map[99] = KEY_UNKNOWN; //KEY_SYSRQ
m_key_map[100] = KEY_RMENU; //KEY_RIGHTALT
m_key_map[101] = KEY_UNKNOWN; //KEY_LINEFEED
m_key_map[102] = KEY_HOME; //KEY_HOME
m_key_map[103] = KEY_UP; //KEY_UP
m_key_map[104] = KEY_PRIOR; //KEY_PAGEUP
m_key_map[105] = KEY_LEFT; //KEY_LEFT
m_key_map[106] = KEY_RIGHT; //KEY_RIGHT
m_key_map[107] = KEY_END; //KEY_END
m_key_map[108] = KEY_DOWN; //KEY_DOWN
m_key_map[109] = KEY_NEXT; //KEY_PAGEDOWN
m_key_map[110] = KEY_INSERT; //KEY_INSERT
m_key_map[111] = KEY_DELETE; //KEY_DELETE
m_key_map[112] = KEY_UNKNOWN; //KEY_MACRO
m_key_map[113] = KEY_VOLUME_MUTE; //KEY_MUTE
m_key_map[114] = KEY_VOLUME_DOWN; //KEY_VOLUMEDOWN
m_key_map[115] = KEY_VOLUME_UP; //KEY_VOLUMEUP
m_key_map[116] = KEY_UNKNOWN; //KEY_POWER
m_key_map[117] = KEY_RETURN; //KEY_KPEQUAL
m_key_map[118] = KEY_PLUS; //KEY_KPPLUSMINUS
m_key_map[119] = KEY_PAUSE; //KEY_PAUSE
m_key_map[120] = KEY_UNKNOWN; //KEY_SCALE
m_key_map[121] = KEY_COMMA; //KEY_KPCOMMA
m_key_map[122] = KEY_UNKNOWN; //KEY_HANGEUL
m_key_map[123] = KEY_UNKNOWN; //KEY_HANJA
m_key_map[124] = KEY_UNKNOWN; //KEY_YEN
m_key_map[125] = KEY_LWIN; //KEY_LEFTMETA
m_key_map[126] = KEY_RWIN; //KEY_RIGHTMETA
m_key_map[127] = KEY_MENU; //KEY_COMPOSE
m_key_map[0] = IRR_KEY_UNKNOWN; //KEY_RESERVED
m_key_map[1] = IRR_KEY_ESCAPE; //KEY_ESC
m_key_map[2] = IRR_KEY_1; //KEY_1
m_key_map[3] = IRR_KEY_2; //KEY_2
m_key_map[4] = IRR_KEY_3; //KEY_3
m_key_map[5] = IRR_KEY_4; //KEY_4
m_key_map[6] = IRR_KEY_5; //KEY_5
m_key_map[7] = IRR_KEY_6; //KEY_6
m_key_map[8] = IRR_KEY_7; //KEY_7
m_key_map[9] = IRR_KEY_8; //KEY_8
m_key_map[10] = IRR_KEY_9; //KEY_9
m_key_map[11] = IRR_KEY_0; //KEY_0
m_key_map[12] = IRR_KEY_MINUS; //KEY_MINUS
m_key_map[13] = IRR_KEY_PLUS; //KEY_EQUAL
m_key_map[14] = IRR_KEY_BACK; //KEY_BACKSPACE
m_key_map[15] = IRR_KEY_TAB; //KEY_TAB
m_key_map[16] = IRR_KEY_Q; //KEY_Q
m_key_map[17] = IRR_KEY_W; //KEY_W
m_key_map[18] = IRR_KEY_E; //KEY_E
m_key_map[19] = IRR_KEY_R; //KEY_R
m_key_map[20] = IRR_KEY_T; //KEY_T
m_key_map[21] = IRR_KEY_Y; //KEY_Y
m_key_map[22] = IRR_KEY_U; //KEY_U
m_key_map[23] = IRR_KEY_I; //KEY_I
m_key_map[25] = IRR_KEY_P; //KEY_P
m_key_map[24] = IRR_KEY_O; //KEY_O
m_key_map[26] = IRR_KEY_OEM_4; //KEY_LEFTBRACE
m_key_map[27] = IRR_KEY_OEM_6; //KEY_RIGHTBRACE
m_key_map[28] = IRR_KEY_RETURN; //KEY_ENTER
m_key_map[29] = IRR_KEY_LCONTROL; //KEY_LEFTCTRL
m_key_map[30] = IRR_KEY_A; //KEY_A
m_key_map[31] = IRR_KEY_S; // KEY_S
m_key_map[32] = IRR_KEY_D; //KEY_D
m_key_map[33] = IRR_KEY_F; //KEY_F
m_key_map[34] = IRR_KEY_G; //KEY_G
m_key_map[35] = IRR_KEY_H; //KEY_H
m_key_map[36] = IRR_KEY_J; //KEY_J
m_key_map[37] = IRR_KEY_K; //KEY_K
m_key_map[38] = IRR_KEY_L; //KEY_L
m_key_map[39] = IRR_KEY_OEM_1; //KEY_SEMICOLON
m_key_map[40] = IRR_KEY_OEM_7; //KEY_APOSTROPHE
m_key_map[41] = IRR_KEY_OEM_3; //KEY_GRAVE
m_key_map[42] = IRR_KEY_LSHIFT; //KEY_LEFTSHIFT
m_key_map[43] = IRR_KEY_OEM_5; //KEY_BACKSLASH
m_key_map[44] = IRR_KEY_Z; //KEY_Z
m_key_map[45] = IRR_KEY_X; //KEY_X
m_key_map[46] = IRR_KEY_C; //KEY_C
m_key_map[47] = IRR_KEY_V; //KEY_V
m_key_map[48] = IRR_KEY_B; //KEY_B
m_key_map[49] = IRR_KEY_N; //KEY_N
m_key_map[50] = IRR_KEY_M; //KEY_M
m_key_map[51] = IRR_KEY_COMMA; //KEY_COMMA
m_key_map[52] = IRR_KEY_PERIOD; //KEY_DOT
m_key_map[53] = IRR_KEY_OEM_2; // KEY_SLASH
m_key_map[54] = IRR_KEY_RSHIFT; //KEY_RIGHTSHIFT
m_key_map[55] = IRR_KEY_MULTIPLY; //KEY_KPASTERISK
m_key_map[56] = IRR_KEY_LMENU; //KEY_LEFTALT
m_key_map[57] = IRR_KEY_SPACE; //KEY_SPACE
m_key_map[58] = IRR_KEY_CAPITAL; //KEY_CAPSLOCK
m_key_map[59] = IRR_KEY_F1; //KEY_F1
m_key_map[60] = IRR_KEY_F2; //KEY_F2
m_key_map[61] = IRR_KEY_F3; //KEY_F3
m_key_map[62] = IRR_KEY_F4; //KEY_F4
m_key_map[63] = IRR_KEY_F5; //KEY_F5
m_key_map[64] = IRR_KEY_F6; //KEY_F6
m_key_map[65] = IRR_KEY_F7; //KEY_F7
m_key_map[66] = IRR_KEY_F8; //KEY_F8
m_key_map[67] = IRR_KEY_F9; //KEY_F9
m_key_map[68] = IRR_KEY_F10; //KEY_F10
m_key_map[69] = IRR_KEY_NUMLOCK; //KEY_NUMLOCK
m_key_map[70] = IRR_KEY_SCROLL; //KEY_SCROLLLOCK
m_key_map[71] = IRR_KEY_NUMPAD7; //KEY_KP7
m_key_map[72] = IRR_KEY_NUMPAD8; //KEY_KP8
m_key_map[73] = IRR_KEY_NUMPAD9; //KEY_KP9
m_key_map[74] = IRR_KEY_SUBTRACT; //KEY_KPMINUS
m_key_map[75] = IRR_KEY_NUMPAD4; //KEY_KP4
m_key_map[76] = IRR_KEY_NUMPAD5; //KEY_KP5
m_key_map[77] = IRR_KEY_NUMPAD6; //KEY_KP6
m_key_map[78] = IRR_KEY_ADD; //KEY_KPPLUS
m_key_map[79] = IRR_KEY_NUMPAD1; //KEY_KP1
m_key_map[80] = IRR_KEY_NUMPAD2; //KEY_KP2
m_key_map[81] = IRR_KEY_NUMPAD3; //KEY_KP3
m_key_map[82] = IRR_KEY_NUMPAD0; //KEY_KP0
m_key_map[83] = IRR_KEY_SEPARATOR; //KEY_KPDOT
m_key_map[85] = IRR_KEY_UNKNOWN; //KEY_ZENKAKUHANKAKU
m_key_map[86] = IRR_KEY_OEM_102; //KEY_102ND
m_key_map[87] = IRR_KEY_F11; //KEY_F11
m_key_map[88] = IRR_KEY_F12; //KEY_F12
m_key_map[89] = IRR_KEY_UNKNOWN; //KEY_RO
m_key_map[90] = IRR_KEY_UNKNOWN; //KEY_KATAKANA
m_key_map[91] = IRR_KEY_UNKNOWN; //KEY_HIRAGANA
m_key_map[92] = IRR_KEY_UNKNOWN; //KEY_HENKAN
m_key_map[93] = IRR_KEY_UNKNOWN; //KEY_KATAKANAHIRAGANA
m_key_map[94] = IRR_KEY_UNKNOWN; //KEY_MUHENKAN
m_key_map[95] = IRR_KEY_SEPARATOR; //KEY_KPJPCOMMA
m_key_map[96] = IRR_KEY_RETURN; //KEY_KPENTER
m_key_map[97] = IRR_KEY_RCONTROL; //KEY_RIGHTCTRL
m_key_map[98] = IRR_KEY_DIVIDE; //KEY_KPSLASH
m_key_map[99] = IRR_KEY_UNKNOWN; //KEY_SYSRQ
m_key_map[100] = IRR_KEY_RMENU; //KEY_RIGHTALT
m_key_map[101] = IRR_KEY_UNKNOWN; //KEY_LINEFEED
m_key_map[102] = IRR_KEY_HOME; //KEY_HOME
m_key_map[103] = IRR_KEY_UP; //KEY_UP
m_key_map[104] = IRR_KEY_PRIOR; //KEY_PAGEUP
m_key_map[105] = IRR_KEY_LEFT; //KEY_LEFT
m_key_map[106] = IRR_KEY_RIGHT; //KEY_RIGHT
m_key_map[107] = IRR_KEY_END; //KEY_END
m_key_map[108] = IRR_KEY_DOWN; //KEY_DOWN
m_key_map[109] = IRR_KEY_NEXT; //KEY_PAGEDOWN
m_key_map[110] = IRR_KEY_INSERT; //KEY_INSERT
m_key_map[111] = IRR_KEY_DELETE; //KEY_DELETE
m_key_map[112] = IRR_KEY_UNKNOWN; //KEY_MACRO
m_key_map[113] = IRR_KEY_VOLUME_MUTE; //KEY_MUTE
m_key_map[114] = IRR_KEY_VOLUME_DOWN; //KEY_VOLUMEDOWN
m_key_map[115] = IRR_KEY_VOLUME_UP; //KEY_VOLUMEUP
m_key_map[116] = IRR_KEY_UNKNOWN; //KEY_POWER
m_key_map[117] = IRR_KEY_RETURN; //KEY_KPEQUAL
m_key_map[118] = IRR_KEY_PLUS; //KEY_KPPLUSMINUS
m_key_map[119] = IRR_KEY_PAUSE; //KEY_PAUSE
m_key_map[120] = IRR_KEY_UNKNOWN; //KEY_SCALE
m_key_map[121] = IRR_KEY_COMMA; //KEY_KPCOMMA
m_key_map[122] = IRR_KEY_UNKNOWN; //KEY_HANGEUL
m_key_map[123] = IRR_KEY_UNKNOWN; //KEY_HANJA
m_key_map[124] = IRR_KEY_UNKNOWN; //KEY_YEN
m_key_map[125] = IRR_KEY_LWIN; //KEY_LEFTMETA
m_key_map[126] = IRR_KEY_RWIN; //KEY_RIGHTMETA
m_key_map[127] = IRR_KEY_MENU; //KEY_COMPOSE
}
// The joystick code is mostly copied from CIrrDeviceLinux.

View File

@ -860,7 +860,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
event.InputMethodEvent.Handle = hWnd;
event.KeyInput.Char = 0;
event.KeyInput.Key = irr::KEY_OEM_CLEAR;
event.KeyInput.Key = irr::IRR_KEY_OEM_CLEAR;
event.KeyInput.Shift = 0;
event.KeyInput.Control = 0;
@ -889,23 +889,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
event.KeyInput.PressedDown = (message==WM_KEYDOWN || message == WM_SYSKEYDOWN);
const UINT MY_MAPVK_VSC_TO_VK_EX = 3; // MAPVK_VSC_TO_VK_EX should be in SDK according to MSDN, but isn't in mine.
if ( event.KeyInput.Key == irr::KEY_SHIFT )
if ( event.KeyInput.Key == irr::IRR_KEY_SHIFT )
{
// this will fail on systems before windows NT/2000/XP, not sure _what_ will return there instead.
event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
}
if ( event.KeyInput.Key == irr::KEY_CONTROL )
if ( event.KeyInput.Key == irr::IRR_KEY_CONTROL )
{
event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
// some keyboards will just return LEFT for both - left and right keys. So also check extend bit.
if (lParam & 0x1000000)
event.KeyInput.Key = irr::KEY_RCONTROL;
event.KeyInput.Key = irr::IRR_KEY_RCONTROL;
}
if ( event.KeyInput.Key == irr::KEY_MENU )
if ( event.KeyInput.Key == irr::IRR_KEY_MENU )
{
event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
if (lParam & 0x1000000)
event.KeyInput.Key = irr::KEY_RMENU;
event.KeyInput.Key = irr::IRR_KEY_RMENU;
}
GetKeyboardState(allKeys);

View File

@ -37,11 +37,11 @@ CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cu
if (!keyMapArray || !keyMapSize)
{
// create default key map
KeyMap.push_back(SKeyMap(EKA_MOVE_FORWARD, irr::KEY_UP));
KeyMap.push_back(SKeyMap(EKA_MOVE_BACKWARD, irr::KEY_DOWN));
KeyMap.push_back(SKeyMap(EKA_STRAFE_LEFT, irr::KEY_LEFT));
KeyMap.push_back(SKeyMap(EKA_STRAFE_RIGHT, irr::KEY_RIGHT));
KeyMap.push_back(SKeyMap(EKA_JUMP_UP, irr::KEY_KEY_J));
KeyMap.push_back(SKeyMap(EKA_MOVE_FORWARD, irr::IRR_KEY_UP));
KeyMap.push_back(SKeyMap(EKA_MOVE_BACKWARD, irr::IRR_KEY_DOWN));
KeyMap.push_back(SKeyMap(EKA_STRAFE_LEFT, irr::IRR_KEY_LEFT));
KeyMap.push_back(SKeyMap(EKA_STRAFE_RIGHT, irr::IRR_KEY_RIGHT));
KeyMap.push_back(SKeyMap(EKA_JUMP_UP, irr::IRR_KEY_J));
}
else
{

View File

@ -1019,8 +1019,8 @@ bool CIrrDeviceMacOSX::run()
if (IsShiftDown != ievent.KeyInput.Shift)
{
ievent.KeyInput.Char = irr::KEY_SHIFT;
ievent.KeyInput.Key = irr::KEY_SHIFT;
ievent.KeyInput.Char = irr::IRR_KEY_SHIFT;
ievent.KeyInput.Key = irr::IRR_KEY_SHIFT;
ievent.KeyInput.PressedDown = ievent.KeyInput.Shift;
IsShiftDown = ievent.KeyInput.Shift;
@ -1030,8 +1030,8 @@ bool CIrrDeviceMacOSX::run()
if (IsControlDown != ievent.KeyInput.Control)
{
ievent.KeyInput.Char = irr::KEY_CONTROL;
ievent.KeyInput.Key = irr::KEY_CONTROL;
ievent.KeyInput.Char = irr::IRR_KEY_CONTROL;
ievent.KeyInput.Key = irr::IRR_KEY_CONTROL;
ievent.KeyInput.PressedDown = ievent.KeyInput.Control;
IsControlDown = ievent.KeyInput.Control;
@ -1220,7 +1220,7 @@ void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed
// workaround for period character
if (c == 0x2E)
{
mkey = irr::KEY_PERIOD;
mkey = irr::IRR_KEY_PERIOD;
mchar = '.';
}
else
@ -1378,115 +1378,114 @@ void CIrrDeviceMacOSX::setCursorVisible(bool visible)
void CIrrDeviceMacOSX::initKeycodes()
{
KeyCodes[kVK_UpArrow] = irr::KEY_UP;
KeyCodes[kVK_DownArrow] = irr::KEY_DOWN;
KeyCodes[kVK_LeftArrow] = irr::KEY_LEFT;
KeyCodes[kVK_RightArrow] = irr::KEY_RIGHT;
KeyCodes[kVK_F1] = irr::KEY_F1;
KeyCodes[kVK_F2] = irr::KEY_F2;
KeyCodes[kVK_F3] = irr::KEY_F3;
KeyCodes[kVK_F4] = irr::KEY_F4;
KeyCodes[kVK_F5] = irr::KEY_F5;
KeyCodes[kVK_F6] = irr::KEY_F6;
KeyCodes[kVK_F7] = irr::KEY_F7;
KeyCodes[kVK_F8] = irr::KEY_F8;
KeyCodes[kVK_F9] = irr::KEY_F9;
KeyCodes[kVK_F10] = irr::KEY_F10;
KeyCodes[kVK_F11] = irr::KEY_F11;
KeyCodes[kVK_F12] = irr::KEY_F12;
KeyCodes[kVK_F13] = irr::KEY_F13;
KeyCodes[kVK_F14] = irr::KEY_F14;
KeyCodes[kVK_F15] = irr::KEY_F15;
KeyCodes[kVK_F16] = irr::KEY_F16;
KeyCodes[kVK_F17] = irr::KEY_F17;
KeyCodes[kVK_F18] = irr::KEY_F18;
KeyCodes[kVK_F19] = irr::KEY_F19;
KeyCodes[kVK_F20] = irr::KEY_F20;
KeyCodes[kVK_Home] = irr::KEY_HOME;
KeyCodes[kVK_End] = irr::KEY_END;
KeyCodes[NSInsertFunctionKey] = irr::KEY_INSERT;
KeyCodes[kVK_ForwardDelete] = irr::KEY_DELETE;
KeyCodes[kVK_Help] = irr::KEY_HELP;
KeyCodes[NSSelectFunctionKey] = irr::KEY_SELECT;
KeyCodes[NSPrintFunctionKey] = irr::KEY_PRINT;
KeyCodes[NSExecuteFunctionKey] = irr::KEY_EXECUT;
KeyCodes[NSPrintScreenFunctionKey] = irr::KEY_SNAPSHOT;
KeyCodes[NSPauseFunctionKey] = irr::KEY_PAUSE;
KeyCodes[NSScrollLockFunctionKey] = irr::KEY_SCROLL;
KeyCodes[kVK_Delete] = irr::KEY_BACK;
KeyCodes[kVK_Tab] = irr::KEY_TAB;
KeyCodes[kVK_Return] = irr::KEY_RETURN;
KeyCodes[kVK_Escape] = irr::KEY_ESCAPE;
KeyCodes[kVK_Control] = irr::KEY_CONTROL;
KeyCodes[kVK_RightControl] = irr::KEY_RCONTROL;
KeyCodes[kVK_Command] = irr::KEY_MENU;
KeyCodes[kVK_Shift] = irr::KEY_SHIFT;
KeyCodes[kVK_RightShift] = irr::KEY_RSHIFT;
KeyCodes[kVK_Space] = irr::KEY_SPACE;
KeyCodes[kVK_UpArrow] = irr::IRR_KEY_UP;
KeyCodes[kVK_DownArrow] = irr::IRR_KEY_DOWN;
KeyCodes[kVK_LeftArrow] = irr::IRR_KEY_LEFT;
KeyCodes[kVK_RightArrow] = irr::IRR_KEY_RIGHT;
KeyCodes[kVK_F1] = irr::IRR_KEY_F1;
KeyCodes[kVK_F2] = irr::IRR_KEY_F2;
KeyCodes[kVK_F3] = irr::IRR_KEY_F3;
KeyCodes[kVK_F4] = irr::IRR_KEY_F4;
KeyCodes[kVK_F5] = irr::IRR_KEY_F5;
KeyCodes[kVK_F6] = irr::IRR_KEY_F6;
KeyCodes[kVK_F7] = irr::IRR_KEY_F7;
KeyCodes[kVK_F8] = irr::IRR_KEY_F8;
KeyCodes[kVK_F9] = irr::IRR_KEY_F9;
KeyCodes[kVK_F10] = irr::IRR_KEY_F10;
KeyCodes[kVK_F11] = irr::IRR_KEY_F11;
KeyCodes[kVK_F12] = irr::IRR_KEY_F12;
KeyCodes[kVK_F13] = irr::IRR_KEY_F13;
KeyCodes[kVK_F14] = irr::IRR_KEY_F14;
KeyCodes[kVK_F15] = irr::IRR_KEY_F15;
KeyCodes[kVK_F16] = irr::IRR_KEY_F16;
KeyCodes[kVK_F17] = irr::IRR_KEY_F17;
KeyCodes[kVK_F18] = irr::IRR_KEY_F18;
KeyCodes[kVK_F19] = irr::IRR_KEY_F19;
KeyCodes[kVK_F20] = irr::IRR_KEY_F20;
KeyCodes[kVK_Home] = irr::IRR_KEY_HOME;
KeyCodes[kVK_End] = irr::IRR_KEY_END;
KeyCodes[NSInsertFunctionKey] = irr::IRR_KEY_INSERT;
KeyCodes[kVK_ForwardDelete] = irr::IRR_KEY_DELETE;
KeyCodes[kVK_Help] = irr::IRR_KEY_HELP;
KeyCodes[NSSelectFunctionKey] = irr::IRR_KEY_SELECT;
KeyCodes[NSPrintFunctionKey] = irr::IRR_KEY_PRINT;
KeyCodes[NSExecuteFunctionKey] = irr::IRR_KEY_EXECUT;
KeyCodes[NSPrintScreenFunctionKey] = irr::IRR_KEY_SNAPSHOT;
KeyCodes[NSPauseFunctionKey] = irr::IRR_KEY_PAUSE;
KeyCodes[NSScrollLockFunctionKey] = irr::IRR_KEY_SCROLL;
KeyCodes[kVK_Delete] = irr::IRR_KEY_BACK;
KeyCodes[kVK_Tab] = irr::IRR_KEY_TAB;
KeyCodes[kVK_Return] = irr::IRR_KEY_RETURN;
KeyCodes[kVK_Escape] = irr::IRR_KEY_ESCAPE;
KeyCodes[kVK_Control] = irr::IRR_KEY_CONTROL;
KeyCodes[kVK_RightControl] = irr::IRR_KEY_RCONTROL;
KeyCodes[kVK_Command] = irr::IRR_KEY_MENU;
KeyCodes[kVK_Shift] = irr::IRR_KEY_SHIFT;
KeyCodes[kVK_RightShift] = irr::IRR_KEY_RSHIFT;
KeyCodes[kVK_Space] = irr::IRR_KEY_SPACE;
KeyCodes[kVK_ANSI_A] = irr::KEY_KEY_A;
KeyCodes[kVK_ANSI_B] = irr::KEY_KEY_B;
KeyCodes[kVK_ANSI_C] = irr::KEY_KEY_C;
KeyCodes[kVK_ANSI_D] = irr::KEY_KEY_D;
KeyCodes[kVK_ANSI_E] = irr::KEY_KEY_E;
KeyCodes[kVK_ANSI_F] = irr::KEY_KEY_F;
KeyCodes[kVK_ANSI_G] = irr::KEY_KEY_G;
KeyCodes[kVK_ANSI_H] = irr::KEY_KEY_H;
KeyCodes[kVK_ANSI_I] = irr::KEY_KEY_I;
KeyCodes[kVK_ANSI_J] = irr::KEY_KEY_J;
KeyCodes[kVK_ANSI_K] = irr::KEY_KEY_K;
KeyCodes[kVK_ANSI_L] = irr::KEY_KEY_L;
KeyCodes[kVK_ANSI_M] = irr::KEY_KEY_M;
KeyCodes[kVK_ANSI_N] = irr::KEY_KEY_N;
KeyCodes[kVK_ANSI_O] = irr::KEY_KEY_O;
KeyCodes[kVK_ANSI_P] = irr::KEY_KEY_P;
KeyCodes[kVK_ANSI_Q] = irr::KEY_KEY_Q;
KeyCodes[kVK_ANSI_R] = irr::KEY_KEY_R;
KeyCodes[kVK_ANSI_S] = irr::KEY_KEY_S;
KeyCodes[kVK_ANSI_T] = irr::KEY_KEY_T;
KeyCodes[kVK_ANSI_U] = irr::KEY_KEY_U;
KeyCodes[kVK_ANSI_V] = irr::KEY_KEY_V;
KeyCodes[kVK_ANSI_W] = irr::KEY_KEY_W;
KeyCodes[kVK_ANSI_X] = irr::KEY_KEY_X;
KeyCodes[kVK_ANSI_X] = irr::KEY_KEY_X;
KeyCodes[kVK_ANSI_Y] = irr::KEY_KEY_Y;
KeyCodes[kVK_ANSI_Z] = irr::KEY_KEY_Z;
KeyCodes[kVK_ANSI_A] = irr::IRR_KEY_A;
KeyCodes[kVK_ANSI_B] = irr::IRR_KEY_B;
KeyCodes[kVK_ANSI_C] = irr::IRR_KEY_C;
KeyCodes[kVK_ANSI_D] = irr::IRR_KEY_D;
KeyCodes[kVK_ANSI_E] = irr::IRR_KEY_E;
KeyCodes[kVK_ANSI_F] = irr::IRR_KEY_F;
KeyCodes[kVK_ANSI_G] = irr::IRR_KEY_G;
KeyCodes[kVK_ANSI_H] = irr::IRR_KEY_H;
KeyCodes[kVK_ANSI_I] = irr::IRR_KEY_I;
KeyCodes[kVK_ANSI_J] = irr::IRR_KEY_J;
KeyCodes[kVK_ANSI_K] = irr::IRR_KEY_K;
KeyCodes[kVK_ANSI_L] = irr::IRR_KEY_L;
KeyCodes[kVK_ANSI_M] = irr::IRR_KEY_M;
KeyCodes[kVK_ANSI_N] = irr::IRR_KEY_N;
KeyCodes[kVK_ANSI_O] = irr::IRR_KEY_O;
KeyCodes[kVK_ANSI_P] = irr::IRR_KEY_P;
KeyCodes[kVK_ANSI_Q] = irr::IRR_KEY_Q;
KeyCodes[kVK_ANSI_R] = irr::IRR_KEY_R;
KeyCodes[kVK_ANSI_S] = irr::IRR_KEY_S;
KeyCodes[kVK_ANSI_T] = irr::IRR_KEY_T;
KeyCodes[kVK_ANSI_U] = irr::IRR_KEY_U;
KeyCodes[kVK_ANSI_V] = irr::IRR_KEY_V;
KeyCodes[kVK_ANSI_W] = irr::IRR_KEY_W;
KeyCodes[kVK_ANSI_X] = irr::IRR_KEY_X;
KeyCodes[kVK_ANSI_Y] = irr::IRR_KEY_Y;
KeyCodes[kVK_ANSI_Z] = irr::IRR_KEY_Z;
KeyCodes[kVK_ANSI_0] = irr::KEY_KEY_0;
KeyCodes[kVK_ANSI_1] = irr::KEY_KEY_1;
KeyCodes[kVK_ANSI_2] = irr::KEY_KEY_2;
KeyCodes[kVK_ANSI_3] = irr::KEY_KEY_3;
KeyCodes[kVK_ANSI_4] = irr::KEY_KEY_4;
KeyCodes[kVK_ANSI_5] = irr::KEY_KEY_5;
KeyCodes[kVK_ANSI_6] = irr::KEY_KEY_6;
KeyCodes[kVK_ANSI_7] = irr::KEY_KEY_7;
KeyCodes[kVK_ANSI_8] = irr::KEY_KEY_8;
KeyCodes[kVK_ANSI_9] = irr::KEY_KEY_9;
KeyCodes[kVK_ANSI_0] = irr::IRR_KEY_0;
KeyCodes[kVK_ANSI_1] = irr::IRR_KEY_1;
KeyCodes[kVK_ANSI_2] = irr::IRR_KEY_2;
KeyCodes[kVK_ANSI_3] = irr::IRR_KEY_3;
KeyCodes[kVK_ANSI_4] = irr::IRR_KEY_4;
KeyCodes[kVK_ANSI_5] = irr::IRR_KEY_5;
KeyCodes[kVK_ANSI_6] = irr::IRR_KEY_6;
KeyCodes[kVK_ANSI_7] = irr::IRR_KEY_7;
KeyCodes[kVK_ANSI_8] = irr::IRR_KEY_8;
KeyCodes[kVK_ANSI_9] = irr::IRR_KEY_9;
KeyCodes[kVK_ANSI_Slash] = irr::KEY_DIVIDE;
KeyCodes[kVK_ANSI_Comma] = irr::KEY_COMMA;
KeyCodes[kVK_ANSI_Period] = irr::KEY_PERIOD;
KeyCodes[kVK_PageUp] = irr::KEY_PRIOR;
KeyCodes[kVK_PageDown] = irr::KEY_NEXT;
KeyCodes[kVK_ANSI_Slash] = irr::IRR_KEY_DIVIDE;
KeyCodes[kVK_ANSI_Comma] = irr::IRR_KEY_COMMA;
KeyCodes[kVK_ANSI_Period] = irr::IRR_KEY_PERIOD;
KeyCodes[kVK_PageUp] = irr::IRR_KEY_PRIOR;
KeyCodes[kVK_PageDown] = irr::IRR_KEY_NEXT;
KeyCodes[kVK_ANSI_Keypad0] = irr::KEY_NUMPAD0;
KeyCodes[kVK_ANSI_Keypad1] = irr::KEY_NUMPAD1;
KeyCodes[kVK_ANSI_Keypad2] = irr::KEY_NUMPAD2;
KeyCodes[kVK_ANSI_Keypad3] = irr::KEY_NUMPAD3;
KeyCodes[kVK_ANSI_Keypad4] = irr::KEY_NUMPAD4;
KeyCodes[kVK_ANSI_Keypad5] = irr::KEY_NUMPAD5;
KeyCodes[kVK_ANSI_Keypad6] = irr::KEY_NUMPAD6;
KeyCodes[kVK_ANSI_Keypad7] = irr::KEY_NUMPAD7;
KeyCodes[kVK_ANSI_Keypad8] = irr::KEY_NUMPAD8;
KeyCodes[kVK_ANSI_Keypad9] = irr::KEY_NUMPAD9;
KeyCodes[kVK_ANSI_Keypad0] = irr::IRR_KEY_NUMPAD0;
KeyCodes[kVK_ANSI_Keypad1] = irr::IRR_KEY_NUMPAD1;
KeyCodes[kVK_ANSI_Keypad2] = irr::IRR_KEY_NUMPAD2;
KeyCodes[kVK_ANSI_Keypad3] = irr::IRR_KEY_NUMPAD3;
KeyCodes[kVK_ANSI_Keypad4] = irr::IRR_KEY_NUMPAD4;
KeyCodes[kVK_ANSI_Keypad5] = irr::IRR_KEY_NUMPAD5;
KeyCodes[kVK_ANSI_Keypad6] = irr::IRR_KEY_NUMPAD6;
KeyCodes[kVK_ANSI_Keypad7] = irr::IRR_KEY_NUMPAD7;
KeyCodes[kVK_ANSI_Keypad8] = irr::IRR_KEY_NUMPAD8;
KeyCodes[kVK_ANSI_Keypad9] = irr::IRR_KEY_NUMPAD9;
KeyCodes[kVK_ANSI_KeypadDecimal] = irr::KEY_DECIMAL;
KeyCodes[kVK_ANSI_KeypadMultiply] = irr::KEY_MULTIPLY;
KeyCodes[kVK_ANSI_KeypadPlus] = irr::KEY_PLUS;
KeyCodes[kVK_ANSI_KeypadClear] = irr::KEY_OEM_CLEAR;
KeyCodes[kVK_ANSI_KeypadDivide] = irr::KEY_DIVIDE;
KeyCodes[kVK_ANSI_KeypadEnter] = irr::KEY_RETURN;
KeyCodes[kVK_ANSI_KeypadMinus] = irr::KEY_SUBTRACT;
KeyCodes[kVK_ANSI_KeypadDecimal] = irr::IRR_KEY_DECIMAL;
KeyCodes[kVK_ANSI_KeypadMultiply] = irr::IRR_KEY_MULTIPLY;
KeyCodes[kVK_ANSI_KeypadPlus] = irr::IRR_KEY_PLUS;
KeyCodes[kVK_ANSI_KeypadClear] = irr::IRR_KEY_OEM_CLEAR;
KeyCodes[kVK_ANSI_KeypadDivide] = irr::IRR_KEY_DIVIDE;
KeyCodes[kVK_ANSI_KeypadEnter] = irr::IRR_KEY_RETURN;
KeyCodes[kVK_ANSI_KeypadMinus] = irr::IRR_KEY_SUBTRACT;
}

View File

@ -237,7 +237,7 @@ bool EventHandler::OnEvent (const SEvent &event)
const EventPropagation blockPropagation = input_manager->input(event);
if (event.EventType == EET_KEY_INPUT_EVENT &&
event.KeyInput.Key == irr::KEY_TAB)
event.KeyInput.Key == irr::IRR_KEY_TAB)
{
// block all tab events, if we let them go, irrlicht will try
// to apply its own focus code

View File

@ -269,19 +269,19 @@ EventPropagation ScreenKeyboard::processEvent(const std::string& eventSource)
}
else if (eventSource == "Back")
{
event.KeyInput.Key = KEY_BACK;
event.KeyInput.Key = IRR_KEY_BACK;
event.KeyInput.Char = 0;
send_event = true;
}
else if (eventSource == "Space")
{
event.KeyInput.Key = KEY_UNKNOWN;
event.KeyInput.Key = IRR_KEY_UNKNOWN;
event.KeyInput.Char = ' ';
send_event = true;
}
else if (eventSource.size() > 0)
{
event.KeyInput.Key = KEY_UNKNOWN;
event.KeyInput.Key = IRR_KEY_UNKNOWN;
event.KeyInput.Char = eventSource.at(0);
send_event = true;
}

View File

@ -324,12 +324,12 @@ bool CGUIEditBox::processKey(const SEvent& event)
switch(event.KeyInput.Key)
{
case KEY_KEY_A:
case IRR_KEY_A:
// select all
newMarkBegin = 0;
newMarkEnd = Text.size();
break;
case KEY_KEY_C:
case IRR_KEY_C:
// copy to clipboard
if (!PasswordBox && Operator && MarkBegin != MarkEnd)
{
@ -345,7 +345,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
#endif
}
break;
case KEY_KEY_X:
case IRR_KEY_X:
// cut to the clipboard
if (!PasswordBox && Operator && MarkBegin != MarkEnd)
{
@ -377,7 +377,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
break;
case KEY_KEY_V:
case IRR_KEY_V:
if ( !isEnabled() )
break;
@ -448,7 +448,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
textChanged = true;
}
break;
case KEY_HOME:
case IRR_KEY_HOME:
if (!m_rtl)
{
// move/highlight to start of text
@ -466,7 +466,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
}
break;
case KEY_END:
case IRR_KEY_END:
if (!m_rtl)
{
// move/highlight to end of text
@ -493,33 +493,33 @@ bool CGUIEditBox::processKey(const SEvent& event)
switch(event.KeyInput.Key)
{
/*
case KEY_KEY_Q:
case IRR_KEY_Q:
inputChar(L'\u05DC');
textChanged = true;
return true;
case KEY_KEY_W:
case IRR_KEY_W:
inputChar(L'\u05DB');
textChanged = true;
return true;
case KEY_KEY_E:
case IRR_KEY_E:
inputChar(L'\u05DA');
textChanged = true;
return true;
case KEY_KEY_R:
case IRR_KEY_R:
inputChar(L'\u05D9');
textChanged = true;
return true;
case KEY_KEY_T:
case IRR_KEY_T:
inputChar(L'\u05D8');
textChanged = true;
return true;
case KEY_KEY_Y:
case IRR_KEY_Y:
inputChar(L'\u05D7');
textChanged = true;
return true;
*/
case KEY_END:
case IRR_KEY_END:
if (!m_rtl)
{
s32 p = Text.size();
@ -547,7 +547,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
BlinkStartTime = getTime();
}
break;
case KEY_HOME:
case IRR_KEY_HOME:
if (!m_rtl)
{
@ -573,7 +573,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
BlinkStartTime = getTime();
}
break;
case KEY_RETURN:
case IRR_KEY_RETURN:
if (MultiLine)
{
inputChar(L'\n');
@ -584,7 +584,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
sendGuiEvent( EGET_EDITBOX_ENTER );
}
break;
case KEY_LEFT:
case IRR_KEY_LEFT:
if (!m_rtl)
{
if (event.KeyInput.Shift)
@ -608,7 +608,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
break;
case KEY_RIGHT:
case IRR_KEY_RIGHT:
if (!m_rtl)
{
if (event.KeyInput.Shift)
@ -631,7 +631,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
BlinkStartTime = getTime();
}
break;
case KEY_UP:
case IRR_KEY_UP:
if (MultiLine || (WordWrap && BrokenText.size() > 1) )
{
s32 lineNo = getLineFromPos(CursorPos);
@ -662,7 +662,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
return false;
}
break;
case KEY_DOWN:
case IRR_KEY_DOWN:
if (MultiLine || (WordWrap && BrokenText.size() > 1) )
{
s32 lineNo = getLineFromPos(CursorPos);
@ -694,7 +694,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
break;
case KEY_BACK:
case IRR_KEY_BACK:
if ( !isEnabled() )
break;
@ -734,7 +734,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
textChanged = true;
}
break;
case KEY_DELETE:
case IRR_KEY_DELETE:
if ( !isEnabled() )
break;
@ -772,33 +772,33 @@ bool CGUIEditBox::processKey(const SEvent& event)
}
break;
case KEY_ESCAPE:
case KEY_TAB:
case KEY_SHIFT:
case KEY_F1:
case KEY_F2:
case KEY_F3:
case KEY_F4:
case KEY_F5:
case KEY_F6:
case KEY_F7:
case KEY_F8:
case KEY_F9:
case KEY_F10:
case KEY_F11:
case KEY_F12:
case KEY_F13:
case KEY_F14:
case KEY_F15:
case KEY_F16:
case KEY_F17:
case KEY_F18:
case KEY_F19:
case KEY_F20:
case KEY_F21:
case KEY_F22:
case KEY_F23:
case KEY_F24:
case IRR_KEY_ESCAPE:
case IRR_KEY_TAB:
case IRR_KEY_SHIFT:
case IRR_KEY_F1:
case IRR_KEY_F2:
case IRR_KEY_F3:
case IRR_KEY_F4:
case IRR_KEY_F5:
case IRR_KEY_F6:
case IRR_KEY_F7:
case IRR_KEY_F8:
case IRR_KEY_F9:
case IRR_KEY_F10:
case IRR_KEY_F11:
case IRR_KEY_F12:
case IRR_KEY_F13:
case IRR_KEY_F14:
case IRR_KEY_F15:
case IRR_KEY_F16:
case IRR_KEY_F17:
case IRR_KEY_F18:
case IRR_KEY_F19:
case IRR_KEY_F20:
case IRR_KEY_F21:
case IRR_KEY_F22:
case IRR_KEY_F23:
case IRR_KEY_F24:
// ignore these keys
return false;
@ -822,29 +822,29 @@ bool CGUIEditBox::processKey(const SEvent& event)
#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
switch(event.KeyInput.Key)
{
// If cursor points the surrogate low, send KEY_LEFT event.
case KEY_UP:
case KEY_DOWN:
// If cursor points the surrogate low, send IRR_KEY_LEFT event.
case IRR_KEY_UP:
case IRR_KEY_DOWN:
if (MultiLine || (WordWrap && BrokenText.size() > 1) )
{
if (UTF16_IS_SURROGATE_LO(Text[CursorPos]))
{
SEvent leftEvent;
leftEvent = event;
leftEvent.KeyInput.Key = KEY_LEFT;
leftEvent.KeyInput.Key = IRR_KEY_LEFT;
Environment->postEventFromUser(leftEvent);
}
}
break;
// If cursor points the surrogate low, send a same event.
case KEY_LEFT:
case KEY_RIGHT:
case KEY_DELETE:
case IRR_KEY_LEFT:
case IRR_KEY_RIGHT:
case IRR_KEY_DELETE:
if (UTF16_IS_SURROGATE_LO(Text[CursorPos]))
Environment->postEventFromUser(event);
break;
// If cursor points front of the surrogate high, send a same event.
case KEY_BACK:
case IRR_KEY_BACK:
if (CursorPos > 0)
{
if (UTF16_IS_SURROGATE_HI(Text[CursorPos-1]))

View File

@ -256,32 +256,32 @@ bool CGUISTKListBox::OnEvent(const SEvent& event)
{
case EET_KEY_INPUT_EVENT:
if (event.KeyInput.PressedDown &&
(event.KeyInput.Key == KEY_DOWN ||
event.KeyInput.Key == KEY_UP ||
event.KeyInput.Key == KEY_HOME ||
event.KeyInput.Key == KEY_END ||
event.KeyInput.Key == KEY_NEXT ||
event.KeyInput.Key == KEY_PRIOR ) )
(event.KeyInput.Key == IRR_KEY_DOWN ||
event.KeyInput.Key == IRR_KEY_UP ||
event.KeyInput.Key == IRR_KEY_HOME ||
event.KeyInput.Key == IRR_KEY_END ||
event.KeyInput.Key == IRR_KEY_NEXT ||
event.KeyInput.Key == IRR_KEY_PRIOR ) )
{
s32 oldSelected = Selected;
switch (event.KeyInput.Key)
{
case KEY_DOWN:
case IRR_KEY_DOWN:
Selected += 1;
break;
case KEY_UP:
case IRR_KEY_UP:
Selected -= 1;
break;
case KEY_HOME:
case IRR_KEY_HOME:
Selected = 0;
break;
case KEY_END:
case IRR_KEY_END:
Selected = (s32)Items.size()-1;
break;
case KEY_NEXT:
case IRR_KEY_NEXT:
Selected += AbsoluteRect.getHeight() / ItemHeight;
break;
case KEY_PRIOR:
case IRR_KEY_PRIOR:
Selected -= AbsoluteRect.getHeight() / ItemHeight;
break;
default:
@ -310,7 +310,9 @@ bool CGUISTKListBox::OnEvent(const SEvent& event)
return true;
}
else
if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
if (!event.KeyInput.PressedDown &&
(event.KeyInput.Key == IRR_KEY_RETURN ||
event.KeyInput.Key == IRR_KEY_SPACE))
{
if (Parent)
{

View File

@ -98,7 +98,7 @@ irr::core::stringw Binding::getAsString() const
{
#if defined(WIN32) || (defined(__linux__) && !defined(ANDROID))
// Windows codes certain special keys, which have atm no defined
// value in irr::KEY_*. So for now hardcode the values.
// value in irr::IRR_KEY_*. So for now hardcode the values.
// FIXME: what happens with international keyboards? E.g. A [
// might be an Umlaut on a German keyboard. How do we get
// the character to display in this case??
@ -111,218 +111,218 @@ irr::core::stringw Binding::getAsString() const
case 222: s="'"; break;
#endif
//I18N: input configuration screen: mouse button
case irr::KEY_LBUTTON : s = _C("input_key", "Left Mouse Button"); break;
case irr::IRR_KEY_LBUTTON : s = _C("input_key", "Left Mouse Button"); break;
//I18N: input configuration screen: mouse button
case irr::KEY_RBUTTON : s = _C("input_key", "Right Mouse Button"); break;
case irr::IRR_KEY_RBUTTON : s = _C("input_key", "Right Mouse Button"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_CANCEL : s = _C("input_key", "Cancel"); break;
case irr::IRR_KEY_CANCEL : s = _C("input_key", "Cancel"); break;
//I18N: input configuration screen: mouse button
case irr::KEY_MBUTTON : s = _C("input_key", "Middle Mouse Button"); break;
case irr::IRR_KEY_MBUTTON : s = _C("input_key", "Middle Mouse Button"); break;
//I18N: input configuration screen: mouse button
case irr::KEY_XBUTTON1 : s = _C("input_key", "X1 Mouse Button"); break;
case irr::IRR_KEY_XBUTTON1 : s = _C("input_key", "X1 Mouse Button"); break;
//I18N: input configuration screen: mouse button
case irr::KEY_XBUTTON2 : s = _C("input_key", "X2 Mouse Button"); break;
case irr::IRR_KEY_XBUTTON2 : s = _C("input_key", "X2 Mouse Button"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_BACK : s = _C("input_key", "Backspace"); break;
case irr::IRR_KEY_BACK : s = _C("input_key", "Backspace"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_TAB : s = _C("input_key", "Tab"); break;
case irr::IRR_KEY_TAB : s = _C("input_key", "Tab"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_CLEAR : s = _C("input_key", "Clear"); break;
case irr::IRR_KEY_CLEAR : s = _C("input_key", "Clear"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_RETURN : s = _C("input_key", "Return"); break;
case irr::IRR_KEY_RETURN : s = _C("input_key", "Return"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SHIFT : s = _C("input_key", "Shift"); break;
case irr::IRR_KEY_SHIFT : s = _C("input_key", "Shift"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_CONTROL : s = _C("input_key", "Control"); break;
case irr::IRR_KEY_CONTROL : s = _C("input_key", "Control"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_MENU : s = _C("input_key", "Alt/Menu"); break;
case irr::IRR_KEY_MENU : s = _C("input_key", "Alt/Menu"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_PAUSE : s = _C("input_key", "Pause"); break;
case irr::IRR_KEY_PAUSE : s = _C("input_key", "Pause"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_CAPITAL : s = _C("input_key", "Caps Lock"); break;
case irr::IRR_KEY_CAPITAL : s = _C("input_key", "Caps Lock"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_KANA : s = _C("input_key", "Kana"); break;
case irr::IRR_KEY_KANA : s = _C("input_key", "Kana"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_JUNJA : s = _C("input_key", "Junja"); break;
case irr::IRR_KEY_JUNJA : s = _C("input_key", "Junja"); break;
//I18N: input configuration screen: keyboard key
//I18N: input configuration screen: keyboard key
case irr::KEY_FINAL : s = _C("input_key", "Final"); break;
case irr::IRR_KEY_FINAL : s = _C("input_key", "Final"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_ESCAPE : s = _C("input_key", "Escape"); break;
case irr::IRR_KEY_ESCAPE : s = _C("input_key", "Escape"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_CONVERT : s = _C("input_key", "Convert"); break;
case irr::IRR_KEY_CONVERT : s = _C("input_key", "Convert"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NONCONVERT : s = _C("input_key", "Nonconvert"); break;
case irr::IRR_KEY_NONCONVERT : s = _C("input_key", "Nonconvert"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_ACCEPT : s = _C("input_key", "Accept"); break;
case irr::IRR_KEY_ACCEPT : s = _C("input_key", "Accept"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_MODECHANGE : s = _C("input_key", "Modechange"); break;
case irr::IRR_KEY_MODECHANGE : s = _C("input_key", "Modechange"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SPACE : s = _C("input_key", "Space"); break;
case irr::IRR_KEY_SPACE : s = _C("input_key", "Space"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_PRIOR : s = _C("input_key", "Page Up"); break;
case irr::IRR_KEY_PRIOR : s = _C("input_key", "Page Up"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NEXT : s = _C("input_key", "Page Down"); break;
case irr::IRR_KEY_NEXT : s = _C("input_key", "Page Down"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_END : s = _C("input_key", "End"); break;
case irr::IRR_KEY_END : s = _C("input_key", "End"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_HOME : s = _C("input_key", "Home"); break;
case irr::IRR_KEY_HOME : s = _C("input_key", "Home"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_LEFT : s = _C("input_key", "Left"); break;
case irr::IRR_KEY_LEFT : s = _C("input_key", "Left"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_UP : s = _C("input_key", "Up"); break;
case irr::IRR_KEY_UP : s = _C("input_key", "Up"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_RIGHT : s = _C("input_key", "Right"); break;
case irr::IRR_KEY_RIGHT : s = _C("input_key", "Right"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_DOWN : s = _C("input_key", "Down"); break;
case irr::IRR_KEY_DOWN : s = _C("input_key", "Down"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SELECT : s = _C("input_key", "Select"); break;
case irr::IRR_KEY_SELECT : s = _C("input_key", "Select"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_PRINT : s = _C("input_key", "Print"); break;
case irr::IRR_KEY_PRINT : s = _C("input_key", "Print"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_EXECUT : s = _C("input_key", "Exec"); break;
case irr::IRR_KEY_EXECUT : s = _C("input_key", "Exec"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SNAPSHOT : s = _C("input_key", "Print Screen"); break;
case irr::IRR_KEY_SNAPSHOT : s = _C("input_key", "Print Screen"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_INSERT : s = _C("input_key", "Insert"); break;
case irr::IRR_KEY_INSERT : s = _C("input_key", "Insert"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_DELETE : s = _C("input_key", "Delete"); break;
case irr::IRR_KEY_DELETE : s = _C("input_key", "Delete"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_HELP : s = _C("input_key", "Help"); break;
case irr::KEY_KEY_0 : s = "0"; break;
case irr::KEY_KEY_1 : s = "1"; break;
case irr::KEY_KEY_2 : s = "2"; break;
case irr::KEY_KEY_3 : s = "3"; break;
case irr::KEY_KEY_4 : s = "4"; break;
case irr::KEY_KEY_5 : s = "5"; break;
case irr::KEY_KEY_6 : s = "6"; break;
case irr::KEY_KEY_7 : s = "7"; break;
case irr::KEY_KEY_8 : s = "8"; break;
case irr::KEY_KEY_9 : s = "9"; break;
case irr::KEY_KEY_A : s = "A"; break;
case irr::KEY_KEY_B : s = "B"; break;
case irr::KEY_KEY_C : s = "C"; break;
case irr::KEY_KEY_D : s = "D"; break;
case irr::KEY_KEY_E : s = "E"; break;
case irr::KEY_KEY_F : s = "F"; break;
case irr::KEY_KEY_G : s = "G"; break;
case irr::KEY_KEY_H : s = "H"; break;
case irr::KEY_KEY_I : s = "I"; break;
case irr::KEY_KEY_J : s = "J"; break;
case irr::KEY_KEY_K : s = "K"; break;
case irr::KEY_KEY_L : s = "L"; break;
case irr::KEY_KEY_M : s = "M"; break;
case irr::KEY_KEY_N : s = "N"; break;
case irr::KEY_KEY_O : s = "O"; break;
case irr::KEY_KEY_P : s = "P"; break;
case irr::KEY_KEY_Q : s = "Q"; break;
case irr::KEY_KEY_R : s = "R"; break;
case irr::KEY_KEY_S : s = "S"; break;
case irr::KEY_KEY_T : s = "T"; break;
case irr::KEY_KEY_U : s = "U"; break;
case irr::KEY_KEY_V : s = "V"; break;
case irr::KEY_KEY_W : s = "W"; break;
case irr::KEY_KEY_X : s = "X"; break;
case irr::KEY_KEY_Y : s = "Y"; break;
case irr::KEY_KEY_Z : s = "Z"; break;
case irr::IRR_KEY_HELP : s = _C("input_key", "Help"); break;
case irr::IRR_KEY_0 : s = "0"; break;
case irr::IRR_KEY_1 : s = "1"; break;
case irr::IRR_KEY_2 : s = "2"; break;
case irr::IRR_KEY_3 : s = "3"; break;
case irr::IRR_KEY_4 : s = "4"; break;
case irr::IRR_KEY_5 : s = "5"; break;
case irr::IRR_KEY_6 : s = "6"; break;
case irr::IRR_KEY_7 : s = "7"; break;
case irr::IRR_KEY_8 : s = "8"; break;
case irr::IRR_KEY_9 : s = "9"; break;
case irr::IRR_KEY_A : s = "A"; break;
case irr::IRR_KEY_B : s = "B"; break;
case irr::IRR_KEY_C : s = "C"; break;
case irr::IRR_KEY_D : s = "D"; break;
case irr::IRR_KEY_E : s = "E"; break;
case irr::IRR_KEY_F : s = "F"; break;
case irr::IRR_KEY_G : s = "G"; break;
case irr::IRR_KEY_H : s = "H"; break;
case irr::IRR_KEY_I : s = "I"; break;
case irr::IRR_KEY_J : s = "J"; break;
case irr::IRR_KEY_K : s = "K"; break;
case irr::IRR_KEY_L : s = "L"; break;
case irr::IRR_KEY_M : s = "M"; break;
case irr::IRR_KEY_N : s = "N"; break;
case irr::IRR_KEY_O : s = "O"; break;
case irr::IRR_KEY_P : s = "P"; break;
case irr::IRR_KEY_Q : s = "Q"; break;
case irr::IRR_KEY_R : s = "R"; break;
case irr::IRR_KEY_S : s = "S"; break;
case irr::IRR_KEY_T : s = "T"; break;
case irr::IRR_KEY_U : s = "U"; break;
case irr::IRR_KEY_V : s = "V"; break;
case irr::IRR_KEY_W : s = "W"; break;
case irr::IRR_KEY_X : s = "X"; break;
case irr::IRR_KEY_Y : s = "Y"; break;
case irr::IRR_KEY_Z : s = "Z"; break;
//I18N: input configuration screen: keyboard key
case irr::KEY_LWIN : s = _C("input_key", "Left Logo"); break;
case irr::IRR_KEY_LWIN : s = _C("input_key", "Left Logo"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_RWIN : s = _C("input_key", "Right Logo"); break;
case irr::IRR_KEY_RWIN : s = _C("input_key", "Right Logo"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_APPS : s = _C("input_key", "Apps"); break;
case irr::IRR_KEY_APPS : s = _C("input_key", "Apps"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SLEEP : s = _C("input_key", "Sleep"); break;
case irr::IRR_KEY_SLEEP : s = _C("input_key", "Sleep"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD0 : s = _C("input_key", "Numpad 0"); break;
case irr::IRR_KEY_NUMPAD0 : s = _C("input_key", "Numpad 0"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD1 : s = _C("input_key", "Numpad 1"); break;
case irr::IRR_KEY_NUMPAD1 : s = _C("input_key", "Numpad 1"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD2 : s = _C("input_key", "Numpad 2"); break;
case irr::IRR_KEY_NUMPAD2 : s = _C("input_key", "Numpad 2"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD3 : s = _C("input_key", "Numpad 3"); break;
case irr::IRR_KEY_NUMPAD3 : s = _C("input_key", "Numpad 3"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD4 : s = _C("input_key", "Numpad 4"); break;
case irr::IRR_KEY_NUMPAD4 : s = _C("input_key", "Numpad 4"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD5 : s = _C("input_key", "Numpad 5"); break;
case irr::IRR_KEY_NUMPAD5 : s = _C("input_key", "Numpad 5"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD6 : s = _C("input_key", "Numpad 6"); break;
case irr::IRR_KEY_NUMPAD6 : s = _C("input_key", "Numpad 6"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD7 : s = _C("input_key", "Numpad 7"); break;
case irr::IRR_KEY_NUMPAD7 : s = _C("input_key", "Numpad 7"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD8 : s = _C("input_key", "Numpad 8"); break;
case irr::IRR_KEY_NUMPAD8 : s = _C("input_key", "Numpad 8"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMPAD9 : s = _C("input_key", "Numpad 9"); break;
case irr::KEY_MULTIPLY : s = "*"; break;
case irr::KEY_ADD : s = "+"; break;
case irr::IRR_KEY_NUMPAD9 : s = _C("input_key", "Numpad 9"); break;
case irr::IRR_KEY_MULTIPLY : s = "*"; break;
case irr::IRR_KEY_ADD : s = "+"; break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SEPARATOR : s = _C("input_key", "Separator"); break;
case irr::IRR_KEY_SEPARATOR : s = _C("input_key", "Separator"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SUBTRACT : s = _C("input_key", "- (Subtract)"); break;
case irr::IRR_KEY_SUBTRACT : s = _C("input_key", "- (Subtract)"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_DECIMAL : s = _C("input_key", "Decimal"); break;
case irr::IRR_KEY_DECIMAL : s = _C("input_key", "Decimal"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_DIVIDE : s = _C("input_key", "/ (Divide)"); break;
case irr::KEY_F1 : s = "F1"; break;
case irr::KEY_F2 : s = "F2"; break;
case irr::KEY_F3 : s = "F3"; break;
case irr::KEY_F4 : s = "F4"; break;
case irr::KEY_F5 : s = "F5"; break;
case irr::KEY_F6 : s = "F6"; break;
case irr::KEY_F7 : s = "F7"; break;
case irr::KEY_F8 : s = "F8"; break;
case irr::KEY_F9 : s = "F9"; break;
case irr::KEY_F10 : s = "F10"; break;
case irr::KEY_F11 : s = "F11"; break;
case irr::KEY_F12 : s = "F12"; break;
case irr::KEY_F13 : s = "F13"; break;
case irr::KEY_F14 : s = "F14"; break;
case irr::KEY_F15 : s = "F15"; break;
case irr::KEY_F16 : s = "F16"; break;
case irr::KEY_F17 : s = "F17"; break;
case irr::KEY_F18 : s = "F18"; break;
case irr::KEY_F19 : s = "F19"; break;
case irr::KEY_F20 : s = "F20"; break;
case irr::KEY_F21 : s = "F21"; break;
case irr::KEY_F22 : s = "F22"; break;
case irr::KEY_F23 : s = "F23"; break;
case irr::KEY_F24 : s = "F24"; break;
case irr::IRR_KEY_DIVIDE : s = _C("input_key", "/ (Divide)"); break;
case irr::IRR_KEY_F1 : s = "F1"; break;
case irr::IRR_KEY_F2 : s = "F2"; break;
case irr::IRR_KEY_F3 : s = "F3"; break;
case irr::IRR_KEY_F4 : s = "F4"; break;
case irr::IRR_KEY_F5 : s = "F5"; break;
case irr::IRR_KEY_F6 : s = "F6"; break;
case irr::IRR_KEY_F7 : s = "F7"; break;
case irr::IRR_KEY_F8 : s = "F8"; break;
case irr::IRR_KEY_F9 : s = "F9"; break;
case irr::IRR_KEY_F10 : s = "F10"; break;
case irr::IRR_KEY_F11 : s = "F11"; break;
case irr::IRR_KEY_F12 : s = "F12"; break;
case irr::IRR_KEY_F13 : s = "F13"; break;
case irr::IRR_KEY_F14 : s = "F14"; break;
case irr::IRR_KEY_F15 : s = "F15"; break;
case irr::IRR_KEY_F16 : s = "F16"; break;
case irr::IRR_KEY_F17 : s = "F17"; break;
case irr::IRR_KEY_F18 : s = "F18"; break;
case irr::IRR_KEY_F19 : s = "F19"; break;
case irr::IRR_KEY_F20 : s = "F20"; break;
case irr::IRR_KEY_F21 : s = "F21"; break;
case irr::IRR_KEY_F22 : s = "F22"; break;
case irr::IRR_KEY_F23 : s = "F23"; break;
case irr::IRR_KEY_F24 : s = "F24"; break;
//I18N: input configuration screen: keyboard key
case irr::KEY_NUMLOCK : s = _C("input_key", "Num Lock"); break;
case irr::IRR_KEY_NUMLOCK : s = _C("input_key", "Num Lock"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_SCROLL : s = _C("input_key", "Scroll Lock"); break;
case irr::IRR_KEY_SCROLL : s = _C("input_key", "Scroll Lock"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_LSHIFT : s = _C("input_key", "Left Shift"); break;
case irr::IRR_KEY_LSHIFT : s = _C("input_key", "Left Shift"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_RSHIFT : s = _C("input_key", "Right Shift"); break;
case irr::IRR_KEY_RSHIFT : s = _C("input_key", "Right Shift"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_LCONTROL : s = _C("input_key", "Left Control"); break;
case irr::IRR_KEY_LCONTROL : s = _C("input_key", "Left Control"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_RCONTROL : s = _C("input_key", "Right Control"); break;
case irr::IRR_KEY_RCONTROL : s = _C("input_key", "Right Control"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_LMENU : s = _C("input_key", "Left Menu"); break;
case irr::IRR_KEY_LMENU : s = _C("input_key", "Left Menu"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_RMENU : s = _C("input_key", "Right Menu"); break;
case irr::KEY_PLUS : s = "+"; break;
case irr::KEY_COMMA : s = ","; break;
case irr::KEY_MINUS : s = "-"; break;
case irr::KEY_PERIOD : s = "."; break;
case irr::IRR_KEY_RMENU : s = _C("input_key", "Right Menu"); break;
case irr::IRR_KEY_PLUS : s = "+"; break;
case irr::IRR_KEY_COMMA : s = ","; break;
case irr::IRR_KEY_MINUS : s = "-"; break;
case irr::IRR_KEY_PERIOD : s = "."; break;
//I18N: input configuration screen: keyboard key
case irr::KEY_ATTN : s = _C("input_key", "Attn"); break;
case irr::IRR_KEY_ATTN : s = _C("input_key", "Attn"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_CRSEL : s = _C("input_key", "Crsel"); break;
case irr::IRR_KEY_CRSEL : s = _C("input_key", "Crsel"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_EXSEL : s = _C("input_key", "Exsel"); break;
case irr::IRR_KEY_EXSEL : s = _C("input_key", "Exsel"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_EREOF : s = _C("input_key", "Ereof"); break;
case irr::IRR_KEY_EREOF : s = _C("input_key", "Ereof"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_PLAY : s = _C("input_key", "Play"); break;
case irr::IRR_KEY_PLAY : s = _C("input_key", "Play"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_ZOOM : s = _C("input_key", "Zoom"); break;
case irr::IRR_KEY_ZOOM : s = _C("input_key", "Zoom"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_PA1 : s = _C("input_key", "Pa1"); break;
case irr::IRR_KEY_PA1 : s = _C("input_key", "Pa1"); break;
//I18N: input configuration screen: keyboard key
case irr::KEY_OEM_CLEAR : s = _C("input_key", "Oem Clear"); break;
case irr::IRR_KEY_OEM_CLEAR : s = _C("input_key", "Oem Clear"); break;
}
break;

View File

@ -109,7 +109,7 @@ void InputManager::handleStaticAction(int key, int value)
// When no players... a cutscene
if (race_manager->getNumPlayers() == 0 && world != NULL && value > 0 &&
(key == KEY_SPACE || key == KEY_RETURN))
(key == IRR_KEY_SPACE || key == IRR_KEY_RETURN))
{
world->onFirePressed(NULL);
}
@ -128,39 +128,39 @@ void InputManager::handleStaticAction(int key, int value)
#ifdef DEBUG
// Special debug options for profile mode: switch the
// camera to show a different kart.
case KEY_KEY_1:
case KEY_KEY_2:
case KEY_KEY_3:
case KEY_KEY_4:
case KEY_KEY_5:
case KEY_KEY_6:
case KEY_KEY_7:
case KEY_KEY_8:
case KEY_KEY_9:
case IRR_KEY_1:
case IRR_KEY_2:
case IRR_KEY_3:
case IRR_KEY_4:
case IRR_KEY_5:
case IRR_KEY_6:
case IRR_KEY_7:
case IRR_KEY_8:
case IRR_KEY_9:
{
if(!ProfileWorld::isProfileMode() || !world) break;
int kart_id = key - KEY_KEY_1;
int kart_id = key - IRR_KEY_1;
if(kart_id<0 || kart_id>=(int)world->getNumKarts()) break;
Camera::getCamera(0)->setKart(world->getKart(kart_id));
break;
}
#endif
case KEY_CONTROL:
case KEY_RCONTROL:
case KEY_LCONTROL:
case KEY_RMENU:
case KEY_LMENU:
case KEY_LWIN:
case IRR_KEY_CONTROL:
case IRR_KEY_RCONTROL:
case IRR_KEY_LCONTROL:
case IRR_KEY_RMENU:
case IRR_KEY_LMENU:
case IRR_KEY_LWIN:
control_is_pressed = value!=0;
break;
case KEY_LSHIFT:
case KEY_RSHIFT:
case KEY_SHIFT:
case IRR_KEY_LSHIFT:
case IRR_KEY_RSHIFT:
case IRR_KEY_SHIFT:
shift_is_pressed = value!=0; break;
// Flying up and down
case KEY_KEY_I:
case IRR_KEY_I:
{
if (!world || !UserConfigParams::m_artist_debug_mode) break;
@ -170,7 +170,7 @@ void InputManager::handleStaticAction(int key, int value)
kart->flyUp();
break;
}
case KEY_KEY_K:
case IRR_KEY_K:
{
if (!world || !UserConfigParams::m_artist_debug_mode) break;
@ -181,7 +181,7 @@ void InputManager::handleStaticAction(int key, int value)
break;
}
// Moving the first person camera
case KEY_KEY_W:
case IRR_KEY_W:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam )
@ -192,7 +192,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
}
case KEY_KEY_S:
case IRR_KEY_S:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam)
@ -203,7 +203,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
}
case KEY_KEY_D:
case IRR_KEY_D:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && !UserConfigParams::m_artist_debug_mode && cam)
@ -214,7 +214,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
}
case KEY_KEY_A:
case IRR_KEY_A:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam)
@ -225,7 +225,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
}
case KEY_KEY_R:
case IRR_KEY_R:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam)
@ -236,7 +236,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
}
case KEY_KEY_F:
case IRR_KEY_F:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam)
@ -248,7 +248,7 @@ void InputManager::handleStaticAction(int key, int value)
break;
}
// Rotating the first person camera
case KEY_KEY_Q:
case IRR_KEY_Q:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam )
@ -258,7 +258,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
}
case KEY_KEY_E:
case IRR_KEY_E:
{
CameraFPS *cam = dynamic_cast<CameraFPS*>(Camera::getActiveCamera());
if (world && UserConfigParams::m_artist_debug_mode && cam)
@ -269,8 +269,8 @@ void InputManager::handleStaticAction(int key, int value)
break;
}
case KEY_SNAPSHOT:
case KEY_PRINT:
case IRR_KEY_SNAPSHOT:
case IRR_KEY_PRINT:
// on windows we don't get a press event, only release. So
// save on release only (to avoid saving twice on other platforms)
if (value == 0)
@ -286,7 +286,7 @@ void InputManager::handleStaticAction(int key, int value)
}
}
break;
case KEY_F11:
case IRR_KEY_F11:
if(value && shift_is_pressed && world && RewindManager::isEnabled())
{
printf("Enter rewind to time:");
@ -317,7 +317,7 @@ void InputManager::handleStaticAction(int key, int value)
#endif
}
break;
case KEY_F2:
case IRR_KEY_F2:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
@ -325,42 +325,42 @@ void InputManager::handleStaticAction(int key, int value)
kart->setPowerup(PowerupManager::POWERUP_PLUNGER, 10000);
}
break;
case KEY_F3:
case IRR_KEY_F3:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
kart->setPowerup(PowerupManager::POWERUP_CAKE, 10000);
}
break;
case KEY_F4:
case IRR_KEY_F4:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
kart->setPowerup(PowerupManager::POWERUP_SWITCH, 10000);
}
break;
case KEY_F5:
case IRR_KEY_F5:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
kart->setPowerup(PowerupManager::POWERUP_BOWLING, 10000);
}
break;
case KEY_F6:
case IRR_KEY_F6:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
kart->setPowerup(PowerupManager::POWERUP_BUBBLEGUM, 10000);
}
break;
case KEY_F7:
case IRR_KEY_F7:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
kart->setPowerup(PowerupManager::POWERUP_ZIPPER, 10000);
}
break;
case KEY_F8:
case IRR_KEY_F8:
if (UserConfigParams::m_artist_debug_mode && value && world)
{
if (control_is_pressed)
@ -383,7 +383,7 @@ void InputManager::handleStaticAction(int key, int value)
}
}
break;
case KEY_F9:
case IRR_KEY_F9:
if (UserConfigParams::m_artist_debug_mode && world)
{
AbstractKart* kart = world->getLocalPlayerKart(0);
@ -396,7 +396,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
*/
case KEY_F10:
case IRR_KEY_F10:
if(world && value)
{
if(control_is_pressed)
@ -406,7 +406,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
/*
case KEY_F11:
case IRR_KEY_F11:
if (UserConfigParams::m_artist_debug_mode && value &&
control_is_pressed && world)
{
@ -414,7 +414,7 @@ void InputManager::handleStaticAction(int key, int value)
}
break;
*/
case KEY_F12:
case IRR_KEY_F12:
if(value)
UserConfigParams::m_display_fps =
!UserConfigParams::m_display_fps;
@ -656,13 +656,13 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
{
action = PA_BEFORE_FIRST;
if (button == KEY_UP) action = PA_MENU_UP;
else if (button == KEY_DOWN) action = PA_MENU_DOWN;
else if (button == KEY_LEFT) action = PA_MENU_LEFT;
else if (button == KEY_RIGHT) action = PA_MENU_RIGHT;
else if (button == KEY_SPACE) action = PA_MENU_SELECT;
else if (button == KEY_RETURN) action = PA_MENU_SELECT;
else if (button == KEY_TAB)
if (button == IRR_KEY_UP) action = PA_MENU_UP;
else if (button == IRR_KEY_DOWN) action = PA_MENU_DOWN;
else if (button == IRR_KEY_LEFT) action = PA_MENU_LEFT;
else if (button == IRR_KEY_RIGHT) action = PA_MENU_RIGHT;
else if (button == IRR_KEY_SPACE) action = PA_MENU_SELECT;
else if (button == IRR_KEY_RETURN) action = PA_MENU_SELECT;
else if (button == IRR_KEY_TAB)
{
if (shift_mask)
{
@ -674,7 +674,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
}
}
if (button == KEY_RETURN)
if (button == IRR_KEY_RETURN)
{
if (GUIEngine::ModalDialog::isADialogActive() &&
!GUIEngine::ScreenKeyboard::isActive())
@ -973,7 +973,7 @@ EventPropagation InputManager::input(const SEvent& event)
if (event.KeyInput.PressedDown)
{
// escape is a little special
if (key == KEY_ESCAPE)
if (key == IRR_KEY_ESCAPE)
{
StateManager::get()->escapePressed();
return EVENT_BLOCK;
@ -984,11 +984,12 @@ EventPropagation InputManager::input(const SEvent& event)
// single letter). Same for spacebar. Same for letters.
if (GUIEngine::isWithinATextBox())
{
if (key == KEY_BACK || key == KEY_SPACE || key == KEY_SHIFT)
if (key == IRR_KEY_BACK || key == IRR_KEY_SPACE ||
key == IRR_KEY_SHIFT)
{
return EVENT_LET;
}
if (key >= KEY_KEY_0 && key <= KEY_KEY_Z)
if (key >= IRR_KEY_0 && key <= IRR_KEY_Z)
{
return EVENT_LET;
}
@ -1016,11 +1017,12 @@ EventPropagation InputManager::input(const SEvent& event)
// single letter). Same for spacebar. Same for letters.
if (GUIEngine::isWithinATextBox())
{
if (key == KEY_BACK || key == KEY_SPACE || key == KEY_SHIFT)
if (key == IRR_KEY_BACK || key == IRR_KEY_SPACE ||
key == IRR_KEY_SHIFT)
{
return EVENT_LET;
}
if (key >= KEY_KEY_0 && key <= KEY_KEY_Z)
if (key >= IRR_KEY_0 && key <= IRR_KEY_Z)
{
return EVENT_LET;
}

View File

@ -53,23 +53,23 @@ void KeyboardConfig::save(std::ofstream& stream)
void KeyboardConfig::setDefaultBinds()
{
setBinding(PA_NITRO, Input::IT_KEYBOARD, KEY_KEY_N);
setBinding(PA_ACCEL, Input::IT_KEYBOARD, KEY_UP);
setBinding(PA_BRAKE, Input::IT_KEYBOARD, KEY_DOWN);
setBinding(PA_STEER_LEFT, Input::IT_KEYBOARD, KEY_LEFT);
setBinding(PA_STEER_RIGHT, Input::IT_KEYBOARD, KEY_RIGHT);
setBinding(PA_DRIFT, Input::IT_KEYBOARD, KEY_KEY_V);
setBinding(PA_RESCUE, Input::IT_KEYBOARD, KEY_BACK);
setBinding(PA_FIRE, Input::IT_KEYBOARD, KEY_SPACE);
setBinding(PA_LOOK_BACK, Input::IT_KEYBOARD, KEY_KEY_B);
setBinding(PA_PAUSE_RACE, Input::IT_KEYBOARD, KEY_ESCAPE);
setBinding(PA_NITRO, Input::IT_KEYBOARD, IRR_KEY_N);
setBinding(PA_ACCEL, Input::IT_KEYBOARD, IRR_KEY_UP);
setBinding(PA_BRAKE, Input::IT_KEYBOARD, IRR_KEY_DOWN);
setBinding(PA_STEER_LEFT, Input::IT_KEYBOARD, IRR_KEY_LEFT);
setBinding(PA_STEER_RIGHT, Input::IT_KEYBOARD, IRR_KEY_RIGHT);
setBinding(PA_DRIFT, Input::IT_KEYBOARD, IRR_KEY_V);
setBinding(PA_RESCUE, Input::IT_KEYBOARD, IRR_KEY_BACK);
setBinding(PA_FIRE, Input::IT_KEYBOARD, IRR_KEY_SPACE);
setBinding(PA_LOOK_BACK, Input::IT_KEYBOARD, IRR_KEY_B);
setBinding(PA_PAUSE_RACE, Input::IT_KEYBOARD, IRR_KEY_ESCAPE);
setBinding(PA_MENU_UP, Input::IT_KEYBOARD, KEY_UP);
setBinding(PA_MENU_DOWN, Input::IT_KEYBOARD, KEY_DOWN);
setBinding(PA_MENU_LEFT, Input::IT_KEYBOARD, KEY_LEFT);
setBinding(PA_MENU_RIGHT, Input::IT_KEYBOARD, KEY_RIGHT);
setBinding(PA_MENU_SELECT, Input::IT_KEYBOARD, KEY_RETURN);
setBinding(PA_MENU_CANCEL, Input::IT_KEYBOARD, KEY_BACK);
setBinding(PA_MENU_UP, Input::IT_KEYBOARD, IRR_KEY_UP);
setBinding(PA_MENU_DOWN, Input::IT_KEYBOARD, IRR_KEY_DOWN);
setBinding(PA_MENU_LEFT, Input::IT_KEYBOARD, IRR_KEY_LEFT);
setBinding(PA_MENU_RIGHT, Input::IT_KEYBOARD, IRR_KEY_RIGHT);
setBinding(PA_MENU_SELECT, Input::IT_KEYBOARD, IRR_KEY_RETURN);
setBinding(PA_MENU_CANCEL, Input::IT_KEYBOARD, IRR_KEY_BACK);
}
//------------------------------------------------------------------------------

View File

@ -305,8 +305,9 @@ void gamepadVisualisation()
if (evt.PressedDown)
{
if (evt.Key == KEY_RETURN || evt.Key == KEY_ESCAPE ||
evt.Key == KEY_SPACE)
if (evt.Key == IRR_KEY_RETURN ||
evt.Key == IRR_KEY_ESCAPE ||
evt.Key == IRR_KEY_SPACE)
{
exit(0);
}

View File

@ -52,7 +52,8 @@ GUIEngine::EventPropagation PressAKeyDialog::processEvent(const std::string& eve
}
else if (eventSource == "assignEsc")
{
Input simulatedInput(Input::IT_KEYBOARD, 0 /* deviceID */, KEY_ESCAPE);
Input simulatedInput(Input::IT_KEYBOARD, 0 /* deviceID */,
IRR_KEY_ESCAPE);
OptionsScreenDevice::getInstance()->gotSensedInput(simulatedInput);
return GUIEngine::EVENT_BLOCK;
}

View File

@ -460,9 +460,9 @@ void OptionsScreenDevice::gotSensedInput(const Input& sensed_input)
ModalDialog::dismiss();
input_manager->setMode(InputManager::MENU);
if (keyboard && (sensed_input.m_button_id == irr::KEY_SHIFT ||
sensed_input.m_button_id == irr::KEY_LSHIFT ||
sensed_input.m_button_id == irr::KEY_RSHIFT))
if (keyboard && (sensed_input.m_button_id == irr::IRR_KEY_SHIFT ||
sensed_input.m_button_id == irr::IRR_KEY_LSHIFT ||
sensed_input.m_button_id == irr::IRR_KEY_RSHIFT))
{
new MessageDialog(_("Warning: The 'Shift' is not a recommended key. When "
"'Shift' is pressed down, all keys that contain a "

View File

@ -870,15 +870,15 @@ bool onEvent(const SEvent &event)
bool handleStaticAction(int key)
{
if (key == KEY_F1)
if (key == IRR_KEY_F1)
{
handleContextMenuAction(DEBUG_GUI_CAM_FREE);
}
else if (key == KEY_F2)
else if (key == IRR_KEY_F2)
{
handleContextMenuAction(DEBUG_GUI_CAM_NORMAL);
}
else if (key == KEY_F3)
else if (key == IRR_KEY_F3)
{
STKTexManager::getInstance()->reloadTexture("");
return true;