Add extra keys default input when using GUI.

We also set the extra keys for controller input when using `defaults` option.
visualboyadvance-m · Sep 4, 2019 · 54991c5b14cec5684b8dab74be7975e84478c7de · 54991c5
1 parent b358c05
commit 54991c5b14cec5684b8dab74be7975e84478c7de
Unified Split

Showing with 6 additions and 2 deletions.

+3 −0 src/wx/guiinit.cpp

+3 −2 src/wx/opts.h
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
@@ -1672,6 +1672,9 @@ static class JoyPadConfig_t : public wxEvtHandler {
                 if (defkeys_joystick[i].joy)
                     a.push_back(defkeys_joystick[i]);
 
+                if (extrakeys_joystick[i].joy)
+                    a.push_back(extrakeys_joystick[i]);
+
                 tc->SetValue(wxJoyKeyTextCtrl::ToString(a));
             }
         }

diff --git a/src/wx/opts.h b/src/wx/opts.h
@@ -3,8 +3,9 @@
 
 #define NUM_KEYS 21
 extern const wxString joynames[NUM_KEYS];
-extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS]; // keyboard defaults
-extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS]; // joystick defaults
+extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS];  // keyboard defaults
+extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS];  // joystick defaults
+extern wxJoyKeyBinding extrakeys_joystick[NUM_KEYS];// extra joystick defaults
 
 extern struct opts_t {
     opts_t();