Improve keypad support

This commit is contained in:
Vincent Lejeune 2015-02-01 19:18:47 +01:00
parent 73a8220203
commit da449e02d0

View File

@ -881,44 +881,43 @@ void CIrrDeviceWayland::createKeyMap()
KeyMap.push_back(SKeyMap(XKB_KEY_Begin, KEY_HOME));
KeyMap.push_back(SKeyMap(XKB_KEY_Num_Lock, KEY_NUMLOCK));
KeyMap.push_back(SKeyMap(XKB_KEY_space, KEY_SPACE));
/* TODO : keypad */
/* 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(XKB_KEY_KP_Tab, KEY_TAB));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Enter, KEY_RETURN));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_F1, KEY_F1));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_F2, KEY_F2));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_F3, KEY_F3));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_F4, KEY_F4));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Home, KEY_HOME));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Left, KEY_LEFT));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Up, KEY_UP));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Right, KEY_RIGHT));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Down, KEY_DOWN));
KeyMap.push_back(SKeyMap(XKB_KEY_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_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(XKB_KEY_KP_Prior, KEY_PRIOR));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Page_Up, KEY_PRIOR));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Next, KEY_NEXT));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Page_Down, KEY_NEXT));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_End, KEY_END));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Begin, KEY_HOME));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Insert, KEY_INSERT));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Delete, KEY_DELETE));
// KeyMap.push_back(SKeyMap(XK_KP_Equal, 0)); // ???
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Multiply, KEY_MULTIPLY));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Add, KEY_ADD));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Separator, KEY_SEPARATOR));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Subtract, KEY_SUBTRACT));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Decimal, KEY_DECIMAL));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_Divide, KEY_DIVIDE));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_0, KEY_NUMPAD0));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_1, KEY_NUMPAD1));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_2, KEY_NUMPAD2));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_3, KEY_NUMPAD3));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_4, KEY_NUMPAD4));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_5, KEY_NUMPAD5));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_6, KEY_NUMPAD6));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_7, KEY_NUMPAD7));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_8, KEY_NUMPAD8));
KeyMap.push_back(SKeyMap(XKB_KEY_KP_9, KEY_NUMPAD9));
KeyMap.push_back(SKeyMap(XKB_KEY_F1, KEY_F1));
KeyMap.push_back(SKeyMap(XKB_KEY_F2, KEY_F2));
KeyMap.push_back(SKeyMap(XKB_KEY_F3, KEY_F3));