From 0b7e752bd177c90a05ca752fa31810f9e34c432c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Apr 2012 23:48:29 +0300 Subject: Dehardcode keys in gui widgets. Add new tab with keys settings in input settings tab. --- src/keyboarddata.h | 130 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 114 insertions(+), 16 deletions(-) (limited to 'src/keyboarddata.h') diff --git a/src/keyboarddata.h b/src/keyboarddata.h index 8c3df1878..856781391 100644 --- a/src/keyboarddata.h +++ b/src/keyboarddata.h @@ -1578,14 +1578,14 @@ static KeyData const keyData[Input::KEY_TOTAL] = { {"keyChatPrevTab", INPUT_KEYBOARD, SDLK_KP7, INPUT_UNKNOWN, Input::KEY_NO_VALUE, - Input::GRP_DEFAULT | Input::GRP_GUI, + Input::GRP_DEFAULT | Input::GRP_GUI | Input::GRP_GUICHAN, &ActionManager::prevChatTab, Input::KEY_NO_VALUE, 50, COND_NOINPUT}, {"keyChatNextTab", INPUT_KEYBOARD, SDLK_KP9, INPUT_UNKNOWN, Input::KEY_NO_VALUE, - Input::GRP_DEFAULT | Input::GRP_GUI, + Input::GRP_DEFAULT | Input::GRP_GUI | Input::GRP_GUICHAN, &ActionManager::nextChatTab, Input::KEY_NO_VALUE, 50, COND_NOINPUT}, @@ -1610,20 +1610,6 @@ static KeyData const keyData[Input::KEY_TOTAL] = { nullptr, Input::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"keyAutoCompleteChat", - INPUT_KEYBOARD, SDLK_TAB, - INPUT_UNKNOWN, Input::KEY_NO_VALUE, - Input::GRP_CHAT, - nullptr, - Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, - {"keyDeActivateChat", - INPUT_KEYBOARD, SDLK_ESCAPE, - INPUT_UNKNOWN, Input::KEY_NO_VALUE, - Input::GRP_CHAT, - nullptr, - Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, {"keyIgnoreInput1", INPUT_KEYBOARD, SDLK_LSUPER, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -1812,6 +1798,118 @@ static KeyData const keyData[Input::KEY_TOTAL] = { Input::GRP_GUI, nullptr, Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIUp", + INPUT_KEYBOARD, SDLK_UP, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIDown", + INPUT_KEYBOARD, SDLK_DOWN, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUILeft", + INPUT_KEYBOARD, SDLK_LEFT, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIRight", + INPUT_KEYBOARD, SDLK_RIGHT, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUISelect", + INPUT_KEYBOARD, SDLK_SPACE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUISelect2", + INPUT_KEYBOARD, SDLK_RETURN, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUICancel", + INPUT_KEYBOARD, SDLK_ESCAPE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIHome", + INPUT_KEYBOARD, SDLK_HOME, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIEnd", + INPUT_KEYBOARD, SDLK_END, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIDelete", + INPUT_KEYBOARD, SDLK_DELETE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIBackSpace", + INPUT_KEYBOARD, SDLK_BACKSPACE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUITab", + INPUT_KEYBOARD, SDLK_TAB, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIPageUp", + INPUT_KEYBOARD, SDLK_PAGEUP, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIPageDown", + INPUT_KEYBOARD, SDLK_PAGEDOWN, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIInsert", + INPUT_KEYBOARD, SDLK_INSERT, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyGUIMod", + INPUT_KEYBOARD, SDLK_LSHIFT, + INPUT_KEYBOARD, SDLK_RSHIFT, + Input::GRP_GUICHAN, + nullptr, + Input::KEY_NO_VALUE, 50, COND_DEFAULT} }; -- cgit v1.2.3-60-g2f50