mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for "OEM-102" key (usually '\' on Euro keyboards)

Browse Source
This commit is contained in:
David Walters 2018-09-02 18:24:51 +01:00
parent d4cb24f8d1
commit b592f254b9
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_defines.h
View File

@ -28,7 +28,7 @@ RETRO_BEGIN_DECLS
#define MAX_INPUT_DEVICES 16 #define MAX_INPUT_DEVICES 16
#define RARCH_MAX_KEYS 136 #define RARCH_MAX_KEYS 137
#define RARCH_FIRST_CUSTOM_BIND 16 #define RARCH_FIRST_CUSTOM_BIND 16
#define RARCH_FIRST_LIGHTGUN_BIND RARCH_ANALOG_BIND_LIST_END #define RARCH_FIRST_LIGHTGUN_BIND RARCH_ANALOG_BIND_LIST_END

7
input/input_keymaps.c
View File

@ -288,6 +288,7 @@ const struct input_key_map input_config_key_map[] = {
{ "euro", RETROK_EURO }, { "euro", RETROK_EURO },
{ "undo", RETROK_UNDO }, { "undo", RETROK_UNDO },
{ "clear", RETROK_CLEAR }, { "clear", RETROK_CLEAR },
{ "oem102", RETROK_OEM_102 },
{ "nul", RETROK_UNKNOWN }, { "nul", RETROK_UNKNOWN },
{ NULL, RETROK_UNKNOWN }, { NULL, RETROK_UNKNOWN },
@ -328,7 +329,7 @@ const struct rarch_key_map rarch_key_map_sdl[] = {
{ SDLK_9, RETROK_9 }, { SDLK_9, RETROK_9 },
{ SDLK_COLON, RETROK_COLON }, { SDLK_COLON, RETROK_COLON },
{ SDLK_SEMICOLON, RETROK_SEMICOLON }, { SDLK_SEMICOLON, RETROK_SEMICOLON },
{ SDLK_LESS, RETROK_LESS }, { SDLK_LESS, RETROK_OEM_102 },
{ SDLK_EQUALS, RETROK_EQUALS }, { SDLK_EQUALS, RETROK_EQUALS },
{ SDLK_GREATER, RETROK_GREATER }, { SDLK_GREATER, RETROK_GREATER },
{ SDLK_QUESTION, RETROK_QUESTION }, { SDLK_QUESTION, RETROK_QUESTION },
@ -574,6 +575,7 @@ const struct rarch_key_map rarch_key_map_dinput[] = {
{ DIK_SCROLL, RETROK_SCROLLOCK }, { DIK_SCROLL, RETROK_SCROLLOCK },
{ DIK_CAPSLOCK, RETROK_CAPSLOCK }, { DIK_CAPSLOCK, RETROK_CAPSLOCK },
{ DIK_NUMLOCK, RETROK_NUMLOCK }, { DIK_NUMLOCK, RETROK_NUMLOCK },
{ DIK_OEM_102, RETROK_OEM_102 },
{ 0, RETROK_UNKNOWN }, { 0, RETROK_UNKNOWN },
}; };
#endif #endif
@ -831,6 +833,7 @@ const struct rarch_key_map rarch_key_map_x11[] = {
/*{ ?, RETROK_POWER },*/ /*{ ?, RETROK_POWER },*/
{ XK_EuroSign, RETROK_EURO }, { XK_EuroSign, RETROK_EURO },
{ XK_Undo, RETROK_UNDO }, { XK_Undo, RETROK_UNDO },
/*{ ?, RETROK_OEM_102 },*/
/* FIXME(shizeeg): RetroArch can't handle these buttons atm. /* FIXME(shizeeg): RetroArch can't handle these buttons atm.
* Do we really need RETROK_KP_INSERT, RETROK_KP_END, * Do we really need RETROK_KP_INSERT, RETROK_KP_END,
* RETROK_KP_DOWN, RETROK_KP_PAGEDOWN ??? * RETROK_KP_DOWN, RETROK_KP_PAGEDOWN ???
@ -986,6 +989,7 @@ const struct rarch_key_map rarch_key_map_linux[] = {
{ KEY_EURO, RETROK_EURO }, { KEY_EURO, RETROK_EURO },
#endif #endif
{ KEY_UNDO, RETROK_UNDO }, { KEY_UNDO, RETROK_UNDO },
/*{ ?, RETROK_OEM_102 },*/
{ 0, RETROK_UNKNOWN }, { 0, RETROK_UNKNOWN },
}; };
#endif #endif
@ -1320,6 +1324,7 @@ const struct rarch_key_map rarch_key_map_apple_hid[] = {
/* { ?, RETROK_POWER }, */ /* { ?, RETROK_POWER }, */
/* { ?, RETROK_EURO }, */ /* { ?, RETROK_EURO }, */
/* { ?, RETROK_UNDO }, */ /* { ?, RETROK_UNDO }, */
{ KEY_NonUSBackslash, RETROK_OEM_102 },
{ 0, RETROK_UNKNOWN } { 0, RETROK_UNKNOWN }
}; };
#endif #endif

1
libretro-common/include/libretro.h
View File

@ -450,6 +450,7 @@ enum retro_key
RETROK_POWER = 320, RETROK_POWER = 320,
RETROK_EURO = 321, RETROK_EURO = 321,
RETROK_UNDO = 322, RETROK_UNDO = 322,
RETROK_OEM_102 = 323,
RETROK_LAST, RETROK_LAST,

3
menu/menu_cbs.c
View File

@ -174,7 +174,8 @@ struct key_desc key_descriptors[RARCH_MAX_KEYS] =
{RETROK_MENU, "Menu"}, {RETROK_MENU, "Menu"},
{RETROK_POWER, "Power"}, {RETROK_POWER, "Power"},
{RETROK_EURO, "€"}, {RETROK_EURO, "€"},
{RETROK_UNDO, "Undo"} {RETROK_UNDO, "Undo"},
{RETROK_OEM_102, "OEM-102"}
}; };
/* This sets up all the callback functions for a menu entry. /* This sets up all the callback functions for a menu entry.