stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-console-keyup' into 'next'

Browse source 
Fix `KeyUp` hook being called when the console is open

See merge request STJr/SRB2!1664
This commit is contained in:
LJ Sonic 2021-12-02 23:57:38 +00:00
commit b959d0f4ab
2 changed files with 286 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -272,7 +272,7 @@ void D_ProcessEvents(void)
if (eaten)
continue; // ate the event
if (!hooked && G_LuaResponder(ev))
if (!hooked && !CON_Ready() && G_LuaResponder(ev))
continue;
G_Responder(ev);

570
src/g_input.c
View file

@ -233,323 +233,323 @@ typedef struct
static keyname_t keynames[] =
{
{KEY_SPACE, "SPACE"},
{KEY_CAPSLOCK, "CAPS LOCK"},
{KEY_ENTER, "ENTER"},
{KEY_TAB, "TAB"},
{KEY_ESCAPE, "ESCAPE"},
{KEY_BACKSPACE, "BACKSPACE"},
{KEY_SPACE, "space"},
{KEY_CAPSLOCK, "caps lock"},
{KEY_ENTER, "enter"},
{KEY_TAB, "tab"},
{KEY_ESCAPE, "escape"},
{KEY_BACKSPACE, "backspace"},
{KEY_NUMLOCK, "NUMLOCK"},
{KEY_SCROLLLOCK, "SCROLLLOCK"},
{KEY_NUMLOCK, "numlock"},
{KEY_SCROLLLOCK, "scrolllock"},
// bill gates keys
{KEY_LEFTWIN, "LEFTWIN"},
{KEY_RIGHTWIN, "RIGHTWIN"},
{KEY_MENU, "MENU"},
{KEY_LEFTWIN, "leftwin"},
{KEY_RIGHTWIN, "rightwin"},
{KEY_MENU, "menu"},
{KEY_LSHIFT, "LSHIFT"},
{KEY_RSHIFT, "RSHIFT"},
{KEY_LSHIFT, "SHIFT"},
{KEY_LCTRL, "LCTRL"},
{KEY_RCTRL, "RCTRL"},
{KEY_LCTRL, "CTRL"},
{KEY_LALT, "LALT"},
{KEY_RALT, "RALT"},
{KEY_LALT, "ALT"},
{KEY_LSHIFT, "lshift"},
{KEY_RSHIFT, "rshift"},
{KEY_LSHIFT, "shift"},
{KEY_LCTRL, "lctrl"},
{KEY_RCTRL, "rctrl"},
{KEY_LCTRL, "ctrl"},
{KEY_LALT, "lalt"},
{KEY_RALT, "ralt"},
{KEY_LALT, "alt"},
// keypad keys
{KEY_KPADSLASH, "KEYPAD /"},
{KEY_KEYPAD7, "KEYPAD 7"},
{KEY_KEYPAD8, "KEYPAD 8"},
{KEY_KEYPAD9, "KEYPAD 9"},
{KEY_MINUSPAD, "KEYPAD -"},
{KEY_KEYPAD4, "KEYPAD 4"},
{KEY_KEYPAD5, "KEYPAD 5"},
{KEY_KEYPAD6, "KEYPAD 6"},
{KEY_PLUSPAD, "KEYPAD +"},
{KEY_KEYPAD1, "KEYPAD 1"},
{KEY_KEYPAD2, "KEYPAD 2"},
{KEY_KEYPAD3, "KEYPAD 3"},
{KEY_KEYPAD0, "KEYPAD 0"},
{KEY_KPADDEL, "KEYPAD ."},
{KEY_KPADSLASH, "keypad /"},
{KEY_KEYPAD7, "keypad 7"},
{KEY_KEYPAD8, "keypad 8"},
{KEY_KEYPAD9, "keypad 9"},
{KEY_MINUSPAD, "keypad -"},
{KEY_KEYPAD4, "keypad 4"},
{KEY_KEYPAD5, "keypad 5"},
{KEY_KEYPAD6, "keypad 6"},
{KEY_PLUSPAD, "keypad +"},
{KEY_KEYPAD1, "keypad 1"},
{KEY_KEYPAD2, "keypad 2"},
{KEY_KEYPAD3, "keypad 3"},
{KEY_KEYPAD0, "keypad 0"},
{KEY_KPADDEL, "keypad ."},
// extended keys (not keypad)
{KEY_HOME, "HOME"},
{KEY_UPARROW, "UP ARROW"},
{KEY_PGUP, "PGUP"},
{KEY_LEFTARROW, "LEFT ARROW"},
{KEY_RIGHTARROW, "RIGHT ARROW"},
{KEY_END, "END"},
{KEY_DOWNARROW, "DOWN ARROW"},
{KEY_PGDN, "PGDN"},
{KEY_INS, "INS"},
{KEY_DEL, "DEL"},
{KEY_HOME, "home"},
{KEY_UPARROW, "up arrow"},
{KEY_PGUP, "pgup"},
{KEY_LEFTARROW, "left arrow"},
{KEY_RIGHTARROW, "right arrow"},
{KEY_END, "end"},
{KEY_DOWNARROW, "down arrow"},
{KEY_PGDN, "pgdn"},
{KEY_INS, "ins"},
{KEY_DEL, "del"},
// other keys
{KEY_F1, "F1"},
{KEY_F2, "F2"},
{KEY_F3, "F3"},
{KEY_F4, "F4"},
{KEY_F5, "F5"},
{KEY_F6, "F6"},
{KEY_F7, "F7"},
{KEY_F8, "F8"},
{KEY_F9, "F9"},
{KEY_F10, "F10"},
{KEY_F11, "F11"},
{KEY_F12, "F12"},
{KEY_F1, "f1"},
{KEY_F2, "f2"},
{KEY_F3, "f3"},
{KEY_F4, "f4"},
{KEY_F5, "f5"},
{KEY_F6, "f6"},
{KEY_F7, "f7"},
{KEY_F8, "f8"},
{KEY_F9, "f9"},
{KEY_F10, "f10"},
{KEY_F11, "f11"},
{KEY_F12, "f12"},
// KEY_CONSOLE has an exception in the keyname code
{'`', "TILDE"},
{KEY_PAUSE, "PAUSE/BREAK"},
{KEY_PAUSE, "pause/break"},
// virtual keys for mouse buttons and joystick buttons
{KEY_MOUSE1+0,"MOUSE1"},
{KEY_MOUSE1+1,"MOUSE2"},
{KEY_MOUSE1+2,"MOUSE3"},
{KEY_MOUSE1+3,"MOUSE4"},
{KEY_MOUSE1+4,"MOUSE5"},
{KEY_MOUSE1+5,"MOUSE6"},
{KEY_MOUSE1+6,"MOUSE7"},
{KEY_MOUSE1+7,"MOUSE8"},
{KEY_2MOUSE1+0,"SEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
{KEY_2MOUSE1+1,"SEC_MOUSE1"},
{KEY_2MOUSE1+2,"SEC_MOUSE3"},
{KEY_2MOUSE1+3,"SEC_MOUSE4"},
{KEY_2MOUSE1+4,"SEC_MOUSE5"},
{KEY_2MOUSE1+5,"SEC_MOUSE6"},
{KEY_2MOUSE1+6,"SEC_MOUSE7"},
{KEY_2MOUSE1+7,"SEC_MOUSE8"},
{KEY_MOUSEWHEELUP, "Wheel 1 UP"},
{KEY_MOUSEWHEELDOWN, "Wheel 1 Down"},
{KEY_2MOUSEWHEELUP, "Wheel 2 UP"},
{KEY_2MOUSEWHEELDOWN, "Wheel 2 Down"},
{KEY_MOUSE1+0,"mouse1"},
{KEY_MOUSE1+1,"mouse2"},
{KEY_MOUSE1+2,"mouse3"},
{KEY_MOUSE1+3,"mouse4"},
{KEY_MOUSE1+4,"mouse5"},
{KEY_MOUSE1+5,"mouse6"},
{KEY_MOUSE1+6,"mouse7"},
{KEY_MOUSE1+7,"mouse8"},
{KEY_2MOUSE1+0,"sec_mouse2"}, // BP: sorry my mouse handler swap button 1 and 2
{KEY_2MOUSE1+1,"sec_mouse1"},
{KEY_2MOUSE1+2,"sec_mouse3"},
{KEY_2MOUSE1+3,"sec_mouse4"},
{KEY_2MOUSE1+4,"sec_mouse5"},
{KEY_2MOUSE1+5,"sec_mouse6"},
{KEY_2MOUSE1+6,"sec_mouse7"},
{KEY_2MOUSE1+7,"sec_mouse8"},
{KEY_MOUSEWHEELUP, "wheel 1 up"},
{KEY_MOUSEWHEELDOWN, "wheel 1 down"},
{KEY_2MOUSEWHEELUP, "wheel 2 up"},
{KEY_2MOUSEWHEELDOWN, "wheel 2 down"},
{KEY_JOY1+0, "JOY1"},
{KEY_JOY1+1, "JOY2"},
{KEY_JOY1+2, "JOY3"},
{KEY_JOY1+3, "JOY4"},
{KEY_JOY1+4, "JOY5"},
{KEY_JOY1+5, "JOY6"},
{KEY_JOY1+6, "JOY7"},
{KEY_JOY1+7, "JOY8"},
{KEY_JOY1+8, "JOY9"},
{KEY_JOY1+0, "joy1"},
{KEY_JOY1+1, "joy2"},
{KEY_JOY1+2, "joy3"},
{KEY_JOY1+3, "joy4"},
{KEY_JOY1+4, "joy5"},
{KEY_JOY1+5, "joy6"},
{KEY_JOY1+6, "joy7"},
{KEY_JOY1+7, "joy8"},
{KEY_JOY1+8, "joy9"},
#if !defined (NOMOREJOYBTN_1S)
// we use up to 32 buttons in DirectInput
{KEY_JOY1+9, "JOY10"},
{KEY_JOY1+10, "JOY11"},
{KEY_JOY1+11, "JOY12"},
{KEY_JOY1+12, "JOY13"},
{KEY_JOY1+13, "JOY14"},
{KEY_JOY1+14, "JOY15"},
{KEY_JOY1+15, "JOY16"},
{KEY_JOY1+16, "JOY17"},
{KEY_JOY1+17, "JOY18"},
{KEY_JOY1+18, "JOY19"},
{KEY_JOY1+19, "JOY20"},
{KEY_JOY1+20, "JOY21"},
{KEY_JOY1+21, "JOY22"},
{KEY_JOY1+22, "JOY23"},
{KEY_JOY1+23, "JOY24"},
{KEY_JOY1+24, "JOY25"},
{KEY_JOY1+25, "JOY26"},
{KEY_JOY1+26, "JOY27"},
{KEY_JOY1+27, "JOY28"},
{KEY_JOY1+28, "JOY29"},
{KEY_JOY1+29, "JOY30"},
{KEY_JOY1+30, "JOY31"},
{KEY_JOY1+31, "JOY32"},
{KEY_JOY1+9, "joy10"},
{KEY_JOY1+10, "joy11"},
{KEY_JOY1+11, "joy12"},
{KEY_JOY1+12, "joy13"},
{KEY_JOY1+13, "joy14"},
{KEY_JOY1+14, "joy15"},
{KEY_JOY1+15, "joy16"},
{KEY_JOY1+16, "joy17"},
{KEY_JOY1+17, "joy18"},
{KEY_JOY1+18, "joy19"},
{KEY_JOY1+19, "joy20"},
{KEY_JOY1+20, "joy21"},
{KEY_JOY1+21, "joy22"},
{KEY_JOY1+22, "joy23"},
{KEY_JOY1+23, "joy24"},
{KEY_JOY1+24, "joy25"},
{KEY_JOY1+25, "joy26"},
{KEY_JOY1+26, "joy27"},
{KEY_JOY1+27, "joy28"},
{KEY_JOY1+28, "joy29"},
{KEY_JOY1+29, "joy30"},
{KEY_JOY1+30, "joy31"},
{KEY_JOY1+31, "joy32"},
#endif
// the DOS version uses Allegro's joystick support
{KEY_HAT1+0, "HATUP"},
{KEY_HAT1+1, "HATDOWN"},
{KEY_HAT1+2, "HATLEFT"},
{KEY_HAT1+3, "HATRIGHT"},
{KEY_HAT1+4, "HATUP2"},
{KEY_HAT1+5, "HATDOWN2"},
{KEY_HAT1+6, "HATLEFT2"},
{KEY_HAT1+7, "HATRIGHT2"},
{KEY_HAT1+8, "HATUP3"},
{KEY_HAT1+9, "HATDOWN3"},
{KEY_HAT1+10, "HATLEFT3"},
{KEY_HAT1+11, "HATRIGHT3"},
{KEY_HAT1+12, "HATUP4"},
{KEY_HAT1+13, "HATDOWN4"},
{KEY_HAT1+14, "HATLEFT4"},
{KEY_HAT1+15, "HATRIGHT4"},
{KEY_HAT1+0, "hatup"},
{KEY_HAT1+1, "hatdown"},
{KEY_HAT1+2, "hatleft"},
{KEY_HAT1+3, "hatright"},
{KEY_HAT1+4, "hatup2"},
{KEY_HAT1+5, "hatdown2"},
{KEY_HAT1+6, "hatleft2"},
{KEY_HAT1+7, "hatright2"},
{KEY_HAT1+8, "hatup3"},
{KEY_HAT1+9, "hatdown3"},
{KEY_HAT1+10, "hatleft3"},
{KEY_HAT1+11, "hatright3"},
{KEY_HAT1+12, "hatup4"},
{KEY_HAT1+13, "hatdown4"},
{KEY_HAT1+14, "hatleft4"},
{KEY_HAT1+15, "hatright4"},
{KEY_DBLMOUSE1+0, "DBLMOUSE1"},
{KEY_DBLMOUSE1+1, "DBLMOUSE2"},
{KEY_DBLMOUSE1+2, "DBLMOUSE3"},
{KEY_DBLMOUSE1+3, "DBLMOUSE4"},
{KEY_DBLMOUSE1+4, "DBLMOUSE5"},
{KEY_DBLMOUSE1+5, "DBLMOUSE6"},
{KEY_DBLMOUSE1+6, "DBLMOUSE7"},
{KEY_DBLMOUSE1+7, "DBLMOUSE8"},
{KEY_DBL2MOUSE1+0, "DBLSEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
{KEY_DBL2MOUSE1+1, "DBLSEC_MOUSE1"},
{KEY_DBL2MOUSE1+2, "DBLSEC_MOUSE3"},
{KEY_DBL2MOUSE1+3, "DBLSEC_MOUSE4"},
{KEY_DBL2MOUSE1+4, "DBLSEC_MOUSE5"},
{KEY_DBL2MOUSE1+5, "DBLSEC_MOUSE6"},
{KEY_DBL2MOUSE1+6, "DBLSEC_MOUSE7"},
{KEY_DBL2MOUSE1+7, "DBLSEC_MOUSE8"},
{KEY_DBLMOUSE1+0, "dblmouse1"},
{KEY_DBLMOUSE1+1, "dblmouse2"},
{KEY_DBLMOUSE1+2, "dblmouse3"},
{KEY_DBLMOUSE1+3, "dblmouse4"},
{KEY_DBLMOUSE1+4, "dblmouse5"},
{KEY_DBLMOUSE1+5, "dblmouse6"},
{KEY_DBLMOUSE1+6, "dblmouse7"},
{KEY_DBLMOUSE1+7, "dblmouse8"},
{KEY_DBL2MOUSE1+0, "dblsec_mouse2"}, // BP: sorry my mouse handler swap button 1 and 2
{KEY_DBL2MOUSE1+1, "dblsec_mouse1"},
{KEY_DBL2MOUSE1+2, "dblsec_mouse3"},
{KEY_DBL2MOUSE1+3, "dblsec_mouse4"},
{KEY_DBL2MOUSE1+4, "dblsec_mouse5"},
{KEY_DBL2MOUSE1+5, "dblsec_mouse6"},
{KEY_DBL2MOUSE1+6, "dblsec_mouse7"},
{KEY_DBL2MOUSE1+7, "dblsec_mouse8"},
{KEY_DBLJOY1+0, "DBLJOY1"},
{KEY_DBLJOY1+1, "DBLJOY2"},
{KEY_DBLJOY1+2, "DBLJOY3"},
{KEY_DBLJOY1+3, "DBLJOY4"},
{KEY_DBLJOY1+4, "DBLJOY5"},
{KEY_DBLJOY1+5, "DBLJOY6"},
{KEY_DBLJOY1+6, "DBLJOY7"},
{KEY_DBLJOY1+7, "DBLJOY8"},
{KEY_DBLJOY1+0, "dbljoy1"},
{KEY_DBLJOY1+1, "dbljoy2"},
{KEY_DBLJOY1+2, "dbljoy3"},
{KEY_DBLJOY1+3, "dbljoy4"},
{KEY_DBLJOY1+4, "dbljoy5"},
{KEY_DBLJOY1+5, "dbljoy6"},
{KEY_DBLJOY1+6, "dbljoy7"},
{KEY_DBLJOY1+7, "dbljoy8"},
#if !defined (NOMOREJOYBTN_1DBL)
{KEY_DBLJOY1+8, "DBLJOY9"},
{KEY_DBLJOY1+9, "DBLJOY10"},
{KEY_DBLJOY1+10, "DBLJOY11"},
{KEY_DBLJOY1+11, "DBLJOY12"},
{KEY_DBLJOY1+12, "DBLJOY13"},
{KEY_DBLJOY1+13, "DBLJOY14"},
{KEY_DBLJOY1+14, "DBLJOY15"},
{KEY_DBLJOY1+15, "DBLJOY16"},
{KEY_DBLJOY1+16, "DBLJOY17"},
{KEY_DBLJOY1+17, "DBLJOY18"},
{KEY_DBLJOY1+18, "DBLJOY19"},
{KEY_DBLJOY1+19, "DBLJOY20"},
{KEY_DBLJOY1+20, "DBLJOY21"},
{KEY_DBLJOY1+21, "DBLJOY22"},
{KEY_DBLJOY1+22, "DBLJOY23"},
{KEY_DBLJOY1+23, "DBLJOY24"},
{KEY_DBLJOY1+24, "DBLJOY25"},
{KEY_DBLJOY1+25, "DBLJOY26"},
{KEY_DBLJOY1+26, "DBLJOY27"},
{KEY_DBLJOY1+27, "DBLJOY28"},
{KEY_DBLJOY1+28, "DBLJOY29"},
{KEY_DBLJOY1+29, "DBLJOY30"},
{KEY_DBLJOY1+30, "DBLJOY31"},
{KEY_DBLJOY1+31, "DBLJOY32"},
{KEY_DBLJOY1+8, "dbljoy9"},
{KEY_DBLJOY1+9, "dbljoy10"},
{KEY_DBLJOY1+10, "dbljoy11"},
{KEY_DBLJOY1+11, "dbljoy12"},
{KEY_DBLJOY1+12, "dbljoy13"},
{KEY_DBLJOY1+13, "dbljoy14"},
{KEY_DBLJOY1+14, "dbljoy15"},
{KEY_DBLJOY1+15, "dbljoy16"},
{KEY_DBLJOY1+16, "dbljoy17"},
{KEY_DBLJOY1+17, "dbljoy18"},
{KEY_DBLJOY1+18, "dbljoy19"},
{KEY_DBLJOY1+19, "dbljoy20"},
{KEY_DBLJOY1+20, "dbljoy21"},
{KEY_DBLJOY1+21, "dbljoy22"},
{KEY_DBLJOY1+22, "dbljoy23"},
{KEY_DBLJOY1+23, "dbljoy24"},
{KEY_DBLJOY1+24, "dbljoy25"},
{KEY_DBLJOY1+25, "dbljoy26"},
{KEY_DBLJOY1+26, "dbljoy27"},
{KEY_DBLJOY1+27, "dbljoy28"},
{KEY_DBLJOY1+28, "dbljoy29"},
{KEY_DBLJOY1+29, "dbljoy30"},
{KEY_DBLJOY1+30, "dbljoy31"},
{KEY_DBLJOY1+31, "dbljoy32"},
#endif
{KEY_DBLHAT1+0, "DBLHATUP"},
{KEY_DBLHAT1+1, "DBLHATDOWN"},
{KEY_DBLHAT1+2, "DBLHATLEFT"},
{KEY_DBLHAT1+3, "DBLHATRIGHT"},
{KEY_DBLHAT1+4, "DBLHATUP2"},
{KEY_DBLHAT1+5, "DBLHATDOWN2"},
{KEY_DBLHAT1+6, "DBLHATLEFT2"},
{KEY_DBLHAT1+7, "DBLHATRIGHT2"},
{KEY_DBLHAT1+8, "DBLHATUP3"},
{KEY_DBLHAT1+9, "DBLHATDOWN3"},
{KEY_DBLHAT1+10, "DBLHATLEFT3"},
{KEY_DBLHAT1+11, "DBLHATRIGHT3"},
{KEY_DBLHAT1+12, "DBLHATUP4"},
{KEY_DBLHAT1+13, "DBLHATDOWN4"},
{KEY_DBLHAT1+14, "DBLHATLEFT4"},
{KEY_DBLHAT1+15, "DBLHATRIGHT4"},
{KEY_DBLHAT1+0, "dblhatup"},
{KEY_DBLHAT1+1, "dblhatdown"},
{KEY_DBLHAT1+2, "dblhatleft"},
{KEY_DBLHAT1+3, "dblhatright"},
{KEY_DBLHAT1+4, "dblhatup2"},
{KEY_DBLHAT1+5, "dblhatdown2"},
{KEY_DBLHAT1+6, "dblhatleft2"},
{KEY_DBLHAT1+7, "dblhatright2"},
{KEY_DBLHAT1+8, "dblhatup3"},
{KEY_DBLHAT1+9, "dblhatdown3"},
{KEY_DBLHAT1+10, "dblhatleft3"},
{KEY_DBLHAT1+11, "dblhatright3"},
{KEY_DBLHAT1+12, "dblhatup4"},
{KEY_DBLHAT1+13, "dblhatdown4"},
{KEY_DBLHAT1+14, "dblhatleft4"},
{KEY_DBLHAT1+15, "dblhatright4"},
{KEY_2JOY1+0, "SEC_JOY1"},
{KEY_2JOY1+1, "SEC_JOY2"},
{KEY_2JOY1+2, "SEC_JOY3"},
{KEY_2JOY1+3, "SEC_JOY4"},
{KEY_2JOY1+4, "SEC_JOY5"},
{KEY_2JOY1+5, "SEC_JOY6"},
{KEY_2JOY1+6, "SEC_JOY7"},
{KEY_2JOY1+7, "SEC_JOY8"},
{KEY_2JOY1+0, "sec_joy1"},
{KEY_2JOY1+1, "sec_joy2"},
{KEY_2JOY1+2, "sec_joy3"},
{KEY_2JOY1+3, "sec_joy4"},
{KEY_2JOY1+4, "sec_joy5"},
{KEY_2JOY1+5, "sec_joy6"},
{KEY_2JOY1+6, "sec_joy7"},
{KEY_2JOY1+7, "sec_joy8"},
#if !defined (NOMOREJOYBTN_2S)
// we use up to 32 buttons in DirectInput
{KEY_2JOY1+8, "SEC_JOY9"},
{KEY_2JOY1+9, "SEC_JOY10"},
{KEY_2JOY1+10, "SEC_JOY11"},
{KEY_2JOY1+11, "SEC_JOY12"},
{KEY_2JOY1+12, "SEC_JOY13"},
{KEY_2JOY1+13, "SEC_JOY14"},
{KEY_2JOY1+14, "SEC_JOY15"},
{KEY_2JOY1+15, "SEC_JOY16"},
{KEY_2JOY1+16, "SEC_JOY17"},
{KEY_2JOY1+17, "SEC_JOY18"},
{KEY_2JOY1+18, "SEC_JOY19"},
{KEY_2JOY1+19, "SEC_JOY20"},
{KEY_2JOY1+20, "SEC_JOY21"},
{KEY_2JOY1+21, "SEC_JOY22"},
{KEY_2JOY1+22, "SEC_JOY23"},
{KEY_2JOY1+23, "SEC_JOY24"},
{KEY_2JOY1+24, "SEC_JOY25"},
{KEY_2JOY1+25, "SEC_JOY26"},
{KEY_2JOY1+26, "SEC_JOY27"},
{KEY_2JOY1+27, "SEC_JOY28"},
{KEY_2JOY1+28, "SEC_JOY29"},
{KEY_2JOY1+29, "SEC_JOY30"},
{KEY_2JOY1+30, "SEC_JOY31"},
{KEY_2JOY1+31, "SEC_JOY32"},
{KEY_2JOY1+8, "sec_joy9"},
{KEY_2JOY1+9, "sec_joy10"},
{KEY_2JOY1+10, "sec_joy11"},
{KEY_2JOY1+11, "sec_joy12"},
{KEY_2JOY1+12, "sec_joy13"},
{KEY_2JOY1+13, "sec_joy14"},
{KEY_2JOY1+14, "sec_joy15"},
{KEY_2JOY1+15, "sec_joy16"},
{KEY_2JOY1+16, "sec_joy17"},
{KEY_2JOY1+17, "sec_joy18"},
{KEY_2JOY1+18, "sec_joy19"},
{KEY_2JOY1+19, "sec_joy20"},
{KEY_2JOY1+20, "sec_joy21"},
{KEY_2JOY1+21, "sec_joy22"},
{KEY_2JOY1+22, "sec_joy23"},
{KEY_2JOY1+23, "sec_joy24"},
{KEY_2JOY1+24, "sec_joy25"},
{KEY_2JOY1+25, "sec_joy26"},
{KEY_2JOY1+26, "sec_joy27"},
{KEY_2JOY1+27, "sec_joy28"},
{KEY_2JOY1+28, "sec_joy29"},
{KEY_2JOY1+29, "sec_joy30"},
{KEY_2JOY1+30, "sec_joy31"},
{KEY_2JOY1+31, "sec_joy32"},
#endif
// the DOS version uses Allegro's joystick support
{KEY_2HAT1+0, "SEC_HATUP"},
{KEY_2HAT1+1, "SEC_HATDOWN"},
{KEY_2HAT1+2, "SEC_HATLEFT"},
{KEY_2HAT1+3, "SEC_HATRIGHT"},
{KEY_2HAT1+4, "SEC_HATUP2"},
{KEY_2HAT1+5, "SEC_HATDOWN2"},
{KEY_2HAT1+6, "SEC_HATLEFT2"},
{KEY_2HAT1+7, "SEC_HATRIGHT2"},
{KEY_2HAT1+8, "SEC_HATUP3"},
{KEY_2HAT1+9, "SEC_HATDOWN3"},
{KEY_2HAT1+10, "SEC_HATLEFT3"},
{KEY_2HAT1+11, "SEC_HATRIGHT3"},
{KEY_2HAT1+12, "SEC_HATUP4"},
{KEY_2HAT1+13, "SEC_HATDOWN4"},
{KEY_2HAT1+14, "SEC_HATLEFT4"},
{KEY_2HAT1+15, "SEC_HATRIGHT4"},
{KEY_2HAT1+0, "sec_hatup"},
{KEY_2HAT1+1, "sec_hatdown"},
{KEY_2HAT1+2, "sec_hatleft"},
{KEY_2HAT1+3, "sec_hatright"},
{KEY_2HAT1+4, "sec_hatup2"},
{KEY_2HAT1+5, "sec_hatdown2"},
{KEY_2HAT1+6, "sec_hatleft2"},
{KEY_2HAT1+7, "sec_hatright2"},
{KEY_2HAT1+8, "sec_hatup3"},
{KEY_2HAT1+9, "sec_hatdown3"},
{KEY_2HAT1+10, "sec_hatleft3"},
{KEY_2HAT1+11, "sec_hatright3"},
{KEY_2HAT1+12, "sec_hatup4"},
{KEY_2HAT1+13, "sec_hatdown4"},
{KEY_2HAT1+14, "sec_hatleft4"},
{KEY_2HAT1+15, "sec_hatright4"},
{KEY_DBL2JOY1+0, "DBLSEC_JOY1"},
{KEY_DBL2JOY1+1, "DBLSEC_JOY2"},
{KEY_DBL2JOY1+2, "DBLSEC_JOY3"},
{KEY_DBL2JOY1+3, "DBLSEC_JOY4"},
{KEY_DBL2JOY1+4, "DBLSEC_JOY5"},
{KEY_DBL2JOY1+5, "DBLSEC_JOY6"},
{KEY_DBL2JOY1+6, "DBLSEC_JOY7"},
{KEY_DBL2JOY1+7, "DBLSEC_JOY8"},
{KEY_DBL2JOY1+0, "dblsec_joy1"},
{KEY_DBL2JOY1+1, "dblsec_joy2"},
{KEY_DBL2JOY1+2, "dblsec_joy3"},
{KEY_DBL2JOY1+3, "dblsec_joy4"},
{KEY_DBL2JOY1+4, "dblsec_joy5"},
{KEY_DBL2JOY1+5, "dblsec_joy6"},
{KEY_DBL2JOY1+6, "dblsec_joy7"},
{KEY_DBL2JOY1+7, "dblsec_joy8"},
#if !defined (NOMOREJOYBTN_2DBL)
{KEY_DBL2JOY1+8, "DBLSEC_JOY9"},
{KEY_DBL2JOY1+9, "DBLSEC_JOY10"},
{KEY_DBL2JOY1+10, "DBLSEC_JOY11"},
{KEY_DBL2JOY1+11, "DBLSEC_JOY12"},
{KEY_DBL2JOY1+12, "DBLSEC_JOY13"},
{KEY_DBL2JOY1+13, "DBLSEC_JOY14"},
{KEY_DBL2JOY1+14, "DBLSEC_JOY15"},
{KEY_DBL2JOY1+15, "DBLSEC_JOY16"},
{KEY_DBL2JOY1+16, "DBLSEC_JOY17"},
{KEY_DBL2JOY1+17, "DBLSEC_JOY18"},
{KEY_DBL2JOY1+18, "DBLSEC_JOY19"},
{KEY_DBL2JOY1+19, "DBLSEC_JOY20"},
{KEY_DBL2JOY1+20, "DBLSEC_JOY21"},
{KEY_DBL2JOY1+21, "DBLSEC_JOY22"},
{KEY_DBL2JOY1+22, "DBLSEC_JOY23"},
{KEY_DBL2JOY1+23, "DBLSEC_JOY24"},
{KEY_DBL2JOY1+24, "DBLSEC_JOY25"},
{KEY_DBL2JOY1+25, "DBLSEC_JOY26"},
{KEY_DBL2JOY1+26, "DBLSEC_JOY27"},
{KEY_DBL2JOY1+27, "DBLSEC_JOY28"},
{KEY_DBL2JOY1+28, "DBLSEC_JOY29"},
{KEY_DBL2JOY1+29, "DBLSEC_JOY30"},
{KEY_DBL2JOY1+30, "DBLSEC_JOY31"},
{KEY_DBL2JOY1+31, "DBLSEC_JOY32"},
{KEY_DBL2JOY1+8, "dblsec_joy9"},
{KEY_DBL2JOY1+9, "dblsec_joy10"},
{KEY_DBL2JOY1+10, "dblsec_joy11"},
{KEY_DBL2JOY1+11, "dblsec_joy12"},
{KEY_DBL2JOY1+12, "dblsec_joy13"},
{KEY_DBL2JOY1+13, "dblsec_joy14"},
{KEY_DBL2JOY1+14, "dblsec_joy15"},
{KEY_DBL2JOY1+15, "dblsec_joy16"},
{KEY_DBL2JOY1+16, "dblsec_joy17"},
{KEY_DBL2JOY1+17, "dblsec_joy18"},
{KEY_DBL2JOY1+18, "dblsec_joy19"},
{KEY_DBL2JOY1+19, "dblsec_joy20"},
{KEY_DBL2JOY1+20, "dblsec_joy21"},
{KEY_DBL2JOY1+21, "dblsec_joy22"},
{KEY_DBL2JOY1+22, "dblsec_joy23"},
{KEY_DBL2JOY1+23, "dblsec_joy24"},
{KEY_DBL2JOY1+24, "dblsec_joy25"},
{KEY_DBL2JOY1+25, "dblsec_joy26"},
{KEY_DBL2JOY1+26, "dblsec_joy27"},
{KEY_DBL2JOY1+27, "dblsec_joy28"},
{KEY_DBL2JOY1+28, "dblsec_joy29"},
{KEY_DBL2JOY1+29, "dblsec_joy30"},
{KEY_DBL2JOY1+30, "dblsec_joy31"},
{KEY_DBL2JOY1+31, "dblsec_joy32"},
#endif
{KEY_DBL2HAT1+0, "DBLSEC_HATUP"},
{KEY_DBL2HAT1+1, "DBLSEC_HATDOWN"},
{KEY_DBL2HAT1+2, "DBLSEC_HATLEFT"},
{KEY_DBL2HAT1+3, "DBLSEC_HATRIGHT"},
{KEY_DBL2HAT1+4, "DBLSEC_HATUP2"},
{KEY_DBL2HAT1+5, "DBLSEC_HATDOWN2"},
{KEY_DBL2HAT1+6, "DBLSEC_HATLEFT2"},
{KEY_DBL2HAT1+7, "DBLSEC_HATRIGHT2"},
{KEY_DBL2HAT1+8, "DBLSEC_HATUP3"},
{KEY_DBL2HAT1+9, "DBLSEC_HATDOWN3"},
{KEY_DBL2HAT1+10, "DBLSEC_HATLEFT3"},
{KEY_DBL2HAT1+11, "DBLSEC_HATRIGHT3"},
{KEY_DBL2HAT1+12, "DBLSEC_HATUP4"},
{KEY_DBL2HAT1+13, "DBLSEC_HATDOWN4"},
{KEY_DBL2HAT1+14, "DBLSEC_HATLEFT4"},
{KEY_DBL2HAT1+15, "DBLSEC_HATRIGHT4"},
{KEY_DBL2HAT1+0, "dblsec_hatup"},
{KEY_DBL2HAT1+1, "dblsec_hatdown"},
{KEY_DBL2HAT1+2, "dblsec_hatleft"},
{KEY_DBL2HAT1+3, "dblsec_hatright"},
{KEY_DBL2HAT1+4, "dblsec_hatup2"},
{KEY_DBL2HAT1+5, "dblsec_hatdown2"},
{KEY_DBL2HAT1+6, "dblsec_hatleft2"},
{KEY_DBL2HAT1+7, "dblsec_hatright2"},
{KEY_DBL2HAT1+8, "dblsec_hatup3"},
{KEY_DBL2HAT1+9, "dblsec_hatdown3"},
{KEY_DBL2HAT1+10, "dblsec_hatleft3"},
{KEY_DBL2HAT1+11, "dblsec_hatright3"},
{KEY_DBL2HAT1+12, "dblsec_hatup4"},
{KEY_DBL2HAT1+13, "dblsec_hatdown4"},
{KEY_DBL2HAT1+14, "dblsec_hatleft4"},
{KEY_DBL2HAT1+15, "dblsec_hatright4"},
};