testkeys: remove dead code, don't build on windows. (nw)

This commit is contained in:
couriersud 2019-02-17 12:45:16 +01:00
parent 44bd859b04
commit d72df29988
2 changed files with 38 additions and 117 deletions

View File

@ -796,35 +796,37 @@ end
-- testkeys
--------------------------------------------------
if (_OPTIONS["osd"] == "sdl") then
project("testkeys")
uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
kind "ConsoleApp"
if _OPTIONS["targetos"] ~= "windows" then
if (_OPTIONS["osd"] == "sdl") then
project("testkeys")
uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
kind "ConsoleApp"
flags {
"Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
}
dofile("osd/sdl_cfg.lua")
flags {
"Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
includedirs {
}
files {
MAME_DIR .. "src/tools/testkeys.cpp",
}
configuration { "mingw*" or "vs*" }
targetextension ".exe"
configuration { }
strip()
end
links {
}
dofile("osd/sdl_cfg.lua")
includedirs {
}
files {
MAME_DIR .. "src/tools/testkeys.cpp",
}
configuration { "mingw*" or "vs*" }
targetextension ".exe"
configuration { }
strip()
end
end

View File

@ -25,13 +25,7 @@ struct key_lookup_table
const char *name;
};
#if (SDLMAME_SDL2)
#define KE(x) { SDL_SCANCODE_ ## x, "SDL_SCANCODE_" #x },
#define KE8(A, B, C, D, E, F, G, H) KE(A) KE(B) KE(C) KE(D) KE(E) KE(F) KE(G) KE(H)
#define KE7(A, B, C, D, E, F, G) KE(A) KE(B) KE(C) KE(D) KE(E) KE(F) KE(G)
#define KE5(A, B, C, D, E) KE(A) KE(B) KE(C) KE(D) KE(E)
#define KE3(A, B, C) KE(A) KE(B) KE(C)
static key_lookup_table sdl_lookup[] =
{
@ -296,46 +290,6 @@ static key_lookup_table sdl_lookup[] =
{-1, ""}
};
#else
#define KE(x) { SDLK_ ## x, "SDLK_" #x },
#define KE8(A, B, C, D, E, F, G, H) KE(A) KE(B) KE(C) KE(D) KE(E) KE(F) KE(G) KE(H)
static key_lookup_table sdl_lookup[] =
{
KE8(UNKNOWN, FIRST, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE )
KE8(SPACE, EXCLAIM, QUOTEDBL, HASH, DOLLAR, AMPERSAND, QUOTE, LEFTPAREN )
KE8(RIGHTPAREN, ASTERISK, PLUS, COMMA, MINUS, PERIOD, SLASH, 0 )
KE8(1, 2, 3, 4, 5, 6, 7, 8 )
KE8(9, COLON, SEMICOLON, LESS, EQUALS, GREATER, QUESTION, AT )
KE8(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, CARET, UNDERSCORE, BACKQUOTE, a, b )
KE8(c, d, e, f, g, h, i, j )
KE8(k, l, m, n, o, p, q, r )
KE8(s, t, u, v, w, x, y, z )
KE8(DELETE, WORLD_0, WORLD_1, WORLD_2, WORLD_3, WORLD_4, WORLD_5, WORLD_6 )
KE8(WORLD_7, WORLD_8, WORLD_9, WORLD_10, WORLD_11, WORLD_12, WORLD_13, WORLD_14 )
KE8(WORLD_15, WORLD_16, WORLD_17, WORLD_18, WORLD_19, WORLD_20, WORLD_21, WORLD_22 )
KE8(WORLD_23, WORLD_24, WORLD_25, WORLD_26, WORLD_27, WORLD_28, WORLD_29, WORLD_30 )
KE8(WORLD_31, WORLD_32, WORLD_33, WORLD_34, WORLD_35, WORLD_36, WORLD_37, WORLD_38 )
KE8(WORLD_39, WORLD_40, WORLD_41, WORLD_42, WORLD_43, WORLD_44, WORLD_45, WORLD_46 )
KE8(WORLD_47, WORLD_48, WORLD_49, WORLD_50, WORLD_51, WORLD_52, WORLD_53, WORLD_54 )
KE8(WORLD_55, WORLD_56, WORLD_57, WORLD_58, WORLD_59, WORLD_60, WORLD_61, WORLD_62 )
KE8(WORLD_63, WORLD_64, WORLD_65, WORLD_66, WORLD_67, WORLD_68, WORLD_69, WORLD_70 )
KE8(WORLD_71, WORLD_72, WORLD_73, WORLD_74, WORLD_75, WORLD_76, WORLD_77, WORLD_78 )
KE8(WORLD_79, WORLD_80, WORLD_81, WORLD_82, WORLD_83, WORLD_84, WORLD_85, WORLD_86 )
KE8(WORLD_87, WORLD_88, WORLD_89, WORLD_90, WORLD_91, WORLD_92, WORLD_93, WORLD_94 )
KE8(WORLD_95, KP0, KP1, KP2, KP3, KP4, KP5, KP6 )
KE8(KP7, KP8, KP9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS )
KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME )
KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 )
KE8(F6, F7, F8, F9, F10, F11, F12, F13 )
KE8(F14, F15, NUMLOCK, CAPSLOCK, SCROLLOCK, RSHIFT, LSHIFT, RCTRL )
KE8(LCTRL, RALT, LALT, RMETA, LMETA, LSUPER, RSUPER, MODE )
KE8(COMPOSE, HELP, PRINT, SYSREQ, BREAK, MENU, POWER, EURO )
KE(UNDO)
KE(LAST)
{-1, ""}
};
#endif
static const char * lookup_key_name(const key_lookup_table *kt, int kc)
{
@ -357,23 +311,15 @@ int main(int argc, char *argv[])
{
SDL_Event event;
int quit = 0;
#if (SDLMAME_SDL2)
char lasttext[20] = "";
#else
char buf[20];
#endif
if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
fprintf(stderr, "Couldn't initialize SDL: %s\n",
SDL_GetError());
exit(1);
}
#if (SDLMAME_SDL2)
SDL_CreateWindow("Input Test", 0, 0, 100, 100,0 );
#else
SDL_SetVideoMode(100, 50, 16, SDL_ANYFORMAT);
SDL_EnableUNICODE(1);
#endif
while(SDL_PollEvent(&event) || !quit) {
switch(event.type) {
case SDL_QUIT:
@ -384,46 +330,19 @@ int main(int argc, char *argv[])
quit=1;
else
{
#if (SDLMAME_SDL2)
printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
lookup_key_name(sdl_lookup, event.key.keysym.scancode),
(int) event.key.keysym.scancode,
0, //(int) event.key.keysym.unicode,
"");
printf("ITEM_ID_XY %s %s\n",
lookup_key_name(sdl_lookup, event.key.keysym.scancode), "");
lasttext[0] = 0;
#else
memset(buf, 0, 19);
utf8_from_uchar(buf, sizeof(buf), event.key.keysym.unicode);
printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
lookup_key_name(sdl_lookup, event.key.keysym.sym),
(int) event.key.keysym.scancode,
(int) event.key.keysym.unicode,
buf);
#endif
}
break;
case SDL_KEYUP:
#if (SDLMAME_SDL2)
printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
lookup_key_name(sdl_lookup, event.key.keysym.scancode),
(int) event.key.keysym.scancode,
0, //(int) event.key.keysym.unicode,
lasttext);
#else
memset(buf, 0, 19);
utf8_from_uchar(buf, sizeof(buf), event.key.keysym.unicode);
printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
lookup_key_name(sdl_lookup, event.key.keysym.sym),
(int) event.key.keysym.scancode,
(int) event.key.keysym.unicode,
buf);
#endif
printf("ITEM_ID_XY %s %s\n",
lookup_key_name(sdl_lookup, event.key.keysym.scancode), lasttext);
break;
#if (SDLMAME_SDL2)
case SDL_TEXTINPUT:
strcpy(lasttext, event.text.text);
break;
#endif
}
event.type = 0;