From: kub <derkub@gmail.com>
Date: Tue, 27 Oct 2020 17:10:41 +0000 (+0100)
Subject: fix key mapping for opendingux platforms
X-Git-Tag: v2.00~665
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c54e0dd8ffc272c7e9cf34886e013c433c8d4b8;p=picodrive.git

fix key mapping for opendingux platforms
---

diff --git a/platform/opendingux/inputmap.c b/platform/opendingux/inputmap.c
index 388d5e01..660fd5f3 100644
--- a/platform/opendingux/inputmap.c
+++ b/platform/opendingux/inputmap.c
@@ -6,7 +6,7 @@
 #include "../common/input_pico.h"
 
 const struct in_default_bind in_sdl_defbinds[] = {
-	{ SDLK_UP,		IN_BINDTYPE_PLAYER12, GBTN_UP },
+	{ SDLK_UP,	IN_BINDTYPE_PLAYER12, GBTN_UP },
 	{ SDLK_DOWN,	IN_BINDTYPE_PLAYER12, GBTN_DOWN },
 	{ SDLK_LEFT,	IN_BINDTYPE_PLAYER12, GBTN_LEFT },
 	{ SDLK_RIGHT,	IN_BINDTYPE_PLAYER12, GBTN_RIGHT },
@@ -37,7 +37,6 @@ const struct menu_keymap in_sdl_key_map[] =
 	{ SDLK_BACKSPACE,	PBTN_R },
 };
 
-#if !defined(__RG350__)
 const char * const in_sdl_key_names[SDLK_LAST] = {
 	[SDLK_UP] = "UP",
 	[SDLK_DOWN] = "DOWN",
@@ -45,42 +44,31 @@ const char * const in_sdl_key_names[SDLK_LAST] = {
 	[SDLK_RIGHT] = "RIGHT",
 	[SDLK_LCTRL] = "A",
 	[SDLK_LALT] = "B",
+#ifdef __GCW0__
 	[SDLK_LSHIFT] = "X",
 	[SDLK_SPACE] = "Y",
-	[SDLK_TAB] = "L",
-	[SDLK_BACKSPACE] = "R",
+#else
+	[SDLK_LSHIFT] = "Y",
+	[SDLK_SPACE] = "X",
+#endif
 	[SDLK_RETURN] = "START",
 	[SDLK_ESCAPE] = "SELECT",
-	[SDLK_POWER] = "POWER",
-	[SDLK_PAUSE] = "LOCK",
 
+#ifdef __RG350__
+	[SDLK_HOME] = "POWER",
+
+	[SDLK_TAB] = "L1",
+	[SDLK_BACKSPACE] = "R1",
 	[SDLK_PAGEUP] = "L2",
 	[SDLK_PAGEDOWN] = "R2",
 	[SDLK_KP_DIVIDE] = "L3",
 	[SDLK_KP_PERIOD] = "R3",
-};
 #else
-/* RG 350 */
-const char * const in_sdl_key_names[SDLK_LAST] = {
-	[SDLK_UP] = "UP",
-	[SDLK_DOWN] = "DOWN",
-	[SDLK_LEFT] = "LEFT",
-	[SDLK_RIGHT] = "RIGHT",
-	[SDLK_LCTRL] = "A",
-	[SDLK_LALT] = "B",
-	[SDLK_SPACE] = "X",
-	[SDLK_LSHIFT] = "Y",
 	[SDLK_TAB] = "L",
 	[SDLK_BACKSPACE] = "R",
-	[SDLK_RETURN] = "START",
-	[SDLK_ESCAPE] = "SELECT",
-	[SDLK_HOME] = "POWER",
+	[SDLK_POWER] = "POWER",
 	[SDLK_PAUSE] = "LOCK",
-
-	[SDLK_PAGEUP] = "L2",
-	[SDLK_PAGEDOWN] = "R2",
-	[SDLK_KP_DIVIDE] = "L3",
-	[SDLK_KP_PERIOD] = "R3",
-};
 #endif
+};
+
 const char *const *in_sdl_key_names_p = in_sdl_key_names;