Calibrated emulated Wiimote aiming in widescreen mode. Added config menu to Wiimote. Added hide cursor option to OpenGL plugin. Added custom Wii settings and moved SYSCONF to User/Config (it will be copied by the game to Wii/shared2/sys when a game is run). Made the DSP and Video debugging windowses run on the same dll instance as the main instance.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1188 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/BootManager.cpp

@@ -26,6 +26,7 @@
 #include "Volume.h"
 #include "VolumeCreator.h"
 #include "Config.h"
+#include "ConfigMain.h"
 #include "Core.h"
 #if !defined(OSX64)
 #include "Frame.h"
@@ -89,9 +90,61 @@ bool BootCore(const std::string& _rFilename)
 	std::string unique_id = StartUp.GetUniqueID();
 	if (unique_id.size() == 6 && ini.Load((FULL_GAMECONFIG_DIR + unique_id + ".ini").c_str()))
 	{
+		// ------------------------------------------------
+		// General settings
+		// ----------------
 		ini.Get("Core", "UseDualCore", &StartUp.bUseDualCore, StartUp.bUseDualCore);
 		ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
 		ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
+
+
+		// ------------------------------------------------
+		// Read SYSCONF settings
+		// ----------------
+		bool bEnableProgressiveScan, bEnableWideScreen;
+		//bRefreshList = false;
+		FILE* pStream; // file handle
+		u8 m_SYSCONF[0x4000]; // SYSCONF file
+		u16 IPL_PGS = 0x17CC; // pregressive scan
+		u16 IPL_AR = 0x04D9; // widescreen
+
+		// Load Wii SYSCONF
+		pStream = NULL;
+		pStream = fopen(FULL_CONFIG_DIR "SYSCONF", "rb");
+		if (pStream != NULL)
+		{
+			fread(m_SYSCONF, 1, 0x4000, pStream);
+			fclose(pStream);
+
+			//wxMessageBox(wxString::Format(": %02x", m_SYSCONF[IPL_AR]));
+
+			ini.Get("Core", "EnableProgressiveScan", &bEnableProgressiveScan, (int)m_SYSCONF[IPL_PGS]);
+			ini.Get("Core", "EnableWideScreen", &bEnableWideScreen, (int)m_SYSCONF[IPL_AR]);
+
+			m_SYSCONF[IPL_PGS] = bEnableProgressiveScan;
+			m_SYSCONF[IPL_AR] = bEnableWideScreen;
+
+			//wxMessageBox(wxString::Format(": %02x", m_SYSCONF[IPL_AR]));
+
+			// Enable custom Wii SYSCONF settings by saving the file to shared2
+			pStream = NULL;
+			pStream = fopen(FULL_WII_USER_DIR "shared2/sys/SYSCONF", "wb");
+			if (pStream != NULL)
+			{
+				fwrite(m_SYSCONF, 1, 0x4000, pStream);
+				fclose(pStream);
+			}	
+			else
+			{
+				PanicAlert("Could not write to shared2/sys/SYSCONF");
+			}	
+			
+		}
+		else
+		{
+			PanicAlert("Could not write to SYSCONF");
+		}
+		// ----------------
 	}
 #if !defined(OSX64)
 	if(main_frame)

Source/Core/DolphinWX/Src/ConfigMain.cpp

@@ -64,7 +64,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
 	
 	// Load Wii SYSCONF
 	pStream = NULL;
-	pStream = fopen(FULL_WII_USER_DIR "shared2/sys/SYSCONF", "rb");
+	pStream = fopen(FULL_CONFIG_DIR "SYSCONF", "rb");
     if (pStream != NULL)
     {
         fread(m_SYSCONF, 1, 0x4000, pStream);
@@ -301,8 +301,19 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event))
 {
 	Destroy();
 
-	// Save Wii SYSCONF
+	// Save Wii SYSCONF twice so that we can keep game specific settings for it
 	pStream = NULL;
+	pStream = fopen(FULL_CONFIG_DIR "SYSCONF", "wb");
+	if (pStream != NULL)
+	{
+		fwrite(m_SYSCONF, 1, 0x4000, pStream);
+		fclose(pStream);
+	}
+	else
+	{
+		PanicAlert("Could not write to SYSCONF");
+	}
+
 	pStream = fopen(FULL_WII_USER_DIR "shared2/sys/SYSCONF", "wb");
 	if (pStream != NULL)
 	{
@@ -311,7 +322,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event))
 	}
 	else
 	{
-		PanicAlert("Could not write to Wii SYSCONF");
+		PanicAlert("Could not write to shared2/sys/SYSCONF");
 	}
 
 	// save the config... dolphin crashes by far to often to save the settings on closing only

Source/Core/DolphinWX/Src/Frame.cpp

@@ -93,6 +93,7 @@ EVT_MENU(IDM_CONFIG_MAIN, CFrame::OnConfigMain)
 EVT_MENU(IDM_CONFIG_GFX_PLUGIN, CFrame::OnPluginGFX)
 EVT_MENU(IDM_CONFIG_DSP_PLUGIN, CFrame::OnPluginDSP)
 EVT_MENU(IDM_CONFIG_PAD_PLUGIN, CFrame::OnPluginPAD)
+EVT_MENU(IDM_CONFIG_WIIMOTE_PLUGIN, CFrame::OnPluginWiimote)
 EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
 EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
 EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen)
@@ -289,6 +290,7 @@ void CFrame::PopulateToolbar(wxToolBar* toolBar)
 	toolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _T("GFX"),  m_Bitmaps[Toolbar_PluginGFX], _T("GFX settings"));
 	toolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _T("DSP"),  m_Bitmaps[Toolbar_PluginDSP], _T("DSP settings"));
 	toolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _T("PAD"),  m_Bitmaps[Toolbar_PluginPAD], _T("PAD settings"));
+	toolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _T("Wiimote"),  m_Bitmaps[Toolbar_PluginPAD], _T("Wiimote settings"));
 	toolBar->AddSeparator();
 	toolBar->AddTool(IDM_HELPABOUT, _T("About"), m_Bitmaps[Toolbar_Help], _T("About Dolphin"));
 
@@ -480,7 +482,6 @@ void CFrame::OnPluginDSP(wxCommandEvent& WXUNUSED (event))
 			);
 }
 
-
 void CFrame::OnPluginPAD(wxCommandEvent& WXUNUSED (event))
 {
 	CPluginManager::GetInstance().OpenConfig(
@@ -488,7 +489,7 @@ void CFrame::OnPluginPAD(wxCommandEvent& WXUNUSED (event))
 			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strPadPlugin.c_str()
 			);
 }
-void CFrame::OnPluginWiiMote(wxCommandEvent& WXUNUSED (event))
+void CFrame::OnPluginWiimote(wxCommandEvent& WXUNUSED (event))
 {
 	CPluginManager::GetInstance().OpenConfig(
 			GetHandle(),

Source/Core/DolphinWX/Src/Frame.h

@@ -64,7 +64,7 @@ class CFrame : public wxFrame
 		void OnPluginGFX(wxCommandEvent& event);
 		void OnPluginDSP(wxCommandEvent& event);
 		void OnPluginPAD(wxCommandEvent& event);
-		void OnPluginWiiMote(wxCommandEvent& event);
+		void OnPluginWiimote(wxCommandEvent& event);
 		void OnOpen(wxCommandEvent& event);
 		void OnPlay(wxCommandEvent& event);
 		void OnStop(wxCommandEvent& event);

Source/Core/DolphinWX/Src/Globals.h

@@ -57,6 +57,7 @@ enum
 	IDM_CONFIG_GFX_PLUGIN,
 	IDM_CONFIG_DSP_PLUGIN,
 	IDM_CONFIG_PAD_PLUGIN,
+	IDM_CONFIG_WIIMOTE_PLUGIN,
 	IDM_TOGGLE_FULLSCREEN,
 	IDM_TOGGLE_DUALCORE,
 	IDM_TOGGLE_SKIPIDLE,

Source/Core/DolphinWX/Src/ISOProperties.cpp

@@ -201,10 +201,13 @@ void CISOProperties::CreateGUIControls()
 	// GameConfig editing - Core overrides and emulation state
 	sbCoreOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
 	sCoreOverrides = new wxBoxSizer(wxVERTICAL);
-	OverrideText = new wxStaticText(m_GameConfig, ID_OVERRIDE_TEXT, _("These settings override core Dolphin settings.\nThe 3rd state means the game uses Dolphin's setting."), wxDefaultPosition, wxDefaultSize);
+	OverrideText = new wxStaticText(m_GameConfig, ID_OVERRIDE_TEXT, _("These settings override core Dolphin settings. The 3rd state means the game uses Dolphin's setting."), wxDefaultPosition, wxDefaultSize);
 	UseDualCore = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	OptimizeQuantizers = new wxCheckBox(m_GameConfig, ID_OPTIMIZEQUANTIZERS, _("Optimize Quantizers"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	EnableProgressiveScan = new wxCheckBox(m_GameConfig, ID_ENABLEPROGRESSIVESCAN, _("[Wii] Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("[Wii] Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	
 	sEmuState = new wxBoxSizer(wxHORIZONTAL);
 	arrayStringFor_EmuState.Add(_("Not Set"));
 	arrayStringFor_EmuState.Add(_("Broken"));
@@ -243,6 +246,8 @@ void CISOProperties::CreateGUIControls()
 	sCoreOverrides->Add(UseDualCore, 0, wxEXPAND|wxLEFT, 5);
 	sCoreOverrides->Add(SkipIdle, 0, wxEXPAND|wxLEFT, 5);
 	sCoreOverrides->Add(OptimizeQuantizers, 0, wxEXPAND|wxLEFT, 5);
+	sCoreOverrides->Add(EnableProgressiveScan, 0, wxEXPAND|wxLEFT, 5);
+	sCoreOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5);
 	sEmuState->AddStretchSpacer();
 	sEmuState->Add(EmuStateText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0);
 	sEmuState->Add(EmuState, 0, wxEXPAND|wxALL, 0);
@@ -473,6 +478,16 @@ void CISOProperties::LoadGameConfig()
 	else
 		OptimizeQuantizers->Set3StateValue(wxCHK_UNDETERMINED);
 
+	if (GameIni.Get("Core", "EnableProgressiveScan", &bTemp))
+		EnableProgressiveScan->Set3StateValue((wxCheckBoxState)bTemp);
+	else
+		EnableProgressiveScan->Set3StateValue(wxCHK_UNDETERMINED);
+
+	if (GameIni.Get("Core", "EnableWideScreen", &bTemp))
+		EnableWideScreen->Set3StateValue((wxCheckBoxState)bTemp);
+	else
+		EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED);
+
 	GameIni.Get("EmuState", "EmulationStateId", &iTemp, 0);
 	EmuState->SetSelection(iTemp);
 
@@ -499,6 +514,16 @@ bool CISOProperties::SaveGameConfig(std::string GameIniFile)
 	else
 		GameIni.Set("Core", "OptimizeQuantizers", OptimizeQuantizers->Get3StateValue());
 
+	if (EnableProgressiveScan->Get3StateValue() == wxCHK_UNDETERMINED)
+		GameIni.DeleteKey("Core", "EnableProgressiveScan");
+	else
+		GameIni.Set("Core", "EnableProgressiveScan", EnableProgressiveScan->Get3StateValue());
+
+	if (EnableWideScreen->Get3StateValue() == wxCHK_UNDETERMINED)
+		GameIni.DeleteKey("Core", "EnableWideScreen");
+	else
+		GameIni.Set("Core", "EnableWideScreen", EnableWideScreen->Get3StateValue());
+
 	GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection());
 	return GameIni.Save(GameIniFile.c_str());
 

Source/Core/DolphinWX/Src/ISOProperties.h

@@ -73,6 +73,8 @@ class CISOProperties : public wxDialog
 		wxCheckBox *UseDualCore;
 		wxCheckBox *SkipIdle;
 		wxCheckBox *OptimizeQuantizers;
+		wxCheckBox *EnableProgressiveScan, *EnableWideScreen; // Wii
+
 		wxStaticText *EmuStateText;
 		wxArrayString arrayStringFor_EmuState;
 		wxChoice *EmuState;
@@ -131,6 +133,8 @@ class CISOProperties : public wxDialog
 			ID_OVERRIDE_TEXT,
 			ID_USEDUALCORE,
 			ID_IDLESKIP,
+			ID_ENABLEPROGRESSIVESCAN,
+			ID_ENABLEWIDESCREEN,
 			ID_OPTIMIZEQUANTIZERS,
 			ID_EMUSTATE_TEXT,
 			ID_EMUSTATE,

Source/Core/DolphinWX/Src/PluginManager.cpp

@@ -24,6 +24,28 @@
 #include "PluginManager.h"
 #include "StringUtil.h"
 
+/* Why does it crash if we try to open the debugger in the same instance like this? */
+namespace PluginVideo
+{
+	extern DynamicLibrary plugin;
+	extern bool IsLoaded();
+	extern bool LoadPlugin(const char *_Filename);
+	extern void Debug(HWND _hwnd, bool Show);
+}
+
+
+namespace PluginDSP
+{
+	extern DynamicLibrary plugin;
+	extern bool IsLoaded();
+	extern bool LoadPlugin(const char *_Filename);
+	extern void Debug(HWND _hwnd, bool Show);
+}
+
+
+//void(__cdecl * m_DllDebugger)    (HWND _hParent) = 0;
+
+
 CPluginManager CPluginManager::m_Instance;
 
 
@@ -35,6 +57,9 @@ CPluginManager::~CPluginManager()
 {}
 
 
+// ----------------------------------------
+// Create list of avaliable plugins
+// -------------
 void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
 {
 	m_PluginInfos.clear();
@@ -98,24 +123,49 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
 	}
 }
 
+
+// ----------------------------------------
+// Open config window. _rFilename = plugin filename ,ret = the dll slot number
+// -------------
 void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename)
 {
-	if (Common::CPlugin::Load(_rFilename))
-	{
-		Common::CPlugin::Config((HWND)_Parent);
-		Common::CPlugin::Release();
-	}
+	int ret = Common::CPlugin::Load(_rFilename);
+
+	Common::CPlugin::Config((HWND)_Parent);
+	Common::CPlugin::Release();	
 }
 
-void CPluginManager::OpenDebug(void* _Parent, const char *_rFilename)
+// ----------------------------------------
+// Open debugging window. Type = Video or DSP. Show = Show or hide window.
+// -------------
+void CPluginManager::OpenDebug(void* _Parent, const char *_rFilename, bool Type, bool Show)
 {
-	if (Common::CPlugin::Load(_rFilename))
-	{
-		Common::CPlugin::Debug((HWND)_Parent);
+	//int ret = 1;
+	//int ret = Common::CPlugin::Load(_rFilename, true);
+	//int ret = PluginVideo::LoadPlugin(_rFilename);
+	//int ret = PluginDSP::LoadPlugin(_rFilename);
+
+		if(Type)
+		{
+			//Common::CPlugin::Debug((HWND)_Parent);
+			if(!PluginVideo::IsLoaded()) PluginVideo::LoadPlugin(_rFilename);
+			PluginVideo::Debug((HWND)_Parent, Show);
+		}
+		else
+		{
+			if(!PluginDSP::IsLoaded()) PluginDSP::LoadPlugin(_rFilename);
+			PluginDSP::Debug((HWND)_Parent, Show);
+		}
 		//Common::CPlugin::Release(); // this is only if the wx dialog is called with ShowModal()
-	}
+
+		//m_DllDebugger = (void (__cdecl*)(HWND))PluginVideo::plugin.Get("DllDebugger");
+		//m_DllDebugger(NULL);
 }
 
+
+// ----------------------------------------
+// Get dll info
+// -------------
 CPluginInfo::CPluginInfo(const char *_rFileName)
 	: m_FileName(_rFileName)
 	, m_Valid(false)

Source/Core/DolphinWX/Src/PluginManager.h

@@ -42,7 +42,7 @@ public:
 	static CPluginManager& GetInstance() {return(m_Instance);}
 	void ScanForPlugins(wxWindow* _wxWindow);
 	void OpenConfig(void* _Parent, const char *_rFilename);
-	void OpenDebug(void* _Parent, const char *_rFilename);
+	void OpenDebug(void* _Parent, const char *_rFilename, bool Type, bool Show);
 	const CPluginInfos& GetPluginInfos() {return(m_PluginInfos);}
 
 private: