The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-14 00:09:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

nJoy: Made it tolerate a bad device (the Wiimote DirectInput device for example)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2003 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-24 22:13:53 +00:00
parent 2a13bedfc8
commit a3c383ad4a
8 changed files with 278 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/MusicMod.sln
View File

@ -57,6 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinWX", "Core\DolphinWX
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{8D612734-FAA5-4B8A-804F-4DEA2367D495} = {8D612734-FAA5-4B8A-804F-4DEA2367D495}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C}
{33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF} {33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF}
{3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63}
@ -316,6 +317,7 @@ Global
{8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|x64.ActiveCfg = DebugFast|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|x64.ActiveCfg = DebugFast|x64
{8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|Win32.ActiveCfg = Release|Win32 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|Win32.ActiveCfg = Release|Win32
{8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|Win32.Build.0 = Release|Win32
{8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|x64.ActiveCfg = Release|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|x64.ActiveCfg = Release|x64
{8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|x64.Build.0 = Release|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|x64.Build.0 = Release|x64
{C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Debug|Win32.ActiveCfg = Debug|Win32 {C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Debug|Win32.ActiveCfg = Debug|Win32

3
Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
View File

@ -250,7 +250,8 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
// ============================= // =============================
// Debugging // Debugging
//if(m_frame) m_frame->LogMsg("%i: Load triggertype: %s %i\n", i, SectionName.c_str(), PadMapping[i].triggertype); if(m_frame) m_frame->LogMsg("%i: Enabled: %i\n", i, PadMapping[i].buttons[CTL_X_BUTTON]);
//Console::Print("%i: Enabled: %i\n", i, PadMapping[i].buttons[CTL_X_BUTTON]);
} }
} }

51
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp
View File

@ -37,7 +37,7 @@
#include "../nJoy.h" #include "../nJoy.h"
#include "Images/controller.xpm" #include "Images/controller.xpm"
extern CONTROLLER_INFO *joyinfo; //extern CONTROLLER_INFO *joyinfo;
extern bool emulator_running; extern bool emulator_running;
//////////////////////// ////////////////////////
@ -82,10 +82,10 @@ void ConfigBox::PadGetStatus()
//int deadzone2 = (int)(((float)(-128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1)); //int deadzone2 = (int)(((float)(-128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1));
// Get original values // Get original values
int main_x = joystate[notebookpage].axis[CTL_MAIN_X]; int main_x = PadState[notebookpage].axis[CTL_MAIN_X];
int main_y = joystate[notebookpage].axis[CTL_MAIN_Y]; int main_y = PadState[notebookpage].axis[CTL_MAIN_Y];
//int sub_x = (joystate[_numPAD].axis[CTL_SUB_X]; //int sub_x = (PadState[_numPAD].axis[CTL_SUB_X];
//int sub_y = -(joystate[_numPAD].axis[CTL_SUB_Y]; //int sub_y = -(PadState[_numPAD].axis[CTL_SUB_Y];
// Get adjusted values // Get adjusted values
int main_x_after = main_x, main_y_after = main_y; int main_x_after = main_x, main_y_after = main_y;
@ -131,7 +131,7 @@ void ConfigBox::PadGetStatus()
// Triggers // Triggers
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
int TriggerValue = 255; int TriggerValue = 255;
if (joystate[notebookpage].halfpress) TriggerValue = 100; if (PadState[notebookpage].halfpress) TriggerValue = 100;
// Get the selected keys // Get the selected keys
long Left, Right; long Left, Right;
@ -139,8 +139,8 @@ void ConfigBox::PadGetStatus()
m_JoyShoulderR[notebookpage]->GetValue().ToLong(&Right); m_JoyShoulderR[notebookpage]->GetValue().ToLong(&Right);
// Get the trigger values // Get the trigger values
int TriggerLeft = joystate[notebookpage].axis[CTL_L_SHOULDER]; int TriggerLeft = PadState[notebookpage].axis[CTL_L_SHOULDER];
int TriggerRight = joystate[notebookpage].axis[CTL_R_SHOULDER]; int TriggerRight = PadState[notebookpage].axis[CTL_R_SHOULDER];
// Convert the triggers values // Convert the triggers values
if (PadMapping[notebookpage].triggertype == CTL_TRIGGER_SDL) if (PadMapping[notebookpage].triggertype == CTL_TRIGGER_SDL)
@ -154,8 +154,8 @@ void ConfigBox::PadGetStatus()
if(Right < 1000) TriggerRight = 0; if(Right < 1000) TriggerRight = 0;
// Get the digital values // Get the digital values
if(Left < 1000 && joystate[notebookpage].buttons[CTL_L_SHOULDER]) TriggerLeft = TriggerValue; if(Left < 1000 && PadState[notebookpage].buttons[CTL_L_SHOULDER]) TriggerLeft = TriggerValue;
if(Right < 1000 && joystate[notebookpage].buttons[CTL_R_SHOULDER]) TriggerRight = TriggerValue; if(Right < 1000 && PadState[notebookpage].buttons[CTL_R_SHOULDER]) TriggerRight = TriggerValue;
m_TStatusTriggers[notebookpage]->SetLabel(wxString::Format( m_TStatusTriggers[notebookpage]->SetLabel(wxString::Format(
wxT("Left:%03i Right:%03i"), wxT("Left:%03i Right:%03i"),
@ -175,13 +175,13 @@ std::string ShowStatus(int VirtualController)
int PhysicalDevice = PadMapping[VirtualController].ID; int PhysicalDevice = PadMapping[VirtualController].ID;
// Make local shortcut // Make local shortcut
SDL_Joystick *joy = joystate[VirtualController].joy; SDL_Joystick *joy = PadState[VirtualController].joy;
// Make shortcuts for all pads // Make shortcuts for all pads
SDL_Joystick *joy0 = joystate[PadMapping[0].ID].joy; SDL_Joystick *joy0 = PadState[0].joy;
SDL_Joystick *joy1 = joystate[PadMapping[1].ID].joy; SDL_Joystick *joy1 = PadState[1].joy;
SDL_Joystick *joy2 = joystate[PadMapping[2].ID].joy; SDL_Joystick *joy2 = PadState[2].joy;
SDL_Joystick *joy3 = joystate[PadMapping[3].ID].joy; SDL_Joystick *joy3 = PadState[3].joy;
// Temporary storage // Temporary storage
std::string StrAxes, StrHats, StrBut; std::string StrAxes, StrHats, StrBut;
@ -215,20 +215,23 @@ std::string ShowStatus(int VirtualController)
return StringFromFormat( return StringFromFormat(
"PadMapping\n" "PadMapping\n"
"Enabled: %i %i %i %i\n"
"ID: %i %i %i %i\n" "ID: %i %i %i %i\n"
"Controllertype: %i %i %i %i\n" "Controllertype: %i %i %i %i\n"
"SquareToCircle: %i %i %i %i\n\n" "SquareToCircle: %i %i %i %i\n\n"
"Handles: %i %i %i %i\n" "Handles: %p %p %p %p\n"
"XInput: %i %i %i\n" "XInput: %i %i %i\n"
"Axes: %s\n" "Axes: %s\n"
"Hats: %s\n" "Hats: %s\n"
"But: %s\n" "But: %s\n"
"Device: Ax: %i Balls:%i But:%i Hats:%i", "Device: Ax: %i Balls:%i Hats:%i But:%i",
PadMapping[0].enabled, PadMapping[1].enabled, PadMapping[2].enabled, PadMapping[3].enabled,
PadMapping[0].ID, PadMapping[1].ID, PadMapping[2].ID, PadMapping[3].ID, PadMapping[0].ID, PadMapping[1].ID, PadMapping[2].ID, PadMapping[3].ID,
PadMapping[0].controllertype, PadMapping[1].controllertype, PadMapping[2].controllertype, PadMapping[3].controllertype, PadMapping[0].controllertype, PadMapping[1].controllertype, PadMapping[2].controllertype, PadMapping[3].controllertype,
PadMapping[0].bSquareToCircle, PadMapping[1].bSquareToCircle, PadMapping[2].bSquareToCircle, PadMapping[3].bSquareToCircle, PadMapping[0].bSquareToCircle, PadMapping[1].bSquareToCircle, PadMapping[2].bSquareToCircle, PadMapping[3].bSquareToCircle,
joy0, joy1, joy2, joy3, joy0, joy1, joy2, joy3,
//PadState[PadMapping[0].ID].joy, PadState[PadMapping[1].ID].joy, PadState[PadMapping[2].ID].joy, PadState[PadMapping[3].ID].joy,
#ifdef _WIN32 #ifdef _WIN32
XInput::IsConnected(0), XInput::GetXI(0, XI_TRIGGER_L), XInput::GetXI(0, XI_TRIGGER_R), XInput::IsConnected(0), XInput::GetXI(0, XI_TRIGGER_L), XInput::GetXI(0, XI_TRIGGER_R),
@ -242,14 +245,18 @@ std::string ShowStatus(int VirtualController)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void ConfigBox::Update() void ConfigBox::Update()
{ {
if(StrangeHack) PadGetStatus();
if(!g_Config.bShowAdvanced) StrangeHack = false; else StrangeHack = true;
// Show the current status // Show the current status
/* /**/
m_pStatusBar->SetLabel(wxString::Format( m_pStatusBar->SetLabel(wxString::Format(
"%s", ShowStatus(notebookpage).c_str() "%s", ShowStatus(notebookpage).c_str()
));*/ ));
Console::Print("3: %p\n", PadState[PadMapping[3].ID].joy);
//LogMsg("Abc%s\n", ShowStatus(notebookpage).c_str());
if(StrangeHack) PadGetStatus();
if(!g_Config.bShowAdvanced) StrangeHack = false; else StrangeHack = true;
} }

66
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -39,7 +39,7 @@
#include "../nJoy.h" #include "../nJoy.h"
#include "Images/controller.xpm" #include "Images/controller.xpm"
extern CONTROLLER_INFO *joyinfo; //extern CONTROLLER_INFO *joyinfo;
//extern CONTROLLER_MAPPING PadMapping[4]; //extern CONTROLLER_MAPPING PadMapping[4];
extern bool emulator_running; extern bool emulator_running;
@ -116,7 +116,7 @@ ConfigBox::ConfigBox(wxWindow *parent, wxWindowID id, const wxString &title,
// Define values // Define values
notebookpage = 0; notebookpage = 0;
g_Pressed = 0; g_Pressed = 0;
Debugging = false; Debugging = true;
m_TCDebugging = NULL; m_TCDebugging = NULL;
ControlsCreated = false; ControlsCreated = false;
@ -216,23 +216,21 @@ void ConfigBox::CancelClick(wxCommandEvent& event)
void ConfigBox::LogMsg(const char* format, ...) void ConfigBox::LogMsg(const char* format, ...)
{ {
#ifdef _WIN32 #ifdef _WIN32
/* if(Debugging)
if(Debugging) {
{ const int MaxMsgSize = 1024*2;
const int MaxMsgSize = 1024*2; char buffer[MaxMsgSize];
char buffer[MaxMsgSize]; va_list args;
va_list args; va_start(args, format);
va_start(args, format); CharArrayFromFormatV(buffer, MaxMsgSize, format, args);
CharArrayFromFormatV(buffer, MaxMsgSize, format, args); va_end(args);
va_end(args);
// Add timestamp // Add timestamp
std::string StrTmp = buffer; std::string StrTmp = buffer;
//StrTmp += Common::Timer::GetTimeFormatted(); //StrTmp += Common::Timer::GetTimeFormatted();
if(m_TCDebugging) m_TCDebugging->AppendText(StrTmp.c_str()); if(m_TCDebugging) m_TCDebugging->AppendText(StrTmp.c_str());
} }
*/
#endif #endif
} }
@ -292,11 +290,11 @@ void ConfigBox::OnSaveById()
// Change Joystick // Change Joystick
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
/* Function: When changing the joystick we save and load the settings and update the PadMapping /* Function: When changing the joystick we save and load the settings and update the PadMapping
and joystate array */ and PadState array */
void ConfigBox::DoChangeJoystick() void ConfigBox::DoChangeJoystick()
{ {
// Close the current pad // Close the current pad, unless it's used by another slot
if (PadMapping[notebookpage].enabled) PadClose(notebookpage); //if (PadMapping[notebookpage].enabled) PadClose(notebookpage);
// Before changing the pad we save potential changes to the current pad (to support SaveByID) // Before changing the pad we save potential changes to the current pad (to support SaveByID)
DoSave(true); DoSave(true);
@ -310,11 +308,19 @@ void ConfigBox::DoChangeJoystick()
} }
void ConfigBox::PadOpen(int Open) // Open for slot 1, 2, 3 or 4 void ConfigBox::PadOpen(int Open) // Open for slot 1, 2, 3 or 4
{ {
joystate[Open].joy = SDL_JoystickOpen(PadMapping[Open].ID); // Check that we got a good pad
if (!joyinfo.at(PadMapping[Open].ID).Good)
{
PadState[Open].joy = NULL;
return;
}
PadState[Open].joy = SDL_JoystickOpen(PadMapping[Open].ID);
} }
void ConfigBox::PadClose(int Close) // Close for slot 1, 2, 3 or 4 void ConfigBox::PadClose(int Close) // Close for slot 1, 2, 3 or 4
{ {
if (SDL_JoystickOpened(PadMapping[Close].ID)) SDL_JoystickClose(joystate[Close].joy); if (SDL_JoystickOpened(PadMapping[Close].ID)) SDL_JoystickClose(PadState[Close].joy);
PadState[Close].joy = NULL;
} }
// Notebook page changed // Notebook page changed
@ -496,6 +502,8 @@ void ConfigBox::OnPaint( wxPaintEvent &event )
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void ConfigBox::CreateGUIControls() void ConfigBox::CreateGUIControls()
{ {
Console::Print("CreateGUIControls()\n");
#ifndef _DEBUG #ifndef _DEBUG
SetTitle(wxT("Configure: nJoy v"INPUT_VERSION" Input Plugin")); SetTitle(wxT("Configure: nJoy v"INPUT_VERSION" Input Plugin"));
#else #else
@ -547,9 +555,9 @@ void ConfigBox::CreateGUIControls()
// Search for devices and add them to the device list // Search for devices and add them to the device list
// ----------------------------- // -----------------------------
wxArrayString arrayStringFor_Joyname; // The string array wxArrayString arrayStringFor_Joyname; // The string array
if(SDL_NumJoysticks() > 0) if(NumGoodPads > 0)
{ {
for(int x = 0; x < SDL_NumJoysticks(); x++) for(int x = 0; x < joyinfo.size(); x++)
{ {
arrayStringFor_Joyname.Add(wxString::FromAscii(joyinfo[x].Name.c_str())); arrayStringFor_Joyname.Add(wxString::FromAscii(joyinfo[x].Name.c_str()));
} }
@ -919,15 +927,15 @@ void ConfigBox::CreateGUIControls()
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Debugging // Debugging
// ----------------------------- // -----------------------------
/*m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(135, 100), wxDefaultSize); m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(135, 100), wxDefaultSize);
//m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(125, 200), wxDefaultSize); //m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(125, 200), wxDefaultSize);
//m_pStatusBar->SetLabel(wxString::Format("Debugging text"));*/ //m_pStatusBar->SetLabel(wxString::Format("Debugging text"));
/*m_TCDebugging = new wxTextCtrl(this, IDT_DEBUGGING3, _T(""), wxDefaultPosition, wxSize(400, 400), /**/m_TCDebugging = new wxTextCtrl(this, IDT_DEBUGGING3, _T(""), wxDefaultPosition, wxSize(400, 400),
wxTE_RICH | wxTE_MULTILINE | wxTE_DONTWRAP | wxNO_BORDER); wxTE_RICH | wxTE_MULTILINE | wxTE_DONTWRAP | wxNO_BORDER);
wxBoxSizer * m_LogSizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer * m_LogSizer = new wxBoxSizer(wxVERTICAL);
m_LogSizer->Add(m_TCDebugging, 0, wxEXPAND | (wxALL), 0); m_LogSizer->Add(m_TCDebugging, 0, wxEXPAND | (wxALL), 0);
m_MainSizer->Add(m_LogSizer, 0, wxEXPAND | ( wxLEFT | wxRIGHT | wxBOTTOM), 5);*/ m_MainSizer->Add(m_LogSizer, 0, wxEXPAND | ( wxLEFT | wxRIGHT | wxBOTTOM), 5);
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Set window size // Set window size
@ -937,6 +945,8 @@ void ConfigBox::CreateGUIControls()
// All done // All done
ControlsCreated = true; ControlsCreated = true;
Console::Print("CreateGUIControls() end\n");
} }
void ConfigBox::SizeWindow() void ConfigBox::SizeWindow()

31
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
View File

@ -39,8 +39,6 @@
#include "../nJoy.h" #include "../nJoy.h"
#include "Images/controller.xpm" #include "Images/controller.xpm"
extern CONTROLLER_INFO *joyinfo;
//extern CONTROLLER_MAPPING PadMapping[4];
extern bool emulator_running; extern bool emulator_running;
//////////////////////// ////////////////////////
@ -387,7 +385,10 @@ void ConfigBox::DoGetButtons(int GetId)
if(Button) if(Button)
{ {
for(int i = 0; i < buttons; i++) for(int i = 0; i < buttons; i++)
{ {
// Some kind of bug in SDL 1.3 would give button 9 and 10 (nonexistent) the value 48 on the 360 pad
if (SDL_JoystickGetButton(joy, i) > 1) continue;
if(SDL_JoystickGetButton(joy, i)) if(SDL_JoystickGetButton(joy, i))
{ {
pressed = i; pressed = i;
@ -398,20 +399,20 @@ void ConfigBox::DoGetButtons(int GetId)
} }
// Check for a XInput trigger // Check for a XInput trigger
#ifdef _WIN32 #ifdef _WIN32
if(XInput) if(XInput)
{ {
for(int i = 0; i <= XI_TRIGGER_R; i++) for(int i = 0; i <= XI_TRIGGER_R; i++)
{ {
if(XInput::GetXI(0, i)) if(XInput::GetXI(0, i))
{ {
pressed = i + 1000; pressed = i + 1000;
type = CTL_AXIS; type = CTL_AXIS;
Succeed = true; Succeed = true;
}
} }
} }
} #endif
#endif
// Check for keyboard action // Check for keyboard action
if (g_Pressed && Button) if (g_Pressed && Button)

2
Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp
View File

@ -149,7 +149,7 @@ void Pad_Use_Rumble(u8 _numPAD, SPADStatus* _pPADStatus)
#ifdef USE_RUMBLE_DINPUT_HACK #ifdef USE_RUMBLE_DINPUT_HACK
// Enable or disable rumble // Enable or disable rumble
if (joystate[_numPAD].halfpress) if (PadState[_numPAD].halfpress)
if (!g_pDI) if (!g_pDI)
if (FAILED(InitDirectInput(m_hWnd))) if (FAILED(InitDirectInput(m_hWnd)))
{ {

355
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -51,10 +51,10 @@
PadMapping[1, 2, 3 and 4]: The button mapping PadMapping[1, 2, 3 and 4]: The button mapping
Joystate[1, 2, 3 and 4]: The current button states Joystate[1, 2, 3 and 4]: The current button states
The arrays PadMapping[] and joystate[] are numbered 0 to 3 for the four different virtual The arrays PadMapping[] and PadState[] are numbered 0 to 3 for the four different virtual
controllers. Joysticks[].ID will have the number of the physical input device mapped to that controllers. Joysticks[].ID will have the number of the physical input device mapped to that
controller (this value range between 0 and the total number of connected physical devices). The controller (this value range between 0 and the total number of connected physical devices). The
mapping of a certain physical device to joystate[].joy is initially done by Initialize(), but mapping of a certain physical device to PadState[].joy is initially done by Initialize(), but
for the configuration we can remap that, like in ConfigBox::ChangeJoystick(). for the configuration we can remap that, like in ConfigBox::ChangeJoystick().
The joyinfo[] array holds the physical gamepad info for a certain physical device. It's therefore The joyinfo[] array holds the physical gamepad info for a certain physical device. It's therefore
@ -84,10 +84,11 @@
#define _CONTROLLER_STATE_H // Avoid certain declarations in nJoy.h #define _CONTROLLER_STATE_H // Avoid certain declarations in nJoy.h
FILE *pFile; FILE *pFile;
HINSTANCE nJoy_hInst = NULL; HINSTANCE nJoy_hInst = NULL;
CONTROLLER_INFO *joyinfo = 0; std::vector<CONTROLLER_INFO> joyinfo;
CONTROLLER_STATE joystate[4]; CONTROLLER_STATE PadState[4];
CONTROLLER_MAPPING PadMapping[4]; CONTROLLER_MAPPING PadMapping[4];
bool emulator_running = FALSE; bool emulator_running = false;
int NumPads = 0, NumGoodPads = 0;
HWND m_hWnd; // Handle to window HWND m_hWnd; // Handle to window
// TODO: fix this dirty hack to stop missing symbols // TODO: fix this dirty hack to stop missing symbols
@ -178,55 +179,52 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
#endif #endif
} }
void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) { void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) {}
}
// Call config dialog // Call config dialog
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void DllConfig(HWND _hParent) void DllConfig(HWND _hParent)
{ {
// Debugging
//Console::Open();
#ifdef _WIN32 #ifdef _WIN32
// Start the pads so we can use them in the configuration and advanced controls
if(!emulator_running)
{
NumPads = Search_Devices(); // Populate joyinfo for all attached devices
}
// Start the pads so we can use them in the configuration and advanced controls m_frame = new ConfigBox(NULL);
if(!emulator_running) m_frame->ShowModal();
{
SPADInitialize _PADInitialize;
_PADInitialize.hWnd = NULL;
_PADInitialize.pLog = NULL;
Initialize((void*)&_PADInitialize);
emulator_running = false; // Set it back to false
}
g_Config.Load(); // Load settings
// We don't need a parent for this wxDialog
//wxWindow win;
//win.SetHWND(_hParent);
//ConfigBox frame(&win);
//win.SetHWND(0);
m_frame = new ConfigBox(NULL);
m_frame->ShowModal();
/* Check if any of the pads failed to open. In Windows there is a strange "IDirectInputDevice2::
SetDataFormat() DirectX error -2147024809" after a few Open and Close */
if ( (PadMapping[0].enabled && PadState[0].joy == NULL)
|| (PadMapping[1].enabled && PadState[1].joy == NULL)
|| (PadMapping[2].enabled && PadState[2].joy == NULL)
|| (PadMapping[3].enabled && PadState[3].joy == NULL))
{
//PostMessage(_hParent, 25, 0, 0);
Console::Print("%s\n", SDL_GetError());
}
#else #else
if (SDL_Init(SDL_INIT_JOYSTICK ) < 0) if (SDL_Init(SDL_INIT_JOYSTICK ) < 0)
{ {
printf("Could not initialize SDL! (%s)\n", SDL_GetError()); printf("Could not initialize SDL! (%s)\n", SDL_GetError());
return; return;
} }
g_Config.Load(); // load settings g_Config.Load(); // load settings
#if defined(HAVE_WX) && HAVE_WX
ConfigBox frame(NULL);
frame.ShowModal();
#endif
#if defined(HAVE_WX) && HAVE_WX
ConfigBox frame(NULL);
frame.ShowModal();
#endif
#endif #endif
} }
void DllDebugger(HWND _hParent, bool Show) { void DllDebugger(HWND _hParent, bool Show) {}
}
// Init PAD (start emulation) // Init PAD (start emulation)
@ -240,49 +238,26 @@ void Initialize(void *init)
{ {
// Debugging // Debugging
//Console::Open(); //Console::Open();
Console::Print("Initialize: %i\n", SDL_WasInit(0));
//Console::Print("Initialize: %i\n", SDL_WasInit(0));
SPADInitialize *_PADInitialize = (SPADInitialize*)init; SPADInitialize *_PADInitialize = (SPADInitialize*)init;
emulator_running = true; emulator_running = true;
#ifdef _DEBUG #ifdef _DEBUG
DEBUG_INIT(); DEBUG_INIT();
#endif #endif
/* SDL 1.3 use DirectInput instead of the old Microsoft Multimeda API, and with this we need
the SDL_INIT_VIDEO flag to */
if (!SDL_WasInit(0))
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0)
{
#ifdef _WIN32
MessageBox(NULL, SDL_GetError(), "Could not initialize SDL!", MB_ICONERROR);
#else
printf("Could not initialize SDL! (%s)\n", SDL_GetError());
#endif
return;
}
#ifdef _WIN32 #ifdef _WIN32
m_hWnd = (HWND)_PADInitialize->hWnd; m_hWnd = (HWND)_PADInitialize->hWnd;
#endif #endif
Search_Devices(); // Populate joyinfo for all attached devices NumPads = Search_Devices(); // Populate joyinfo for all attached devices
g_Config.Load(); // Load joystick mapping, PadMapping[].ID etc
if (PadMapping[0].enabled)
joystate[0].joy = SDL_JoystickOpen(PadMapping[0].ID);
if (PadMapping[1].enabled)
joystate[1].joy = SDL_JoystickOpen(PadMapping[1].ID);
if (PadMapping[2].enabled)
joystate[2].joy = SDL_JoystickOpen(PadMapping[2].ID);
if (PadMapping[3].enabled)
joystate[3].joy = SDL_JoystickOpen(PadMapping[3].ID);
/* Check if any of the pads failed to open. In Windows there is a strange "IDirectInputDevice2:: /* Check if any of the pads failed to open. In Windows there is a strange "IDirectInputDevice2::
SetDataFormat() DirectX error -2147024809" after a few Open and Close */ SetDataFormat() DirectX error -2147024809" after a few Open and Close */
if( (PadMapping[0].enabled && joystate[0].joy == NULL) if ( (PadMapping[0].enabled && PadState[0].joy == NULL)
|| (PadMapping[1].enabled && joystate[1].joy == NULL) || (PadMapping[1].enabled && PadState[1].joy == NULL)
|| (PadMapping[2].enabled && joystate[2].joy == NULL) || (PadMapping[2].enabled && PadState[2].joy == NULL)
|| (PadMapping[3].enabled && joystate[3].joy == NULL)) || (PadMapping[3].enabled && PadState[3].joy == NULL))
{ {
_PADInitialize->padNumber = -1; _PADInitialize->padNumber = -1;
Console::Print("%s\n", SDL_GetError()); Console::Print("%s\n", SDL_GetError());
@ -299,62 +274,85 @@ int Search_Devices()
DEBUG_INIT(); DEBUG_INIT();
#endif #endif
int numjoy = SDL_NumJoysticks(); /* SDL 1.3 use DirectInput instead of the old Microsoft Multimeda API, and with this we need
the SDL_INIT_VIDEO flag to */
if (joyinfo) if (!SDL_WasInit(0))
{ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0)
delete [] joyinfo; {
joyinfo = new CONTROLLER_INFO [numjoy]; PanicAlert("Could not initialize SDL: %s", SDL_GetError());
} return 0;
else }
{
joyinfo = new CONTROLLER_INFO [numjoy];
}
// Warn the user if no PadMapping are detected
if (numjoy == 0)
{
#ifdef _WIN32
//MessageBox(NULL, "No Joystick detected!", NULL, MB_ICONWARNING);
#else
printf("No Joystick detected!\n");
#endif
return 0;
}
#ifdef _DEBUG #ifdef _DEBUG
fprintf(pFile, "Scanning for devices\n"); fprintf(pFile, "Scanning for devices\n");
fprintf(pFile, "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n"); fprintf(pFile, "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n");
#endif #endif
for(int i = 0; i < numjoy; i++ ) // Get device status
int numjoy = SDL_NumJoysticks();
for (int i = 0; i < numjoy; i++ )
{ {
// Open the device to be able to read the values CONTROLLER_INFO Tmp;
joyinfo[i].joy = SDL_JoystickOpen(i);
joyinfo[i].ID = i; Tmp.joy = SDL_JoystickOpen(i);
joyinfo[i].NumAxes = SDL_JoystickNumAxes(joyinfo[i].joy); Tmp.ID = i;
joyinfo[i].NumButtons = SDL_JoystickNumButtons(joyinfo[i].joy); Tmp.NumAxes = SDL_JoystickNumAxes(Tmp.joy);
joyinfo[i].NumBalls = SDL_JoystickNumBalls(joyinfo[i].joy); Tmp.NumButtons = SDL_JoystickNumButtons(Tmp.joy);
joyinfo[i].NumHats = SDL_JoystickNumHats(joyinfo[i].joy); Tmp.NumBalls = SDL_JoystickNumBalls(Tmp.joy);
joyinfo[i].Name = SDL_JoystickName(i); Tmp.NumHats = SDL_JoystickNumHats(Tmp.joy);
Tmp.Name = SDL_JoystickName(i);
// Check if the device is okay
if ( Tmp.NumAxes == 0
&& Tmp.NumBalls == 0
&& Tmp.NumButtons == 0
&& Tmp.NumHats == 0
)
{
Tmp.Good = false;
}
else
{
NumGoodPads++;
Tmp.Good = true;
}
joyinfo.push_back(Tmp);
#ifdef _DEBUG #ifdef _DEBUG
fprintf(pFile, "ID: %d\n", i); fprintf(pFile, "ID: %d\n", i);
fprintf(pFile, "Name: %s\n", joyinfo[i].Name); fprintf(pFile, "Name: %s\n", joyinfo[i].Name);
fprintf(pFile, "Buttons: %d\n", joyinfo[i].NumButtons); fprintf(pFile, "Buttons: %d\n", joyinfo[i].NumButtons);
fprintf(pFile, "Axes: %d\n", joyinfo[i].NumAxes); fprintf(pFile, "Axes: %d\n", joyinfo[i].NumAxes);
fprintf(pFile, "Hats: %d\n", joyinfo[i].NumHats); fprintf(pFile, "Hats: %d\n", joyinfo[i].NumHats);
fprintf(pFile, "Balls: %d\n\n", joyinfo[i].NumBalls); fprintf(pFile, "Balls: %d\n\n", joyinfo[i].NumBalls);
#endif #endif
// We have now read the values we need so we close the device // We have now read the values we need so we close the device
if (SDL_JoystickOpened(i)) SDL_JoystickClose(joyinfo[i].joy); if (SDL_JoystickOpened(i)) SDL_JoystickClose(joyinfo[i].joy);
} }
return numjoy; // Warn the user if no gamepads are detected
if (NumGoodPads == 0 && emulator_running)
{
PanicAlert("No Joystick detected");
return joyinfo.size();
}
// Load PadMapping[] etc
g_Config.Load();
// Update the PadState[].joy handle
for (int i = 0; i < 4; i++)
{
if (PadMapping[i].enabled && joyinfo.size() > PadMapping[i].ID)
if(joyinfo.at(PadMapping[i].ID).Good)
PadState[i].joy = SDL_JoystickOpen(PadMapping[i].ID);
}
return joyinfo.size();
} }
// Shutdown PAD (stop emulation) // Shutdown PAD (stop emulation)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
/* Information: This function can not be run twice without an Initialize in between. If /* Information: This function can not be run twice without an Initialize in between. If
@ -362,16 +360,16 @@ int Search_Devices()
Called from: The Dolphin Core, ConfigBox::OnClose() */ Called from: The Dolphin Core, ConfigBox::OnClose() */
void Shutdown() void Shutdown()
{ {
//Console::Print("Shutdown: %i\n", SDL_WasInit(0)); Console::Print("Shutdown: %i\n", SDL_WasInit(0));
if (PadMapping[0].enabled && SDL_JoystickOpened(PadMapping[0].ID)) /* Close all devices carefully. We must check that we are not accessing any undefined
SDL_JoystickClose(joystate[0].joy); vector elements or any bad devices */
if (PadMapping[1].enabled && SDL_JoystickOpened(PadMapping[1].ID)) for (int i = 0; i < 4; i++)
SDL_JoystickClose(joystate[1].joy); {
if (PadMapping[2].enabled && SDL_JoystickOpened(PadMapping[2].ID)) if (PadMapping[i].enabled && joyinfo.size() > PadMapping[i].ID)
SDL_JoystickClose(joystate[2].joy); if (joyinfo.at(PadMapping[i].ID).Good)
if (PadMapping[3].enabled && SDL_JoystickOpened(PadMapping[3].ID)) if(SDL_JoystickOpened(PadMapping[i].ID)) SDL_JoystickClose(PadState[i].joy);
SDL_JoystickClose(joystate[3].joy); }
SDL_Quit(); SDL_Quit();
@ -379,14 +377,16 @@ void Shutdown()
DEBUG_QUIT(); DEBUG_QUIT();
#endif #endif
delete [] joyinfo; // Clear the physical device info
joyinfo = NULL; //delete [] joyinfo;
//joyinfo = NULL;
joyinfo.clear();
emulator_running = false; emulator_running = false;
#ifdef _WIN32 #ifdef _WIN32
#ifdef USE_RUMBLE_DINPUT_HACK #ifdef USE_RUMBLE_DINPUT_HACK
FreeDirectInput(); FreeDirectInput();
#endif #endif
#elif defined(__linux__) #elif defined(__linux__)
close(fd); close(fd);
@ -404,13 +404,13 @@ void PAD_Input(u16 _Key, u8 _UpDown)
for(int j = CTL_L_SHOULDER; j <= CTL_START; j++) for(int j = CTL_L_SHOULDER; j <= CTL_START; j++)
{ {
if (PadMapping[i].buttons[j] == _Key) if (PadMapping[i].buttons[j] == _Key)
{ joystate[i].buttons[j] = _UpDown; break; } { PadState[i].buttons[j] = _UpDown; break; }
} }
for(int j = CTL_D_PAD_UP; j <= CTL_D_PAD_RIGHT; j++) for(int j = CTL_D_PAD_UP; j <= CTL_D_PAD_RIGHT; j++)
{ {
if (PadMapping[i].dpad2[j] == _Key) if (PadMapping[i].dpad2[j] == _Key)
{ joystate[i].dpad2[j] = _UpDown; break; } { PadState[i].dpad2[j] = _UpDown; break; }
} }
} }
@ -430,8 +430,10 @@ void DoState(unsigned char **ptr, int mode) {}
// Function: Gives the current pad status to the Core // Function: Gives the current pad status to the Core
void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
{ {
if (!PadMapping[_numPAD].enabled) Console::Print("%i %i %i\n", _numPAD, PadMapping[_numPAD].enabled, PadState[_numPAD].joy);
return;
// Check if the pad is enabled
if (!PadMapping[_numPAD].enabled || !PadState[_numPAD].joy) return;
// Clear pad status // Clear pad status
memset(_pPADStatus, 0, sizeof(SPADStatus)); memset(_pPADStatus, 0, sizeof(SPADStatus));
@ -447,12 +449,12 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
// ----------- // -----------
// Read axis values // Read axis values
int i_main_stick_x = joystate[_numPAD].axis[CTL_MAIN_X]; int i_main_stick_x = PadState[_numPAD].axis[CTL_MAIN_X];
int i_main_stick_y = -joystate[_numPAD].axis[CTL_MAIN_Y]; int i_main_stick_y = -PadState[_numPAD].axis[CTL_MAIN_Y];
int i_sub_stick_x = joystate[_numPAD].axis[CTL_SUB_X]; int i_sub_stick_x = PadState[_numPAD].axis[CTL_SUB_X];
int i_sub_stick_y = -joystate[_numPAD].axis[CTL_SUB_Y]; int i_sub_stick_y = -PadState[_numPAD].axis[CTL_SUB_Y];
int TriggerLeft = joystate[_numPAD].axis[CTL_L_SHOULDER]; int TriggerLeft = PadState[_numPAD].axis[CTL_L_SHOULDER];
int TriggerRight = joystate[_numPAD].axis[CTL_R_SHOULDER]; int TriggerRight = PadState[_numPAD].axis[CTL_R_SHOULDER];
// Check if we should make adjustments // Check if we should make adjustments
if(PadMapping[_numPAD].bSquareToCircle) if(PadMapping[_numPAD].bSquareToCircle)
@ -490,10 +492,10 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
// The L and R triggers // The L and R triggers
// ----------- // -----------
int TriggerValue = 255; int TriggerValue = 255;
if (joystate[_numPAD].halfpress) TriggerValue = 100; if (PadState[_numPAD].halfpress) TriggerValue = 100;
_pPADStatus->button |= PAD_USE_ORIGIN; // Neutral value, no button pressed _pPADStatus->button |= PAD_USE_ORIGIN; // Neutral value, no button pressed
if (joystate[_numPAD].buttons[CTL_L_SHOULDER]) if (PadState[_numPAD].buttons[CTL_L_SHOULDER])
{ {
_pPADStatus->button |= PAD_TRIGGER_L; _pPADStatus->button |= PAD_TRIGGER_L;
_pPADStatus->triggerLeft = TriggerValue; _pPADStatus->triggerLeft = TriggerValue;
@ -501,7 +503,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
else if(TriggerLeft > 0) else if(TriggerLeft > 0)
_pPADStatus->triggerLeft = TriggerLeft; _pPADStatus->triggerLeft = TriggerLeft;
if (joystate[_numPAD].buttons[CTL_R_SHOULDER]) if (PadState[_numPAD].buttons[CTL_R_SHOULDER])
{ {
_pPADStatus->button |= PAD_TRIGGER_R; _pPADStatus->button |= PAD_TRIGGER_R;
_pPADStatus->triggerRight = TriggerValue; _pPADStatus->triggerRight = TriggerValue;
@ -517,20 +519,20 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
// The digital buttons // The digital buttons
// ----------- // -----------
if (joystate[_numPAD].buttons[CTL_A_BUTTON]) if (PadState[_numPAD].buttons[CTL_A_BUTTON])
{ {
_pPADStatus->button |= PAD_BUTTON_A; _pPADStatus->button |= PAD_BUTTON_A;
_pPADStatus->analogA = 255; // Perhaps support pressure? _pPADStatus->analogA = 255; // Perhaps support pressure?
} }
if (joystate[_numPAD].buttons[CTL_B_BUTTON]) if (PadState[_numPAD].buttons[CTL_B_BUTTON])
{ {
_pPADStatus->button |= PAD_BUTTON_B; _pPADStatus->button |= PAD_BUTTON_B;
_pPADStatus->analogB = 255; // Perhaps support pressure? _pPADStatus->analogB = 255; // Perhaps support pressure?
} }
if (joystate[_numPAD].buttons[CTL_X_BUTTON]) _pPADStatus->button|=PAD_BUTTON_X; if (PadState[_numPAD].buttons[CTL_X_BUTTON]) _pPADStatus->button|=PAD_BUTTON_X;
if (joystate[_numPAD].buttons[CTL_Y_BUTTON]) _pPADStatus->button|=PAD_BUTTON_Y; if (PadState[_numPAD].buttons[CTL_Y_BUTTON]) _pPADStatus->button|=PAD_BUTTON_Y;
if (joystate[_numPAD].buttons[CTL_Z_TRIGGER]) _pPADStatus->button|=PAD_TRIGGER_Z; if (PadState[_numPAD].buttons[CTL_Z_TRIGGER]) _pPADStatus->button|=PAD_TRIGGER_Z;
if (joystate[_numPAD].buttons[CTL_START]) _pPADStatus->button|=PAD_BUTTON_START; if (PadState[_numPAD].buttons[CTL_START]) _pPADStatus->button|=PAD_BUTTON_START;
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
@ -538,20 +540,20 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
// ----------- // -----------
if (PadMapping[_numPAD].controllertype == CTL_DPAD_HAT) if (PadMapping[_numPAD].controllertype == CTL_DPAD_HAT)
{ {
if (joystate[_numPAD].dpad == SDL_HAT_LEFTUP || joystate[_numPAD].dpad == SDL_HAT_UP || joystate[_numPAD].dpad == SDL_HAT_RIGHTUP ) _pPADStatus->button|=PAD_BUTTON_UP; if (PadState[_numPAD].dpad == SDL_HAT_LEFTUP || PadState[_numPAD].dpad == SDL_HAT_UP || PadState[_numPAD].dpad == SDL_HAT_RIGHTUP ) _pPADStatus->button|=PAD_BUTTON_UP;
if (joystate[_numPAD].dpad == SDL_HAT_LEFTUP || joystate[_numPAD].dpad == SDL_HAT_LEFT || joystate[_numPAD].dpad == SDL_HAT_LEFTDOWN ) _pPADStatus->button|=PAD_BUTTON_LEFT; if (PadState[_numPAD].dpad == SDL_HAT_LEFTUP || PadState[_numPAD].dpad == SDL_HAT_LEFT || PadState[_numPAD].dpad == SDL_HAT_LEFTDOWN ) _pPADStatus->button|=PAD_BUTTON_LEFT;
if (joystate[_numPAD].dpad == SDL_HAT_LEFTDOWN || joystate[_numPAD].dpad == SDL_HAT_DOWN || joystate[_numPAD].dpad == SDL_HAT_RIGHTDOWN ) _pPADStatus->button|=PAD_BUTTON_DOWN; if (PadState[_numPAD].dpad == SDL_HAT_LEFTDOWN || PadState[_numPAD].dpad == SDL_HAT_DOWN || PadState[_numPAD].dpad == SDL_HAT_RIGHTDOWN ) _pPADStatus->button|=PAD_BUTTON_DOWN;
if (joystate[_numPAD].dpad == SDL_HAT_RIGHTUP || joystate[_numPAD].dpad == SDL_HAT_RIGHT || joystate[_numPAD].dpad == SDL_HAT_RIGHTDOWN ) _pPADStatus->button|=PAD_BUTTON_RIGHT; if (PadState[_numPAD].dpad == SDL_HAT_RIGHTUP || PadState[_numPAD].dpad == SDL_HAT_RIGHT || PadState[_numPAD].dpad == SDL_HAT_RIGHTDOWN ) _pPADStatus->button|=PAD_BUTTON_RIGHT;
} }
else else
{ {
if (joystate[_numPAD].dpad2[CTL_D_PAD_UP]) if (PadState[_numPAD].dpad2[CTL_D_PAD_UP])
_pPADStatus->button |= PAD_BUTTON_UP; _pPADStatus->button |= PAD_BUTTON_UP;
if (joystate[_numPAD].dpad2[CTL_D_PAD_DOWN]) if (PadState[_numPAD].dpad2[CTL_D_PAD_DOWN])
_pPADStatus->button |= PAD_BUTTON_DOWN; _pPADStatus->button |= PAD_BUTTON_DOWN;
if (joystate[_numPAD].dpad2[CTL_D_PAD_LEFT]) if (PadState[_numPAD].dpad2[CTL_D_PAD_LEFT])
_pPADStatus->button |= PAD_BUTTON_LEFT; _pPADStatus->button |= PAD_BUTTON_LEFT;
if (joystate[_numPAD].dpad2[CTL_D_PAD_RIGHT]) if (PadState[_numPAD].dpad2[CTL_D_PAD_RIGHT])
_pPADStatus->button |= PAD_BUTTON_RIGHT; _pPADStatus->button |= PAD_BUTTON_RIGHT;
} }
@ -564,12 +566,20 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
/* Debugging /* Debugging
Console::ClearScreen(); Console::ClearScreen();
Console::Print( Console::Print(
"Pad %i: %i %i\n"
"Trigger type: %s Left:%04x Right:%04x Value:%i\n" "Trigger type: %s Left:%04x Right:%04x Value:%i\n"
"Buttons: %i X:%i\n"
"D-Pad type: %s L:%i R:%i U:%i D:%i", "D-Pad type: %s L:%i R:%i U:%i D:%i",
_numPAD, PadMapping[_numPAD].enabled, PadState[_numPAD].joy,
(PadMapping[_numPAD].triggertype ? "CTL_TRIGGER_XINPUT" : "CTL_TRIGGER_SDL"), (PadMapping[_numPAD].triggertype ? "CTL_TRIGGER_XINPUT" : "CTL_TRIGGER_SDL"),
TriggerLeft, TriggerRight, TriggerValue, _pPADStatus->triggerLeft, _pPADStatus->triggerRight, TriggerValue,
_pPADStatus->button, PadState[_numPAD].buttons[CTL_X_BUTTON],
(PadMapping[_numPAD].controllertype ? "CTL_DPAD_CUSTOM" : "CTL_DPAD_HAT"), (PadMapping[_numPAD].controllertype ? "CTL_DPAD_CUSTOM" : "CTL_DPAD_HAT"),
0, 0, 0, 0 0, 0, 0, 0
);*/ );*/
} }
@ -587,6 +597,8 @@ unsigned int PAD_GetAttachedPads()
if (PadMapping[2].enabled) connected |= 4; if (PadMapping[2].enabled) connected |= 4;
if (PadMapping[3].enabled) connected |= 8; if (PadMapping[3].enabled) connected |= 8;
//Console::Print("PAD_GetAttachedPads: %i %i %i\n", PadMapping[0].enabled, PadMapping[1].enabled, PadMapping[2].enabled, PadMapping[3].enabled);
return connected; return connected;
} }
@ -608,7 +620,7 @@ unsigned int PAD_GetAttachedPads()
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
int Pad_Convert(int _val) int Pad_Convert(int _val)
{ {
/* If the limits on joystate[].axis[] actually is a u16 then we don't need this /* If the limits on PadState[].axis[] actually is a u16 then we don't need this
but if it's not actually limited to that we need to apply these limits */ but if it's not actually limited to that we need to apply these limits */
if(_val > 32767) _val = 32767; // upper limit if(_val > 32767) _val = 32767; // upper limit
if(_val < -32768) _val = -32768; // lower limit if(_val < -32768) _val = -32768; // lower limit
@ -713,7 +725,7 @@ std::vector<int> Pad_Square_to_Circle(int _x, int _y, int _pad)
// Read current joystick status // Read current joystick status
/* ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ /* ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
The value PadMapping[].buttons[] is the number of the assigned joypad button, The value PadMapping[].buttons[] is the number of the assigned joypad button,
joystate[].buttons[] is the status of the button, it becomes 0 (no pressed) or 1 (pressed) */ PadState[].buttons[] is the status of the button, it becomes 0 (no pressed) or 1 (pressed) */
// Read buttons status. Called from GetJoyState(). // Read buttons status. Called from GetJoyState().
@ -723,7 +735,7 @@ void ReadButton(int controller, int button)
int ctl_button = PadMapping[controller].buttons[button]; int ctl_button = PadMapping[controller].buttons[button];
if (ctl_button < joyinfo[PadMapping[controller].ID].NumButtons) if (ctl_button < joyinfo[PadMapping[controller].ID].NumButtons)
{ {
joystate[controller].buttons[button] = SDL_JoystickGetButton(joystate[controller].joy, ctl_button); PadState[controller].buttons[button] = SDL_JoystickGetButton(PadState[controller].joy, ctl_button);
} }
} }
@ -731,7 +743,7 @@ void ReadButton(int controller, int button)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
/* Called from: PAD_GetStatus() /* Called from: PAD_GetStatus()
Input: The virtual device 0, 1, 2 or 3 Input: The virtual device 0, 1, 2 or 3
Function: Updates the joystate struct with the current pad status. The input value "controller" is Function: Updates the PadState struct with the current pad status. The input value "controller" is
for a virtual controller 0 to 3. */ for a virtual controller 0 to 3. */
void GetJoyState(int controller) void GetJoyState(int controller)
{ {
@ -742,36 +754,37 @@ void GetJoyState(int controller)
int Buttons = joyinfo[PadMapping[controller].ID].NumButtons; int Buttons = joyinfo[PadMapping[controller].ID].NumButtons;
// Update axis states. It doesn't hurt much if we happen to ask for nonexisting axises here. // Update axis states. It doesn't hurt much if we happen to ask for nonexisting axises here.
joystate[controller].axis[CTL_MAIN_X] = SDL_JoystickGetAxis(joystate[controller].joy, PadMapping[controller].axis[CTL_MAIN_X]); PadState[controller].axis[CTL_MAIN_X] = SDL_JoystickGetAxis(PadState[controller].joy, PadMapping[controller].axis[CTL_MAIN_X]);
joystate[controller].axis[CTL_MAIN_Y] = SDL_JoystickGetAxis(joystate[controller].joy, PadMapping[controller].axis[CTL_MAIN_Y]); PadState[controller].axis[CTL_MAIN_Y] = SDL_JoystickGetAxis(PadState[controller].joy, PadMapping[controller].axis[CTL_MAIN_Y]);
joystate[controller].axis[CTL_SUB_X] = SDL_JoystickGetAxis(joystate[controller].joy, PadMapping[controller].axis[CTL_SUB_X]); PadState[controller].axis[CTL_SUB_X] = SDL_JoystickGetAxis(PadState[controller].joy, PadMapping[controller].axis[CTL_SUB_X]);
joystate[controller].axis[CTL_SUB_Y] = SDL_JoystickGetAxis(joystate[controller].joy, PadMapping[controller].axis[CTL_SUB_Y]); PadState[controller].axis[CTL_SUB_Y] = SDL_JoystickGetAxis(PadState[controller].joy, PadMapping[controller].axis[CTL_SUB_Y]);
// Update trigger axises // Update trigger axises
#ifdef _WIN32 #ifdef _WIN32
if (PadMapping[controller].triggertype == CTL_TRIGGER_SDL) if (PadMapping[controller].triggertype == CTL_TRIGGER_SDL)
{ {
#endif #endif
joystate[controller].axis[CTL_L_SHOULDER] = SDL_JoystickGetAxis(joystate[controller].joy, PadMapping[controller].buttons[CTL_L_SHOULDER] - 1000); if(PadMapping[controller].buttons[CTL_L_SHOULDER] >= 1000) PadState[controller].axis[CTL_L_SHOULDER] = SDL_JoystickGetAxis(PadState[controller].joy, PadMapping[controller].buttons[CTL_L_SHOULDER] - 1000);
joystate[controller].axis[CTL_R_SHOULDER] = SDL_JoystickGetAxis(joystate[controller].joy, PadMapping[controller].buttons[CTL_R_SHOULDER] - 1000); if(PadMapping[controller].buttons[CTL_R_SHOULDER] >= 1000) PadState[controller].axis[CTL_R_SHOULDER] = SDL_JoystickGetAxis(PadState[controller].joy, PadMapping[controller].buttons[CTL_R_SHOULDER] - 1000);
#ifdef _WIN32 #ifdef _WIN32
} }
else else
{ {
joystate[controller].axis[CTL_L_SHOULDER] = XInput::GetXI(0, PadMapping[controller].buttons[CTL_L_SHOULDER] - 1000); PadState[controller].axis[CTL_L_SHOULDER] = XInput::GetXI(0, PadMapping[controller].buttons[CTL_L_SHOULDER] - 1000);
joystate[controller].axis[CTL_R_SHOULDER] = XInput::GetXI(0, PadMapping[controller].buttons[CTL_R_SHOULDER] - 1000); PadState[controller].axis[CTL_R_SHOULDER] = XInput::GetXI(0, PadMapping[controller].buttons[CTL_R_SHOULDER] - 1000);
} }
#endif #endif
/* Debugging /* Debugging
Console::ClearScreen(); Console::ClearScreen();
Console::Print("sfjsdfgsdf");
Console::Print( Console::Print(
"Controller and handle: %i %i\n" "Controller and handle: %i %i\n"
"Triggers:%i %i %i %i %i\n", "Triggers:%i %i %i %i %i\n",
controller, (int)joystate[controller].joy, controller, (int)PadState[controller].joy,
PadMapping[controller].triggertype, PadMapping[controller].triggertype,
PadMapping[controller].buttons[CTL_L_SHOULDER], PadMapping[controller].buttons[CTL_R_SHOULDER], PadMapping[controller].buttons[CTL_L_SHOULDER], PadMapping[controller].buttons[CTL_R_SHOULDER],
joystate[controller].axis[CTL_L_SHOULDER], joystate[controller].axis[CTL_R_SHOULDER] PadState[controller].axis[CTL_L_SHOULDER], PadState[controller].axis[CTL_R_SHOULDER]
); */ ); */
ReadButton(controller, CTL_L_SHOULDER); ReadButton(controller, CTL_L_SHOULDER);
@ -785,25 +798,25 @@ void GetJoyState(int controller)
// //
if (PadMapping[controller].halfpress < joyinfo[controller].NumButtons) if (PadMapping[controller].halfpress < joyinfo[controller].NumButtons)
joystate[controller].halfpress = SDL_JoystickGetButton(joystate[controller].joy, PadMapping[controller].halfpress); PadState[controller].halfpress = SDL_JoystickGetButton(PadState[controller].joy, PadMapping[controller].halfpress);
// Check if we have an analog or digital joypad // Check if we have an analog or digital joypad
if (PadMapping[controller].controllertype == CTL_DPAD_HAT) if (PadMapping[controller].controllertype == CTL_DPAD_HAT)
{ {
joystate[controller].dpad = SDL_JoystickGetHat(joystate[controller].joy, PadMapping[controller].dpad); PadState[controller].dpad = SDL_JoystickGetHat(PadState[controller].joy, PadMapping[controller].dpad);
} }
else else
{ {
/* Only do this if the assigned button is in range (to allow for the current way of saving keyboard /* Only do this if the assigned button is in range (to allow for the current way of saving keyboard
keys in the same array) */ keys in the same array) */
if(PadMapping[controller].dpad2[CTL_D_PAD_UP] <= Buttons) if(PadMapping[controller].dpad2[CTL_D_PAD_UP] <= Buttons)
joystate[controller].dpad2[CTL_D_PAD_UP] = SDL_JoystickGetButton(joystate[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_UP]); PadState[controller].dpad2[CTL_D_PAD_UP] = SDL_JoystickGetButton(PadState[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_UP]);
if(PadMapping[controller].dpad2[CTL_D_PAD_DOWN] <= Buttons) if(PadMapping[controller].dpad2[CTL_D_PAD_DOWN] <= Buttons)
joystate[controller].dpad2[CTL_D_PAD_DOWN] = SDL_JoystickGetButton(joystate[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_DOWN]); PadState[controller].dpad2[CTL_D_PAD_DOWN] = SDL_JoystickGetButton(PadState[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_DOWN]);
if(PadMapping[controller].dpad2[CTL_D_PAD_LEFT] <= Buttons) if(PadMapping[controller].dpad2[CTL_D_PAD_LEFT] <= Buttons)
joystate[controller].dpad2[CTL_D_PAD_LEFT] = SDL_JoystickGetButton(joystate[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_LEFT]); PadState[controller].dpad2[CTL_D_PAD_LEFT] = SDL_JoystickGetButton(PadState[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_LEFT]);
if(PadMapping[controller].dpad2[CTL_D_PAD_RIGHT] <= Buttons) if(PadMapping[controller].dpad2[CTL_D_PAD_RIGHT] <= Buttons)
joystate[controller].dpad2[CTL_D_PAD_RIGHT] = SDL_JoystickGetButton(joystate[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_RIGHT]); PadState[controller].dpad2[CTL_D_PAD_RIGHT] = SDL_JoystickGetButton(PadState[controller].joy, PadMapping[controller].dpad2[CTL_D_PAD_RIGHT]);
} }
} }
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////

9
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
View File

@ -105,7 +105,7 @@
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Structures // Structures
/* ¯¯¯¯¯¯¯¯¯¯ /* ¯¯¯¯¯¯¯¯¯¯
CONTROLLER_STATE buttons (joystate) = 0 or 1 CONTROLLER_STATE buttons (PadState) = 0 or 1
CONTROLLER_MAPPING buttons (joystick) = 0 or 1, 2, 3, 4, a certain joypad button CONTROLLER_MAPPING buttons (joystick) = 0 or 1, 2, 3, 4, a certain joypad button
Please remember: The axis limit is hardcoded here, if you allow more axises (for Please remember: The axis limit is hardcoded here, if you allow more axises (for
@ -147,6 +147,7 @@ struct CONTROLLER_INFO // CONNECTED WINDOWS DEVICES INFO
int NumHats; // Amount of Hats (POV) int NumHats; // Amount of Hats (POV)
std::string Name; // Joypad/stickname std::string Name; // Joypad/stickname
int ID; // SDL joystick device ID int ID; // SDL joystick device ID
bool Good;
SDL_Joystick *joy; // SDL joystick device SDL_Joystick *joy; // SDL joystick device
}; };
@ -226,10 +227,12 @@ extern std::vector<u8> Keys;
// ¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯
#ifndef _CONTROLLER_STATE_H #ifndef _CONTROLLER_STATE_H
extern FILE *pFile; extern FILE *pFile;
extern CONTROLLER_INFO *joyinfo; //extern CONTROLLER_INFO *joyinfo;
extern CONTROLLER_STATE joystate[4]; extern std::vector<CONTROLLER_INFO> joyinfo;
extern CONTROLLER_STATE PadState[4];
extern CONTROLLER_MAPPING PadMapping[4]; extern CONTROLLER_MAPPING PadMapping[4];
extern HWND m_hWnd; // Handle to window extern HWND m_hWnd; // Handle to window
extern int NumPads, NumGoodPads; // Number of goods pads
#endif #endif