ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

give wiimote + extensions more sane (to me...) default keys. make order of all directions be left, right, up, down, instead of having different orderings 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4525 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-11-09 07:46:43 +00:00
parent c8d46de541
commit 0b30b23719
5 changed files with 172 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
Source/Plugins/Plugin_Wiimote/Src/Config.cpp
View File

@ -26,8 +26,11 @@
#include "EmuDefinitions.h" // for PadMapping #include "EmuDefinitions.h" // for PadMapping
#include "main.h" #include "main.h"
// Ini Control Names // Configuration file control names
// Do not change the order unless you change the related arrays // Do not change the order unless you change the related arrays
// Directionals are ordered as L, R, U, D
// Wiimote
static const char* wmControlNames[] = static const char* wmControlNames[] =
{ {
"WmA", "WmA",
@ -44,8 +47,38 @@ static const char* wmControlNames[] =
"WmShake", "WmShake",
"WmPitchL", "WmPitchL",
"WmPitchR", "WmPitchR",
}; };
static int wmDefaultControls[] =
{
'Z',
'X',
'C',
'V',
'M',
'B',
'N',
#ifdef _WIN32
VK_LEFT,
VK_RIGHT,
VK_UP,
VK_DOWN,
VK_OEM_2, // /?
VK_OEM_COMMA,
VK_OEM_PERIOD
#elif defined(HAVE_X11) && HAVE_X11
XK_Left,
XK_Right,
XK_Up,
XK_Down,
XK_slash,
XK_comma,
XK_period
#else
0,0,0,0,0,0,0
#endif
};
// Nunchuk
static const char* ncControlNames[] = static const char* ncControlNames[] =
{ {
"NcZ", "NcZ",
@ -56,7 +89,30 @@ static const char* ncControlNames[] =
"NcD", "NcD",
"NcShake", "NcShake",
}; };
static int nCDefaultControls[] =
{
#ifdef _WIN32
VK_NUMPAD0,
VK_DECIMAL,
VK_NUMPAD4,
VK_NUMPAD6,
VK_NUMPAD8,
VK_NUMPAD5,
VK_ADD
#elif defined(HAVE_X11) && HAVE_X11
XK_KP_0,
XK_KP_Decimal,
XK_KP_4,
XK_KP_6,
XK_KP_8,
XK_KP_5,
XK_KP_Add
#else
0,0,0,0,0,0,0
#endif
};
// Classic Controller
static const char* ccControlNames[] = static const char* ccControlNames[] =
{ {
"CcA", "CcA",
@ -67,23 +123,74 @@ static const char* ccControlNames[] =
"CcM", "CcM",
"CcH", "CcH",
"CcTl", "CcTl",
"CcTr",
"CcZl", "CcZl",
"CcZr", "CcZr",
"CcTr",
"CcDl", "CcDl",
"CcDu",
"CcDr", "CcDr",
"CcDu",
"CcDd", "CcDd",
"CcLl", "CcLl",
"CcLu",
"CcLr", "CcLr",
"CcLu",
"CcLd", "CcLd",
"CcRl", "CcRl",
"CcRu",
"CcRr", "CcRr",
"CcRu",
"CcRd", "CcRd",
}; };
static int ccDefaultControls[] =
{
// A, B, X, Y
#ifdef _WIN32
VK_OEM_6, // ]
VK_OEM_7, // '
VK_OEM_4, // [
VK_OEM_1, // ;
#elif defined(HAVE_X11) && HAVE_X11
XK_bracketright,
XK_quoteright,
XK_bracketleft,
XK_semicolon,
#else
0,0,0,0,
#endif
// +, -, Home
'L',
'J',
'K',
// Triggers, Zs
'E',
'U',
'R',
'Y',
// Digital pad
'A',
'D',
'W',
'S',
// Left analog
'F',
'H',
'T',
'G',
// Right analog
#ifdef _WIN32
VK_NUMPAD4,
VK_NUMPAD6,
VK_NUMPAD8,
VK_NUMPAD5
#elif defined(HAVE_X11) && HAVE_X11
XK_KP_4,
XK_KP_6,
XK_KP_8,
XK_KP_5
#else
0,0,0,0
#endif
};
// GH3 Default controls
static const char* gh3ControlNames[] = static const char* gh3ControlNames[] =
{ {
"GH3Green", "GH3Green",
@ -95,112 +202,37 @@ static const char* gh3ControlNames[] =
"GH3Minus", "GH3Minus",
"GH3Whammy", "GH3Whammy",
"GH3Al", "GH3Al",
"GH3Au",
"GH3Ar", "GH3Ar",
"GH3Au",
"GH3Ad", "GH3Ad",
"GH3StrumUp", "GH3StrumUp",
"GH3StrumDown", "GH3StrumDown",
}; };
// Default controls
static int wmDefaultControls[] =
{
65, // WmA
66, // WmB
49, // Wm1
50, // Wm2
80, // WmP
77, // WmM
72, // WmH
#ifdef _WIN32
VK_LEFT, // Regular directional keys
VK_RIGHT,
VK_UP,
VK_DOWN,
#elif defined(HAVE_X11) && HAVE_X11
XK_Left,
XK_Right,
XK_Up,
XK_Down,
#else
0,0,0,0,
#endif
83, // WmShake (S)
51, // WmPitchL (3)
52, // WmPitchR (4)
};
static int nCDefaultControls[] =
{
90, // NcZ Z
67, // NcC C
#ifdef _WIN32
VK_NUMPAD4, // NcL
VK_NUMPAD6, // NcR
VK_NUMPAD8, // NcU
VK_NUMPAD5, // NcD
#elif defined(HAVE_X11) && HAVE_X11
XK_KP_Left, // Numlock must be off
XK_KP_Right,
XK_KP_Up,
XK_KP_Down,
#else
0,0,0,0,
#endif
68, // NcShake D
};
static int ccDefaultControls[] =
{
90, // CcA (C)
67, // CcB (Z)
0x58, // CcX (X)
0x59, // CcY (Y)
0x4f, // CcP O instead of P
0x4e, // CcM N instead of M
0x55, // CcH U instead of H
0x37, // CcTl 7
0x38, // CcZl 8
0x39, // CcZr 9
0x30, // CcTr 0
#ifdef _WIN32 // TODO: ugly that wm/nc use lrud and cc/gh3 use lurd
VK_NUMPAD4, //CcDl
VK_NUMPAD8, // CcDu
VK_NUMPAD6, // CcDr
VK_NUMPAD5, // CcDd
#elif defined(HAVE_X11) && HAVE_X11
XK_KP_Left, // Numlock must be off
XK_KP_Up,
XK_KP_Right,
XK_KP_Down,
#else
0,0,0,0,
#endif
0x4a, // CcLl J
0x49, // CcLu I
0x4c, // CcLr L
0x4b, // CcLd K
0x44, // CcRl D
0x52, // CcRu R
0x47, // CcRr G
0x46, // CcRd F
};
static int GH3DefaultControls[] = static int GH3DefaultControls[] =
{ {
0, // GH3Green 'A',
0, // GH3Red 'S',
0, // GH3Yellow 'D',
0, // GH3Blue 'F',
0, // GH3Orange 'G',
0, // GH3Plus 'L',
0, // GH3Minus 'J',
0, // GH3Whammy 'H',
0, // GH3Al #ifdef _WIN32
0, // GH3Au VK_NUMPAD4,
0, // GH3Ar VK_NUMPAD6,
0, // GH3Ad VK_NUMPAD8,
13, // GH3StrumUp VK_NUMPAD5,
161, // GH3StrumDown #elif defined(HAVE_X11) && HAVE_X11
XK_KP_4,
XK_KP_6,
XK_KP_8,
XK_KP_5,
#else
0,0,0,0,
#endif
'I',
'K',
}; };
@ -245,21 +277,21 @@ void Config::Load(bool ChangePad)
iniFile.Get(SectionName, "TriggerPitchRange", &Trigger.Range.Pitch, false); iniFile.Get(SectionName, "TriggerPitchRange", &Trigger.Range.Pitch, false);
// Wiimote // Wiimote
for (int x = 0; x < 14; x++) for (int x = 0; x < WM_CONTROLS; x++)
iniFile.Get(SectionName, wmControlNames[x], &WiiMoteEmu::PadMapping[i].Wm.keyForControls[x], wmDefaultControls[x]); iniFile.Get(SectionName, wmControlNames[x], &WiiMoteEmu::PadMapping[i].Wm.keyForControls[x], wmDefaultControls[x]);
// Nunchuck // Nunchuck
iniFile.Get(SectionName, "NunchuckStick", &Nunchuck.Type, Nunchuck.KEYBOARD); iniFile.Get(SectionName, "NunchuckStick", &Nunchuck.Type, Nunchuck.KEYBOARD);
for (int x = 0; x < 7; x++) for (int x = 0; x < NC_CONTROLS; x++)
iniFile.Get(SectionName, ncControlNames[x], &WiiMoteEmu::PadMapping[i].Nc.keyForControls[x], nCDefaultControls[x]); iniFile.Get(SectionName, ncControlNames[x], &WiiMoteEmu::PadMapping[i].Nc.keyForControls[x], nCDefaultControls[x]);
// Classic Controller // Classic Controller
iniFile.Get(SectionName, "CcLeftStick", &ClassicController.LType, ClassicController.KEYBOARD); iniFile.Get(SectionName, "CcLeftStick", &ClassicController.LType, ClassicController.KEYBOARD);
iniFile.Get(SectionName, "CcRightStick", &ClassicController.RType, ClassicController.KEYBOARD); iniFile.Get(SectionName, "CcRightStick", &ClassicController.RType, ClassicController.KEYBOARD);
iniFile.Get(SectionName, "CcTriggers", &ClassicController.TType, ClassicController.KEYBOARD); iniFile.Get(SectionName, "CcTriggers", &ClassicController.TType, ClassicController.KEYBOARD);
for (int x = 0; x < 23; x++) for (int x = 0; x < CC_CONTROLS; x++)
iniFile.Get(SectionName, ccControlNames[x], &WiiMoteEmu::PadMapping[i].Cc.keyForControls[x], ccDefaultControls[x]); iniFile.Get(SectionName, ccControlNames[x], &WiiMoteEmu::PadMapping[i].Cc.keyForControls[x], ccDefaultControls[x]);
iniFile.Get(SectionName, "GH3Analog", &GH3Controller.AType, GH3Controller.ANALOG1); iniFile.Get(SectionName, "GH3Analog", &GH3Controller.AType, GH3Controller.ANALOG1);
for (int x = 0; x < 14; x++) for (int x = 0; x < GH3_CONTROLS; x++)
iniFile.Get(SectionName, gh3ControlNames[x], &WiiMoteEmu::PadMapping[i].GH3c.keyForControls[x], GH3DefaultControls[x]); iniFile.Get(SectionName, gh3ControlNames[x], &WiiMoteEmu::PadMapping[i].GH3c.keyForControls[x], GH3DefaultControls[x]);
// Don't update this when we are loading settings from the ConfigBox // Don't update this when we are loading settings from the ConfigBox
@ -347,23 +379,23 @@ void Config::Save(int Slot)
iniFile.Set(SectionName, "TriggerPitchRange", Trigger.Range.Pitch); iniFile.Set(SectionName, "TriggerPitchRange", Trigger.Range.Pitch);
// Wiimote // Wiimote
for (int x = 0; x < 14; x++) for (int x = 0; x < WM_CONTROLS; x++)
iniFile.Set(SectionName, wmControlNames[x], WiiMoteEmu::PadMapping[i].Wm.keyForControls[x]); iniFile.Set(SectionName, wmControlNames[x], WiiMoteEmu::PadMapping[i].Wm.keyForControls[x]);
// Nunchuck // Nunchuck
iniFile.Set(SectionName, "NunchuckStick", Nunchuck.Type); iniFile.Set(SectionName, "NunchuckStick", Nunchuck.Type);
for (int x = 0; x < 7; x++) for (int x = 0; x < NC_CONTROLS; x++)
iniFile.Set(SectionName, ncControlNames[x], WiiMoteEmu::PadMapping[i].Nc.keyForControls[x]); iniFile.Set(SectionName, ncControlNames[x], WiiMoteEmu::PadMapping[i].Nc.keyForControls[x]);
// Classic Controller // Classic Controller
iniFile.Set(SectionName, "CcLeftStick", ClassicController.LType); iniFile.Set(SectionName, "CcLeftStick", ClassicController.LType);
iniFile.Set(SectionName, "CcRightStick", ClassicController.RType); iniFile.Set(SectionName, "CcRightStick", ClassicController.RType);
iniFile.Set(SectionName, "CcTriggers", ClassicController.TType); iniFile.Set(SectionName, "CcTriggers", ClassicController.TType);
for (int x = 0; x < 23; x++) for (int x = 0; x < CC_CONTROLS; x++)
iniFile.Set(SectionName, ccControlNames[x], WiiMoteEmu::PadMapping[i].Cc.keyForControls[x]); iniFile.Set(SectionName, ccControlNames[x], WiiMoteEmu::PadMapping[i].Cc.keyForControls[x]);
// GH3 // GH3
iniFile.Set(SectionName, "GH3Analog", GH3Controller.AType); iniFile.Set(SectionName, "GH3Analog", GH3Controller.AType);
for (int x = 0; x < 14; x++) for (int x = 0; x < GH3_CONTROLS; x++)
iniFile.Set(SectionName, gh3ControlNames[x], WiiMoteEmu::PadMapping[i].GH3c.keyForControls[x]); iniFile.Set(SectionName, gh3ControlNames[x], WiiMoteEmu::PadMapping[i].GH3c.keyForControls[x]);
// Save the physical device ID number // Save the physical device ID number

30
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
View File

@ -757,20 +757,20 @@ void WiimotePadConfigDialog::CreatePadGUIControls()
wxT("- "), wxT("- "),
wxT("Home"), wxT("Home"),
wxT("Left trigger"), wxT("Left trigger"),
wxT("Right trigger"),
wxT("Left Z"), wxT("Left Z"),
wxT("Right Z"), wxT("Right Z"),
wxT("Right trigger"),
wxT("Digital Left"), wxT("Digital Left"),
wxT("Digital Up"),
wxT("Digital Right"), wxT("Digital Right"),
wxT("Digital Up"),
wxT("Digital Down"), wxT("Digital Down"),
wxT("L Left"), wxT("L Left"),
wxT("L Up"),
wxT("L Right"), wxT("L Right"),
wxT("L Up"),
wxT("L Down"), wxT("L Down"),
wxT("R Left"), wxT("R Left"),
wxT("R Up"),
wxT("R Right"), wxT("R Right"),
wxT("R Up"),
wxT("R Down"), wxT("R Down"),
}; };
for ( int x = 0; x < CC_CONTROLS; x++) for ( int x = 0; x < CC_CONTROLS; x++)
@ -801,24 +801,20 @@ void WiimotePadConfigDialog::CreatePadGUIControls()
m_SCcVertLeft[i]->Add(m_SCcLeftStick[i], 0, wxALIGN_RIGHT | (wxALL), 2); m_SCcVertLeft[i]->Add(m_SCcLeftStick[i], 0, wxALIGN_RIGHT | (wxALL), 2);
m_SCcVertLeft[i]->Add(m_SCcRightStick[i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 2); m_SCcVertLeft[i]->Add(m_SCcRightStick[i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 2);
m_SCcVertLeft[i]->AddSpacer(2); m_SCcVertLeft[i]->AddSpacer(2);
// Digital l,r,u,d // Left and right stick
for ( int x = IDB_CC_DL; x <= IDB_CC_DD; x++) for ( int x = IDB_CC_LL; x <= IDB_CC_RD; x++)
{
m_SCcVertLeft[i]->Add(m_Sizer_Classic[x - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1); m_SCcVertLeft[i]->Add(m_Sizer_Classic[x - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1);
}
// left and right trigger
m_SCcVertLeft[i]->Add(m_Sizer_Classic[IDB_CC_TL - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1);
m_SCcVertLeft[i]->Add(m_Sizer_Classic[IDB_CC_TR - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1);
// The middle parent // The middle parent
m_SCcVertMiddle[i] = new wxBoxSizer(wxVERTICAL); m_SCcVertMiddle[i] = new wxBoxSizer(wxVERTICAL);
m_SCcVertMiddle[i]->Add(m_SCcTriggers[i], 0, wxALIGN_RIGHT | (wxALL), 1); m_SCcVertMiddle[i]->Add(m_SCcTriggers[i], 0, wxALIGN_RIGHT | (wxALL), 1);
m_SCcVertLeft[i]->AddSpacer(2); m_SCcVertMiddle[i]->AddSpacer(2);
// Left and right stick // Shoulder buttons
for ( int x = IDB_CC_LL; x <= IDB_CC_RD; x++) for ( int x = IDB_CC_TL; x <= IDB_CC_ZR; x++)
{ m_SCcVertMiddle[i]->Add(m_Sizer_Classic[x - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1);
// Digital l,r,u,d
for ( int x = IDB_CC_DL; x <= IDB_CC_DD; x++)
m_SCcVertMiddle[i]->Add(m_Sizer_Classic[x - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1); m_SCcVertMiddle[i]->Add(m_Sizer_Classic[x - IDB_CC_A][i], 0, wxALIGN_RIGHT | (wxLEFT | wxRIGHT | wxDOWN), 1);
}
// The right parent // The right parent
m_SCcVertRight[i] = new wxBoxSizer(wxVERTICAL); m_SCcVertRight[i] = new wxBoxSizer(wxVERTICAL);
@ -862,8 +858,8 @@ void WiimotePadConfigDialog::CreatePadGUIControls()
wxT("- "), wxT("- "),
wxT("Whammy"), wxT("Whammy"),
wxT("Left"), //analog stick wxT("Left"), //analog stick
wxT("Up"),
wxT("Right"), wxT("Right"),
wxT("Up"),
wxT("Down"), wxT("Down"),
wxT("Strum Up"), wxT("Strum Up"),
wxT("Strum Down"), wxT("Strum Down"),

10
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.h
View File

@ -218,10 +218,10 @@ class WiimotePadConfigDialog : public wxDialog
IDB_CC_A, IDB_CC_B, IDB_CC_A, IDB_CC_B,
IDB_CC_X, IDB_CC_Y, IDB_CC_X, IDB_CC_Y,
IDB_CC_P, IDB_CC_M, IDB_CC_H, IDB_CC_P, IDB_CC_M, IDB_CC_H,
IDB_CC_TL, IDB_CC_ZL, IDB_CC_ZR, IDB_CC_TR, IDB_CC_TL, IDB_CC_TR, IDB_CC_ZL, IDB_CC_ZR, // Shoulder triggers and Zs
IDB_CC_DL, IDB_CC_DU, IDB_CC_DR, IDB_CC_DD, // Digital pad IDB_CC_DL, IDB_CC_DR, IDB_CC_DU, IDB_CC_DD, // Digital pad
IDB_CC_LL, IDB_CC_LU, IDB_CC_LR, IDB_CC_LD, // Left analog stick IDB_CC_LL, IDB_CC_LR, IDB_CC_LU, IDB_CC_LD, // Left analog stick
IDB_CC_RL, IDB_CC_RU, IDB_CC_RR, IDB_CC_RD, // Right analog stick IDB_CC_RL, IDB_CC_RR, IDB_CC_RU, IDB_CC_RD, // Right analog stick
// Guitar Hero 3 Controller // Guitar Hero 3 Controller
IDB_GH3_GREEN, IDB_GH3_GREEN,
@ -233,8 +233,8 @@ class WiimotePadConfigDialog : public wxDialog
IDB_GH3_MINUS, IDB_GH3_MINUS,
IDB_GH3_WHAMMY, IDB_GH3_WHAMMY,
IDB_GH3_ANALOG_LEFT, IDB_GH3_ANALOG_LEFT,
IDB_GH3_ANALOG_UP,
IDB_GH3_ANALOG_RIGHT, IDB_GH3_ANALOG_RIGHT,
IDB_GH3_ANALOG_UP,
IDB_GH3_ANALOG_DOWN, IDB_GH3_ANALOG_DOWN,
IDB_GH3_STRUM_UP, IDB_GH3_STRUM_UP,
IDB_GH3_STRUM_DOWN, IDB_GH3_STRUM_DOWN,

8
Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h
View File

@ -251,10 +251,10 @@ struct KeyboardClassicController
#endif #endif
B, X, Y, B, X, Y,
P, M, H, P, M, H,
Dl, Du, Dr, Dd,
Tl, Tr, Zl, Zr, Tl, Tr, Zl, Zr,
Ll, Lu, Lr, Ld, Dl, Dr, Du, Dd,
Rl, Ru, Rr, Rd, Ll, Lr, Lu, Ld,
Rl, Rr, Ru, Rd,
SHAKE, SHAKE,
LAST_CONSTANT LAST_CONSTANT
}; };
@ -274,7 +274,7 @@ struct KeyboardGH3GLP
Red, Yellow, Blue, Red, Yellow, Blue,
Orange,Plus, Minus, Orange,Plus, Minus,
Whammy, Whammy,
Al, Au, Ar, Ad, Al, Ar, Au, Ad,
StrumUp, StrumDown, StrumUp, StrumDown,
SHAKE, SHAKE,
LAST_CONSTANT LAST_CONSTANT

10
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

@ -1215,19 +1215,19 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
if(IsKey(g_ClassicContExt.X)) if(IsKey(g_ClassicContExt.X))
_ext.b2.bX = 0x00; _ext.b2.bX = 0x00;
if(IsKey(g_ClassicContExt.P)) // O instead of P if(IsKey(g_ClassicContExt.P))
_ext.b1.bP = 0x00; _ext.b1.bP = 0x00;
if(IsKey(g_ClassicContExt.M)) // N instead of M if(IsKey(g_ClassicContExt.M))
_ext.b1.bM = 0x00; _ext.b1.bM = 0x00;
if(IsKey(g_ClassicContExt.H)) // Home button if(IsKey(g_ClassicContExt.H))
_ext.b1.bH = 0x00; _ext.b1.bH = 0x00;
if(IsKey(g_ClassicContExt.Zl)) // Digital left trigger if(IsKey(g_ClassicContExt.Zl))
_ext.b2.bZL = 0x00; _ext.b2.bZL = 0x00;
if(IsKey(g_ClassicContExt.Zr)) // Digital right trigger if(IsKey(g_ClassicContExt.Zr))
_ext.b2.bZR = 0x00; _ext.b2.bZR = 0x00;
// All buttons pressed // All buttons pressed