kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102 from ibilon/master

Browse Source 
Fix keyCode
This commit is contained in:
Joshua Granick
2014-03-10 10:18:12 -07:00
parent 9c4b88a131 ee37281c22
commit c7830bea6a
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
project/include/KeyCodes.h
View File

@@ -35,19 +35,27 @@ enum KeyCode
keyZ = 90, keyZ = 90,
keyALTERNATE = 18, keyALTERNATE = 18,
keyAMPERSAND = 55,
keyAPPLICATION = 302,
keyASTERISK = 56,
keyAT = 50,
keyBACKQUOTE = 192, keyBACKQUOTE = 192,
keyBACKSLASH = 220, keyBACKSLASH = 220,
keyBACKSPACE = 8, keyBACKSPACE = 8,
keyCARET = 54,
keyCAPS_LOCK = 20, keyCAPS_LOCK = 20,
keyCOLON = 186,
keyCOMMA = 188, keyCOMMA = 188,
keyCOMMAND = 15, keyCOMMAND = 15,
keyCONTROL = 17, keyCONTROL = 17,
keyDELETE = 46, keyDELETE = 46,
keyDOLLAR = 52,
keyDOWN = 40, keyDOWN = 40,
keyEND = 35, keyEND = 35,
keyENTER = 13, keyENTER = 13,
keyEQUAL = 187, keyEQUAL = 187,
keyESCAPE = 27, keyESCAPE = 27,
keyEXCLAIM = 49,
keyF1 = 112, keyF1 = 112,
keyF2 = 113, keyF2 = 113,
keyF3 = 114, keyF3 = 114,
@@ -63,10 +71,14 @@ enum KeyCode
keyF13 = 124, keyF13 = 124,
keyF14 = 125, keyF14 = 125,
keyF15 = 126, keyF15 = 126,
keyGREATER = 190,
keyHASH = 51,
keyHOME = 36, keyHOME = 36,
keyINSERT = 45, keyINSERT = 45,
keyLEFT = 37, keyLEFT = 37,
keyLEFTBRACKET = 219, keyLEFTBRACKET = 219,
keyLEFTPAREN = 57,
keyLESS = 188,
keyMINUS = 189, keyMINUS = 189,
keyNUMBER_0 = 48, keyNUMBER_0 = 48,
keyNUMBER_1 = 49, keyNUMBER_1 = 49,
@@ -78,6 +90,7 @@ enum KeyCode
keyNUMBER_7 = 55, keyNUMBER_7 = 55,
keyNUMBER_8 = 56, keyNUMBER_8 = 56,
keyNUMBER_9 = 57, keyNUMBER_9 = 57,
keyNUMLOCKCLEAR = 144,
keyNUMPAD = 21, keyNUMPAD = 21,
keyNUMPAD_0 = 96, keyNUMPAD_0 = 96,
keyNUMPAD_1 = 97, keyNUMPAD_1 = 97,
@@ -97,15 +110,22 @@ enum KeyCode
keyNUMPAD_SUBTRACT = 109, keyNUMPAD_SUBTRACT = 109,
keyPAGE_DOWN = 34, keyPAGE_DOWN = 34,
keyPAGE_UP = 33, keyPAGE_UP = 33,
keyPAUSE = 19,
keyPERCENT = 53,
keyPERIOD = 190, keyPERIOD = 190,
keyPRINTSCREEN = 301,
keyQUESTION = 191,
keyQUOTE = 222, keyQUOTE = 222,
keyRIGHT = 39, keyRIGHT = 39,
keyRIGHTBRACKET = 221, keyRIGHTBRACKET = 221,
keyRIGHTPAREN = 48,
keySCROLLLOCK = 145,
keySEMICOLON = 186, keySEMICOLON = 186,
keySHIFT = 16, keySHIFT = 16,
keySLASH = 191, keySLASH = 191,
keySPACE = 32, keySPACE = 32,
keyTAB = 9, keyTAB = 9,
keyUNDERSCORE = 189,
keyUP = 38, keyUP = 38,
}; };

21
project/src/backend/sdl2/SDL2Stage.cpp
View File

@@ -765,7 +765,6 @@ void AddModStates(int &ioFlags,int inState = -1)
#define SDL_TRANS(x) case SDLK_##x: return key##x; #define SDL_TRANS(x) case SDLK_##x: return key##x;
#define SDL_TRANS_TO(x, y) case SDLK_##x: return key##y; #define SDL_TRANS_TO(x, y) case SDLK_##x: return key##y;
int SDLKeyToFlash(int inKey,bool &outRight) int SDLKeyToFlash(int inKey,bool &outRight)
{ {
outRight = (inKey==SDLK_RSHIFT || inKey==SDLK_RCTRL || outRight = (inKey==SDLK_RSHIFT || inKey==SDLK_RCTRL ||
@@ -805,27 +804,47 @@ int SDLKeyToFlash(int inKey,bool &outRight)
case SDLK_KP_ENTER: case SDLK_KP_ENTER:
return keyENTER; return keyENTER;
SDL_TRANS(AMPERSAND)
SDL_TRANS(APPLICATION)
SDL_TRANS(ASTERISK)
SDL_TRANS(AT)
SDL_TRANS(BACKQUOTE) SDL_TRANS(BACKQUOTE)
SDL_TRANS(BACKSLASH) SDL_TRANS(BACKSLASH)
SDL_TRANS(BACKSPACE) SDL_TRANS(BACKSPACE)
SDL_TRANS(CARET)
SDL_TRANS(COLON)
SDL_TRANS(COMMA) SDL_TRANS(COMMA)
SDL_TRANS(DELETE) SDL_TRANS(DELETE)
SDL_TRANS(DOLLAR)
SDL_TRANS(DOWN) SDL_TRANS(DOWN)
SDL_TRANS(END) SDL_TRANS(END)
SDL_TRANS(ESCAPE) SDL_TRANS(ESCAPE)
SDL_TRANS(EXCLAIM)
SDL_TRANS(GREATER)
SDL_TRANS(HASH)
SDL_TRANS(HOME) SDL_TRANS(HOME)
SDL_TRANS(INSERT) SDL_TRANS(INSERT)
SDL_TRANS(LEFT) SDL_TRANS(LEFT)
SDL_TRANS(LEFTBRACKET) SDL_TRANS(LEFTBRACKET)
SDL_TRANS(LEFTPAREN)
SDL_TRANS(LESS)
SDL_TRANS(MINUS) SDL_TRANS(MINUS)
SDL_TRANS(NUMLOCKCLEAR)
SDL_TRANS(PAUSE)
SDL_TRANS(PERCENT)
SDL_TRANS(PERIOD) SDL_TRANS(PERIOD)
SDL_TRANS(PRINTSCREEN)
SDL_TRANS(QUESTION)
SDL_TRANS(QUOTE) SDL_TRANS(QUOTE)
SDL_TRANS(RIGHT) SDL_TRANS(RIGHT)
SDL_TRANS(RIGHTBRACKET) SDL_TRANS(RIGHTBRACKET)
SDL_TRANS(RIGHTPAREN)
SDL_TRANS(SCROLLLOCK)
SDL_TRANS(SEMICOLON) SDL_TRANS(SEMICOLON)
SDL_TRANS(SLASH) SDL_TRANS(SLASH)
SDL_TRANS(SPACE) SDL_TRANS(SPACE)
SDL_TRANS(TAB) SDL_TRANS(TAB)
SDL_TRANS(UNDERSCORE)
SDL_TRANS(UP) SDL_TRANS(UP)
SDL_TRANS(F13) SDL_TRANS(F13)
SDL_TRANS(F14) SDL_TRANS(F14)