From 989fecc3516e8b49d5765d8f5e36affe14bd383a Mon Sep 17 00:00:00 2001
From: Thomas Jentzsch <tjentzsch@yahoo.de>
Date: Sun, 26 Mar 2023 10:23:38 +0200
Subject: [PATCH] enhanced/fixed some controller default mappings

---
 docs/index_r77.html             |  6 +++---
 src/common/PJoystickHandler.cxx | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/docs/index_r77.html b/docs/index_r77.html
index 982c281c8..04a15c119 100644
--- a/docs/index_r77.html
+++ b/docs/index_r77.html
@@ -95,17 +95,17 @@
       <td>Open settings</td>
     </tr>
     <tr>
-      <td>Button 7</td>
+      <td>Button 8</td>
       <td>-</td>
       <td>Rewind game</td>
     </tr>
     <tr>
-      <td>Button 8</td>
+      <td>Button 9</td>
       <td>MODE</td>
       <td>Select</td>
     </tr>
     <tr>
-      <td>Button 9</td>
+      <td>Button 10</td>
       <td>RESET</td>
       <td>Reset</td>
     </tr>
diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index af75d86ae..86e6a299c 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -1403,13 +1403,22 @@ PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultRight
 PhysicalJoystickHandler::EventMappingArray
 PhysicalJoystickHandler::DefaultCommonMapping = {
   // valid for all joysticks
+  // Note: buttons 0..2 are used by controllers!
 #if defined(RETRON77)
-  {Event::CmdMenuMode,        3}, // Note: buttons 0..2 are used by controllers!
-  {Event::ExitMode,           4},
-  {Event::OptionsMenuMode,    5},
-  {Event::RewindPause,        6},
-  {Event::ConsoleSelect,      7},
-  {Event::ConsoleReset,       8},
+  {Event::CmdMenuMode,            3}, // Button "Y" / "4"
+  {Event::ExitMode,               4}, // Left Shoulder Button
+  {Event::OptionsMenuMode,        5}, // Right Shoulder Button
+  {Event::RewindPause,            7}, // Right Trigger Button
+  {Event::ConsoleSelect,          8}, // Button "Select"
+  {Event::ConsoleReset,           9}, // Button "Start"
+#else
+  {Event::ConsoleSelect,          8}, // Button "Select"
+  {Event::ConsoleReset,           9}, // Button "Start"
+  {Event::ConsoleColorToggle,     3}, // Button "Y" / "4"
+  {Event::ConsoleLeftDiffToggle,  4}, // Left Shoulder Button
+  {Event::ConsoleRightDiffToggle, 5}, // Right Shoulder Button
+  {Event::CmdMenuMode,            6}, // Left Trigger Button
+  {Event::OptionsMenuMode,        7}, // Right Trigger Button
 #endif
 };