Joypad mapping through core options, cleanups

Author: zoltanvb

src/libretro/b2_libretro.info

@@ -8,7 +8,7 @@ display_name = "Acorn - BBC Micro (b2)"
 categories = "Emulator"
 
 # Name of the authors who wrote the core:
-authors = "TBA"
+authors = "Tom Seddon|Zoltan Balogh"
 
 # Name of the core:
 corename = "b2"
@@ -17,7 +17,7 @@ corename = "b2"
 supported_extensions = "ssd|dsd"
 
 # License of the cores source code:
-license = "GPLv2"
+license = "GPLv3"
 
 # Privacy-specific permissions needed for using the core:
 permissions = ""
@@ -47,7 +47,7 @@ savestate_features = "serialized"
 # Does the core support the libretro cheat interface?
 cheats = "false"
 # Does the core support libretro input descriptors
-input_descriptors = "true"
+input_descriptors = "false"
 # Does the core support memory descriptors commonly used for achievements
 memory_descriptors = "false"
 # Does the core use the libretro save interface or does it do its own thing (like with shared memory cards)?
@@ -76,4 +76,4 @@ disk_control = "true"
 is_experimental = "true"
 
 # Descriptive text, useful for tooltips, etc.
-description = "Emulate the Z80 based home computers that the original ep128emu supports - that is, Enterprise 64/128, Videoton TVC, Amstrad CPC and ZX Spectrum. Focus is on Enterprise and TVC."
+description = "Libretro port of Tom Seddon's B2 emulator for BBC Micro."

src/libretro/b2_libretro_keymap.h

@@ -112,4 +112,108 @@ const std::map<unsigned, BeebKey> beeb_libretro_keymap = {
 // TODO: map the 3 extra keypad keys on the Master somewhere (delete, ', #)
 };
 
+const std::map<std::string, BeebKey> joypad_keymap = {
+// None is added separately in the code, since it should be the first and default
+//    {"None",     BeebKey_None},
+    {"a",        BeebKey_A},
+    {"b",        BeebKey_B},
+    {"c",        BeebKey_C},
+    {"d",        BeebKey_D},
+    {"e",        BeebKey_E},
+    {"f",        BeebKey_F},
+    {"g",        BeebKey_G},
+    {"h",        BeebKey_H},
+    {"i",        BeebKey_I},
+    {"j",        BeebKey_J},
+    {"k",        BeebKey_K},
+    {"l",        BeebKey_L},
+    {"m",        BeebKey_M},
+    {"n",        BeebKey_N},
+    {"o",        BeebKey_O},
+    {"p",        BeebKey_P},
+    {"q",        BeebKey_Q},
+    {"r",        BeebKey_R},
+    {"s",        BeebKey_S},
+    {"t",        BeebKey_T},
+    {"u",        BeebKey_U},
+    {"v",        BeebKey_V},
+    {"w",        BeebKey_W},
+    {"x",        BeebKey_X},
+    {"y",        BeebKey_Y},
+    {"z",        BeebKey_Z},
+    {"Space",    BeebKey_Space},
+    {"0",        BeebKey_0},
+    {"1",        BeebKey_1},
+    {"2",        BeebKey_2},
+    {"3",        BeebKey_3},
+    {"4",        BeebKey_4},
+    {"5",        BeebKey_5},
+    {"6",        BeebKey_6},
+    {"7",        BeebKey_7},
+    {"8",        BeebKey_8},
+    {"9",        BeebKey_9},
+    {"Cursor up",BeebKey_Up},
+    {"Cursor down",
+                 BeebKey_Down},
+    {"Cursor left",
+                 BeebKey_Left},
+    {"Cursor right",
+                 BeebKey_Right},
+    {"; (semicolon)",
+                 BeebKey_Semicolon},
+    {": (colon)", BeebKey_Colon},
+    {"]",        BeebKey_RightSquareBracket},
+    {", (comma)",BeebKey_Comma},
+    {". (dot)",  BeebKey_Stop},
+    {"/",        BeebKey_Slash},
+    {"F0",       BeebKey_f0},
+    {"F1",       BeebKey_f1},
+    {"F2",       BeebKey_f2},
+    {"F3",       BeebKey_f3},
+    {"F4",       BeebKey_f4},
+    {"F5",       BeebKey_f5},
+    {"F6",       BeebKey_f6},
+    {"F7",       BeebKey_f7},
+    {"F8",       BeebKey_f8},
+    {"F9",       BeebKey_f9},
+    {"Break",    BeebKey_Break},
+    {"Escape",   BeebKey_Escape},
+    {"- (minus)",BeebKey_Minus},
+    {"=",        BeebKey_Caret},
+    {"\\ (backslash)",
+                 BeebKey_Backslash},
+    {"Tab",      BeebKey_Tab},
+    {"@",        BeebKey_At},
+    {"[",        BeebKey_LeftSquareBracket},
+    {"_ (underline)",
+                 BeebKey_Underline},
+    {"Ctrl",     BeebKey_Ctrl},
+    {"Return",   BeebKey_Return},
+    {"Shift",    BeebKey_Shift},
+    {"Caps Lock",BeebKey_CapsLock},
+    {"Shift Lock",BeebKey_ShiftLock},
+    {"Delete",   BeebKey_Delete},
+    {"Copy",     BeebKey_Copy},
+// Keypad not added until BBC Master support is implemented/tested
+};
+
+const std::map<std::string, unsigned> joypad_buttonmap = {
+    {"Up",    RETRO_DEVICE_ID_JOYPAD_UP},
+    {"Down",  RETRO_DEVICE_ID_JOYPAD_DOWN},
+    {"Left",  RETRO_DEVICE_ID_JOYPAD_LEFT},
+    {"Right", RETRO_DEVICE_ID_JOYPAD_RIGHT},
+    {"A",     RETRO_DEVICE_ID_JOYPAD_A},
+    {"B",     RETRO_DEVICE_ID_JOYPAD_B},
+    {"X",     RETRO_DEVICE_ID_JOYPAD_X},
+    {"Y",     RETRO_DEVICE_ID_JOYPAD_Y},
+    {"Select",RETRO_DEVICE_ID_JOYPAD_SELECT},
+    {"Start", RETRO_DEVICE_ID_JOYPAD_START},
+    {"L",     RETRO_DEVICE_ID_JOYPAD_L},
+    {"R",     RETRO_DEVICE_ID_JOYPAD_R},
+    {"L2",    RETRO_DEVICE_ID_JOYPAD_L2},
+    {"R2",    RETRO_DEVICE_ID_JOYPAD_R2},
+    {"L3",    RETRO_DEVICE_ID_JOYPAD_L3},
+    {"R3",    RETRO_DEVICE_ID_JOYPAD_R3},
+};
+
 #endif