summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/GCKeyboardEmu.cpp320
-rw-r--r--Source/Core/Core/HW/GCPadEmu.cpp72
-rw-r--r--Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp23
-rw-r--r--Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp58
-rw-r--r--Source/Core/Core/HotkeyManager.cpp60
-rw-r--r--Source/Core/InputCommon/ControllerEmu.cpp5
-rw-r--r--Source/Core/InputCommon/ControllerEmu.h2
7 files changed, 270 insertions, 270 deletions
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp
index 3a96f6d051..7bff11e119 100644
--- a/Source/Core/Core/HW/GCKeyboardEmu.cpp
+++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp
@@ -265,185 +265,183 @@ void GCKeyboard::GetInput(KeyboardStatus* const kb)
void GCKeyboard::LoadDefaults(const ControllerInterface& ciface)
{
- #define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str)
-
ControllerEmu::LoadDefaults(ciface);
// Buttons
- set_control(m_keys0x, 5, "A");
- set_control(m_keys0x, 6, "B");
- set_control(m_keys0x, 7, "C");
- set_control(m_keys0x, 8, "D");
- set_control(m_keys0x, 9, "E");
- set_control(m_keys0x, 10, "F");
- set_control(m_keys0x, 11, "G");
- set_control(m_keys0x, 12, "H");
- set_control(m_keys0x, 13, "I");
- set_control(m_keys0x, 14, "J");
- set_control(m_keys0x, 15, "K");
- set_control(m_keys1x, 0, "L");
- set_control(m_keys1x, 1, "M");
- set_control(m_keys1x, 2, "N");
- set_control(m_keys1x, 3, "O");
- set_control(m_keys1x, 4, "P");
- set_control(m_keys1x, 5, "Q");
- set_control(m_keys1x, 6, "R");
- set_control(m_keys1x, 7, "S");
- set_control(m_keys1x, 8, "T");
- set_control(m_keys1x, 9, "U");
- set_control(m_keys1x, 10, "V");
- set_control(m_keys1x, 11, "W");
- set_control(m_keys1x, 12, "X");
- set_control(m_keys1x, 13, "Y");
- set_control(m_keys1x, 14, "Z");
+ m_keys0x->SetControlExpression(5, "A");
+ m_keys0x->SetControlExpression(6, "B");
+ m_keys0x->SetControlExpression(7, "C");
+ m_keys0x->SetControlExpression(8, "D");
+ m_keys0x->SetControlExpression(9, "E");
+ m_keys0x->SetControlExpression(10, "F");
+ m_keys0x->SetControlExpression(11, "G");
+ m_keys0x->SetControlExpression(12, "H");
+ m_keys0x->SetControlExpression(13, "I");
+ m_keys0x->SetControlExpression(14, "J");
+ m_keys0x->SetControlExpression(15, "K");
+ m_keys1x->SetControlExpression(0, "L");
+ m_keys1x->SetControlExpression(1, "M");
+ m_keys1x->SetControlExpression(2, "N");
+ m_keys1x->SetControlExpression(3, "O");
+ m_keys1x->SetControlExpression(4, "P");
+ m_keys1x->SetControlExpression(5, "Q");
+ m_keys1x->SetControlExpression(6, "R");
+ m_keys1x->SetControlExpression(7, "S");
+ m_keys1x->SetControlExpression(8, "T");
+ m_keys1x->SetControlExpression(9, "U");
+ m_keys1x->SetControlExpression(10, "V");
+ m_keys1x->SetControlExpression(11, "W");
+ m_keys1x->SetControlExpression(12, "X");
+ m_keys1x->SetControlExpression(13, "Y");
+ m_keys1x->SetControlExpression(14, "Z");
- set_control(m_keys1x, 15, "1");
- set_control(m_keys2x, 0, "2");
- set_control(m_keys2x, 1, "3");
- set_control(m_keys2x, 2, "4");
- set_control(m_keys2x, 3, "5");
- set_control(m_keys2x, 4, "6");
- set_control(m_keys2x, 5, "7");
- set_control(m_keys2x, 6, "8");
- set_control(m_keys2x, 7, "9");
- set_control(m_keys2x, 8, "0");
+ m_keys1x->SetControlExpression(15, "1");
+ m_keys2x->SetControlExpression(0, "2");
+ m_keys2x->SetControlExpression(1, "3");
+ m_keys2x->SetControlExpression(2, "4");
+ m_keys2x->SetControlExpression(3, "5");
+ m_keys2x->SetControlExpression(4, "6");
+ m_keys2x->SetControlExpression(5, "7");
+ m_keys2x->SetControlExpression(6, "8");
+ m_keys2x->SetControlExpression(7, "9");
+ m_keys2x->SetControlExpression(8, "0");
- set_control(m_keys3x, 5, "F1");
- set_control(m_keys3x, 6, "F2");
- set_control(m_keys3x, 7, "F3");
- set_control(m_keys3x, 8, "F4");
- set_control(m_keys3x, 9, "F5");
- set_control(m_keys3x, 10, "F6");
- set_control(m_keys3x, 11, "F7");
- set_control(m_keys3x, 12, "F8");
- set_control(m_keys3x, 13, "F9");
- set_control(m_keys3x, 14, "F10");
- set_control(m_keys3x, 15, "F11");
- set_control(m_keys4x, 0, "F12");
+ m_keys3x->SetControlExpression(5, "F1");
+ m_keys3x->SetControlExpression(6, "F2");
+ m_keys3x->SetControlExpression(7, "F3");
+ m_keys3x->SetControlExpression(8, "F4");
+ m_keys3x->SetControlExpression(9, "F5");
+ m_keys3x->SetControlExpression(10, "F6");
+ m_keys3x->SetControlExpression(11, "F7");
+ m_keys3x->SetControlExpression(12, "F8");
+ m_keys3x->SetControlExpression(13, "F9");
+ m_keys3x->SetControlExpression(14, "F10");
+ m_keys3x->SetControlExpression(15, "F11");
+ m_keys4x->SetControlExpression(0, "F12");
#ifdef _WIN32
- set_control(m_keys0x, 0, "HOME");
- set_control(m_keys0x, 1, "END");
- set_control(m_keys0x, 2, "PRIOR");
- set_control(m_keys0x, 3, "NEXT");
- set_control(m_keys0x, 4, "SCROLL");
+ m_keys0x->SetControlExpression(0, "HOME");
+ m_keys0x->SetControlExpression(1, "END");
+ m_keys0x->SetControlExpression(2, "PRIOR");
+ m_keys0x->SetControlExpression(3, "NEXT");
+ m_keys0x->SetControlExpression(4, "SCROLL");
- set_control(m_keys2x, 9, "MINUS");
- set_control(m_keys2x, 10, "GRAVE");
- set_control(m_keys2x, 11, "SYSRQ");
- set_control(m_keys2x, 12, "APOSTROPHE");
- set_control(m_keys2x, 13, "LBRACKET");
- set_control(m_keys2x, 14, "EQUALS");
- set_control(m_keys2x, 15, "MULTIPLY");
- set_control(m_keys3x, 0, "RBRACKET");
- set_control(m_keys3x, 1, "COMMA");
- set_control(m_keys3x, 2, "PERIOD");
- set_control(m_keys3x, 3, "SLASH");
- set_control(m_keys3x, 4, "BACKSLASH");
+ m_keys2x->SetControlExpression(9, "MINUS");
+ m_keys2x->SetControlExpression(10, "GRAVE");
+ m_keys2x->SetControlExpression(11, "SYSRQ");
+ m_keys2x->SetControlExpression(12, "APOSTROPHE");
+ m_keys2x->SetControlExpression(13, "LBRACKET");
+ m_keys2x->SetControlExpression(14, "EQUALS");
+ m_keys2x->SetControlExpression(15, "MULTIPLY");
+ m_keys3x->SetControlExpression(0, "RBRACKET");
+ m_keys3x->SetControlExpression(1, "COMMA");
+ m_keys3x->SetControlExpression(2, "PERIOD");
+ m_keys3x->SetControlExpression(3, "SLASH");
+ m_keys3x->SetControlExpression(4, "BACKSLASH");
- set_control(m_keys4x, 1, "ESCAPE");
- set_control(m_keys4x, 2, "INSERT");
- set_control(m_keys4x, 3, "DELETE");
- set_control(m_keys4x, 4, "SEMICOLON");
- set_control(m_keys4x, 5, "BACK");
- set_control(m_keys4x, 6, "TAB");
- set_control(m_keys4x, 7, "CAPITAL");
- set_control(m_keys4x, 8, "LSHIFT");
- set_control(m_keys4x, 9, "RSHIFT");
- set_control(m_keys4x, 10, "LCONTROL");
- set_control(m_keys4x, 11, "RMENU");
- set_control(m_keys4x, 12, "LWIN");
- set_control(m_keys4x, 13, "SPACE");
- set_control(m_keys4x, 14, "RWIN");
- set_control(m_keys4x, 15, "MENU");
+ m_keys4x->SetControlExpression(1, "ESCAPE");
+ m_keys4x->SetControlExpression(2, "INSERT");
+ m_keys4x->SetControlExpression(3, "DELETE");
+ m_keys4x->SetControlExpression(4, "SEMICOLON");
+ m_keys4x->SetControlExpression(5, "BACK");
+ m_keys4x->SetControlExpression(6, "TAB");
+ m_keys4x->SetControlExpression(7, "CAPITAL");
+ m_keys4x->SetControlExpression(8, "LSHIFT");
+ m_keys4x->SetControlExpression(9, "RSHIFT");
+ m_keys4x->SetControlExpression(10, "LCONTROL");
+ m_keys4x->SetControlExpression(11, "RMENU");
+ m_keys4x->SetControlExpression(12, "LWIN");
+ m_keys4x->SetControlExpression(13, "SPACE");
+ m_keys4x->SetControlExpression(14, "RWIN");
+ m_keys4x->SetControlExpression(15, "MENU");
- set_control(m_keys5x, 0, "LEFT");
- set_control(m_keys5x, 1, "DOWN");
- set_control(m_keys5x, 2, "UP");
- set_control(m_keys5x, 3, "RIGHT");
- set_control(m_keys5x, 4, "RETURN");
+ m_keys5x->SetControlExpression(0, "LEFT");
+ m_keys5x->SetControlExpression(1, "DOWN");
+ m_keys5x->SetControlExpression(2, "UP");
+ m_keys5x->SetControlExpression(3, "RIGHT");
+ m_keys5x->SetControlExpression(4, "RETURN");
#elif __APPLE__
- set_control(m_keys0x, 0, "Home");
- set_control(m_keys0x, 1, "End");
- set_control(m_keys0x, 2, "Page Up");
- set_control(m_keys0x, 3, "Page Down");
- set_control(m_keys0x, 4, ""); // Scroll lock
+ m_keys0x->SetControlExpression(0, "Home");
+ m_keys0x->SetControlExpression(1, "End");
+ m_keys0x->SetControlExpression(2, "Page Up");
+ m_keys0x->SetControlExpression(3, "Page Down");
+ m_keys0x->SetControlExpression(4, ""); // Scroll lock
- set_control(m_keys2x, 9, "-");
- set_control(m_keys2x, 10, "Paragraph");
- set_control(m_keys2x, 11, ""); // Print Scr
- set_control(m_keys2x, 12, "'");
- set_control(m_keys2x, 13, "[");
- set_control(m_keys2x, 14, "=");
- set_control(m_keys2x, 15, "Keypad *");
- set_control(m_keys3x, 0, "]");
- set_control(m_keys3x, 1, ",");
- set_control(m_keys3x, 2, ".");
- set_control(m_keys3x, 3, "/");
- set_control(m_keys3x, 4, "\\");
+ m_keys2x->SetControlExpression(9, "-");
+ m_keys2x->SetControlExpression(10, "Paragraph");
+ m_keys2x->SetControlExpression(11, ""); // Print Scr
+ m_keys2x->SetControlExpression(12, "'");
+ m_keys2x->SetControlExpression(13, "[");
+ m_keys2x->SetControlExpression(14, "=");
+ m_keys2x->SetControlExpression(15, "Keypad *");
+ m_keys3x->SetControlExpression(0, "]");
+ m_keys3x->SetControlExpression(1, ",");
+ m_keys3x->SetControlExpression(2, ".");
+ m_keys3x->SetControlExpression(3, "/");
+ m_keys3x->SetControlExpression(4, "\\");
- set_control(m_keys4x, 1, "Escape");
- set_control(m_keys4x, 2, "Insert");
- set_control(m_keys4x, 3, "Delete");
- set_control(m_keys4x, 4, ";");
- set_control(m_keys4x, 5, "Backspace");
- set_control(m_keys4x, 6, "Tab");
- set_control(m_keys4x, 7, "Caps Lock");
- set_control(m_keys4x, 8, "Left Shift");
- set_control(m_keys4x, 9, "Right Shift");
- set_control(m_keys4x, 10, "Left Control");
- set_control(m_keys4x, 11, "Right Alt");
- set_control(m_keys4x, 12, "Left Command");
- set_control(m_keys4x, 13, "Space");
- set_control(m_keys4x, 14, "Right Command");
- set_control(m_keys4x, 15, ""); // Menu
+ m_keys4x->SetControlExpression(1, "Escape");
+ m_keys4x->SetControlExpression(2, "Insert");
+ m_keys4x->SetControlExpression(3, "Delete");
+ m_keys4x->SetControlExpression(4, ";");
+ m_keys4x->SetControlExpression(5, "Backspace");
+ m_keys4x->SetControlExpression(6, "Tab");
+ m_keys4x->SetControlExpression(7, "Caps Lock");
+ m_keys4x->SetControlExpression(8, "Left Shift");
+ m_keys4x->SetControlExpression(9, "Right Shift");
+ m_keys4x->SetControlExpression(10, "Left Control");
+ m_keys4x->SetControlExpression(11, "Right Alt");
+ m_keys4x->SetControlExpression(12, "Left Command");
+ m_keys4x->SetControlExpression(13, "Space");
+ m_keys4x->SetControlExpression(14, "Right Command");
+ m_keys4x->SetControlExpression(15, ""); // Menu
- set_control(m_keys5x, 0, "Left Arrow");
- set_control(m_keys5x, 1, "Down Arrow");
- set_control(m_keys5x, 2, "Up Arrow");
- set_control(m_keys5x, 3, "Right Arrow");
- set_control(m_keys5x, 4, "Return");
+ m_keys5x->SetControlExpression(0, "Left Arrow");
+ m_keys5x->SetControlExpression(1, "Down Arrow");
+ m_keys5x->SetControlExpression(2, "Up Arrow");
+ m_keys5x->SetControlExpression(3, "Right Arrow");
+ m_keys5x->SetControlExpression(4, "Return");
#else // linux
- set_control(m_keys0x, 0, "Home");
- set_control(m_keys0x, 1, "End");
- set_control(m_keys0x, 2, "Prior");
- set_control(m_keys0x, 3, "Next");
- set_control(m_keys0x, 4, "Scroll_Lock");
+ m_keys0x->SetControlExpression(0, "Home");
+ m_keys0x->SetControlExpression(1, "End");
+ m_keys0x->SetControlExpression(2, "Prior");
+ m_keys0x->SetControlExpression(3, "Next");
+ m_keys0x->SetControlExpression(4, "Scroll_Lock");
- set_control(m_keys2x, 9, "minus");
- set_control(m_keys2x, 10, "grave");
- set_control(m_keys2x, 11, "Print");
- set_control(m_keys2x, 12, "apostrophe");
- set_control(m_keys2x, 13, "bracketleft");
- set_control(m_keys2x, 14, "equal");
- set_control(m_keys2x, 15, "KP_Multiply");
- set_control(m_keys3x, 0, "bracketright");
- set_control(m_keys3x, 1, "comma");
- set_control(m_keys3x, 2, "period");
- set_control(m_keys3x, 3, "slash");
- set_control(m_keys3x, 4, "backslash");
+ m_keys2x->SetControlExpression(9, "minus");
+ m_keys2x->SetControlExpression(10, "grave");
+ m_keys2x->SetControlExpression(11, "Print");
+ m_keys2x->SetControlExpression(12, "apostrophe");
+ m_keys2x->SetControlExpression(13, "bracketleft");
+ m_keys2x->SetControlExpression(14, "equal");
+ m_keys2x->SetControlExpression(15, "KP_Multiply");
+ m_keys3x->SetControlExpression(0, "bracketright");
+ m_keys3x->SetControlExpression(1, "comma");
+ m_keys3x->SetControlExpression(2, "period");
+ m_keys3x->SetControlExpression(3, "slash");
+ m_keys3x->SetControlExpression(4, "backslash");
- set_control(m_keys4x, 1, "Escape");
- set_control(m_keys4x, 2, "Insert");
- set_control(m_keys4x, 3, "Delete");
- set_control(m_keys4x, 4, "semicolon");
- set_control(m_keys4x, 5, "BackSpace");
- set_control(m_keys4x, 6, "Tab");
- set_control(m_keys4x, 7, "Caps_Lock");
- set_control(m_keys4x, 8, "Shift_L");
- set_control(m_keys4x, 9, "Shift_R");
- set_control(m_keys4x, 10, "Control_L");
- set_control(m_keys4x, 11, "Alt_R");
- set_control(m_keys4x, 12, "Super_L");
- set_control(m_keys4x, 13, "space");
- set_control(m_keys4x, 14, "Super_R");
- set_control(m_keys4x, 15, "Menu");
+ m_keys4x->SetControlExpression(1, "Escape");
+ m_keys4x->SetControlExpression(2, "Insert");
+ m_keys4x->SetControlExpression(3, "Delete");
+ m_keys4x->SetControlExpression(4, "semicolon");
+ m_keys4x->SetControlExpression(5, "BackSpace");
+ m_keys4x->SetControlExpression(6, "Tab");
+ m_keys4x->SetControlExpression(7, "Caps_Lock");
+ m_keys4x->SetControlExpression(8, "Shift_L");
+ m_keys4x->SetControlExpression(9, "Shift_R");
+ m_keys4x->SetControlExpression(10, "Control_L");
+ m_keys4x->SetControlExpression(11, "Alt_R");
+ m_keys4x->SetControlExpression(12, "Super_L");
+ m_keys4x->SetControlExpression(13, "space");
+ m_keys4x->SetControlExpression(14, "Super_R");
+ m_keys4x->SetControlExpression(15, "Menu");
- set_control(m_keys5x, 0, "Left");
- set_control(m_keys5x, 1, "Down");
- set_control(m_keys5x, 2, "Up");
- set_control(m_keys5x, 3, "Right");
- set_control(m_keys5x, 4, "Return");
+ m_keys5x->SetControlExpression(0, "Left");
+ m_keys5x->SetControlExpression(1, "Down");
+ m_keys5x->SetControlExpression(2, "Up");
+ m_keys5x->SetControlExpression(3, "Right");
+ m_keys5x->SetControlExpression(4, "Return");
#endif
}
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
index cea88e17e0..8069e8f06c 100644
--- a/Source/Core/Core/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/HW/GCPadEmu.cpp
@@ -125,21 +125,19 @@ void GCPad::SetOutput(const ControlState strength)
void GCPad::LoadDefaults(const ControllerInterface& ciface)
{
- #define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str)
-
ControllerEmu::LoadDefaults(ciface);
// Buttons
- set_control(m_buttons, 0, "X"); // A
- set_control(m_buttons, 1, "Z"); // B
- set_control(m_buttons, 2, "C"); // X
- set_control(m_buttons, 3, "S"); // Y
- set_control(m_buttons, 4, "D"); // Z
+ m_buttons->SetControlExpression(0, "X"); // A
+ m_buttons->SetControlExpression(1, "Z"); // B
+ m_buttons->SetControlExpression(2, "C"); // X
+ m_buttons->SetControlExpression(3, "S"); // Y
+ m_buttons->SetControlExpression(4, "D"); // Z
#ifdef _WIN32
- set_control(m_buttons, 5, "!LMENU & RETURN"); // Start
+ m_buttons->SetControlExpression(5, "!LMENU & RETURN"); // Start
#else
// OS X/Linux
- set_control(m_buttons, 5, "!`Alt_L` & Return"); // Start
+ m_buttons->SetControlExpression(5, "!`Alt_L` & Return"); // Start
#endif
// stick modifiers to 50 %
@@ -147,51 +145,51 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
m_c_stick->controls[4]->control_ref->range = 0.5f;
// D-Pad
- set_control(m_dpad, 0, "T"); // Up
- set_control(m_dpad, 1, "G"); // Down
- set_control(m_dpad, 2, "F"); // Left
- set_control(m_dpad, 3, "H"); // Right
+ m_dpad->SetControlExpression(0, "T"); // Up
+ m_dpad->SetControlExpression(1, "G"); // Down
+ m_dpad->SetControlExpression(2, "F"); // Left
+ m_dpad->SetControlExpression(3, "H"); // Right
// C Stick
- set_control(m_c_stick, 0, "I"); // Up
- set_control(m_c_stick, 1, "K"); // Down
- set_control(m_c_stick, 2, "J"); // Left
- set_control(m_c_stick, 3, "L"); // Right
+ m_c_stick->SetControlExpression(0, "I"); // Up
+ m_c_stick->SetControlExpression(1, "K"); // Down
+ m_c_stick->SetControlExpression(2, "J"); // Left
+ m_c_stick->SetControlExpression(3, "L"); // Right
#ifdef _WIN32
- set_control(m_c_stick, 4, "LCONTROL"); // Modifier
+ m_c_stick->SetControlExpression(4, "LCONTROL"); // Modifier
// Control Stick
- set_control(m_main_stick, 0, "UP"); // Up
- set_control(m_main_stick, 1, "DOWN"); // Down
- set_control(m_main_stick, 2, "LEFT"); // Left
- set_control(m_main_stick, 3, "RIGHT"); // Right
- set_control(m_main_stick, 4, "LSHIFT"); // Modifier
+ m_main_stick->SetControlExpression(0, "UP"); // Up
+ m_main_stick->SetControlExpression(1, "DOWN"); // Down
+ m_main_stick->SetControlExpression(2, "LEFT"); // Left
+ m_main_stick->SetControlExpression(3, "RIGHT"); // Right
+ m_main_stick->SetControlExpression(4, "LSHIFT"); // Modifier
#elif __APPLE__
- set_control(m_c_stick, 4, "Left Control"); // Modifier
+ m_c_stick->SetControlExpression(4, "Left Control"); // Modifier
// Control Stick
- set_control(m_main_stick, 0, "Up Arrow"); // Up
- set_control(m_main_stick, 1, "Down Arrow"); // Down
- set_control(m_main_stick, 2, "Left Arrow"); // Left
- set_control(m_main_stick, 3, "Right Arrow"); // Right
- set_control(m_main_stick, 4, "Left Shift"); // Modifier
+ m_main_stick->SetControlExpression(0, "Up Arrow"); // Up
+ m_main_stick->SetControlExpression(1, "Down Arrow"); // Down
+ m_main_stick->SetControlExpression(2, "Left Arrow"); // Left
+ m_main_stick->SetControlExpression(3, "Right Arrow"); // Right
+ m_main_stick->SetControlExpression(4, "Left Shift"); // Modifier
#else
// not sure if these are right
- set_control(m_c_stick, 4, "Control_L"); // Modifier
+ m_c_stick->SetControlExpression(4, "Control_L"); // Modifier
// Control Stick
- set_control(m_main_stick, 0, "Up"); // Up
- set_control(m_main_stick, 1, "Down"); // Down
- set_control(m_main_stick, 2, "Left"); // Left
- set_control(m_main_stick, 3, "Right"); // Right
- set_control(m_main_stick, 4, "Shift_L"); // Modifier
+ m_main_stick->SetControlExpression(0, "Up"); // Up
+ m_main_stick->SetControlExpression(1, "Down"); // Down
+ m_main_stick->SetControlExpression(2, "Left"); // Left
+ m_main_stick->SetControlExpression(3, "Right"); // Right
+ m_main_stick->SetControlExpression(4, "Shift_L"); // Modifier
#endif
// Triggers
- set_control(m_triggers, 0, "Q"); // L
- set_control(m_triggers, 1, "W"); // R
+ m_triggers->SetControlExpression(0, "Q"); // L
+ m_triggers->SetControlExpression(1, "W"); // R
}
bool GCPad::GetMicButton() const
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
index 8e2b483d99..68f31f54a2 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -116,25 +116,22 @@ bool Nunchuk::IsButtonPressed() const
void Nunchuk::LoadDefaults(const ControllerInterface& ciface)
{
- // ugly macroooo
- #define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str)
-
// Stick
- set_control(m_stick, 0, "W"); // up
- set_control(m_stick, 1, "S"); // down
- set_control(m_stick, 2, "A"); // left
- set_control(m_stick, 3, "D"); // right
+ m_stick->SetControlExpression(0, "W"); // up
+ m_stick->SetControlExpression(1, "S"); // down
+ m_stick->SetControlExpression(2, "A"); // left
+ m_stick->SetControlExpression(3, "D"); // right
// Buttons
#ifdef _WIN32
- set_control(m_buttons, 0, "LCONTROL"); // C
- set_control(m_buttons, 1, "LSHIFT"); // Z
+ m_buttons->SetControlExpression(0, "LCONTROL"); // C
+ m_buttons->SetControlExpression(1, "LSHIFT"); // Z
#elif __APPLE__
- set_control(m_buttons, 0, "Left Control"); // C
- set_control(m_buttons, 1, "Left Shift"); // Z
+ m_buttons->SetControlExpression(0, "Left Control"); // C
+ m_buttons->SetControlExpression(1, "Left Shift"); // Z
#else
- set_control(m_buttons, 0, "Control_L"); // C
- set_control(m_buttons, 1, "Shift_L"); // Z
+ m_buttons->SetControlExpression(0, "Control_L"); // C
+ m_buttons->SetControlExpression(1, "Shift_L"); // Z
#endif
}
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index b7bfbdf51b..c345c3492b 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -893,53 +893,51 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
{
ControllerEmu::LoadDefaults(ciface);
- #define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str)
-
// Buttons
#if defined HAVE_X11 && HAVE_X11
- set_control(m_buttons, 0, "Click 1"); // A
- set_control(m_buttons, 1, "Click 3"); // B
+ m_buttons->SetControlExpression(0, "Click 1"); // A
+ m_buttons->SetControlExpression(1, "Click 3"); // B
#else
- set_control(m_buttons, 0, "Click 0"); // A
- set_control(m_buttons, 1, "Click 1"); // B
+ m_buttons->SetControlExpression(0, "Click 0"); // A
+ m_buttons->SetControlExpression(1, "Click 1"); // B
#endif
- set_control(m_buttons, 2, "1"); // 1
- set_control(m_buttons, 3, "2"); // 2
- set_control(m_buttons, 4, "Q"); // -
- set_control(m_buttons, 5, "E"); // +
+ m_buttons->SetControlExpression(2, "1"); // 1
+ m_buttons->SetControlExpression(3, "2"); // 2
+ m_buttons->SetControlExpression(4, "Q"); // -
+ m_buttons->SetControlExpression(5, "E"); // +
#ifdef _WIN32
- set_control(m_buttons, 6, "!LMENU & RETURN"); // Home
+ m_buttons->SetControlExpression(6, "!LMENU & RETURN"); // Home
#else
- set_control(m_buttons, 6, "!`Alt_L` & Return"); // Home
+ m_buttons->SetControlExpression(6, "!`Alt_L` & Return"); // Home
#endif
// Shake
- for (size_t i = 0; i != 3; ++i)
- set_control(m_shake, i, "Click 2");
+ for (int i = 0; i < 3; ++i)
+ m_shake->SetControlExpression(i, "Click 2");
// IR
- set_control(m_ir, 0, "Cursor Y-");
- set_control(m_ir, 1, "Cursor Y+");
- set_control(m_ir, 2, "Cursor X-");
- set_control(m_ir, 3, "Cursor X+");
+ m_ir->SetControlExpression(0, "Cursor Y-");
+ m_ir->SetControlExpression(1, "Cursor Y+");
+ m_ir->SetControlExpression(2, "Cursor X-");
+ m_ir->SetControlExpression(3, "Cursor X+");
// DPad
#ifdef _WIN32
- set_control(m_dpad, 0, "UP"); // Up
- set_control(m_dpad, 1, "DOWN"); // Down
- set_control(m_dpad, 2, "LEFT"); // Left
- set_control(m_dpad, 3, "RIGHT"); // Right
+ m_dpad->SetControlExpression(0, "UP"); // Up
+ m_dpad->SetControlExpression(1, "DOWN"); // Down
+ m_dpad->SetControlExpression(2, "LEFT"); // Left
+ m_dpad->SetControlExpression(3, "RIGHT"); // Right
#elif __APPLE__
- set_control(m_dpad, 0, "Up Arrow"); // Up
- set_control(m_dpad, 1, "Down Arrow"); // Down
- set_control(m_dpad, 2, "Left Arrow"); // Left
- set_control(m_dpad, 3, "Right Arrow"); // Right
+ m_dpad->SetControlExpression(0, "Up Arrow"); // Up
+ m_dpad->SetControlExpression(1, "Down Arrow"); // Down
+ m_dpad->SetControlExpression(2, "Left Arrow"); // Left
+ m_dpad->SetControlExpression(3, "Right Arrow"); // Right
#else
- set_control(m_dpad, 0, "Up"); // Up
- set_control(m_dpad, 1, "Down"); // Down
- set_control(m_dpad, 2, "Left"); // Left
- set_control(m_dpad, 3, "Right"); // Right
+ m_dpad->SetControlExpression(0, "Up"); // Up
+ m_dpad->SetControlExpression(1, "Down"); // Down
+ m_dpad->SetControlExpression(2, "Left"); // Left
+ m_dpad->SetControlExpression(3, "Right"); // Right
#endif
// ugly stuff
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp
index fb5a5c12b2..d20230d7ac 100644
--- a/Source/Core/Core/HotkeyManager.cpp
+++ b/Source/Core/Core/HotkeyManager.cpp
@@ -261,48 +261,50 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
const std::string CTRL = "(!`Alt_L` & !(`Shift_L` | `Shift_R`) & (`Control_L` | `Control_R` ))";
#endif
- #define set_control(num, str) (m_keys[(num) / 32])->controls[(num) % 32]->control_ref->expression = (str)
+ auto set_key_expression = [this](int index, const std::string& expression) {
+ m_keys[index / 32]->controls[index % 32]->control_ref->expression = expression;
+ };
// General hotkeys
- set_control(HK_OPEN, CTRL + " & O");
- set_control(HK_PLAY_PAUSE, "`F10`");
+ set_key_expression(HK_OPEN, CTRL + " & O");
+ set_key_expression(HK_PLAY_PAUSE, "`F10`");
#ifdef _WIN32
- set_control(HK_STOP, "ESCAPE");
- set_control(HK_FULLSCREEN, ALT + " & RETURN");
+ set_key_expression(HK_STOP, "ESCAPE");
+ set_key_expression(HK_FULLSCREEN, ALT + " & RETURN");
#else
- set_control(HK_STOP, "Escape");
- set_control(HK_FULLSCREEN, ALT + " & Return");
+ set_key_expression(HK_STOP, "Escape");
+ set_key_expression(HK_FULLSCREEN, ALT + " & Return");
#endif
- set_control(HK_SCREENSHOT, NON + " & `F9`");
- set_control(HK_WIIMOTE1_CONNECT, ALT + " & `F5`");
- set_control(HK_WIIMOTE2_CONNECT, ALT + " & `F6`");
- set_control(HK_WIIMOTE3_CONNECT, ALT + " & `F7`");
- set_control(HK_WIIMOTE4_CONNECT, ALT + " & `F8`");
- set_control(HK_BALANCEBOARD_CONNECT, ALT + " & `F9`");
+ set_key_expression(HK_SCREENSHOT, NON + " & `F9`");
+ set_key_expression(HK_WIIMOTE1_CONNECT, ALT + " & `F5`");
+ set_key_expression(HK_WIIMOTE2_CONNECT, ALT + " & `F6`");
+ set_key_expression(HK_WIIMOTE3_CONNECT, ALT + " & `F7`");
+ set_key_expression(HK_WIIMOTE4_CONNECT, ALT + " & `F8`");
+ set_key_expression(HK_BALANCEBOARD_CONNECT, ALT + " & `F9`");
#ifdef _WIN32
- set_control(HK_TOGGLE_THROTTLE, "TAB");
+ set_key_expression(HK_TOGGLE_THROTTLE, "TAB");
#else
- set_control(HK_TOGGLE_THROTTLE, "Tab");
+ set_key_expression(HK_TOGGLE_THROTTLE, "Tab");
#endif
// Freelook
- set_control(HK_FREELOOK_DECREASE_SPEED, SHIFT + " & `1`");
- set_control(HK_FREELOOK_INCREASE_SPEED, SHIFT + " & `2`");
- set_control(HK_FREELOOK_RESET_SPEED, SHIFT + " & F");
- set_control(HK_FREELOOK_UP, SHIFT + " & E");
- set_control(HK_FREELOOK_DOWN, SHIFT + " & Q");
- set_control(HK_FREELOOK_LEFT, SHIFT + " & A");
- set_control(HK_FREELOOK_RIGHT, SHIFT + " & D");
- set_control(HK_FREELOOK_ZOOM_IN, SHIFT + " & W");
- set_control(HK_FREELOOK_ZOOM_OUT, SHIFT + " & S");
- set_control(HK_FREELOOK_RESET, SHIFT + " & R");
+ set_key_expression(HK_FREELOOK_DECREASE_SPEED, SHIFT + " & `1`");
+ set_key_expression(HK_FREELOOK_INCREASE_SPEED, SHIFT + " & `2`");
+ set_key_expression(HK_FREELOOK_RESET_SPEED, SHIFT + " & F");
+ set_key_expression(HK_FREELOOK_UP, SHIFT + " & E");
+ set_key_expression(HK_FREELOOK_DOWN, SHIFT + " & Q");
+ set_key_expression(HK_FREELOOK_LEFT, SHIFT + " & A");
+ set_key_expression(HK_FREELOOK_RIGHT, SHIFT + " & D");
+ set_key_expression(HK_FREELOOK_ZOOM_IN, SHIFT + " & W");
+ set_key_expression(HK_FREELOOK_ZOOM_OUT, SHIFT + " & S");
+ set_key_expression(HK_FREELOOK_RESET, SHIFT + " & R");
// Savestates
for (int i = 0; i < 8; i++)
{
- set_control(HK_LOAD_STATE_SLOT_1 + i, StringFromFormat((NON + " & `F%d`").c_str(), i + 1));
- set_control(HK_SAVE_STATE_SLOT_1 + i, StringFromFormat((SHIFT + " & `F%d`").c_str(), i + 1));
+ set_key_expression(HK_LOAD_STATE_SLOT_1 + i, StringFromFormat((NON + " & `F%d`").c_str(), i + 1));
+ set_key_expression(HK_SAVE_STATE_SLOT_1 + i, StringFromFormat((SHIFT + " & `F%d`").c_str(), i + 1));
}
- set_control(HK_UNDO_LOAD_STATE, NON + " & `F12`");
- set_control(HK_UNDO_SAVE_STATE, SHIFT + " & `F12`");
+ set_key_expression(HK_UNDO_LOAD_STATE, NON + " & `F12`");
+ set_key_expression(HK_UNDO_SAVE_STATE, SHIFT + " & `F12`");
}
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index 6a00eb5156..3c32afbde2 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -143,6 +143,11 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
ctrlGroup->SaveConfig(sec, defdev, base);
}
+void ControllerEmu::ControlGroup::SetControlExpression(int index, const std::string& expression)
+{
+ controls.at(index)->control_ref->expression = expression;
+}
+
ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
: AnalogStick(_name, _name, GROUP_TYPE_STICK)
{}
diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h
index db6e23f636..6fcc30e9e3 100644
--- a/Source/Core/InputCommon/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu.h
@@ -154,6 +154,8 @@ public:
virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
+ void SetControlExpression(int index, const std::string& expression);
+
const std::string name;
const std::string ui_name;
const unsigned int type;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-25 17:45:38 +0000