wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dolpin-SA: fix start / hotkey order of operations bug

Browse source
This commit is contained in:
brooksytech 2024-03-05 17:37:33 +00:00
parent e575242b19
commit e9658f165e
No known key found for this signature in database
9 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/emulators/standalone/dolphin-sa/config/AMD64/GCPadNew.ini.south
View file

@ -2,11 +2,11 @@
Device = evdev/0/Microsoft X-Box 360 pad
Buttons/A = Button 0
Buttons/B = Button 2
Buttons/Start = Button 6
Buttons/Start = Button 7
Buttons/X = Button 1
Buttons/Y = Button 3
Buttons/Z = Button 5
Buttons/Hotkey = Button 7
Buttons/Hotkey = Button 6
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-

4
packages/emulators/standalone/dolphin-sa/config/AMD64/GCPadNew.ini.west
View file

@ -2,11 +2,11 @@
Device = evdev/0/Microsoft X-Box 360 pad
Buttons/A = Button 1
Buttons/B = Button 0
Buttons/Start = Button 6
Buttons/Start = Button 7
Buttons/X = Button 3
Buttons/Y = Button 2
Buttons/Z = Button 5
Buttons/Hotkey = Button 7
Buttons/Hotkey = Button 6
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-

4
packages/emulators/standalone/dolphin-sa/config/RK3399/GCPadNew.ini.south
View file

@ -2,11 +2,11 @@
Device = evdev/0/rg552_joypad
Buttons/A = Button 0
Buttons/B = Button 3
Buttons/Start = Button 8
Buttons/Start = Button 9
Buttons/X = Button 1
Buttons/Y = Button 2
Buttons/Z = Button 7
Buttons/Hotkey = Button 9
Buttons/Hotkey = Button 8
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 3+
C-Stick/Left = Axis 2-

4
packages/emulators/standalone/dolphin-sa/config/RK3399/GCPadNew.ini.west
View file

@ -2,11 +2,11 @@
Device = evdev/0/rg552_joypad
Buttons/A = Button 1
Buttons/B = Button 0
Buttons/Start = Button 8
Buttons/Start = Button 9
Buttons/X = Button 2
Buttons/Y = Button 3
Buttons/Z = Button 7
Buttons/Hotkey = Button 9
Buttons/Hotkey = Button 8
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 3+
C-Stick/Left = Axis 2-

4
packages/emulators/standalone/dolphin-sa/config/RK3588-ACE/GCPadNew.ini.south
View file

@ -2,11 +2,11 @@
Device = evdev/0/GameForce ACE Gamepad
Buttons/A = Button 0
Buttons/B = Button 4
Buttons/Start = Button 9
Buttons/Start = Button 8
Buttons/X = Button 1
Buttons/Y = Button 3
Buttons/Z = Button 6
Buttons/Hotkey = Button 8
Buttons/Hotkey = Button 9
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-

4
packages/emulators/standalone/dolphin-sa/config/RK3588-ACE/GCPadNew.ini.west
View file

@ -2,11 +2,11 @@
Device = evdev/0/GameForce ACE Gamepad
Buttons/A = Button 1
Buttons/B = Button 0
Buttons/Start = Button 9
Buttons/Start = Button 8
Buttons/X = Button 3
Buttons/Y = Button 4
Buttons/Z = Button 6
Buttons/Hotkey = Button 8
Buttons/Hotkey = Button 9
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-

4
packages/emulators/standalone/dolphin-sa/config/RK3588/GCPadNew.ini.south
View file

@ -2,11 +2,11 @@
Device = evdev/0/Microsoft X-Box 360 pad
Buttons/A = Button 0
Buttons/B = Button 2
Buttons/Start = Button 6
Buttons/Start = Button 7
Buttons/X = Button 1
Buttons/Y = Button 3
Buttons/Z = Button 5
Buttons/Hotkey = Button 7
Buttons/Hotkey = Button 6
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-

4
packages/emulators/standalone/dolphin-sa/config/RK3588/GCPadNew.ini.west
View file

@ -2,11 +2,11 @@
Device = evdev/0/Microsoft X-Box 360 pad
Buttons/A = Button 1
Buttons/B = Button 0
Buttons/Start = Button 6
Buttons/Start = Button 7
Buttons/X = Button 3
Buttons/Y = Button 2
Buttons/Z = Button 5
Buttons/Hotkey = Button 7
Buttons/Hotkey = Button 6
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-

19
packages/emulators/standalone/dolphin-sa/patches/wayland/000-add-wayland.patch
View file

@ -506,36 +506,37 @@ diff -rupN dolphin.orig/Source/Core/Core/Core.cpp dolphin/Source/Core/Core/Core.
Pad::LoadGBAConfig();
diff -rupN dolphin.orig/Source/Core/Core/HW/GCPadEmu.cpp dolphin/Source/Core/Core/HW/GCPadEmu.cpp
--- dolphin.orig/Source/Core/Core/HW/GCPadEmu.cpp 2024-03-05 04:05:26.582982663 +0000
+++ dolphin/Source/Core/Core/HW/GCPadEmu.cpp 2024-03-05 04:06:08.240295843 +0000
@@ -24,6 +24,7 @@ static const u16 button_bitmasks[] = {
PAD_BUTTON_X,
+++ dolphin/Source/Core/Core/HW/GCPadEmu.cpp 2024-03-05 14:39:55.915795457 +0000
@@ -25,6 +25,7 @@ static const u16 button_bitmasks[] = {
PAD_BUTTON_Y,
PAD_TRIGGER_Z,
+ PAD_BUTTON_HOTKEY,
PAD_BUTTON_START,
+ PAD_BUTTON_HOTKEY,
0 // MIC HAX
};
@@ -47,6 +48,9 @@ GCPad::GCPad(const unsigned int index) :
// i18n: The START/PAUSE button on GameCube controllers
m_buttons->AddInput(ControllerEmu::Translate, START_BUTTON, _trans("START"));
+ // Hotkey Button
+ m_buttons->AddInput(ControllerEmu::Translate, HOTKEY_BUTTON, _trans("HOTKEY"));
+
+
// sticks
groups.emplace_back(m_main_stick = new ControllerEmu::OctagonAnalogStick(
MAIN_STICK_GROUP, _trans("Control Stick"), MAIN_STICK_GATE_RADIUS));
diff -rupN dolphin.orig/Source/Core/Core/HW/GCPadEmu.h dolphin/Source/Core/Core/HW/GCPadEmu.h
--- dolphin.orig/Source/Core/Core/HW/GCPadEmu.h 2024-03-05 04:05:26.582982663 +0000
+++ dolphin/Source/Core/Core/HW/GCPadEmu.h 2024-03-05 04:06:08.240295843 +0000
@@ -65,6 +65,7 @@ public:
static constexpr const char* X_BUTTON = "X";
+++ dolphin/Source/Core/Core/HW/GCPadEmu.h 2024-03-05 14:38:20.524919664 +0000
@@ -66,6 +66,8 @@ public:
static constexpr const char* Y_BUTTON = "Y";
static constexpr const char* Z_BUTTON = "Z";
+ static constexpr const char* HOTKEY_BUTTON = "Hotkey";
static constexpr const char* START_BUTTON = "Start";
+ static constexpr const char* HOTKEY_BUTTON = "Hotkey";
+
// i18n: The left trigger button (labeled L on real controllers)
static constexpr const char* L_DIGITAL = _trans("L");
diff -rupN dolphin.orig/Source/Core/Core/State.cpp dolphin/Source/Core/Core/State.cpp
--- dolphin.orig/Source/Core/Core/State.cpp 2024-03-05 04:05:26.586982789 +0000
+++ dolphin/Source/Core/Core/State.cpp 2024-03-05 04:06:08.240295843 +0000